9.01
This commit is contained in:
parent
89b8dbad3a
commit
3284dff5e7
27 changed files with 272 additions and 181 deletions
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -8026,15 +8026,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>
|
||||
|
|
@ -8050,13 +8050,13 @@ Sugar, Biscof" </Value>
|
|||
Var OpenFromXML = CurrentXMLFileName2
|
||||
GetInstanceIDMenuTab OpenFromInstMenuTab
|
||||
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
|
||||
|
|
@ -8075,7 +8075,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"
|
||||
|
|
@ -8088,10 +8088,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
|
||||
|
|
@ -8179,7 +8179,7 @@ Sugar, Biscof" </Value>
|
|||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImageDrinkOption + "cold.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImageDrinkOption + "cold_db.png" ) </FilenameDisable>
|
||||
<State> $12-01-01-0081.Button </State>
|
||||
<State> $12-01-02-0081.Button </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 115 </X>
|
||||
|
|
@ -8189,8 +8189,8 @@ Sugar, Biscof" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> $12-01-01-0081.Button </State>
|
||||
<Value> Var( "฿" + $12-01-01-0081.Price ) </Value>
|
||||
<State> $12-01-02-0081.Button </State>
|
||||
<Value> Var( "฿" + $12-01-02-0081.Price ) </Value>
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 146 </X>
|
||||
|
|
@ -8217,7 +8217,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"
|
||||
|
|
@ -8237,9 +8237,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
|
||||
|
|
@ -8276,7 +8276,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>
|
||||
|
|
|
|||
|
|
@ -7049,15 +7049,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>
|
||||
|
|
@ -7073,13 +7073,13 @@ Sugar, Biscof" </Value>
|
|||
Var OpenFromXML = CurrentXMLFileName2
|
||||
GetInstanceIDMenuTab OpenFromInstMenuTab
|
||||
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
|
||||
|
|
@ -7098,7 +7098,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"
|
||||
|
|
@ -7111,10 +7111,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
|
||||
|
|
@ -7202,7 +7202,7 @@ Sugar, Biscof" </Value>
|
|||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImageDrinkOption + "cold.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImageDrinkOption + "cold_db.png" ) </FilenameDisable>
|
||||
<State> $12-01-01-0081.Button </State>
|
||||
<State> $12-01-02-0081.Button </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 115 </X>
|
||||
|
|
@ -7212,8 +7212,8 @@ Sugar, Biscof" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> $12-01-01-0081.Button </State>
|
||||
<Value> Var( "฿" + $12-01-01-0081.Price ) </Value>
|
||||
<State> $12-01-02-0081.Button </State>
|
||||
<Value> Var( "฿" + $12-01-02-0081.Price ) </Value>
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 146 </X>
|
||||
|
|
@ -7240,7 +7240,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"
|
||||
|
|
@ -7260,9 +7260,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
|
||||
|
|
@ -7299,7 +7299,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>
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@
|
|||
Machine RemoveCup
|
||||
Machine DoorLidOpen
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -2839,6 +2839,7 @@ JASMINE" </Value>
|
|||
Machine RemoveCup
|
||||
Machine DoorLidOpen
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@
|
|||
Machine RemoveCup
|
||||
Machine DoorLidOpen
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -6429,15 +6429,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>
|
||||
|
|
@ -6452,13 +6452,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
|
||||
|
|
@ -6477,7 +6477,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"
|
||||
|
|
@ -6490,10 +6490,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
|
||||
|
|
@ -6580,7 +6580,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>
|
||||
|
|
@ -6590,8 +6590,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>
|
||||
|
|
@ -6618,7 +6618,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"
|
||||
|
|
@ -6638,9 +6638,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
|
||||
|
|
@ -6677,7 +6677,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>
|
||||
|
|
@ -12347,6 +12347,7 @@ LIMENADE SODA" </Value>
|
|||
Machine RemoveCup
|
||||
Machine DoorLidOpen
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -216,6 +216,8 @@
|
|||
AddData 50 dummyPhone param1 param2 param3
|
||||
EndIf
|
||||
|
||||
SAVELOG "drinkok.xml version 1"
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 500 </Timeout>
|
||||
<EventTimeout>
|
||||
|
|
@ -244,7 +246,8 @@
|
|||
|
||||
EndIf
|
||||
|
||||
; 420 sec
|
||||
; 420 sec
|
||||
; to be obsolete
|
||||
If Timeout > 840 Then
|
||||
Var CountForRetryStuck = 1
|
||||
Open "ROOT/taobin_project/xml/page_drink_stuck.xml"
|
||||
|
|
@ -273,26 +276,10 @@
|
|||
;
|
||||
If MachineStage = "show-menu" Then
|
||||
|
||||
|
||||
Var Seeker.TNumberTaobinMember = ""
|
||||
|
||||
If NextOrder = "true" Then
|
||||
|
||||
; Fast-forward to page_cannotConti
|
||||
If RejectOrder = "true" Then
|
||||
; BEGIN
|
||||
Var NextOrder = "false"
|
||||
|
||||
TransferVar "next" "curr"
|
||||
Var Seeker = "curr"
|
||||
|
||||
SAVELOG "Make next order by RejectOrder"
|
||||
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
|
||||
; END
|
||||
EndIf
|
||||
|
||||
; next order set. Havecup and checkup value must false. Certain cup not on any arm.
|
||||
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; BEGIN
|
||||
|
|
@ -315,44 +302,25 @@
|
|||
;
|
||||
; this stage for remove cup
|
||||
If MachineStage = "remove-cup" Then
|
||||
If CART_COUNT = 0 Then
|
||||
If NextOrder = "false" Then
|
||||
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
|
||||
Else
|
||||
Var buttonRemoveCup = "Enable"
|
||||
Var txtDrinkOKState = "Enable"
|
||||
|
||||
Var Timeout2 = Timeout2 + 1
|
||||
|
||||
If Timeout2 > 15 Then
|
||||
If InternationalEnable = 1 Then
|
||||
|
||||
Else
|
||||
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
|
||||
EndIf
|
||||
Var Timeout2 = 0
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
If NextOrder = "false" Then
|
||||
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
|
||||
Else
|
||||
|
||||
Var buttonRemoveCup = "Enable"
|
||||
Var txtDrinkOKState = "Enable"
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; BEGIN
|
||||
Var NextOrder = "false"
|
||||
|
||||
TransferVar "next" "curr"
|
||||
Var Seeker = "curr"
|
||||
SAVELOG "Make next order by take-cup"
|
||||
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
|
||||
; END
|
||||
|
||||
Var Timeout2 = Timeout2 + 1
|
||||
|
||||
If Timeout2 > 15 Then
|
||||
If InternationalEnable = 1 Then
|
||||
|
||||
Else
|
||||
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
|
||||
EndIf
|
||||
Var Timeout2 = 0
|
||||
Else
|
||||
Machine DoorClose
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
If Timeout = 5 Then
|
||||
|
|
@ -530,21 +498,21 @@
|
|||
</Image>
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 160 </X>
|
||||
<Y> 1673 </Y>
|
||||
<State> buttonRemoveCup </State>
|
||||
;<Color> "0x00BDFF" </Color>
|
||||
<Interval> 500 </Interval>
|
||||
<Filename> Var( DirImage + "/bn_open_door.png" ) </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_open_door.png" ) </FilenamePress>
|
||||
<EventClick>
|
||||
;Var buttonRemoveCup = "Invisible"
|
||||
Machine RemoveCup
|
||||
Machine DoorLidOpen
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
;<Button>
|
||||
;<X> 160 </X>
|
||||
;<Y> 1673 </Y>
|
||||
;<State> buttonRemoveCup </State>
|
||||
;;<Color> "0x00BDFF" </Color>
|
||||
;<Interval> 500 </Interval>
|
||||
;<Filename> Var( DirImage + "/bn_open_door.png" ) </Filename>
|
||||
;<FilenamePress> Var( DirImage + "/bp_open_door.png" ) </FilenamePress>
|
||||
;<EventClick>
|
||||
; ;Var buttonRemoveCup = "Invisible"
|
||||
; Machine RemoveCup
|
||||
; Machine DoorLidOpen
|
||||
; Refresh
|
||||
;</EventClick>
|
||||
;</Button>
|
||||
|
||||
;500
|
||||
;1180
|
||||
|
|
@ -710,9 +678,15 @@
|
|||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
||||
<EventUnitTest1>
|
||||
Var MachineStage = "show-menu"
|
||||
Var Timeout2 = 0
|
||||
__CMD "UpdateCupOnArm" UserSelectProductCode "-" "-"
|
||||
</EventUnitTest1>
|
||||
|
||||
<EventUnitTest2>
|
||||
Open "ROOT/xml/page_drinkok.xml"
|
||||
</EventUnitTest2>
|
||||
|
||||
</Popup>
|
||||
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@
|
|||
|
||||
;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
|
||||
|
||||
SAVELOG "Thank you conti version 1"
|
||||
SAVELOG "Thank you conti version 2"
|
||||
|
||||
;PendingFlag InternationalEnable
|
||||
;PendingFlag New_Payment
|
||||
|
|
@ -182,6 +182,7 @@
|
|||
|
||||
EndIf
|
||||
|
||||
|
||||
If HaveCup = "false" Then
|
||||
If MachineStage = "show-menu" Then
|
||||
|
||||
|
|
@ -264,7 +265,27 @@
|
|||
|
||||
;include=ROOT/taobin_project/inc/remove_cup_step.inc
|
||||
|
||||
|
||||
If buttonRemoveCup = "Invisible" Then
|
||||
If show_eng = "true" Then
|
||||
Var MachineErrorDetailAll = " Please take cup."
|
||||
Else
|
||||
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
|
||||
EndIf
|
||||
Else
|
||||
If CupChecking = "true" Then
|
||||
If show_eng = "true" Then
|
||||
Var MachineErrorDetailAll = " Please take a cup."
|
||||
Else
|
||||
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
|
||||
EndIf
|
||||
Else
|
||||
If show_eng = "true" Then
|
||||
Var MachineErrorDetailAll = " Press button for take a cup."
|
||||
Else
|
||||
Var MachineErrorDetailAll = " กรุณากดปุ่ม แล้วนำแก้วออกก่อนครับ/คะ"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Refresh
|
||||
TimerReset
|
||||
|
|
@ -351,8 +372,39 @@
|
|||
<Width> 1080 </Width>
|
||||
<Align> end </Align>
|
||||
<Color> 0xFF0000 </Color>
|
||||
<Value> "TCT1"</Value>
|
||||
<Value> "TCT1 "</Value>
|
||||
</Text>
|
||||
|
||||
|
||||
|
||||
<Text>
|
||||
<X> 5 </X>
|
||||
<Y> 1868 </Y>
|
||||
<Size> 24 </Size>
|
||||
<Align> Center </Align>
|
||||
<Width> 1080 </Width>
|
||||
<Font> RobotoRegular </Font>
|
||||
<Color> 0xDE794E </Color>
|
||||
<Value> MachineErrorDetailAll </Value>
|
||||
</Text>
|
||||
|
||||
|
||||
|
||||
<EventUnitTest1>
|
||||
Var Timeout2 = 0
|
||||
__CMD "UpdateCupOnArm" UserSelectProductCode "-" "-"
|
||||
</EventUnitTest1>
|
||||
|
||||
<EventUnitTest2>
|
||||
Open "ROOT/xml/page_thankyouConti.xml"
|
||||
</EventUnitTest2>
|
||||
|
||||
<EventUnitTest3>
|
||||
|
||||
|
||||
</EventUnitTest3>
|
||||
|
||||
<EventUnitTest4>
|
||||
</EventUnitTest4>
|
||||
|
||||
</Popup>
|
||||
|
|
|
|||
|
|
@ -7910,13 +7910,10 @@
|
|||
;
|
||||
|
||||
<EventUnitTest1>
|
||||
Var PromotionOreoToppingFreeEnable = 1
|
||||
DEBUGVAR PromotionOreoToppingFreeEnable
|
||||
__CMD "UpdateCupOnArm" UserSelectProductCode "-"
|
||||
</EventUnitTest1>
|
||||
|
||||
<EventUnitTest2>
|
||||
Var PromotionOreoToppingFreeEnable = 0
|
||||
DEBUGVAR PromotionOreoToppingFreeEnable
|
||||
</EventUnitTest2>
|
||||
|
||||
<EventUnitTest4>
|
||||
|
|
|
|||
|
|
@ -167,6 +167,12 @@
|
|||
Var EnableNewBrewUI = "false"
|
||||
EndIf
|
||||
|
||||
Var Index = 1
|
||||
DEBUGVAR TestArrary[0]
|
||||
DEBUGVAR TestArrary[Index]
|
||||
DEBUGVAR TestArrary[2]
|
||||
DEBUGVAR TestArrary[3]
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue