This commit is contained in:
wanlop run 2024-10-04 16:06:58 +07:00
parent 89b8dbad3a
commit 3284dff5e7
27 changed files with 272 additions and 181 deletions

View file

@ -7408,15 +7408,15 @@ Sugar, Biscof" </Value>
</Block>
; - - -
; ==================> Len = 12
; 12-01-01-0081 12-01-01-0081 -
; 12-01-01-0081 12-01-02-0081 -
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-01-01-0081.Button,12-01-01-0081.Button,Disable=Invisible,$Sum12010100811201010081) </State>
<State> Flag( 12-01-01-0081.Button,12-01-02-0081.Button,Disable=Invisible,$Sum12010100811201020081) </State>
<Button>
<State> $Sum12010100811201010081 </State>
<State> $Sum12010100811201020081 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_blackcoffee.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_blackcoffee.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_blackcoffee.png" </FilenameDisable>
@ -7431,13 +7431,13 @@ Sugar, Biscof" </Value>
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_blackcoffee.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-01-01-0081.Price
Var PriceD2 = $12-01-01-0081.Price
Var PriceD2 = $12-01-02-0081.Price
Var PriceD3 = $-.Price
Var PD_CODE1 = "12-01-01-0081"
Var PD_CODE2 = "12-01-01-0081"
Var PD_CODE2 = "12-01-02-0081"
Var PD_CODE3 = "##-##-##-####"
Var PD_STAGE_1 = $12-01-01-0081.Button
Var PD_STAGE_2 = $12-01-01-0081.Button
Var PD_STAGE_2 = $12-01-02-0081.Button
Var PD_STAGE_3 = "Disable2"
Var OverlayMenuFilter !assigned xmlpro( 12-01-01-0081, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter
@ -7456,7 +7456,7 @@ Sugar, Biscof" </Value>
Var DefaultDrinkType = 3
EndIf
If PD_STAGE_2 = "Enable" Then
Topping "Load" "12-01-01-0081"
Topping "Load" "12-01-02-0081"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" "12-01-01-0081"
@ -7469,10 +7469,10 @@ Sugar, Biscof" </Value>
Var menu_name_thai_hot = $12-01-01-0081.Name
Var menu_desc_thai_hot = $12-01-01-0081.description
Var menu_name_eng_cold = $12-01-01-0081.NameE
Var menu_desc_eng_cold = $12-01-01-0081.descriptionE
Var menu_name_thai_cold = $12-01-01-0081.Name
Var menu_desc_thai_cold = $12-01-01-0081.description
Var menu_name_eng_cold = $12-01-02-0081.NameE
Var menu_desc_eng_cold = $12-01-02-0081.descriptionE
Var menu_name_thai_cold = $12-01-02-0081.Name
Var menu_desc_thai_cold = $12-01-02-0081.description
Var menu_name_eng_blender = $##-##-##-####.NameE
Var menu_desc_eng_blender = $##-##-##-####.descriptionE
@ -7559,7 +7559,7 @@ Sugar, Biscof" </Value>
<Y> 264 </Y>
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<State> $12-01-01-0081.Button </State>
<State> $12-01-02-0081.Button </State>
</Image>
<Text>
<X> 115 </X>
@ -7569,8 +7569,8 @@ Sugar, Biscof" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-01-01-0081.Button </State>
<Value> StringFmt( $12-01-01-0081.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
<State> $12-01-02-0081.Button </State>
<Value> StringFmt( $12-01-02-0081.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 146 </X>
@ -7597,7 +7597,7 @@ Sugar, Biscof" </Value>
eval(
If ICE_PROCESS_STATUS = 2 Then
If $Sum12010100811201010081 = "Disable" Then
If $Sum12010100811201020081 = "Disable" Then
Var ice_tab_process_show = "Disable"
Else
Var ice_tab_process_show = "Enable"
@ -7617,9 +7617,9 @@ Sugar, Biscof" </Value>
<Y> 117 </Y>
<State>
eval(
If $Sum12010100811201010081 = "Disable" Then
If $Sum12010100811201020081 = "Disable" Then
STRCONTAIN "ERR" $12-01-01-0081.TAG tag1_is_disable
STRCONTAIN "ERR" $12-01-01-0081.TAG tag2_is_disable
STRCONTAIN "ERR" $12-01-02-0081.TAG tag2_is_disable
STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
Var return = "Invisible"
If tag1_is_disable = "true" Then
@ -7656,7 +7656,7 @@ Sugar, Biscof" </Value>
<Font> MITRegularTTF </Font>
<Color> 0x5A5A5A </Color>
<Mode> "disable-show" </Mode>
<State> $Sum12010100811201010081 </State>
<State> $Sum12010100811201020081 </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
@ -13326,6 +13326,7 @@ LIMENADE SODA" </Value>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
Refresh
</EventClick>
</Button>

View file

@ -7408,19 +7408,19 @@ Sugar, Biscof" </Value>
</Block>
; - - -
; ==================> Len = 12
; 12-01-01-0081 12-01-01-0081 -
; 12-01-01-0081 12-01-02-0081 -
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-01-01-0081.Button,12-01-01-0081.Button,Disable=Invisible,$Sum12010100811201010081) </State>
<State> Flag( 12-01-01-0081.Button,12-01-02-0081.Button,Disable=Invisible,$Sum12010100811201010081) </State>
<Button>
<State> $Sum12010100811201010081 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_blackcoffee.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_blackcoffee.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_blackcoffee.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-01-01-0081, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<OverlayImage> xmlpro( 12-01-02-0081, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
@ -7431,15 +7431,15 @@ Sugar, Biscof" </Value>
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_blackcoffee.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-01-01-0081.Price
Var PriceD2 = $12-01-01-0081.Price
Var PriceD2 = $12-01-02-0081.Price
Var PriceD3 = $-.Price
Var PD_CODE1 = "12-01-01-0081"
Var PD_CODE2 = "12-01-01-0081"
Var PD_CODE2 = "12-01-02-0081"
Var PD_CODE3 = "##-##-##-####"
Var PD_STAGE_1 = $12-01-01-0081.Button
Var PD_STAGE_2 = $12-01-01-0081.Button
Var PD_STAGE_2 = $12-01-02-0081.Button
Var PD_STAGE_3 = "Disable2"
Var OverlayMenuFilter !assigned xmlpro( 12-01-01-0081, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
Var OverlayMenuFilter !assigned xmlpro( 12-01-02-0081, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
@ -7456,7 +7456,7 @@ Sugar, Biscof" </Value>
Var DefaultDrinkType = 3
EndIf
If PD_STAGE_2 = "Enable" Then
Topping "Load" "12-01-01-0081"
Topping "Load" "12-01-02-0081"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" "12-01-01-0081"
@ -7469,10 +7469,10 @@ Sugar, Biscof" </Value>
Var menu_name_thai_hot = $12-01-01-0081.Name
Var menu_desc_thai_hot = $12-01-01-0081.description
Var menu_name_eng_cold = $12-01-01-0081.NameE
Var menu_desc_eng_cold = $12-01-01-0081.descriptionE
Var menu_name_thai_cold = $12-01-01-0081.Name
Var menu_desc_thai_cold = $12-01-01-0081.description
Var menu_name_eng_cold = $12-01-02-0081.NameE
Var menu_desc_eng_cold = $12-01-02-0081.descriptionE
Var menu_name_thai_cold = $12-01-02-0081.Name
Var menu_desc_thai_cold = $12-01-02-0081.description
Var menu_name_eng_blender = $##-##-##-####.NameE
Var menu_desc_eng_blender = $##-##-##-####.descriptionE
@ -7559,7 +7559,7 @@ Sugar, Biscof" </Value>
<Y> 264 </Y>
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<State> $12-01-01-0081.Button </State>
<State> $12-01-02-0081.Button </State>
</Image>
<Text>
<X> 115 </X>
@ -7569,8 +7569,8 @@ Sugar, Biscof" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-01-01-0081.Button </State>
<Value> StringFmt( $12-01-01-0081.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
<State> $12-01-02-0081.Button </State>
<Value> StringFmt( $12-01-02-0081.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 146 </X>
@ -7619,7 +7619,7 @@ Sugar, Biscof" </Value>
eval(
If $Sum12010100811201010081 = "Disable" Then
STRCONTAIN "ERR" $12-01-01-0081.TAG tag1_is_disable
STRCONTAIN "ERR" $12-01-01-0081.TAG tag2_is_disable
STRCONTAIN "ERR" $12-01-02-0081.TAG tag2_is_disable
STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
Var return = "Invisible"
If tag1_is_disable = "true" Then

View file

@ -414,6 +414,12 @@ If BoxID = 173149 Then
Var New_Payment = 1
Var NewFlowPaymentCode = 1
EndIf
If BoxID = 173249 Then
Var New_Payment = 1
Var NewFlowPaymentCode = 1
EndIf
If BoxID = 172053 Then
Var New_Payment = 1
Var NewFlowPaymentCode = 1
@ -439,9 +445,14 @@ EndIf
;
If BoxID > 200000 Then
If BoxID < 201020 Then
If BoxID < 200400 Then
Var New_Payment = 1
Var NewFlowPaymentCode = 1
EndIf
EndIf
Var SaveOrderNameAndPictureEnable = 0
If BoxID = 176757 Then
Var SaveOrderNameAndPictureEnable = 1
EndIf