Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
wanlop run 2024-12-12 10:51:45 +07:00
commit 5269f48101
3 changed files with 219 additions and 145 deletions

View file

@ -195,7 +195,7 @@
Var PromotionIDCurrentOrder = 0
RootLayoutVisible 3 "show"
Var ButtonLanguageCurrentXPosition = 1005
Var ButtonLanguageCurrentYPosition = 458 - 38
@ -241,67 +241,134 @@
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
DEBUGVAR MultiProcess
DEBUGVAR Inst5MenuLoaded
DEBUGVAR Inst6MenuLoaded
DEBUGVAR Inst7MenuLoaded
DEBUGVAR Inst8MenuLoaded
DEBUGVAR Inst9MenuLoaded
DEBUGVAR Inst10MenuLoaded
DEBUGVAR Inst11MenuLoaded
DEBUGVAR MultiProcessTimer
If MultiProcess = "Enable" Then
If SelectedMenu = "coffee" Then
Var MultiProcessTimer = MultiProcessTimer + 1
If Inst5MenuLoaded = "done" Then
Var MultiProcess = "Invisible"
TabMenuVisibleInst 2
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
Else
If MultiProcessTimer >= 20 Then
Var MultiProcess = "Invisible"
TabMenuVisibleInst 2
Var MultiProcessTimer = 0
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
EndIf
EndIf
EndIf
If SelectedMenu = "tea" Then
Var MultiProcessTimer = MultiProcessTimer + 1
If Inst6MenuLoaded = "done" Then
Var MultiProcess = "Invisible"
TabMenuVisibleInst 3
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
Else
If MultiProcessTimer >= 20 Then
Var MultiProcess = "Invisible"
TabMenuVisibleInst 3
Var MultiProcessTimer = 0
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
EndIf
EndIf
EndIf
If SelectedMenu = "caramel" Then
If SelectedMenu = "caramel" Then
Var MultiProcessTimer = MultiProcessTimer + 1
If Inst7MenuLoaded = "done" Then
Var MultiProcess = "Invisible"
TabMenuVisibleInst 4
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
Else
If MultiProcessTimer >= 20 Then
Var MultiProcess = "Invisible"
TabMenuVisibleInst 4
Var MultiProcessTimer = 0
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
EndIf
EndIf
EndIf
If SelectedMenu = "kidmenu" Then
If SelectedMenu = "kidmenu" Then
Var MultiProcessTimer = MultiProcessTimer + 1
If Inst8MenuLoaded = "done" Then
Var MultiProcess = "Invisible"
TabMenuVisibleInst 5
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
Else
If MultiProcessTimer >= 20 Then
Var MultiProcess = "Invisible"
TabMenuVisibleInst 5
Var MultiProcessTimer = 0
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
EndIf
EndIf
EndIf
If SelectedMenu = "healthy" Then
If SelectedMenu = "healthy" Then
Var MultiProcessTimer = MultiProcessTimer + 1
If Inst9MenuLoaded = "done" Then
Var MultiProcess = "Invisible"
TabMenuVisibleInst 6
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
Else
If MultiProcessTimer >= 20 Then
Var MultiProcess = "Invisible"
TabMenuVisibleInst 6
Var MultiProcessTimer = 0
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
EndIf
EndIf
EndIf
If SelectedMenu = "pepsi" Then
If SelectedMenu = "pepsi" Then
Var MultiProcessTimer = MultiProcessTimer + 1
If Inst10MenuLoaded = "done" Then
Var MultiProcess = "Invisible"
TabMenuVisibleInst 8
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
Else
If MultiProcessTimer >= 20 Then
Var MultiProcess = "Invisible"
TabMenuVisibleInst 8
Var MultiProcessTimer = 0
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
EndIf
EndIf
EndIf
If SelectedMenu = "soda" Then
If SelectedMenu = "soda" Then
Var MultiProcessTimer = MultiProcessTimer + 1
If Inst11MenuLoaded = "done" Then
Var MultiProcess = "Invisible"
TabMenuVisibleInst 7
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
Else
If MultiProcessTimer >= 20 Then
Var MultiProcess = "Invisible"
TabMenuVisibleInst 7
Var MultiProcessTimer = 0
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
EndIf
EndIf
EndIf
EndIf
@ -452,6 +519,7 @@
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
Else
Var MultiProcessTimer = 0
Var MultiProcess = "Enable"
Var SelectedMenu = "coffee"
EndIf
@ -481,6 +549,7 @@
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
Else
Var MultiProcessTimer = 0
Var MultiProcess = "Enable"
Var SelectedMenu = "tea"
EndIf
@ -509,6 +578,7 @@
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
Else
Var MultiProcessTimer = 0
Var MultiProcess = "Enable"
Var SelectedMenu = "caramel"
EndIf
@ -538,6 +608,7 @@
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
Else
Var MultiProcessTimer = 0
Var MultiProcess = "Enable"
Var SelectedMenu = "kidmenu"
EndIf
@ -565,6 +636,7 @@
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
Else
Var MultiProcessTimer = 0
Var MultiProcess = "Enable"
Var SelectedMenu = "appfast"
EndIf
@ -594,6 +666,7 @@
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
Else
Var MultiProcessTimer = 0
Var MultiProcess = "Enable"
Var SelectedMenu = "soda"
EndIf
@ -649,6 +722,7 @@
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
Else
Var MultiProcessTimer = 0
Var MultiProcess = "Enable"
Var SelectedMenu = "healthy"
EndIf
@ -701,6 +775,7 @@
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
Else
Var MultiProcessTimer = 0
Var MultiProcess = "Enable"
Var SelectedMenu = "pepsi"
EndIf

View file

@ -883,140 +883,6 @@
<Color> "0xeae6e1" </Color>
</Image>
<EventLanguageOnChange>
DEBUGVAR LanguageShowByIndex
DEBUGVAR LanguageShow
If LanguageShow = "ENG" Then
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 430
Var text_show_normal_x = 408
Var text_show_blend_x = 892
Var SugarZeroCalPrice_X = 540
Var text_cancel_xc = 53
Var text_cancel_yc = 16
Var Text_SugarZeroCalPrice_X = 360
Var Text_SugarNormalPrice_Y = 80
Var OatMilkPrice_X = 260
If show_name_len > 24 Then
Var showname = showname + "###size=54"
EndIf
If BGSugar = "Enable" Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
EndIf
If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
Var ShowTextSelfTestCountDown = "Please wait a moment (" + MACHINE_SELF_TEST_COUNT_DOWN
Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
Else
Var ShowTextSelfTestCountDown = "Please wait a moment"
EndIf
EndIf
If LanguageShow = "THAI" Then
Var topping_shot_price_x = 600
Var text_x_add_oreo_price = 420
Var text_show_normal_x = 386
Var text_show_blend_x = 852
Var SugarZeroCalPrice_X = 495
Var text_cancel_xc = 53
Var text_cancel_yc = 16
Var Text_SugarZeroCalPrice_X = 360
Var Text_SugarNormalPrice_Y = 75
Var OatMilkPrice_X = 220
If show_name_len > 0 Then
Var showname = showname + "###size=68"
EndIf
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
Var ShowTextSelfTestCountDown ="กรุณารอสักครู่ (" + MACHINE_SELF_TEST_COUNT_DOWN
Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
Else
Var ShowTextSelfTestCountDown ="กรุณารอสักครู่"
EndIf
EndIf
If LanguageShow = "MYANMAR" Then
Var show_eng = "true"
DEBUGVAR show_eng
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 430
Var text_show_normal_x = 568
Var text_show_blend_x = 903
Var SugarZeroCalPrice_X = 540
Var Text_SugarZeroCalPrice_X = 360
Var Text_SugarNormalPrice_Y = 80
Var text_cancel_xc = 5
Var text_cancel_yc = 30
Var show_eng = "true"
Var OatMilkPrice_X = 210
If show_name_len > 24 Then
Var showname = showname + "###size=54"
EndIf
Var DirImage = "ROOT/taobin_project/image/topping_mmr"
If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
Var ShowTextSelfTestCountDown = "ခဏစောင့်ပါ။ (" + MACHINE_SELF_TEST_COUNT_DOWN
Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
Else
Var ShowTextSelfTestCountDown = "ခဏစောင့်ပါ။"
EndIf
EndIf
Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000113, LanguageShowByIndex)
DEBUGVAR StringToppingOatMilkWithPrice
Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
DEBUGVAR StringToppingOatMilkWithPrice
Var StringToppingOreoWithPrice !assigned GetLanguageID( 000101, LanguageShowByIndex)
Var StringToppingOreoWithPrice = StringToppingOreoWithPrice + text_price_6
;Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
;Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
Var StringCoffeeLevelWithPrice0 !assigned GetLanguageID( 000108, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice0 = StringCoffeeLevelWithPrice0 + CustomCoffeeLevelAdditionalPrice[0]
Var StringCoffeeLevelWithPrice1 !assigned GetLanguageID( 000109, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice1 = StringCoffeeLevelWithPrice1 + CustomCoffeeLevelAdditionalPrice[1]
Var StringCoffeeLevelWithPrice2 !assigned GetLanguageID( 000110, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice2 = StringCoffeeLevelWithPrice2 + CustomCoffeeLevelAdditionalPrice[2]
Var StringCoffeeLevelWithPrice3 !assigned GetLanguageID( 000111, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice3 = StringCoffeeLevelWithPrice3 + CustomCoffeeLevelAdditionalPrice[3]
;Var showname = aliasName[LanguageShowByIndex]
;Var showdesc = aliasName[LanguageShowByIndex]
If SelectDrinkType = 1 Then
Var showname = NameLang[IndexDrinktType][LanguageShowByIndex]
Var showdesc = DescLang[IndexDrinktType][LanguageShowByIndex]
Else
Var showname = aliasName[LanguageShowByIndex]
Var showdesc = aliasName[LanguageShowByIndex]
EndIf
DEBUGVAR showname
DEBUGVAR showdesc
BackslashNToEnter showname
BackslashNToEnter showdesc
CRLFToSpace showname
CRLFToSpace showdesc
Var Timeout = 0
Var ButtonLanguageCurrentXPosition = 1005
Var ButtonLanguageCurrentYPosition = 458 - 38
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 450 - 38
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
RefreshAll
</EventLanguageOnChange>
<Button>
<X> 990 </X>
<Y> 438 </Y>
@ -1186,6 +1052,139 @@
</EventClick>
</LangSwitch>
<EventLanguageOnChange>
DEBUGVAR LanguageShowByIndex
DEBUGVAR LanguageShow
If LanguageShow = "ENG" Then
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 430
Var text_show_normal_x = 408
Var text_show_blend_x = 892
Var SugarZeroCalPrice_X = 540
Var text_cancel_xc = 53
Var text_cancel_yc = 16
Var Text_SugarZeroCalPrice_X = 360
Var Text_SugarNormalPrice_Y = 80
Var OatMilkPrice_X = 260
If show_name_len > 24 Then
Var showname = showname + "###size=54"
EndIf
If BGSugar = "Enable" Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
EndIf
If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
Var ShowTextSelfTestCountDown = "Please wait a moment (" + MACHINE_SELF_TEST_COUNT_DOWN
Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
Else
Var ShowTextSelfTestCountDown = "Please wait a moment"
EndIf
EndIf
If LanguageShow = "THAI" Then
Var topping_shot_price_x = 600
Var text_x_add_oreo_price = 420
Var text_show_normal_x = 386
Var text_show_blend_x = 852
Var SugarZeroCalPrice_X = 495
Var text_cancel_xc = 53
Var text_cancel_yc = 16
Var Text_SugarZeroCalPrice_X = 360
Var Text_SugarNormalPrice_Y = 75
Var OatMilkPrice_X = 220
If show_name_len > 0 Then
Var showname = showname + "###size=68"
EndIf
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
Var ShowTextSelfTestCountDown ="กรุณารอสักครู่ (" + MACHINE_SELF_TEST_COUNT_DOWN
Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
Else
Var ShowTextSelfTestCountDown ="กรุณารอสักครู่"
EndIf
EndIf
If LanguageShow = "MYANMAR" Then
Var show_eng = "true"
DEBUGVAR show_eng
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 430
Var text_show_normal_x = 568
Var text_show_blend_x = 903
Var SugarZeroCalPrice_X = 540
Var Text_SugarZeroCalPrice_X = 360
Var Text_SugarNormalPrice_Y = 80
Var text_cancel_xc = 5
Var text_cancel_yc = 30
Var show_eng = "true"
Var OatMilkPrice_X = 210
If show_name_len > 24 Then
Var showname = showname + "###size=54"
EndIf
Var DirImage = "ROOT/taobin_project/image/topping_mmr"
If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
Var ShowTextSelfTestCountDown = "ခဏစောင့်ပါ။ (" + MACHINE_SELF_TEST_COUNT_DOWN
Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
Else
Var ShowTextSelfTestCountDown = "ခဏစောင့်ပါ။"
EndIf
EndIf
;Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000113, LanguageShowByIndex)
;DEBUGVAR StringToppingOatMilkWithPrice
;Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
;DEBUGVAR StringToppingOatMilkWithPrice
Var StringToppingOreoWithPrice !assigned GetLanguageID( 000101, LanguageShowByIndex)
Var StringToppingOreoWithPrice = StringToppingOreoWithPrice + text_price_6
;Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
;Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
Var StringCoffeeLevelWithPrice0 !assigned GetLanguageID( 000108, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice0 = StringCoffeeLevelWithPrice0 + CustomCoffeeLevelAdditionalPrice[0]
Var StringCoffeeLevelWithPrice1 !assigned GetLanguageID( 000109, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice1 = StringCoffeeLevelWithPrice1 + CustomCoffeeLevelAdditionalPrice[1]
Var StringCoffeeLevelWithPrice2 !assigned GetLanguageID( 000110, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice2 = StringCoffeeLevelWithPrice2 + CustomCoffeeLevelAdditionalPrice[2]
Var StringCoffeeLevelWithPrice3 !assigned GetLanguageID( 000111, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice3 = StringCoffeeLevelWithPrice3 + CustomCoffeeLevelAdditionalPrice[3]
;Var showname = aliasName[LanguageShowByIndex]
;Var showdesc = aliasName[LanguageShowByIndex]
If SelectDrinkType = 1 Then
Var showname = NameLang[IndexDrinktType][LanguageShowByIndex]
Var showdesc = DescLang[IndexDrinktType][LanguageShowByIndex]
Else
Var showname = aliasName[LanguageShowByIndex]
Var showdesc = aliasName[LanguageShowByIndex]
EndIf
DEBUGVAR showname
DEBUGVAR showdesc
DEBUGVAR IndexDrinktType
BackslashNToEnter showname
BackslashNToEnter showdesc
CRLFToSpace showname
CRLFToSpace showdesc
Var Timeout = 0
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 438
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 430
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
RefreshAll
</EventLanguageOnChange>
; back
<Button>
<X> 19 </X>

View file

@ -803,12 +803,12 @@
; Member not found
If ErrorCause = "failed_fromoper_1001" Then
Var QRErrorText = "Member cannot be found"
Var QRErrorText = "Number not found"
EndIf
; Not enough balance
If ErrorCause = "failed_fromoper_1002" Then
Var QRErrorText = "Not having enough\nbalance"
Var QRErrorText = "Insufficient Balance"
EndIf
Var QR_POPUP = "/img_popup8-2.png"