Merge origin/masterpiece into smoothie_tbp

This commit is contained in:
Ittipat Lusuk 2025-05-13 09:59:33 +07:00
commit 678a79ae83
80 changed files with 10192 additions and 14079 deletions

View file

@ -57,6 +57,9 @@ Else
EndIf
If CatalogLayoutV3 = 1 Then
DEBUGVAR NextPage
SAVELOG " CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3"
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev"
EndIf
@ -81,3 +84,4 @@ If OpenFromMulti = 1 Then
TabMenuVisibleInst 99
EndIf
Var OpenFromMulti = 0

View file

@ -9,7 +9,6 @@
Var ChildrenFree = 0
Var KBankCashlessMachine = 0
Var SmoothieToPayment = 0
Var OreoDueEnable = 0
Var OreoForFreeEnable = 0

View file

@ -43,10 +43,12 @@
Var Seeker = "next"
Var Seeker.thankLidFlag = 0
Var Seeker.thankStrawFlag = 0
Var Seeker.SmoothieToPayment = 0
Var Seeker = "curr"
Var Seeker.thankLidFlag = 0
Var Seeker.thankStrawFlag = 0
Var Seeker.SmoothieToPayment = 0
DEBUGVAR web_ref
DEBUGVAR web_payment
@ -2167,7 +2169,7 @@ PRICE "Reset" "-"
; Original value is 40
If EnableMultiInstance = "true" Then
If CountUpReloadAll > 150 Then
If CountUpReloadAll > 120 Then
Var NeedReboot = "false"
Var StartUpExt = "-"
@ -2178,7 +2180,7 @@ PRICE "Reset" "-"
Else
If CountUpReloadAll > 100 Then
If CountUpReloadAll > 50 Then
Var NeedReboot = "false"
Var StartUpExt = "-"
@ -2583,7 +2585,7 @@ PRICE "Reset" "-"
<EventClick>
Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
SAVELOG " NEXT PAGE NEXT PAGE NEXT PAGE "
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
If DoorCupPosition = "bottom" Then

View file

@ -182,6 +182,7 @@
Var LidStateX = "Enable"
Var Seeker.thankLidFlag = 0
Var Seeker.thankStrawFlag = 0
Var Seeker.SmoothieToPayment = 0
Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"

View file

@ -60,6 +60,7 @@
Var Seeker.thankLidFlag = 0
Var Seeker.thankStrawFlag = 0
Var Seeker.SmoothieToPayment = 0
WEB "DISABLE"

View file

@ -55,6 +55,7 @@
Var Seeker.thankLidFlag = 0
Var Seeker.thankStrawFlag = 0
Var Seeker.SmoothieToPayment = 0
WEB "DISABLE"

View file

@ -34,6 +34,7 @@
Var Seeker.thankLidFlag = 0
Var Seeker.thankStrawFlag = 0
Var Seeker.SmoothieToPayment = 0
WEB "DISABLE"

View file

@ -28,6 +28,7 @@
Var Seeker.thankLidFlag = 0
Var Seeker.thankStrawFlag = 0
Var Seeker.SmoothieToPayment = 0
WEB "DISABLE"

View file

@ -14,6 +14,7 @@
Var Seeker.thankLidFlag = 0
Var Seeker.thankStrawFlag = 0
Var Seeker.SmoothieToPayment = 0
WEB "DISABLE"

View file

@ -24,6 +24,7 @@
Var Seeker.thankLidFlag = 0
Var Seeker.thankStrawFlag = 0
Var Seeker.SmoothieToPayment = 0
WEB "DISABLE"

View file

@ -14,6 +14,7 @@
Var Seeker.thankLidFlag = 0
Var Seeker.thankStrawFlag = 0
Var Seeker.SmoothieToPayment = 0
WEB "DISABLE"

View file

@ -43,7 +43,7 @@
;banner_shifting
</Script>
;dummy_layout.inc
; menu_new_list 14
; menu_new_list 15
; ==================> Len = 16
; - 12-05-02-0133 12-05-03-0133
<Block>
@ -1802,6 +1802,259 @@ Ice" </Value>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
</Block>
; - - -
; ==================> Len = 16
; - - -
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( $Sum) </State>
<Button>
<State> $Sum </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
<OverlayImage> xmlpro( -, "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>
Var NameDrink = "Tao Power Drink Ume Soda"
Var NameDrinkTH = "เต่าทรงพลังบ๊วยโซดา"
Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง บ๊วย และโซดา (มีคาเฟอีน)"
Var DrinkDescription = "Medicine Drink, Ume , Soda"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $-.Price
Var PriceD3 = $-.Price
Var PD_CODE1 = "##-##-##-####"
Var PD_CODE2 = "##-##-##-####"
Var PD_CODE3 = "##-##-##-####"
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = "Disable2"
Var PD_STAGE_3 = "Disable2"
Var OverlayMenuFilter !assigned xmlpro( -, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
If PD_STAGE_1 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 1
EndIf
If PD_STAGE_2 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 2
EndIf
If PD_STAGE_3 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 3
EndIf
If PD_STAGE_2 = "Enable" Then
Topping "Load" "-"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" "-"
Else
Topping "Load" "-"
EndIf
EndIf
Var menu_name_eng_hot = $##-##-##-####.NameE
Var menu_desc_eng_hot = $##-##-##-####.descriptionE
Var menu_name_thai_hot = $##-##-##-####.Name
Var menu_desc_thai_hot = $##-##-##-####.description
Var menu_name_eng_cold = $##-##-##-####.NameE
Var menu_desc_eng_cold = $##-##-##-####.descriptionE
Var menu_name_thai_cold = $##-##-##-####.Name
Var menu_desc_thai_cold = $##-##-##-####.description
Var menu_name_eng_blender = $##-##-##-####.NameE
Var menu_desc_eng_blender = $##-##-##-####.descriptionE
Var menu_name_thai_blender = $##-##-##-####.Name
Var menu_desc_thai_blender = $##-##-##-####.description
DEBUGVAR PD_STAGE_1
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
</EventOnClick>
</Button>
<Text>
<X> 16 </X>
<Y> 164 </Y>
<Size> 24 </Size>
<Width>220</Width>
<Mode> "multi2" </Mode>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "เต่าทรงพลังบ๊วยโซดา" </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 220 </Y>
<Size> 14 </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "เครื่องดื่มเต่าทรงพลัง บ๊วย
และโซดา (มีคาเฟอีน)" </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 164 </Y>
<Size> 22 </Size>
<Width>220</Width>
<Mode> "multi2" </Mode>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Tao Power Drink Ume Soda" </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 220 </Y>
<Size> 14 </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Medicine Drink, Ume ,
Soda" </Value>
</Text>
<Image>
<X> 16 </X>
<Y> 264 </Y>
<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
</Image>
<Image>
<X> 16 </X>
<Y> 264 </Y>
<State> "Invisible" </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
</Image>
<Text>
<X> 50 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
<Y> 264 </Y>
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<State> "Invisible" </State>
</Image>
<Text>
<X> 115 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 146 </X>
<Y> 264 </Y>
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
<State> "Invisible" </State>
</Image>
<Text>
<X> 180 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitRegularTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
<Y> 264 </Y>
<State>
eval(
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Invisible"
Else
Var ice_tab_process_show = "Invisible"
EndIf
Var return = ice_tab_process_show
)
</State>
<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
</Image>
<Image>
<X> 49 </X>
<Y> 117 </Y>
<State>
eval(
If $Sum = "Disable" Then
STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
Var return = "Invisible"
If tag1_is_disable = "true" Then
Var return = "Enable"
EndIf
If tag2_is_disable = "true" Then
Var return = "Enable"
EndIf
If tag3_is_disable = "true" Then
Var return = "Enable"
EndIf
Else
Var return = "Invisible"
EndIf
)
</State>
<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
</Image>
<Text>
<X> 84 </X>
<Y> 266 </Y>
<Size> 10 </Size>
<Font> OpunMediumTTF </Font>
<Color> 0xDE794E </Color>
<State> ice_tab_process_show </State>
<Value> ice_show_open </Value>
</Text>
<Text>
<X> 48 </X>
<Y> 116 </Y>
<Size> 32 </Size>
<Width>128</Width>
<Height>64</Height>
<Font> MITRegularTTF </Font>
<Color> 0x5A5A5A </Color>
<Mode> "disable-show" </Mode>
<State> $Sum </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
</Block>
; - - -
; ==================> Len = 16

View file

@ -3339,257 +3339,7 @@ Sugar, Oreo" </Value>
<Align> center-vertical-horizontal </Align>
</Text>
</Block>
;
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( .Button,.Button,.Button,$Sum) </State>
<Button>
<State> $Sum </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_peach_Oreo_smoothie.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_peach_Oreo_smoothie.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_peach_Oreo_smoothie.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<EventOnClick>
Var NameDrink = "Peach Oreo"
Var NameDrinkTH = "พีชโอรีโอภูเขาไฟ"
Var DrinkDescriptionTH = "พีช นม น้ำตาล Oreo"
Var DrinkDescription = "Peach, Milk, Sugar, Oreo"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_peach_Oreo_smoothie.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $.Price
Var PriceD2 = $.Price
Var PriceD3 = $.Price
Var PD_CODE1 = "##-##-##-####"
Var PD_CODE2 = "##-##-##-####"
Var PD_CODE3 = "##-##-##-####"
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = "Disable2"
Var PD_STAGE_3 = "Disable2"
Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
If PD_STAGE_1 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 1
EndIf
If PD_STAGE_2 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 2
EndIf
If PD_STAGE_3 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 3
EndIf
If PD_STAGE_3 = "Enable" Then
Topping "Load" ""
Else
If PD_STAGE_2 = "Enable" Then
Topping "Load" ""
Else
Topping "Load" ""
EndIf
EndIf
Var menu_name_eng_hot = $##-##-##-####.NameE
Var menu_desc_eng_hot = $##-##-##-####.descriptionE
Var menu_name_thai_hot = $##-##-##-####.Name
Var menu_desc_thai_hot = $##-##-##-####.description
Var menu_name_eng_cold = $##-##-##-####.NameE
Var menu_desc_eng_cold = $##-##-##-####.descriptionE
Var menu_name_thai_cold = $##-##-##-####.Name
Var menu_desc_thai_cold = $##-##-##-####.description
Var menu_name_eng_blender = $##-##-##-####.NameE
Var menu_desc_eng_blender = $##-##-##-####.descriptionE
Var menu_name_thai_blender = $##-##-##-####.Name
Var menu_desc_thai_blender = $##-##-##-####.description
DEBUGVAR PD_STAGE_1
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
</EventOnClick>
</Button>
<Text>
<X> 16 </X>
<Y> 164 </Y>
<Size> 24 </Size>
<Width>220</Width>
<Mode> "multi2" </Mode>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "พีชโอรีโอภูเขาไฟ" </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 220 </Y>
<Size> 14 </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "พีช นม น้ำตาล
Oreo" </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 164 </Y>
<Size> 22 </Size>
<Width>220</Width>
<Mode> "multi2" </Mode>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Peach Oreo" </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 220 </Y>
<Size> 14 </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Peach, Milk,
Sugar, Oreo" </Value>
</Text>
<Image>
<X> 16 </X>
<Y> 264 </Y>
<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
</Image>
<Image>
<X> 16 </X>
<Y> 264 </Y>
<State> "Invisible" </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
</Image>
<Text>
<X> 50 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
<Y> 264 </Y>
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<State> "Invisible" </State>
</Image>
<Text>
<X> 115 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 146 </X>
<Y> 264 </Y>
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
<State> "Invisible" </State>
</Image>
<Text>
<X> 183 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
<Y> 264 </Y>
<State>
eval(
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Invisible"
Else
Var ice_tab_process_show = "Invisible"
EndIf
Var return = ice_tab_process_show
)
</State>
<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
</Image>
<Image>
<X> 49 </X>
<Y> 117 </Y>
<State>
eval(
If $Sum = "Disable" Then
STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
Var return = "Invisible"
If tag1_is_disable = "true" Then
Var return = "Enable"
EndIf
If tag2_is_disable = "true" Then
Var return = "Enable"
EndIf
If tag3_is_disable = "true" Then
Var return = "Enable"
EndIf
Else
Var return = "Invisible"
EndIf
)
</State>
<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
</Image>
<Text>
<X> 84 </X>
<Y> 266 </Y>
<Size> 10 </Size>
<Font> OpunMediumTTF </Font>
<Color> 0xDE794E </Color>
<State> ice_tab_process_show </State>
<Value> ice_show_open </Value>
</Text>
<Text>
<X> 48 </X>
<Y> 116 </Y>
<Size> 32 </Size>
<Width>128</Width>
<Height>64</Height>
<Font> MITRegularTTF </Font>
<Color> 0x5A5A5A </Color>
<Mode> "disable-show" </Mode>
<State> $Sum </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
</Block>
; - - -
</FrameScroll>
; Cart
<Button>

View file

@ -16451,9 +16451,9 @@ Plant Protein" </Value>
<State> Flag( 12-06-01-0002.Button,$Sum1206010002) </State>
<Button>
<State> $Sum1206010002 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
<OverlayImage> xmlpro( 12-06-01-0002, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -16462,7 +16462,7 @@ Plant Protein" </Value>
Var NameDrinkTH = "โจ๊กผักฮ้องกง"
Var DrinkDescriptionTH = "ข้าว ผัก โปรตีนจากพืช น้ำ"
Var DrinkDescription = "Rice, Plant-based protein, Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-06-01-0002.Price
Var PriceD2 = $-.Price

View file

@ -4317,9 +4317,9 @@ Mint Soda" </Value>
<State> Flag( 12-01-02-0061.Button,12-01-03-0061.Button,$Sum12010200611201030061) </State>
<Button>
<State> $Sum12010200611201030061 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
<OverlayImage> xmlpro( 12-01-03-0061, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -4328,7 +4328,7 @@ Mint Soda" </Value>
Var NameDrinkTH = "มอคค่ามัทฉะโตเกียวบานาน่าเย็น"
Var DrinkDescriptionTH = "กาแฟ น้ำ นม โกโก้ และ กล้วย"
Var DrinkDescription = "Espresso, Banana , Cocoa, Milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $12-01-02-0061.Price
@ -4568,9 +4568,9 @@ Mint Soda" </Value>
<State> Flag( 12-01-02-0062.Button,$Sum1201020062) </State>
<Button>
<State> $Sum1201020062 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
<OverlayImage> xmlpro( 12-01-02-0062, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -4579,7 +4579,7 @@ Mint Soda" </Value>
Var NameDrinkTH = "มัทฉะลาเต้โตเกียวบานาน่าเย็น"
Var DrinkDescriptionTH = "กาแฟ น้ำ นม มัทฉะ และ กล้วย"
Var DrinkDescription = "Espresso, Banana , Matcha, Milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $12-01-02-0062.Price
@ -4819,9 +4819,9 @@ Mint Soda" </Value>
<State> Flag( 12-03-02-0024.Button,12-03-03-0024.Button,$Sum12030200241203030024) </State>
<Button>
<State> $Sum12030200241203030024 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
<OverlayImage> xmlpro( 12-03-03-0024, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -4830,7 +4830,7 @@ Mint Soda" </Value>
Var NameDrinkTH = "นมช็อกโกโตเกียวบานาน่าเย็น"
Var DrinkDescriptionTH = "โกโก้ โตเกียวบานาน่า นม น้ำตาลและน้ำแข็ง"
Var DrinkDescription = "Tokyo Banana , Milk, Sugar, Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $12-03-02-0024.Price
@ -5070,9 +5070,9 @@ Mint Soda" </Value>
<State> Flag( 12-03-03-0045.Button,$Sum1203030045) </State>
<Button>
<State> $Sum1203030045 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
<OverlayImage> xmlpro( 12-03-03-0045, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -5081,7 +5081,7 @@ Mint Soda" </Value>
Var NameDrinkTH = "สตรอว์เบอร์รี่โตเกียวบานาน่าปั่น"
Var DrinkDescriptionTH = "กล้วย สตรอเบอรี และนม"
Var DrinkDescription = "Banana , Strawberry , Milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $-.Price
@ -5321,9 +5321,9 @@ Mint Soda" </Value>
<State> Flag( 12-03-03-0029.Button,$Sum1203030029) </State>
<Button>
<State> $Sum1203030029 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
<OverlayImage> xmlpro( 12-03-03-0029, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -5332,7 +5332,7 @@ Mint Soda" </Value>
Var NameDrinkTH = "นมกล้วยปั่น โอรีโอภูเขาไฟ"
Var DrinkDescriptionTH = "กล้วย นม น้ำตาล Oreo"
Var DrinkDescription = "Banana , Milk, Sugar, Oreo"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $-.Price
@ -5572,9 +5572,9 @@ Mint Soda" </Value>
<State> Flag( 12-02-02-0053.Button,$Sum1202020053) </State>
<Button>
<State> $Sum1202020053 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
<OverlayImage> xmlpro( 12-02-02-0053, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -5583,7 +5583,7 @@ Mint Soda" </Value>
Var NameDrinkTH = "ขิงโตเกียวบานาน่าเย็น"
Var DrinkDescriptionTH = "กล้วย ขิง และน้ำแข็ง"
Var DrinkDescription = "Banana , Ginger And Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $12-02-02-0053.Price
@ -5823,9 +5823,9 @@ Mint Soda" </Value>
<State> Flag( 12-02-02-0054.Button,$Sum1202020054) </State>
<Button>
<State> $Sum1202020054 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
<OverlayImage> xmlpro( 12-02-02-0054, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -5834,7 +5834,7 @@ Mint Soda" </Value>
Var NameDrinkTH = "ชาไทยโตเกียวบานาน่าเย็น"
Var DrinkDescriptionTH = "กล้วย ชาไทย นม และน้ำแข็ง"
Var DrinkDescription = "Banana , Thai Tea, Milk And Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $12-02-02-0054.Price
@ -6074,9 +6074,9 @@ Mint Soda" </Value>
<State> Flag( 12-03-02-0023.Button,12-03-03-0023.Button,$Sum12030200231203030023) </State>
<Button>
<State> $Sum12030200231203030023 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
<OverlayImage> xmlpro( 12-03-03-0023, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -6085,7 +6085,7 @@ Mint Soda" </Value>
Var NameDrinkTH = "นมโตเกียวบานาน่าเย็น"
Var DrinkDescriptionTH = "โตเกียวบานาน่า นม น้ำตาลและน้ำแข็ง"
Var DrinkDescription = "Tokyo Banana , Milk, Sugar, Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $12-03-02-0023.Price
@ -6325,9 +6325,9 @@ Mint Soda" </Value>
<State> Flag( 12-05-02-0078.Button,$Sum1205020078) </State>
<Button>
<State> $Sum1205020078 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
<OverlayImage> xmlpro( 12-05-02-0078, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -6336,7 +6336,7 @@ Mint Soda" </Value>
Var NameDrinkTH = "เต่าทรงพลังโตเกียวบานาน่าโซดาเย็น"
Var DrinkDescriptionTH = "กล้วย เต่าทรงพลัง (มีคาเฟอีน)"
Var DrinkDescription = "Banana , Medicine Drink, Soda And Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $12-05-02-0078.Price

File diff suppressed because it is too large Load diff

View file

@ -3344,19 +3344,19 @@ Coconut" </Value>
</Block>
; - - -
; ==================> Len = 16
; 12-05-02-0114 12-05-03-0114
; - 12-05-02-0114 12-05-03-0114
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( .Button,12-05-02-0114.Button,12-05-03-0114.Button,$Sum12050201141205030114) </State>
<State> Flag( 12-05-02-0114.Button,12-05-03-0114.Button,$Sum12050201141205030114) </State>
<Button>
<State> $Sum12050201141205030114 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_coconut_pro.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_coconut_pro.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_coconut_pro.png" </FilenameDisable>
<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<OverlayImage> xmlpro( 12-05-03-0114, "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>
@ -3366,7 +3366,7 @@ Coconut" </Value>
Var DrinkDescription = "Coconut , Pepsi And Soda"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_coconut_pro.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $.Price
Var PriceD1 = $-.Price
Var PriceD2 = $12-05-02-0114.Price
Var PriceD3 = $12-05-03-0114.Price
Var PD_CODE1 = "##-##-##-####"
@ -3375,7 +3375,7 @@ Coconut" </Value>
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $12-05-02-0114.Button
Var PD_STAGE_3 = $12-05-03-0114.Button
Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0114, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
@ -3395,7 +3395,7 @@ Coconut" </Value>
Topping "Load" "12-05-02-0114"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" ""
Topping "Load" "-"
Else
Topping "Load" "12-05-03-0114"
EndIf
@ -3490,7 +3490,7 @@ Coconut" </Value>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>

View file

@ -3379,9 +3379,9 @@ Sugar, Oreo" </Value>
<State> Flag( 12-99-03-0016.Button,$Sum1299030016) </State>
<Button>
<State> $Sum1299030016 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
<OverlayImage> xmlpro( 12-99-03-0016, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -3390,7 +3390,7 @@ Sugar, Oreo" </Value>
Var NameDrinkTH = "กาเลคซอน "
Var DrinkDescriptionTH = "เมล่อน น้ำเชื่อมกล้วย นม และน้ำแข็ง"
Var DrinkDescription = "Melon , Banana ,Milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = "-"
Var PriceD2 = 35

View file

@ -24,6 +24,7 @@
Var Seeker.thankLidFlag = 0
Var Seeker.thankStrawFlag = 0
Var Seeker.SmoothieToPayment = 0
WEB "DISABLE"

View file

@ -225,6 +225,10 @@
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf
If Seeker.SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_before_conti.xml"
EndIf
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
EndIf
@ -244,7 +248,7 @@
EndIf
Else
; seeker currr
DEBUGVAR ChangeFlag2

View file

@ -630,9 +630,11 @@
<State> StageShowAlias</State>
<X> 0 </X>
<Y> 938 </Y>
<Width> 1080</Width>
<Width> 1080 </Width>
<Align> Center </Align>
<Size> 66 </Size>
<MaxSize> 66 </MaxSize>
<Size> Auto </Size>
<MaxLine> 1 </MaxLine>
<Font> KanitMediumTTF </Font>
<Color> HeadlineColor </Color>
<Value> showname </Value>

View file

@ -431,31 +431,7 @@
If GetFreeFromError = 1 Then
Var Seeker.FreeVendingCampaign = 1
CoinVending OFF
If Seeker = "curr" Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If SmoothieToPayment = 1 Then
; do nothing
Else
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
If SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
Else
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
EndIf
@ -1404,27 +1380,11 @@
Var Seeker.PayWithQR = 1
Var Seeker.VendingTSID = VendingTSID
If Seeker = "curr" Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If SmoothieToPayment = 1 Then
; do nothing
Else
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
;Var TxRef1 = ""
;CreateTxRef1 TxRef1
EndIf
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
Var BrewingTextThai = "เตรียมแก้ว"
If SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
Else
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
EndIf
@ -1966,25 +1926,11 @@
CoinVending OFF
Refresh
If Seeker = "curr" Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If SmoothieToPayment = 1 Then
; do nothing
Else
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
EndIf
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef
If SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
Else
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
EndIf
EndIf
EndIf
@ -3322,9 +3268,11 @@
<Text>
<X> 0 </X>
<Y> 938 </Y>
<Width> 1080</Width>
<Width> 1080 </Width>
<Align> Center </Align>
<Size> 72 </Size>
<MaxSize> 66 </MaxSize>
<Size> Auto </Size>
<MaxLine> 1 </MaxLine>
<Font> KanitMediumTTF </Font>
<Color> HeadlineColor </Color>
<Value> showname </Value>

View file

@ -376,22 +376,7 @@
Else
Var CART_INDEX = 0
If Seeker = "curr" Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
EndIf
Else
If ShouldCollectPoint = 1 Then

View file

@ -216,31 +216,7 @@
Else
Var CART_INDEX = 0
If Seeker = "curr" Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If SmoothieToPayment = 1 Then
; do nothing
Else
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
If SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
Else
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
EndIf
Var ReqAdddata22 = 0

View file

@ -113,23 +113,7 @@
Else
Var CART_INDEX = 0
If Seeker = "curr" Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
EndIf
Var ReqAdddata22 = 0

View file

@ -97,25 +97,7 @@
If FlagPayCredit = 1 Then
Var FlagPayCredit = 0
If Seeker = "curr" Then
DEBUGVAR "MakeDrinkV1"
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Var Seeker.StoreCreditFlag = 1
Var Seeker.StoreCreditFlag = 1
EndIf
@ -123,7 +105,7 @@
Var Timeout = Timeout + 1
If Timeout > 3 Then
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
EndIf
TimerReset

View file

@ -6,6 +6,7 @@
;<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
<Volume> SoundVolume </Volume>
<EventOpen>
SAVELOG " spiral sell v3"
Var Timeout = 0
Var LastMakeSpiralResult = 0
@ -17,8 +18,7 @@
SPIRAL_SELL ServiceCredit SpiralRef
Var TimeOutSmoothiesProcess = 120
Var Seeker.SmoothieToPayment = SmoothieToPayment
Var NextSmoothie = 0
DEBUGVAR Seeker.SmoothieToPayment
</EventOpen>

View file

@ -151,8 +151,8 @@
Var buttonRemoveCup = "Invisible"
SAVELOG "Thank you conti version TCT7"
SAVELOG "Support NextSmoothie"
SAVELOG "Thank you conti version TCV9"
SAVELOG "Support NextSmoothie and fix bug next"
DEBUGVAR NextSmoothie
DEBUGVAR Seeker.SmoothieToPayment
@ -351,23 +351,25 @@
If MenuReadyForCup = "YES" Then
; smoothie next
If NextSmoothie = 1 Then
DEBUGVAR Seeker
DEBUGVAR Seeker.SmoothieToPayment
Var NextSmoothie = 0
If Seeker.SmoothieToPayment = 1 Then
Var TimeOutSmoothiesProcess = 120
Var Seeker.SmoothieToPayment = 0
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
EndIf
EndIf
Var LastMakeDrinkResult = "-"
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
; smoothie next
DEBUGVAR Seeker
DEBUGVAR Seeker.SmoothieToPayment
Var NextSmoothie = 0
If Seeker.SmoothieToPayment = 1 Then
Var TimeOutSmoothiesProcess = 120
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
EndIf
MakeDrinkV1 Seeker.selected_a_drink SelectSugarID
If CountryName = "Thailand" Then

View file

@ -10936,11 +10936,11 @@
Var showdesc = DescLang[0][LanguageShowByIndex]
Else
If show_eng = "true" Then
Var showname = menu_name_eng_blender
Var showdesc = menu_desc_eng_blender
Var showname = menu_name_eng_hot
Var showdesc = menu_desc_eng_hot
Else
Var showname = menu_name_thai_blender
Var showdesc = menu_desc_thai_blender
Var showname = menu_name_thai_hot
Var showdesc = menu_desc_thai_hot
EndIf
EndIf

View file

@ -1,4 +1,4 @@
DEBUGVAR "MIGGAZE0"
DEBUGVAR " payment ev evaluate "
If Seeker.PayWithQR = 1 Then
Var ServiceAmount2 = Seeker.ServiceAmount2

View file

@ -17,6 +17,8 @@ Var ServiceType = "coffee-payment"
Var ServiceCredit = SelectDrink
Var SuggestID = ""
DEBUGVAR Seeker
Var PayDetail = "2/S:0/0/"
Var SessionID4 = MachineSpiralID
@ -54,12 +56,17 @@ If Seeker.CodeChannel = 1 Then
Var SessionID2 = SessionID2 + Seeker.CodeNumber
Var SessionID2 = SessionID2 + "/"
DEBUGVAR PayDetail
DEBUGVAR Seeker.PayDetail2
DEBUGVAR SessionID2
Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
DEBUGVAR PayDetail
DEBUGVAR Seeker.PayDetail2
Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate

View file

@ -0,0 +1,28 @@
SAVELOG "[MAKE_DRINK] V2"
DEBUGVAR Seeker
DEBUGVAR Seeker.SmoothieToPayment
If Seeker = "curr" Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If Seeker.SmoothieToPayment = 1 Then
; do nothing
Else
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
If Seeker.SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
Else
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

View file

@ -181,6 +181,7 @@
DEBUGVAR TestArrary[2]
DEBUGVAR TestArrary[3]
Var CountTouchButton = 0
</EventOpen>
<Timeout> 1000 </Timeout>
@ -327,7 +328,40 @@
<Y> info_3Y </Y>
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
<EventClick>
OpenInst 4 ""
If CountTouchButton = 4 Then
Var TimeOutSmoothiesProcess = 181
Var SelectDrink = "12-00-07-0000"
Var Seeker.selected_a_drink = SelectDrink
Var Seeker.TNumberTaobinCredit = "0899999999"
Var Seeker.StoreCreditFlag = 0
Var Seeker.CoffeePinNumber = ""
Var Seeker.VendingTSI = ""
Var RemainAmountStr = "Free###size=150"
Var RoadShowMarketCode = "EFR01"
Var Seeker.VendingCode = RoadShowMarketCode
DEBUGVAR RoadShowMarketCode
Var Seeker.IntVendingCampaign = PriceDrink
Var Seeker.FreeVendingCampaign = 1
Var Seeker.CodeChannel = 1
Var Seeker.CodeNumber = IDNum
If New_Payment = 1 Then
Var Seeker.ORDER_ID = ""
GenHashWithTimeStamp Seeker.ORDER_ID
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
EndIf
</EventClick>
</Image>