pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Update: sugar zero thai & add sugar zero aus

Browse source
This commit is contained in:
Kenta420 2024-05-10 16:35:49 +07:00
parent b9216ce8e7
commit f2820dfe82
4 changed files with 332 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/topping_inter/radio_dis_uncheck.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

442
inter/aus/xml/page_topping_select6.lxml
View file

@ -7,7 +7,7 @@
<EventOpen> <EventOpen>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Var UserSeletedSugar = 0 Var UserSelectedSugar = 0
SAVELOG "Event Open Select 6 AUS" SAVELOG "Event Open Select 6 AUS"
@ -319,6 +319,17 @@
Var text_milk_choice_price_x = 265 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> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
@ -775,7 +786,7 @@
EndIf EndIf
If UserSeletedSugar = 0 Then If UserSelectedSugar = 0 Then
If SugarModeUpdateWhenChangeDrinkType = 1 Then If SugarModeUpdateWhenChangeDrinkType = 1 Then
Var SugarModeUpdateWhenChangeDrinkType = 0 Var SugarModeUpdateWhenChangeDrinkType = 0
RefreshAll RefreshAll
@ -805,7 +816,8 @@
If toppingID1index1 = toppingID1Default Then If toppingID1index1 = toppingID1Default Then
Var SugarState1 = "PressForever" Var SugarState1 = "PressForever"
Var sugar_default_flag = 1 Var sugar_default_flag = 1
Var SugarZeroCalOption = "Invisible" ; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf EndIf
If toppingID1index2 = toppingID1Default Then If toppingID1index2 = toppingID1Default Then
@ -825,7 +837,8 @@
If sugar_default_flag = 0 Then If sugar_default_flag = 0 Then
Var SugarState1 = "PressForever" Var SugarState1 = "PressForever"
Var SugarZeroCalOption = "Invisible" ; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf EndIf
EndIf EndIf
@ -844,7 +857,8 @@
If toppingID1index1 = toppingID1Default Then If toppingID1index1 = toppingID1Default Then
Var SugarState1 = "PressForever" Var SugarState1 = "PressForever"
Var sugar_default_flag = 1 Var sugar_default_flag = 1
Var SugarZeroCalOption = "Invisible" ; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf EndIf
If toppingID1index2 = toppingID1Default Then If toppingID1index2 = toppingID1Default Then
@ -864,7 +878,8 @@
If sugar_default_flag = 0 Then If sugar_default_flag = 0 Then
Var SugarState1 = "PressForever" Var SugarState1 = "PressForever"
Var SugarZeroCalOption = "Invisible" ; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf EndIf
EndIf EndIf
@ -1003,6 +1018,8 @@
If toppingID1index2 = toppingID1Default Then If toppingID1index2 = toppingID1Default Then
Var SugarState3 = "PressForever" Var SugarState3 = "PressForever"
Var sugar_default_flag = 1 Var sugar_default_flag = 1
; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf EndIf
If toppingID1index3 = toppingID1Default Then If toppingID1index3 = toppingID1Default Then
@ -1050,6 +1067,8 @@
If toppingID1index2 = toppingID1Default Then If toppingID1index2 = toppingID1Default Then
Var SugarState4 = "PressForever" Var SugarState4 = "PressForever"
Var sugar_default_flag = 1 Var sugar_default_flag = 1
; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf EndIf
If toppingID1index3 = toppingID1Default Then If toppingID1index3 = toppingID1Default Then
@ -1089,6 +1108,8 @@
If toppingID1index2 = toppingID1Default Then If toppingID1index2 = toppingID1Default Then
Var SugarState3 = "PressForever" Var SugarState3 = "PressForever"
Var sugar_default_flag = 1 Var sugar_default_flag = 1
; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf EndIf
If toppingID1index3 = toppingID1Default Then If toppingID1index3 = toppingID1Default Then
@ -1126,6 +1147,7 @@
; Sugar Zero Cal ; Sugar Zero Cal
DEBUGVAR SugarZeroCalEnable DEBUGVAR SugarZeroCalEnable
DEBUGVAR SugarZeroCalCheck
If SugarZeroCalEnable = "true" Then If SugarZeroCalEnable = "true" Then
Var SugarZeroCalPrice = 50 Var SugarZeroCalPrice = 50
@ -1133,15 +1155,10 @@
Var SugarZeroCalPriceStr !assigned StringFmt( SugarZeroCalPrice , priceFormat, PreScaleConvertShow) Var SugarZeroCalPriceStr !assigned StringFmt( SugarZeroCalPrice , priceFormat, PreScaleConvertShow)
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
Var SugarZeroCalCheck = "Enable"
Else Else
Var SugarZeroCalOption = "Invisible" Var SugarZeroCalOption = "Invisible"
EndIf EndIf
If MAT_ID_511215 = "Disable" Then
Var SugarZeroCalOption = "Invisible"
EndIf
Var ShowCollagenOnly = "Enable" Var ShowCollagenOnly = "Enable"
Var BugFlag = 1 Var BugFlag = 1
@ -1197,7 +1214,7 @@
Else Else
EndIf EndIf
; End of UserSeletedSugar = 0 ; End of UserSelectedSugar = 0
Refresh Refresh
@ -1872,11 +1889,14 @@
EndIf EndIf
Var SugarZeroCalOption = "Invisible" Var SugarZeroCalOption = "Invisible"
Var UserSeletedSugar = 1 Var UserSelectedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Function 2
Refresh Refresh
</EventClick> </EventClick>
<Language> <Language>
@ -1908,7 +1928,7 @@
<EventClick> <EventClick>
SAVELOG "SUGAR2" SAVELOG "SUGAR2"
DEBUGVAR SelectDrinkType DEBUGVAR SelectDrinkType
DEBUGVAR UserSeletedSugar DEBUGVAR UserSelectedSugar
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
@ -1935,16 +1955,10 @@
Var topping1 = toppingID1index1 Var topping1 = toppingID1index1
EndIf EndIf
If SugarZeroCalEnable = "true" Then Var SugarZeroCalCheck = "Enable"
If MAT_ID_511215 = "Disable" Then Var SugarNormalCheck = "PressForever"
Else
Var SugarZeroCalCheck = "Enable"
Var SugarNormalCheck = "PressForever"
Var SugarZeroCalOption = "Enable"
EndIf
EndIf
Var UserSeletedSugar = 1 Var UserSelectedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -2005,16 +2019,9 @@
Var topping1 = toppingID1index2 Var topping1 = toppingID1index2
EndIf EndIf
If SugarZeroCalEnable = "true" Then Var SugarZeroCalCheck = "Enable"
If MAT_ID_511215 = "Disable" Then Var SugarNormalCheck = "PressForever"
Else Var UserSelectedSugar = 1
Var SugarZeroCalCheck = "Enable"
Var SugarNormalCheck = "PressForever"
Var SugarZeroCalOption = "Enable"
EndIf
EndIf
Var UserSeletedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -2082,16 +2089,9 @@
Var topping1 = toppingID1index2 Var topping1 = toppingID1index2
EndIf EndIf
If SugarZeroCalEnable = "true" Then Var SugarZeroCalCheck = "Enable"
If MAT_ID_511215 = "Disable" Then Var SugarNormalCheck = "PressForever"
Else Var UserSelectedSugar = 1
Var SugarZeroCalCheck = "Enable"
Var SugarNormalCheck = "PressForever"
Var SugarZeroCalOption = "Enable"
EndIf
EndIf
Var UserSeletedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -2159,16 +2159,9 @@
Var topping1 = toppingID1index3 Var topping1 = toppingID1index3
EndIf EndIf
If SugarZeroCalEnable = "true" Then Var SugarZeroCalCheck = "Enable"
If MAT_ID_511215 = "Disable" Then Var SugarNormalCheck = "PressForever"
Else Var UserSelectedSugar = 1
Var SugarZeroCalCheck = "Enable"
Var SugarNormalCheck = "PressForever"
Var SugarZeroCalOption = "Enable"
EndIf
EndIf
Var UserSeletedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -2236,16 +2229,9 @@
Var topping1 = toppingID1index4 Var topping1 = toppingID1index4
EndIf EndIf
If SugarZeroCalEnable = "true" Then Var SugarZeroCalCheck = "Enable"
If MAT_ID_511215 = "Disable" Then Var SugarNormalCheck = "PressForever"
Else Var UserSelectedSugar = 1
Var SugarZeroCalCheck = "Enable"
Var SugarNormalCheck = "PressForever"
Var SugarZeroCalOption = "Enable"
EndIf
EndIf
Var UserSeletedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -2349,12 +2335,16 @@
Var topping1 = toppingID1index1 Var topping1 = toppingID1index1
EndIf EndIf
Var SugarZeroCalOption = "Invisible" Var SugarZeroCalCheck = "Enable"
Var UserSeletedSugar = 1 Var SugarNormalCheck = "PressForever"
Var UserSelectedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Function 2
Refresh Refresh
</EventClick> </EventClick>
<Language> <Language>
@ -2385,7 +2375,7 @@
<EventClick> <EventClick>
SAVELOG "SUGAR2" SAVELOG "SUGAR2"
DEBUGVAR SelectDrinkType DEBUGVAR SelectDrinkType
DEBUGVAR UserSeletedSugar DEBUGVAR UserSelectedSugar
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
@ -2401,15 +2391,9 @@
Var topping1 = toppingID1index2 Var topping1 = toppingID1index2
EndIf EndIf
If SugarZeroCalEnable = "true" Then Var SugarZeroCalCheck = "Enable"
If MAT_ID_511215 = "Disable" Then Var SugarNormalCheck = "PressForever"
Else ;Var UserSelectedSugar = 1
Var SugarZeroCalCheck = "Enable"
Var SugarNormalCheck = "PressForever"
Var SugarZeroCalOption = "Enable"
EndIf
EndIf
;Var UserSeletedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -2457,17 +2441,13 @@
Var SugarState4 = "Enable" Var SugarState4 = "Enable"
Var SugarState5 = "Enable" Var SugarState5 = "Enable"
Var topping1 = toppingID1index3 Var topping1 = toppingID1index3
Var SugarZeroCalCheck = "Enable"
Var SugarNormalCheck = "PressForever"
EndIf EndIf
If SugarZeroCalEnable = "true" Then ;Var UserSelectedSugar = 1
If MAT_ID_511215 = "Disable" Then
Else
Var SugarZeroCalCheck = "Enable"
Var SugarNormalCheck = "PressForever"
Var SugarZeroCalOption = "Enable"
EndIf
EndIf
;Var UserSeletedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -2514,17 +2494,12 @@
Var SugarState4 = "PressForever" Var SugarState4 = "PressForever"
Var SugarState5 = "Enable" Var SugarState5 = "Enable"
Var topping1 = toppingID1index4 Var topping1 = toppingID1index4
Var SugarZeroCalCheck = "Enable"
Var SugarNormalCheck = "PressForever"
EndIf EndIf
If SugarZeroCalEnable = "true" Then ;Var UserSelectedSugar = 1
If MAT_ID_511215 = "Disable" Then
Else
Var SugarZeroCalCheck = "Enable"
Var SugarNormalCheck = "PressForever"
Var SugarZeroCalOption = "Enable"
EndIf
EndIf
;Var UserSeletedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -2628,12 +2603,16 @@
Var topping1 = toppingID1index1 Var topping1 = toppingID1index1
EndIf EndIf
Var SugarZeroCalOption = "Invisible" Var SugarZeroCalCheck = "Enable"
;Var UserSeletedSugar = 1 Var SugarNormalCheck = "PressForever"
;Var UserSelectedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Function 2
Refresh Refresh
</EventClick> </EventClick>
<Language> <Language>
@ -2665,7 +2644,7 @@
<EventClick> <EventClick>
SAVELOG "SUGAR2" SAVELOG "SUGAR2"
DEBUGVAR SelectDrinkType DEBUGVAR SelectDrinkType
DEBUGVAR UserSeletedSugar DEBUGVAR UserSelectedSugar
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
@ -2681,15 +2660,9 @@
Var topping1 = toppingID1index2 Var topping1 = toppingID1index2
EndIf EndIf
If SugarZeroCalEnable = "true" Then Var SugarZeroCalCheck = "Enable"
If MAT_ID_511215 = "Disable" Then Var SugarNormalCheck = "PressForever"
Else Var UserSelectedSugar = 1
Var SugarZeroCalCheck = "Enable"
Var SugarNormalCheck = "PressForever"
Var SugarZeroCalOption = "Enable"
EndIf
EndIf
Var UserSeletedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -2739,15 +2712,10 @@
Var topping1 = toppingID1index3 Var topping1 = toppingID1index3
EndIf EndIf
If SugarZeroCalEnable = "true" Then
If MAT_ID_511215 = "Disable" Then Var SugarZeroCalCheck = "Enable"
Else Var SugarNormalCheck = "PressForever"
Var SugarZeroCalCheck = "Enable" ;Var UserSelectedSugar = 1
Var SugarNormalCheck = "PressForever"
Var SugarZeroCalOption = "Enable"
EndIf
EndIf
;Var UserSeletedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -2796,15 +2764,10 @@
Var topping1 = toppingID1index4 Var topping1 = toppingID1index4
EndIf EndIf
If SugarZeroCalEnable = "true" Then
If MAT_ID_511215 = "Disable" Then Var SugarZeroCalCheck = "Enable"
Else Var SugarNormalCheck = "PressForever"
Var SugarZeroCalCheck = "Enable" ;Var UserSelectedSugar = 1
Var SugarNormalCheck = "PressForever"
Var SugarZeroCalOption = "Enable"
EndIf
EndIf
;Var UserSeletedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -2899,7 +2862,11 @@
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
Var SugarZeroCalCheck = "Enable" If SugarZeroCalCheck = "Disable2" Then
Else
Var SugarZeroCalCheck = "Enable"
EndIf
If SugarNormalCheck = "PressForever" Then If SugarNormalCheck = "PressForever" Then
Else Else
@ -2920,6 +2887,8 @@
<State> SugarZeroCalCheck </State> <State> SugarZeroCalCheck </State>
<Mode> "No" </Mode> <Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping_inter/radio_unchecked.png" </Filename> <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> <FilenamePress> "ROOT/taobin_project/image/topping_inter/radio_checked.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
@ -2929,6 +2898,8 @@
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Refresh
Else Else
Var SugarNormalCheck = "Enable" Var SugarNormalCheck = "Enable"
@ -2940,7 +2911,6 @@
Function 2 Function 2
EndIf EndIf
Refresh
</EventClick> </EventClick>
</Button> </Button>
@ -3014,6 +2984,8 @@
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Refresh
Else Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
@ -3027,14 +2999,22 @@
Var topping1 = toppingID1index1 Var topping1 = toppingID1index1
EndIf EndIf
Var SugarZeroCalOption = "Invisible" Var UserSelectedSugar = 1
Var UserSeletedSugar = 1 Var SugarNormalCheck = "PressForever"
If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable2" Then
Else
Var SugarZeroCalCheck = "Disable"
EndIf
EndIf
DEBUGVAR SugarZeroCalCheck
Function 2 Function 2
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh
</EventClick> </EventClick>
<Language> <Language>
<ID> 000040 </ID> <ID> 000040 </ID>
@ -3065,7 +3045,7 @@
<EventClick> <EventClick>
SAVELOG "SUGAR2" SAVELOG "SUGAR2"
DEBUGVAR SelectDrinkType DEBUGVAR SelectDrinkType
DEBUGVAR UserSeletedSugar DEBUGVAR UserSelectedSugar
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
@ -3090,9 +3070,25 @@
Var SugarState5 = "Enable" Var SugarState5 = "Enable"
Var SugarState6 = "Enable" Var SugarState6 = "Enable"
Var topping1 = toppingID1index1 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 EndIf
Var UserSeletedSugar = 1 Var UserSelectedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -3151,9 +3147,25 @@
Var SugarState5 = "Enable" Var SugarState5 = "Enable"
Var SugarState6 = "Enable" Var SugarState6 = "Enable"
Var topping1 = toppingID1index2 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 EndIf
Var UserSeletedSugar = 1 Var UserSelectedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -3219,10 +3231,26 @@
Var SugarState5 = "Enable" Var SugarState5 = "Enable"
Var SugarState6 = "Enable" Var SugarState6 = "Enable"
Var topping1 = toppingID1index2 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 EndIf
Var UserSeletedSugar = 1 Var UserSelectedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -3290,7 +3318,13 @@
Var topping1 = toppingID1index3 Var topping1 = toppingID1index3
EndIf EndIf
Var UserSeletedSugar = 1 If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf
Var UserSelectedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -3358,8 +3392,12 @@
Var topping1 = toppingID1index4 Var topping1 = toppingID1index4
EndIf EndIf
If SugarZeroCalEnable = "true" Then
Var UserSeletedSugar = 1 If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf
Var UserSelectedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -3437,8 +3475,15 @@
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Refresh
Else Else
Var SugarZeroCalCheck = "Enable" If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable2" Then
Else
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf
If SugarNormalCheck = "PressForever" Then If SugarNormalCheck = "PressForever" Then
Else Else
@ -3448,7 +3493,6 @@
Function 2 Function 2
EndIf EndIf
Refresh
</EventClick> </EventClick>
</Button> </Button>
@ -3459,6 +3503,8 @@
<State> SugarZeroCalCheck </State> <State> SugarZeroCalCheck </State>
<Mode> "No" </Mode> <Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping_inter/radio_unchecked.png" </Filename> <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> <FilenamePress> "ROOT/taobin_project/image/topping_inter/radio_checked.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
@ -3468,6 +3514,7 @@
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Refresh
Else Else
Var SugarNormalCheck = "Enable" Var SugarNormalCheck = "Enable"
@ -3479,7 +3526,6 @@
Function 2 Function 2
EndIf EndIf
Refresh
</EventClick> </EventClick>
</Button> </Button>
@ -3551,6 +3597,7 @@
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Refresh
Else Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
@ -3563,14 +3610,18 @@
Var topping1 = toppingID1index1 Var topping1 = toppingID1index1
EndIf EndIf
Var SugarZeroCalOption = "Invisible" Var SugarNormalCheck = "PressForever"
Var UserSeletedSugar = 1 If SugarZeroCalCheck = "Disable2" Then
Else
Var SugarZeroCalCheck = "Disable"
EndIf
Var UserSelectedSugar = 1
Function 2 Function 2
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh
</EventClick> </EventClick>
<Language> <Language>
<ID> 000052 </ID> <ID> 000052 </ID>
@ -3600,7 +3651,7 @@
<EventClick> <EventClick>
SAVELOG "SUGAR2" SAVELOG "SUGAR2"
DEBUGVAR SelectDrinkType DEBUGVAR SelectDrinkType
DEBUGVAR UserSeletedSugar DEBUGVAR UserSelectedSugar
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
@ -3616,7 +3667,13 @@
Var topping1 = toppingID1index2 Var topping1 = toppingID1index2
EndIf EndIf
;Var UserSeletedSugar = 1 If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf
;Var UserSelectedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -3666,7 +3723,13 @@
Var topping1 = toppingID1index3 Var topping1 = toppingID1index3
EndIf EndIf
;Var UserSeletedSugar = 1 If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf
;Var UserSelectedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -3715,7 +3778,12 @@
Var topping1 = toppingID1index4 Var topping1 = toppingID1index4
EndIf EndIf
;Var UserSeletedSugar = 1 If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf
;Var UserSelectedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -3795,8 +3863,15 @@
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Refresh
Else Else
Var SugarZeroCalCheck = "Enable" If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable2" Then
Else
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf
If SugarNormalCheck = "PressForever" Then If SugarNormalCheck = "PressForever" Then
Else Else
@ -3806,7 +3881,6 @@
Function 2 Function 2
EndIf EndIf
Refresh
</EventClick> </EventClick>
</Button> </Button>
@ -3817,6 +3891,8 @@
<State> SugarZeroCalCheck </State> <State> SugarZeroCalCheck </State>
<Mode> "No" </Mode> <Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping_inter/radio_unchecked.png" </Filename> <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> <FilenamePress> "ROOT/taobin_project/image/topping_inter/radio_checked.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
@ -3826,6 +3902,7 @@
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Refresh
Else Else
Var SugarNormalCheck = "Enable" Var SugarNormalCheck = "Enable"
@ -3837,7 +3914,6 @@
Function 2 Function 2
EndIf EndIf
Refresh
</EventClick> </EventClick>
</Button> </Button>
@ -3922,8 +3998,13 @@
Var topping1 = toppingID1index1 Var topping1 = toppingID1index1
EndIf EndIf
Var SugarZeroCalOption = "Invisible" Var SugarNormalCheck = "PressForever"
;Var UserSeletedSugar = 1 If SugarZeroCalCheck = "Disable2" Then
Else
Var SugarZeroCalCheck = "Disable"
EndIf
Var UserSelectedSugar = 1
Function 2 Function 2
@ -3961,7 +4042,7 @@
<EventClick> <EventClick>
SAVELOG "SUGAR2" SAVELOG "SUGAR2"
DEBUGVAR SelectDrinkType DEBUGVAR SelectDrinkType
DEBUGVAR UserSeletedSugar DEBUGVAR UserSelectedSugar
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
@ -3977,7 +4058,12 @@
Var topping1 = toppingID1index2 Var topping1 = toppingID1index2
EndIf EndIf
Var UserSeletedSugar = 1 If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf
Var UserSelectedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -4027,7 +4113,12 @@
Var topping1 = toppingID1index3 Var topping1 = toppingID1index3
EndIf EndIf
;Var UserSeletedSugar = 1 If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf
;Var UserSelectedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -4076,7 +4167,12 @@
Var topping1 = toppingID1index4 Var topping1 = toppingID1index4
EndIf EndIf
;Var UserSeletedSugar = 1 If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf
;Var UserSelectedSugar = 1
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -5068,17 +5164,31 @@
EndIf 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 If Seeker = "curr" Then
Topping "Select" UserSelectProductCode
; Set option toppinng and pack ;include="ROOT/taobin_project/inc/select_drink_current.inc"
Topping "Select1-ID" topping1
Topping "Select2-ID" topping2
Topping "Select3-ID" topping3
Topping "Select6-ID" topping6
; Pack
Topping "Pack" ExtendDataCurr
Else Else
Topping "SetNextOrder" UserSelectProductCode Topping "SetNextOrder" UserSelectProductCode
@ -5475,6 +5585,12 @@
DEBUGVAR PriceDrinkTmpShow DEBUGVAR PriceDrinkTmpShow
EndIf EndIf
If SugarZeroCalCheck = "PressForever" Then
If SugarNormalCheck = "PressForever" Then
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf
CRLFToSpace showname CRLFToSpace showname
CRLFToSpace showdesc CRLFToSpace showdesc
DEBUGVAR showname DEBUGVAR showname

15
ui/lang.tsv
View file

@ -879,8 +879,13 @@
1000014 Test again ทดสอบอีกครั้ง 1000014 Test again ทดสอบอีกครั้ง
1000015 Test result ผลการทดสอบ 1000015 Test result ผลการทดสอบ
1000016 Confirm ยืนยัน 1000016 Confirm ยืนยัน
1000017 1000017 Wait a moment รอสักครู่
1000018 1000018 The machine is testing เครื่องกำลังทดสอบ
1000019 The machine is working เครื่องกำลังทำงาน
1000020
1000021
Calibrate Calibrate
1100000 Calibrate คาลิเบรท 1100000 Calibrate คาลิเบรท
@ -975,9 +980,9 @@
1800019 Pay ice 310 g for ice only จ่ายน้ำแข็ง 310 กรัม น้ำแข็งล้วน 1800019 Pay ice 310 g for ice only จ่ายน้ำแข็ง 310 กรัม น้ำแข็งล้วน
1800020 Pay ice 100 g for test จ่ายน้ำแข็ง 100 กรัม เพื่อทดสอบ 1800020 Pay ice 100 g for test จ่ายน้ำแข็ง 100 กรัม เพื่อทดสอบ
1800021 Ice module configuration กำหนดค่าโมดูลน้ำแข็ง 1800021 Ice module configuration กำหนดค่าโมดูลน้ำแข็ง
1800022 1800022 Temperature อุณหภูมิ
1800023 1800023 Current weight น้ำหนักปัจจุบัน
1800024 1800024 Ice quantity ปริมาณน้ำแข็ง
1800025 1800025
1800026 1800026
1800027 1800027

Can't render this file because it has a wrong number of fields in line 21.

62
xml/page_topping_select7.xml
View file

@ -1458,6 +1458,8 @@
If toppingID1index1 = toppingID1Default Then If toppingID1index1 = toppingID1Default Then
Var SugarState1 = "PressForever" Var SugarState1 = "PressForever"
Var sugar_default_flag = 1 Var sugar_default_flag = 1
; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf EndIf
If toppingID1index2 = toppingID1Default Then If toppingID1index2 = toppingID1Default Then
@ -1492,6 +1494,8 @@
If sugar_default_flag = 0 Then If sugar_default_flag = 0 Then
Var SugarState1 = "PressForever" Var SugarState1 = "PressForever"
; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf EndIf
EndIf EndIf
@ -1511,6 +1515,8 @@
If toppingID1index1 = toppingID1Default Then If toppingID1index1 = toppingID1Default Then
Var SugarState1 = "PressForever" Var SugarState1 = "PressForever"
Var sugar_default_flag = 1 Var sugar_default_flag = 1
; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf EndIf
If toppingID1index2 = toppingID1Default Then If toppingID1index2 = toppingID1Default Then
@ -1538,6 +1544,8 @@
If sugar_default_flag = 0 Then If sugar_default_flag = 0 Then
Var SugarState1 = "PressForever" Var SugarState1 = "PressForever"
; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf EndIf
EndIf EndIf
@ -1757,6 +1765,8 @@
If toppingID1index2 = toppingID1Default Then If toppingID1index2 = toppingID1Default Then
Var SugarState3 = "PressForever" Var SugarState3 = "PressForever"
Var sugar_default_flag = 1 Var sugar_default_flag = 1
; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf EndIf
If toppingID1index3 = toppingID1Default Then If toppingID1index3 = toppingID1Default Then
@ -1812,6 +1822,8 @@
If toppingID1index2 = toppingID1Default Then If toppingID1index2 = toppingID1Default Then
Var SugarState4 = "PressForever" Var SugarState4 = "PressForever"
Var sugar_default_flag = 1 Var sugar_default_flag = 1
; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf EndIf
If toppingID1index3 = toppingID1Default Then If toppingID1index3 = toppingID1Default Then
@ -1863,6 +1875,8 @@
If toppingID1index2 = toppingID1Default Then If toppingID1index2 = toppingID1Default Then
Var SugarState3 = "PressForever" Var SugarState3 = "PressForever"
Var sugar_default_flag = 1 Var sugar_default_flag = 1
; select no sugar
Var SugarZeroCalCheck = "Disable"
EndIf EndIf
If toppingID1index3 = toppingID1Default Then If toppingID1index3 = toppingID1Default Then
@ -1915,6 +1929,7 @@
; Sugar Zero Cal ; Sugar Zero Cal
DEBUGVAR SugarZeroCalEnable DEBUGVAR SugarZeroCalEnable
DEBUGVAR SugarZeroCalCheck
If SugarZeroCalEnable = "true" Then If SugarZeroCalEnable = "true" Then
Var SugarZeroCalPrice = 10 Var SugarZeroCalPrice = 10
@ -2739,6 +2754,7 @@
Var topping1 = toppingID1index1 Var topping1 = toppingID1index1
EndIf EndIf
Var SugarZeroCalOption = "Invisible"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
@ -3856,17 +3872,14 @@
EndIf EndIf
Var topping1 = toppingID1index1 Var topping1 = toppingID1index1
EndIf Else
If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable" Then
If SugarZeroCalEnable = "true" Then Var SugarZeroCalCheck = "Enable"
If SugarZeroCalCheck = "Disable" Then EndIf
Var SugarZeroCalCheck = "Enable"
EndIf EndIf
EndIf EndIf
Var SugarZeroCalOption = "Enable"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
@ -3930,12 +3943,22 @@
EndIf EndIf
Var topping1 = toppingID1index2 ; select no sugar
EndIf Var SugarNormalCheck = "PressForever"
If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable2" Then
Else
Var SugarZeroCalCheck = "Disable"
EndIf
EndIf
If SugarZeroCalEnable = "true" Then Var topping1 = toppingID1index2
If SugarZeroCalCheck = "Disable" Then Else
Var SugarZeroCalCheck = "Enable" If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf EndIf
EndIf EndIf
@ -4028,14 +4051,15 @@
EndIf EndIf
Var topping1 = toppingID1index2 Var topping1 = toppingID1index2
Else
If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf
EndIf EndIf
If SugarZeroCalEnable = "true" Then
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
EndIf
EndIf
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf