diff --git a/inter/sgp/menu/lang.tsv b/inter/sgp/menu/lang.tsv index 1f92ddf5..f80ae8c0 100644 --- a/inter/sgp/menu/lang.tsv +++ b/inter/sgp/menu/lang.tsv @@ -806,5 +806,27 @@ TextID Note English Thai 800743 จ่าย ช่อง %d ผง %d ใน 0.1 วิ Pay slot %d powder %d in 0.1 sec 800744 จ่าย %s ผง %d ใน 0.1 วิ Pay %s powder %d in 0.1 sec 800745 จ่าย %s ผง %d กรัม Pay %s powder %d gram -800746 หมุนล้าง Rotate clean -800747 หมุนชง Rotate brew +800746 Rotate clean หมุนล้าง +800747 Rotate brew หมุนชง +800748 Ginder เครื่องบด +800749 Do you clean GInder module? ล้างเครื่องบดหรือยัง? + +800750 Soda Bath ถังแช่โซดา +800751 Do you clean Soda bath? ล้างถังแสดงโซดาหรือยัง? + +800752 Change / Clean เปลี่ยน / ทำความสะอาด + +800753 Powder Canister กล่องผง +800754 Syrup buffer ถังไซรับ +800755 Bean Canister กล่องเมล็ด +800756 Whipper Module ชุดหัวชง +800757 Clean bowl ถ้วยล้าง +800758 Arm module ชุดแขน +800759 Change Module เปลี่ยนอุปกรณ์ +800760 Clean ทำความสะอาด +800761 Disc Powder ฐานจานผง +800762 Change/Clean เปลี่ยน/ทำตวามสะอาด +800763 Did you change/clean module or not? เปลียนหรือทำความสะอาดอุปกรณ์หรือไม่ +800764 Did you change module or not? เปลียนอุปกรณ์หรือไม่ +800765 Did you clean module or not? ทำความสะอาดหรือไม่ +800766 SerialNumber ตัวเลขประจำอุปกรณ์ diff --git a/inter/sgp/xml/page_brewing3.lxml b/inter/sgp/xml/page_brewing3.lxml index f69262d4..63e5d228 100644 --- a/inter/sgp/xml/page_brewing3.lxml +++ b/inter/sgp/xml/page_brewing3.lxml @@ -427,7 +427,7 @@ Var ButtonGamePressToPlayState = "Invisible" - + CashlessReq SUCCESS diff --git a/inter/sgp/xml/page_catalog_group_tea.lxml b/inter/sgp/xml/page_catalog_group_tea.lxml index 8aae7952..76e7a0e4 100644 --- a/inter/sgp/xml/page_catalog_group_tea.lxml +++ b/inter/sgp/xml/page_catalog_group_tea.lxml @@ -7308,7 +7308,7 @@ Var PD_CODE3 = "52-02-03-0064" ; begin lang Var aliasName[0] = "Coconut\nJasmine milk tea" - Var aliasDesc[0] = "Coconut Syrup, Jasmine Tea, Milk \nWater" + Var aliasDesc[0] = "Coconut Syrup, Jasmine Tea, Milk" Var aliasName[1] = "" Var aliasDesc[1] = "" Var aliasName[2] = "" @@ -7441,9 +7441,9 @@ KanitMediumTTF 0x6F5F51 - Coconut Syrup, Jasmine Tea, Milk \nWater + Coconut Syrup, Jasmine Tea, Milk - Coconut Syrup, Jasmine Tea, Milk \nWater + Coconut Syrup, Jasmine Tea, Milk diff --git a/inter/sgp/xml/page_topping_select6.lxml b/inter/sgp/xml/page_topping_select6.lxml index 5753851b..3fd36165 100644 --- a/inter/sgp/xml/page_topping_select6.lxml +++ b/inter/sgp/xml/page_topping_select6.lxml @@ -3634,7 +3634,7 @@ EndIf ; - + Var SelectDrink = UserSelectProductCode Var Seeker.selected_a_drink = UserSelectProductCode @@ -3695,7 +3695,6 @@ EndIf - GetLongTimeInMinute LastTimeClickOrder If CART_COUNT = 0 Then diff --git a/xml/page_payment_cash-SGP.xml b/xml/page_payment_cash-SGP.xml index bcf9809a..3bb8e58f 100644 --- a/xml/page_payment_cash-SGP.xml +++ b/xml/page_payment_cash-SGP.xml @@ -1769,6 +1769,8 @@ EndIf SoundVolume ;VendingQR OFF + + SAVELOG "AdultState1 click" If CoinInOK = 0 Then If CancelFlag = 0 Then @@ -1818,6 +1820,9 @@ EndIf SoundVolume ;VendingQR OFF + + SAVELOG "AdultState3 click" + If CoinInOK = 0 Then If CancelFlag = 0 Then @@ -1855,7 +1860,8 @@ EndIf - + SAVELOG "alphaState2 click" + If CoinInOK = 0 Then If CancelFlag = 0 Then SAVELOG "ButtonCancleAlpha2 > Cancle Order." @@ -1908,11 +1914,7 @@ EndIf 748 alphaState3 eval( - If EnoughChange = "yes" Then - Var return = DirImage2 + "/img_popup12.png" - Else - Var return = DirImage2 + "/img_popup12_NotEnoughCoin.png" - EndIf + Var return = DirImage2 + "/img_popup12_NotEnoughCoin.png" ) @@ -1947,13 +1949,14 @@ EndIf "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + + SAVELOG "alphaState3 click" CoinVending BILLREJECT Var alphaState3 = "Invisible" If SettingDisableTaobinCredit = "true" Then - If EnoughChange = "yes" Then + If EnoughChange = "yes" Then Else @@ -2015,7 +2018,7 @@ EndIf "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "alphaState3_offline click" CoinVending BILLREJECT Var alphaState3_offline = "Invisible" diff --git a/xml_main/startup.xml b/xml_main/startup.xml index e847830c..770419ad 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "8.43" - Var XMLPageVersionInt = 843 + Var XMLPageVersion = "8.44"" + Var XMLPageVersionInt = 844 ;Oreo Var OreoGuarantee = 0