Update: sugar zero thai & add sugar zero aus
This commit is contained in:
Kenta420
parent
b9216ce8e7
commit
f2820dfe82
4 changed files with 332 additions and 187 deletions
BIN
image/topping_inter/radio_dis_uncheck.png
Normal file
BIN
image/topping_inter/radio_dis_uncheck.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
|
|
@ -7,7 +7,7 @@
|
|||
<EventOpen>
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
|
||||
Var UserSeletedSugar = 0
|
||||
Var UserSelectedSugar = 0
|
||||
|
||||
SAVELOG "Event Open Select 6 AUS"
|
||||
|
||||
|
|
@ -319,6 +319,17 @@
|
|||
|
||||
Var text_milk_choice_price_x = 265
|
||||
|
||||
If SugarZeroCalEnable = "false" Then
|
||||
Var SugarZeroCalOption = "Invisible"
|
||||
EndIf
|
||||
If MAT_ID_511215 = "Disable" Then
|
||||
; Disable2 away
|
||||
Var SugarZeroCalCheck = "Disable2"
|
||||
EndIf
|
||||
If MAT_ID_511215 = "Enable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
|
@ -775,7 +786,7 @@
|
|||
EndIf
|
||||
|
||||
|
||||
If UserSeletedSugar = 0 Then
|
||||
If UserSelectedSugar = 0 Then
|
||||
If SugarModeUpdateWhenChangeDrinkType = 1 Then
|
||||
Var SugarModeUpdateWhenChangeDrinkType = 0
|
||||
RefreshAll
|
||||
|
|
@ -805,7 +816,8 @@
|
|||
If toppingID1index1 = toppingID1Default Then
|
||||
Var SugarState1 = "PressForever"
|
||||
Var sugar_default_flag = 1
|
||||
Var SugarZeroCalOption = "Invisible"
|
||||
; select no sugar
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID1index2 = toppingID1Default Then
|
||||
|
|
@ -825,7 +837,8 @@
|
|||
|
||||
If sugar_default_flag = 0 Then
|
||||
Var SugarState1 = "PressForever"
|
||||
Var SugarZeroCalOption = "Invisible"
|
||||
; select no sugar
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -844,7 +857,8 @@
|
|||
If toppingID1index1 = toppingID1Default Then
|
||||
Var SugarState1 = "PressForever"
|
||||
Var sugar_default_flag = 1
|
||||
Var SugarZeroCalOption = "Invisible"
|
||||
; select no sugar
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID1index2 = toppingID1Default Then
|
||||
|
|
@ -864,7 +878,8 @@
|
|||
|
||||
If sugar_default_flag = 0 Then
|
||||
Var SugarState1 = "PressForever"
|
||||
Var SugarZeroCalOption = "Invisible"
|
||||
; select no sugar
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -1003,6 +1018,8 @@
|
|||
If toppingID1index2 = toppingID1Default Then
|
||||
Var SugarState3 = "PressForever"
|
||||
Var sugar_default_flag = 1
|
||||
; select no sugar
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID1index3 = toppingID1Default Then
|
||||
|
|
@ -1050,6 +1067,8 @@
|
|||
If toppingID1index2 = toppingID1Default Then
|
||||
Var SugarState4 = "PressForever"
|
||||
Var sugar_default_flag = 1
|
||||
; select no sugar
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID1index3 = toppingID1Default Then
|
||||
|
|
@ -1089,6 +1108,8 @@
|
|||
If toppingID1index2 = toppingID1Default Then
|
||||
Var SugarState3 = "PressForever"
|
||||
Var sugar_default_flag = 1
|
||||
; select no sugar
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID1index3 = toppingID1Default Then
|
||||
|
|
@ -1126,6 +1147,7 @@
|
|||
|
||||
; Sugar Zero Cal
|
||||
DEBUGVAR SugarZeroCalEnable
|
||||
DEBUGVAR SugarZeroCalCheck
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
|
||||
Var SugarZeroCalPrice = 50
|
||||
|
|
@ -1133,15 +1155,10 @@
|
|||
Var SugarZeroCalPriceStr !assigned StringFmt( SugarZeroCalPrice , priceFormat, PreScaleConvertShow)
|
||||
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Else
|
||||
Var SugarZeroCalOption = "Invisible"
|
||||
EndIf
|
||||
|
||||
If MAT_ID_511215 = "Disable" Then
|
||||
Var SugarZeroCalOption = "Invisible"
|
||||
EndIf
|
||||
|
||||
Var ShowCollagenOnly = "Enable"
|
||||
|
||||
Var BugFlag = 1
|
||||
|
|
@ -1197,7 +1214,7 @@
|
|||
Else
|
||||
|
||||
EndIf
|
||||
; End of UserSeletedSugar = 0
|
||||
; End of UserSelectedSugar = 0
|
||||
|
||||
Refresh
|
||||
|
||||
|
|
@ -1872,11 +1889,14 @@
|
|||
EndIf
|
||||
|
||||
Var SugarZeroCalOption = "Invisible"
|
||||
Var UserSeletedSugar = 1
|
||||
Var UserSelectedSugar = 1
|
||||
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
||||
Function 2
|
||||
|
||||
Refresh
|
||||
</EventClick>
|
||||
<Language>
|
||||
|
|
@ -1908,7 +1928,7 @@
|
|||
<EventClick>
|
||||
SAVELOG "SUGAR2"
|
||||
DEBUGVAR SelectDrinkType
|
||||
DEBUGVAR UserSeletedSugar
|
||||
DEBUGVAR UserSelectedSugar
|
||||
|
||||
If SelectDrinkType = 0 Then
|
||||
SAVELOG "drink type popup"
|
||||
|
|
@ -1935,16 +1955,10 @@
|
|||
Var topping1 = toppingID1index1
|
||||
EndIf
|
||||
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If MAT_ID_511215 = "Disable" Then
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
|
||||
Var UserSeletedSugar = 1
|
||||
Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -2005,16 +2019,9 @@
|
|||
Var topping1 = toppingID1index2
|
||||
EndIf
|
||||
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If MAT_ID_511215 = "Disable" Then
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var UserSeletedSugar = 1
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -2082,16 +2089,9 @@
|
|||
Var topping1 = toppingID1index2
|
||||
EndIf
|
||||
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If MAT_ID_511215 = "Disable" Then
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var UserSeletedSugar = 1
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -2159,16 +2159,9 @@
|
|||
Var topping1 = toppingID1index3
|
||||
EndIf
|
||||
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If MAT_ID_511215 = "Disable" Then
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var UserSeletedSugar = 1
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -2236,16 +2229,9 @@
|
|||
Var topping1 = toppingID1index4
|
||||
EndIf
|
||||
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If MAT_ID_511215 = "Disable" Then
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var UserSeletedSugar = 1
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -2349,12 +2335,16 @@
|
|||
Var topping1 = toppingID1index1
|
||||
EndIf
|
||||
|
||||
Var SugarZeroCalOption = "Invisible"
|
||||
Var UserSeletedSugar = 1
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var UserSelectedSugar = 1
|
||||
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
||||
Function 2
|
||||
|
||||
Refresh
|
||||
</EventClick>
|
||||
<Language>
|
||||
|
|
@ -2385,7 +2375,7 @@
|
|||
<EventClick>
|
||||
SAVELOG "SUGAR2"
|
||||
DEBUGVAR SelectDrinkType
|
||||
DEBUGVAR UserSeletedSugar
|
||||
DEBUGVAR UserSelectedSugar
|
||||
|
||||
If SelectDrinkType = 0 Then
|
||||
SAVELOG "drink type popup"
|
||||
|
|
@ -2401,15 +2391,9 @@
|
|||
Var topping1 = toppingID1index2
|
||||
EndIf
|
||||
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If MAT_ID_511215 = "Disable" Then
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
;Var UserSeletedSugar = 1
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
;Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -2457,17 +2441,13 @@
|
|||
Var SugarState4 = "Enable"
|
||||
Var SugarState5 = "Enable"
|
||||
Var topping1 = toppingID1index3
|
||||
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
|
||||
EndIf
|
||||
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If MAT_ID_511215 = "Disable" Then
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
;Var UserSeletedSugar = 1
|
||||
;Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -2514,17 +2494,12 @@
|
|||
Var SugarState4 = "PressForever"
|
||||
Var SugarState5 = "Enable"
|
||||
Var topping1 = toppingID1index4
|
||||
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
EndIf
|
||||
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If MAT_ID_511215 = "Disable" Then
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
;Var UserSeletedSugar = 1
|
||||
;Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -2628,12 +2603,16 @@
|
|||
Var topping1 = toppingID1index1
|
||||
EndIf
|
||||
|
||||
Var SugarZeroCalOption = "Invisible"
|
||||
;Var UserSeletedSugar = 1
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
;Var UserSelectedSugar = 1
|
||||
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
||||
Function 2
|
||||
|
||||
Refresh
|
||||
</EventClick>
|
||||
<Language>
|
||||
|
|
@ -2665,7 +2644,7 @@
|
|||
<EventClick>
|
||||
SAVELOG "SUGAR2"
|
||||
DEBUGVAR SelectDrinkType
|
||||
DEBUGVAR UserSeletedSugar
|
||||
DEBUGVAR UserSelectedSugar
|
||||
|
||||
If SelectDrinkType = 0 Then
|
||||
SAVELOG "drink type popup"
|
||||
|
|
@ -2681,15 +2660,9 @@
|
|||
Var topping1 = toppingID1index2
|
||||
EndIf
|
||||
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If MAT_ID_511215 = "Disable" Then
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
Var UserSeletedSugar = 1
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -2739,15 +2712,10 @@
|
|||
Var topping1 = toppingID1index3
|
||||
EndIf
|
||||
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If MAT_ID_511215 = "Disable" Then
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
;Var UserSeletedSugar = 1
|
||||
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
;Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -2796,15 +2764,10 @@
|
|||
Var topping1 = toppingID1index4
|
||||
EndIf
|
||||
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If MAT_ID_511215 = "Disable" Then
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
;Var UserSeletedSugar = 1
|
||||
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
;Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -2899,7 +2862,11 @@
|
|||
SAVELOG "drink type popup"
|
||||
Var high_light_drink_type = "Enable"
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
If SugarZeroCalCheck = "Disable2" Then
|
||||
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
|
||||
If SugarNormalCheck = "PressForever" Then
|
||||
Else
|
||||
|
|
@ -2920,6 +2887,8 @@
|
|||
<State> SugarZeroCalCheck </State>
|
||||
<Mode> "No" </Mode>
|
||||
<Filename> "ROOT/taobin_project/image/topping_inter/radio_unchecked.png" </Filename>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/topping_inter/radio_dis_uncheck.png" </FilenameDisable>
|
||||
<FilenameDisable2> "ROOT/taobin_project/image/topping_inter/radio_dis_uncheck.png" </FilenameDisable2>
|
||||
<FilenamePress> "ROOT/taobin_project/image/topping_inter/radio_checked.png" </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
|
|
@ -2929,6 +2898,8 @@
|
|||
If SelectDrinkType = 0 Then
|
||||
SAVELOG "drink type popup"
|
||||
Var high_light_drink_type = "Enable"
|
||||
|
||||
Refresh
|
||||
Else
|
||||
Var SugarNormalCheck = "Enable"
|
||||
|
||||
|
|
@ -2940,7 +2911,6 @@
|
|||
Function 2
|
||||
EndIf
|
||||
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -3014,6 +2984,8 @@
|
|||
If SelectDrinkType = 0 Then
|
||||
SAVELOG "drink type popup"
|
||||
Var high_light_drink_type = "Enable"
|
||||
|
||||
Refresh
|
||||
Else
|
||||
|
||||
If ShiftSugarStep = 1 Then
|
||||
|
|
@ -3027,14 +2999,22 @@
|
|||
Var topping1 = toppingID1index1
|
||||
EndIf
|
||||
|
||||
Var SugarZeroCalOption = "Invisible"
|
||||
Var UserSeletedSugar = 1
|
||||
Var UserSelectedSugar = 1
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable2" Then
|
||||
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR SugarZeroCalCheck
|
||||
|
||||
Function 2
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
Refresh
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000040 </ID>
|
||||
|
|
@ -3065,7 +3045,7 @@
|
|||
<EventClick>
|
||||
SAVELOG "SUGAR2"
|
||||
DEBUGVAR SelectDrinkType
|
||||
DEBUGVAR UserSeletedSugar
|
||||
DEBUGVAR UserSelectedSugar
|
||||
|
||||
If SelectDrinkType = 0 Then
|
||||
SAVELOG "drink type popup"
|
||||
|
|
@ -3090,9 +3070,25 @@
|
|||
Var SugarState5 = "Enable"
|
||||
Var SugarState6 = "Enable"
|
||||
Var topping1 = toppingID1index1
|
||||
|
||||
; select no sugar
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable2" Then
|
||||
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var UserSeletedSugar = 1
|
||||
Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -3151,9 +3147,25 @@
|
|||
Var SugarState5 = "Enable"
|
||||
Var SugarState6 = "Enable"
|
||||
Var topping1 = toppingID1index2
|
||||
|
||||
; select no sugar
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable2" Then
|
||||
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var UserSeletedSugar = 1
|
||||
Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -3219,10 +3231,26 @@
|
|||
Var SugarState5 = "Enable"
|
||||
Var SugarState6 = "Enable"
|
||||
Var topping1 = toppingID1index2
|
||||
|
||||
; select no sugar
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable2" Then
|
||||
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var UserSeletedSugar = 1
|
||||
Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -3290,7 +3318,13 @@
|
|||
Var topping1 = toppingID1index3
|
||||
EndIf
|
||||
|
||||
Var UserSeletedSugar = 1
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -3358,8 +3392,12 @@
|
|||
Var topping1 = toppingID1index4
|
||||
EndIf
|
||||
|
||||
|
||||
Var UserSeletedSugar = 1
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -3437,8 +3475,15 @@
|
|||
If SelectDrinkType = 0 Then
|
||||
SAVELOG "drink type popup"
|
||||
Var high_light_drink_type = "Enable"
|
||||
Refresh
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable2" Then
|
||||
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SugarNormalCheck = "PressForever" Then
|
||||
Else
|
||||
|
|
@ -3448,7 +3493,6 @@
|
|||
Function 2
|
||||
EndIf
|
||||
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -3459,6 +3503,8 @@
|
|||
<State> SugarZeroCalCheck </State>
|
||||
<Mode> "No" </Mode>
|
||||
<Filename> "ROOT/taobin_project/image/topping_inter/radio_unchecked.png" </Filename>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/topping_inter/radio_dis_uncheck.png" </FilenameDisable>
|
||||
<FilenameDisable2> "ROOT/taobin_project/image/topping_inter/radio_dis_uncheck.png" </FilenameDisable2>
|
||||
<FilenamePress> "ROOT/taobin_project/image/topping_inter/radio_checked.png" </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
|
|
@ -3468,6 +3514,7 @@
|
|||
If SelectDrinkType = 0 Then
|
||||
SAVELOG "drink type popup"
|
||||
Var high_light_drink_type = "Enable"
|
||||
Refresh
|
||||
Else
|
||||
Var SugarNormalCheck = "Enable"
|
||||
|
||||
|
|
@ -3479,7 +3526,6 @@
|
|||
Function 2
|
||||
EndIf
|
||||
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -3551,6 +3597,7 @@
|
|||
If SelectDrinkType = 0 Then
|
||||
SAVELOG "drink type popup"
|
||||
Var high_light_drink_type = "Enable"
|
||||
Refresh
|
||||
Else
|
||||
|
||||
If ShiftSugarStep = 1 Then
|
||||
|
|
@ -3563,14 +3610,18 @@
|
|||
Var topping1 = toppingID1index1
|
||||
EndIf
|
||||
|
||||
Var SugarZeroCalOption = "Invisible"
|
||||
Var UserSeletedSugar = 1
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
If SugarZeroCalCheck = "Disable2" Then
|
||||
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
Var UserSelectedSugar = 1
|
||||
|
||||
Function 2
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
Refresh
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000052 </ID>
|
||||
|
|
@ -3600,7 +3651,7 @@
|
|||
<EventClick>
|
||||
SAVELOG "SUGAR2"
|
||||
DEBUGVAR SelectDrinkType
|
||||
DEBUGVAR UserSeletedSugar
|
||||
DEBUGVAR UserSelectedSugar
|
||||
|
||||
If SelectDrinkType = 0 Then
|
||||
SAVELOG "drink type popup"
|
||||
|
|
@ -3616,7 +3667,13 @@
|
|||
Var topping1 = toppingID1index2
|
||||
EndIf
|
||||
|
||||
;Var UserSeletedSugar = 1
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
;Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -3666,7 +3723,13 @@
|
|||
Var topping1 = toppingID1index3
|
||||
EndIf
|
||||
|
||||
;Var UserSeletedSugar = 1
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
;Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -3715,7 +3778,12 @@
|
|||
Var topping1 = toppingID1index4
|
||||
EndIf
|
||||
|
||||
;Var UserSeletedSugar = 1
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
;Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -3795,8 +3863,15 @@
|
|||
If SelectDrinkType = 0 Then
|
||||
SAVELOG "drink type popup"
|
||||
Var high_light_drink_type = "Enable"
|
||||
Refresh
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable2" Then
|
||||
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SugarNormalCheck = "PressForever" Then
|
||||
Else
|
||||
|
|
@ -3806,7 +3881,6 @@
|
|||
Function 2
|
||||
EndIf
|
||||
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -3817,6 +3891,8 @@
|
|||
<State> SugarZeroCalCheck </State>
|
||||
<Mode> "No" </Mode>
|
||||
<Filename> "ROOT/taobin_project/image/topping_inter/radio_unchecked.png" </Filename>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/topping_inter/radio_dis_uncheck.png" </FilenameDisable>
|
||||
<FilenameDisable2> "ROOT/taobin_project/image/topping_inter/radio_dis_uncheck.png" </FilenameDisable2>
|
||||
<FilenamePress> "ROOT/taobin_project/image/topping_inter/radio_checked.png" </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
|
|
@ -3826,6 +3902,7 @@
|
|||
If SelectDrinkType = 0 Then
|
||||
SAVELOG "drink type popup"
|
||||
Var high_light_drink_type = "Enable"
|
||||
Refresh
|
||||
Else
|
||||
Var SugarNormalCheck = "Enable"
|
||||
|
||||
|
|
@ -3837,7 +3914,6 @@
|
|||
Function 2
|
||||
EndIf
|
||||
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -3922,8 +3998,13 @@
|
|||
Var topping1 = toppingID1index1
|
||||
EndIf
|
||||
|
||||
Var SugarZeroCalOption = "Invisible"
|
||||
;Var UserSeletedSugar = 1
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
If SugarZeroCalCheck = "Disable2" Then
|
||||
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
Var UserSelectedSugar = 1
|
||||
|
||||
Function 2
|
||||
|
||||
|
|
@ -3961,7 +4042,7 @@
|
|||
<EventClick>
|
||||
SAVELOG "SUGAR2"
|
||||
DEBUGVAR SelectDrinkType
|
||||
DEBUGVAR UserSeletedSugar
|
||||
DEBUGVAR UserSelectedSugar
|
||||
|
||||
If SelectDrinkType = 0 Then
|
||||
SAVELOG "drink type popup"
|
||||
|
|
@ -3977,7 +4058,12 @@
|
|||
Var topping1 = toppingID1index2
|
||||
EndIf
|
||||
|
||||
Var UserSeletedSugar = 1
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -4027,7 +4113,12 @@
|
|||
Var topping1 = toppingID1index3
|
||||
EndIf
|
||||
|
||||
;Var UserSeletedSugar = 1
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
;Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -4076,7 +4167,12 @@
|
|||
Var topping1 = toppingID1index4
|
||||
EndIf
|
||||
|
||||
;Var UserSeletedSugar = 1
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
;Var UserSelectedSugar = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR topping1
|
||||
|
|
@ -5068,17 +5164,31 @@
|
|||
|
||||
EndIf
|
||||
|
||||
Var Seeker.topping1 = topping1
|
||||
Var Seeker.topping2 = topping2
|
||||
Var Seeker.topping3 = topping3
|
||||
Var Seeker.topping6 = topping6
|
||||
Var Seeker.topping7 = topping7
|
||||
Var Seeker.topping8 = topping8
|
||||
Var Seeker.topping9 = topping9
|
||||
Var Seeker.topping10 = topping10
|
||||
|
||||
Var Seeker.PostTopping1 = sugarToppingID
|
||||
|
||||
DEBUGVAR Seeker.topping1
|
||||
DEBUGVAR Seeker.topping2
|
||||
DEBUGVAR Seeker.topping3
|
||||
DEBUGVAR Seeker.topping6
|
||||
DEBUGVAR Seeker.topping7
|
||||
DEBUGVAR Seeker.topping8
|
||||
DEBUGVAR Seeker.topping9
|
||||
DEBUGVAR Seeker.topping10
|
||||
DEBUGVAR Seeker.PostTopping1
|
||||
|
||||
|
||||
If Seeker = "curr" Then
|
||||
Topping "Select" UserSelectProductCode
|
||||
|
||||
; Set option toppinng and pack
|
||||
Topping "Select1-ID" topping1
|
||||
Topping "Select2-ID" topping2
|
||||
Topping "Select3-ID" topping3
|
||||
Topping "Select6-ID" topping6
|
||||
|
||||
; Pack
|
||||
Topping "Pack" ExtendDataCurr
|
||||
;include="ROOT/taobin_project/inc/select_drink_current.inc"
|
||||
|
||||
Else
|
||||
Topping "SetNextOrder" UserSelectProductCode
|
||||
|
|
@ -5475,6 +5585,12 @@
|
|||
DEBUGVAR PriceDrinkTmpShow
|
||||
EndIf
|
||||
|
||||
If SugarZeroCalCheck = "PressForever" Then
|
||||
If SugarNormalCheck = "PressForever" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
CRLFToSpace showname
|
||||
CRLFToSpace showdesc
|
||||
DEBUGVAR showname
|
||||
|
|
|
|||
15
ui/lang.tsv
15
ui/lang.tsv
|
|
@ -879,8 +879,13 @@
|
|||
1000014 Test again ทดสอบอีกครั้ง
|
||||
1000015 Test result ผลการทดสอบ
|
||||
1000016 Confirm ยืนยัน
|
||||
1000017
|
||||
1000018
|
||||
1000017 Wait a moment รอสักครู่
|
||||
1000018 The machine is testing เครื่องกำลังทดสอบ
|
||||
1000019 The machine is working เครื่องกำลังทำงาน
|
||||
1000020
|
||||
1000021
|
||||
|
||||
|
||||
|
||||
Calibrate
|
||||
1100000 Calibrate คาลิเบรท
|
||||
|
|
@ -975,9 +980,9 @@
|
|||
1800019 Pay ice 310 g for ice only จ่ายน้ำแข็ง 310 กรัม น้ำแข็งล้วน
|
||||
1800020 Pay ice 100 g for test จ่ายน้ำแข็ง 100 กรัม เพื่อทดสอบ
|
||||
1800021 Ice module configuration กำหนดค่าโมดูลน้ำแข็ง
|
||||
1800022
|
||||
1800023
|
||||
1800024
|
||||
1800022 Temperature อุณหภูมิ
|
||||
1800023 Current weight น้ำหนักปัจจุบัน
|
||||
1800024 Ice quantity ปริมาณน้ำแข็ง
|
||||
1800025
|
||||
1800026
|
||||
1800027
|
||||
|
|
|
|||
|
Can't render this file because it has a wrong number of fields in line 21.
|
|
|
@ -1458,6 +1458,8 @@
|
|||
If toppingID1index1 = toppingID1Default Then
|
||||
Var SugarState1 = "PressForever"
|
||||
Var sugar_default_flag = 1
|
||||
; select no sugar
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID1index2 = toppingID1Default Then
|
||||
|
|
@ -1492,6 +1494,8 @@
|
|||
|
||||
If sugar_default_flag = 0 Then
|
||||
Var SugarState1 = "PressForever"
|
||||
; select no sugar
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -1511,6 +1515,8 @@
|
|||
If toppingID1index1 = toppingID1Default Then
|
||||
Var SugarState1 = "PressForever"
|
||||
Var sugar_default_flag = 1
|
||||
; select no sugar
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID1index2 = toppingID1Default Then
|
||||
|
|
@ -1538,6 +1544,8 @@
|
|||
|
||||
If sugar_default_flag = 0 Then
|
||||
Var SugarState1 = "PressForever"
|
||||
; select no sugar
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -1757,6 +1765,8 @@
|
|||
If toppingID1index2 = toppingID1Default Then
|
||||
Var SugarState3 = "PressForever"
|
||||
Var sugar_default_flag = 1
|
||||
; select no sugar
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID1index3 = toppingID1Default Then
|
||||
|
|
@ -1812,6 +1822,8 @@
|
|||
If toppingID1index2 = toppingID1Default Then
|
||||
Var SugarState4 = "PressForever"
|
||||
Var sugar_default_flag = 1
|
||||
; select no sugar
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID1index3 = toppingID1Default Then
|
||||
|
|
@ -1863,6 +1875,8 @@
|
|||
If toppingID1index2 = toppingID1Default Then
|
||||
Var SugarState3 = "PressForever"
|
||||
Var sugar_default_flag = 1
|
||||
; select no sugar
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID1index3 = toppingID1Default Then
|
||||
|
|
@ -1915,6 +1929,7 @@
|
|||
|
||||
; Sugar Zero Cal
|
||||
DEBUGVAR SugarZeroCalEnable
|
||||
DEBUGVAR SugarZeroCalCheck
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
|
||||
Var SugarZeroCalPrice = 10
|
||||
|
|
@ -2739,6 +2754,7 @@
|
|||
Var topping1 = toppingID1index1
|
||||
EndIf
|
||||
|
||||
Var SugarZeroCalOption = "Invisible"
|
||||
Var UserSeletedSugar = 1
|
||||
|
||||
EndIf
|
||||
|
|
@ -3856,17 +3872,14 @@
|
|||
EndIf
|
||||
|
||||
Var topping1 = toppingID1index1
|
||||
EndIf
|
||||
|
||||
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Else
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
|
||||
Var UserSeletedSugar = 1
|
||||
EndIf
|
||||
|
||||
|
|
@ -3930,12 +3943,22 @@
|
|||
|
||||
EndIf
|
||||
|
||||
Var topping1 = toppingID1index2
|
||||
EndIf
|
||||
; select no sugar
|
||||
Var SugarNormalCheck = "PressForever"
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable2" Then
|
||||
|
||||
Else
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
Var topping1 = toppingID1index2
|
||||
Else
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -4028,14 +4051,15 @@
|
|||
EndIf
|
||||
|
||||
Var topping1 = toppingID1index2
|
||||
Else
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If SugarZeroCalEnable = "true" Then
|
||||
If SugarZeroCalCheck = "Disable" Then
|
||||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var UserSeletedSugar = 1
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue