diff --git a/sound_thai/sublang/north/drinkfinish.wav b/sound_thai/sublang/north/drinkfinish.wav deleted file mode 100644 index 48e90e72..00000000 Binary files a/sound_thai/sublang/north/drinkfinish.wav and /dev/null differ diff --git a/sound_thai/sublang/north/next_drink.wav b/sound_thai/sublang/north/next_drink.wav deleted file mode 100644 index 94ce680b..00000000 Binary files a/sound_thai/sublang/north/next_drink.wav and /dev/null differ diff --git a/sound_thai/sublang/north/payment.wav b/sound_thai/sublang/north/payment.wav deleted file mode 100644 index b8b2b62a..00000000 Binary files a/sound_thai/sublang/north/payment.wav and /dev/null differ diff --git a/sound_thai/sublang/north/select_level.wav b/sound_thai/sublang/north/select_level.wav deleted file mode 100644 index 9ecf7911..00000000 Binary files a/sound_thai/sublang/north/select_level.wav and /dev/null differ diff --git a/sound_thai/sublang/north/taobin_sawade.wav b/sound_thai/sublang/north/taobin_sawade.wav deleted file mode 100644 index c7bad4c5..00000000 Binary files a/sound_thai/sublang/north/taobin_sawade.wav and /dev/null differ diff --git a/sound_thai/sublang/north/thankyou.wav b/sound_thai/sublang/north/thankyou.wav deleted file mode 100644 index 74bc3746..00000000 Binary files a/sound_thai/sublang/north/thankyou.wav and /dev/null differ diff --git a/sound_thai/sublang/northeast/drinkfinish.wav b/sound_thai/sublang/northeast/drinkfinish.wav deleted file mode 100644 index 70a5144b..00000000 Binary files a/sound_thai/sublang/northeast/drinkfinish.wav and /dev/null differ diff --git a/sound_thai/sublang/northeast/next_drink.wav b/sound_thai/sublang/northeast/next_drink.wav deleted file mode 100644 index 9ae6ba2b..00000000 Binary files a/sound_thai/sublang/northeast/next_drink.wav and /dev/null differ diff --git a/sound_thai/sublang/northeast/payment.wav b/sound_thai/sublang/northeast/payment.wav deleted file mode 100644 index 52e09de0..00000000 Binary files a/sound_thai/sublang/northeast/payment.wav and /dev/null differ diff --git a/sound_thai/sublang/northeast/select_level.wav b/sound_thai/sublang/northeast/select_level.wav deleted file mode 100644 index edc9239c..00000000 Binary files a/sound_thai/sublang/northeast/select_level.wav and /dev/null differ diff --git a/sound_thai/sublang/northeast/taobin_sawade.wav b/sound_thai/sublang/northeast/taobin_sawade.wav deleted file mode 100644 index 642a65e8..00000000 Binary files a/sound_thai/sublang/northeast/taobin_sawade.wav and /dev/null differ diff --git a/sound_thai/sublang/northeast/thankyou.wav b/sound_thai/sublang/northeast/thankyou.wav deleted file mode 100644 index e4d7b56f..00000000 Binary files a/sound_thai/sublang/northeast/thankyou.wav and /dev/null differ diff --git a/sound_thai/sublang/south/drinkfinish.wav b/sound_thai/sublang/south/drinkfinish.wav deleted file mode 100644 index 3987c2ab..00000000 Binary files a/sound_thai/sublang/south/drinkfinish.wav and /dev/null differ diff --git a/sound_thai/sublang/south/next_drink.wav b/sound_thai/sublang/south/next_drink.wav deleted file mode 100644 index f28bbc5e..00000000 Binary files a/sound_thai/sublang/south/next_drink.wav and /dev/null differ diff --git a/sound_thai/sublang/south/payment.wav b/sound_thai/sublang/south/payment.wav deleted file mode 100644 index 8b6579b0..00000000 Binary files a/sound_thai/sublang/south/payment.wav and /dev/null differ diff --git a/sound_thai/sublang/south/select_level.wav b/sound_thai/sublang/south/select_level.wav deleted file mode 100644 index fc102cdb..00000000 Binary files a/sound_thai/sublang/south/select_level.wav and /dev/null differ diff --git a/sound_thai/sublang/south/taobin_sawade.wav b/sound_thai/sublang/south/taobin_sawade.wav deleted file mode 100644 index b2477760..00000000 Binary files a/sound_thai/sublang/south/taobin_sawade.wav and /dev/null differ diff --git a/sound_thai/sublang/south/thankyou.wav b/sound_thai/sublang/south/thankyou.wav deleted file mode 100644 index 06e1eefb..00000000 Binary files a/sound_thai/sublang/south/thankyou.wav and /dev/null differ diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 12aa5994..e73cec1a 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -69,14 +69,16 @@ Else Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3" - If SoundThaiIndex = 1 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/north/thankyou.wav" - EndIf - If SoundThaiIndex = 2 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/northeast/thankyou.wav" - EndIf - If SoundThaiIndex = 3 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/south/thankyou.wav" + ; Play Sound #zone + If SoundBackToSchoolEnable = 1 Then + + If SoundBackToSchoolType = 1 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" + EndIf + If SoundBackToSchoolType = 2 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" + EndIf + Var PlaySoundLag = RootPathSoundBackToSchool + "thankyou.wav" EndIf Play PlaySoundLag @@ -562,14 +564,17 @@ Else Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/next_drink.mp3" - If SoundThaiIndex = 1 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/north/next_drink.wav" - EndIf - If SoundThaiIndex = 2 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/northeast/next_drink.wav" - EndIf - If SoundThaiIndex = 3 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/south/next_drink.wav" + + ; Play Sound #zone + If SoundBackToSchoolEnable = 1 Then + + If SoundBackToSchoolType = 1 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" + EndIf + If SoundBackToSchoolType = 2 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" + EndIf + Var PlaySoundLag = RootPathSoundBackToSchool + "next_drink.wav" EndIf PlayLong PlaySoundLag diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml index e3a0b1e8..e1eb02ba 100644 --- a/xml/page_catalog2.xml +++ b/xml/page_catalog2.xml @@ -68,16 +68,7 @@ Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3" - If SoundThaiIndex = 1 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/north/taobin_sawade.wav" - EndIf - If SoundThaiIndex = 2 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/northeast/taobin_sawade.wav" - EndIf - If SoundThaiIndex = 3 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/south/taobin_sawade.wav" - EndIf - + ; Play Sound #zone If SoundBackToSchoolEnable = 1 Then If SoundBackToSchoolType = 1 Then @@ -86,6 +77,7 @@ If SoundBackToSchoolType = 2 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" EndIf + Var PlaySoundLag = RootPathSoundBackToSchool + "taobin_sawade.wav" EndIf Play PlaySoundLag diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index c46734db..d83c3e02 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -476,15 +476,19 @@ Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw.mp3" Else Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/drinkfinish.mp3" - If SoundThaiIndex = 1 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/north/drinkfinish.wav" - EndIf - If SoundThaiIndex = 2 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/northeast/drinkfinish.wav" - EndIf - If SoundThaiIndex = 3 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/south/drinkfinish.wav" + + ; Play Sound #zone + If SoundBackToSchoolEnable = 1 Then + + If SoundBackToSchoolType = 1 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" + EndIf + If SoundBackToSchoolType = 2 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" + EndIf + Var PlaySoundLag = RootPathSoundBackToSchool + "drinkfinish.wav" EndIf + Play PlaySoundLag EndIf EndIf diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 4f76153a..a694fb3e 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -133,16 +133,20 @@ Else Var DirImage = "ROOT/taobin_project/image/page_payment" Var PlaySoundLag = "ROOT/taobin_project/sound_thai/payment.mp3" - If SoundThaiIndex = 1 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/north/payment.wav" - EndIf - If SoundThaiIndex = 2 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/northeast/payment.wav" - EndIf - If SoundThaiIndex = 3 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/south/payment.wav" + + ; Play Sound #zone + If SoundBackToSchoolEnable = 1 Then + + If SoundBackToSchoolType = 1 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" + EndIf + If SoundBackToSchoolType = 2 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" + EndIf + Var PlaySoundLag = RootPathSoundBackToSchool + "payment.wav" EndIf + Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a" EndIf diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 4f8b38f6..4f10a959 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -983,7 +983,23 @@ If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_mobile.mp3" Else - PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_mobile.mp3" + + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_mobile.mp3" + + ; Play Sound #zone + If SoundBackToSchoolEnable = 1 Then + + If SoundBackToSchoolType = 1 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" + EndIf + If SoundBackToSchoolType = 2 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" + EndIf + Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_mobile.wav" + EndIf + + Play PlaySoundLag + EndIf EndIf @@ -1008,7 +1024,22 @@ If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + + ; Play Sound #zone + If SoundBackToSchoolEnable = 1 Then + + If SoundBackToSchoolType = 1 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" + EndIf + If SoundBackToSchoolType = 2 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" + EndIf + Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" + EndIf + + Play PlaySoundLag + EndIf EndIf @@ -1036,7 +1067,21 @@ If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + + ; Play Sound #zone + If SoundBackToSchoolEnable = 1 Then + + If SoundBackToSchoolType = 1 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" + EndIf + If SoundBackToSchoolType = 2 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" + EndIf + Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" + EndIf + + Play PlaySoundLag EndIf EndIf @@ -1062,7 +1107,21 @@ If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + + ; Play Sound #zone + If SoundBackToSchoolEnable = 1 Then + + If SoundBackToSchoolType = 1 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" + EndIf + If SoundBackToSchoolType = 2 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" + EndIf + Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" + EndIf + + Play PlaySoundLag EndIf EndIf @@ -1088,7 +1147,21 @@ If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + + ; Play Sound #zone + If SoundBackToSchoolEnable = 1 Then + + If SoundBackToSchoolType = 1 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" + EndIf + If SoundBackToSchoolType = 2 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" + EndIf + Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" + EndIf + + Play PlaySoundLag EndIf EndIf @@ -1114,7 +1187,21 @@ If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + + ; Play Sound #zone + If SoundBackToSchoolEnable = 1 Then + + If SoundBackToSchoolType = 1 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" + EndIf + If SoundBackToSchoolType = 2 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" + EndIf + Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" + EndIf + + Play PlaySoundLag EndIf EndIf @@ -1145,7 +1232,21 @@ If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + + ; Play Sound #zone + If SoundBackToSchoolEnable = 1 Then + + If SoundBackToSchoolType = 1 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" + EndIf + If SoundBackToSchoolType = 2 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" + EndIf + Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" + EndIf + + Play PlaySoundLag EndIf EndIf @@ -1174,7 +1275,21 @@ If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + + ; Play Sound #zone + If SoundBackToSchoolEnable = 1 Then + + If SoundBackToSchoolType = 1 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" + EndIf + If SoundBackToSchoolType = 2 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" + EndIf + Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" + EndIf + + Play PlaySoundLag EndIf EndIf @@ -1203,7 +1318,21 @@ If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + + ; Play Sound #zone + If SoundBackToSchoolEnable = 1 Then + + If SoundBackToSchoolType = 1 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" + EndIf + If SoundBackToSchoolType = 2 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" + EndIf + Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" + EndIf + + Play PlaySoundLag EndIf EndIf diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index b4a3a157..85c44554 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -464,16 +464,18 @@ Else Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" - If SoundThaiIndex = 1 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/north/select_level.wav" + ; Play Sound #zone + If SoundBackToSchoolEnable = 1 Then + + If SoundBackToSchoolType = 1 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" + EndIf + If SoundBackToSchoolType = 2 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" + EndIf + Var PlaySoundLag = RootPathSoundBackToSchool + "select_level.wav" EndIf - If SoundThaiIndex = 2 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/northeast/select_level.wav" - EndIf - If SoundThaiIndex = 3 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/south/select_level.wav" - EndIf - + Play PlaySoundLag EndIf EndIf @@ -3639,12 +3641,7 @@ EndIf ; - If OreoDueEnable = 1 Then - If UserSelectProductCode = "12-03-03-0009-alter" Then - Var PromotionIDCurrentOrder = 2 - Var UserSelectProductCode = "12-03-03-0009" - EndIf - EndIf + DEBUGVAR PromotionIDCurrentOrder