9.99 snap

This commit is contained in:
wanlop run 2025-05-28 12:44:07 +07:00
parent 5ae45089de
commit 87251ef61e
85 changed files with 2133 additions and 3440 deletions

View file

@ -196,10 +196,8 @@ If BoxID = 201714 Then
EndIf
If BoxID = 123456 Then
Var ToppingNewUINewSystem = 0
Var Catalog20BahtEnable = 1
Var AppleFarmFestivalPro = 1
Var HappyTriosPro = 1
EndIf
DEBUGVAR ConfigNumer

View file

@ -1383,11 +1383,10 @@
Var InternationalShow = 0
Var CatalogLayoutV3 = 1
If BoxID = 123456 Then
Var SpiralOnline = "true"
Var SpiralOnline = "false"
Var InternationalShow = 0
EndIf
@ -1408,15 +1407,12 @@
Var SpiralModeFrozenFruit = 1
Var InternationalShow = 1
EndIf
; test payment
Var New_Payment = 1
Var InternationalEnable = 1
DEBUGVAR InternationalEnable
;TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/video/script_video.ev"
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/multi_ads/ads_path.ev"

View file

@ -14836,9 +14836,9 @@ Tea" </Value>
<State> Flag( 12-02-01-0008.Button,12-02-02-0008.Button,12-02-03-0008.Button,$Sum120201000812020200081202030008) </State>
<Button>
<State> $Sum120201000812020200081202030008 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_lychee_tea.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_lychee_tea.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_lychee_tea.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_lychee_tea.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_lychee_tea.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_lychee_tea.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-02-01-0008, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -14847,7 +14847,7 @@ Tea" </Value>
Var NameDrinkTH = "ชาลิ้นจี่ "
Var DrinkDescriptionTH = "ชาไทย ลิ้นจี่ "
Var DrinkDescription = "Thai tea, Lychee, Sugar, Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_lychee_tea.png"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lychee_tea.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-02-01-0008.Price
Var PriceD2 = $12-02-02-0008.Price
@ -15334,263 +15334,6 @@ Tea" </Value>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
</Block>
; - - -
; ==================> Len = 21
; 12-02-02-0009 12-02-01-0009 -
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-02-02-0009.Button,12-02-01-0009.Button,$Sum12020200091202010009) </State>
<Button>
<State> $Sum12020200091202010009 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_strawberry_thai_tea.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_strawberry_thai_tea.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_strawberry_thai_tea.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-02-02-0009, "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 = "Strawberry Tea"
Var NameDrinkTH = "ชาสตรอเบอรี"
Var DrinkDescriptionTH = "ชาไทย สตรอเบอรี "
Var DrinkDescription = "Thai tea, Strawberry, Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_strawberry_thai_tea.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-02-02-0009.Price
Var PriceD2 = $12-02-01-0009.Price
Var PriceD3 = $-.Price
Var PD_CODE1 = "12-02-02-0009"
Var PD_CODE2 = "12-02-01-0009"
Var PD_CODE3 = "##-##-##-####"
Var PD_STAGE_1 = $12-02-02-0009.Button
Var PD_STAGE_2 = $12-02-01-0009.Button
Var PD_STAGE_3 = "Disable2"
Var OverlayMenuFilter !assigned xmlpro( 12-02-02-0009, "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" "12-02-01-0009"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" "12-02-02-0009"
Else
Topping "Load" "-"
EndIf
EndIf
Var menu_name_eng_hot = $12-02-02-0009.NameE
Var menu_desc_eng_hot = $12-02-02-0009.descriptionE
Var menu_name_thai_hot = $12-02-02-0009.Name
Var menu_desc_thai_hot = $12-02-02-0009.description
Var menu_name_eng_cold = $12-02-01-0009.NameE
Var menu_desc_eng_cold = $12-02-01-0009.descriptionE
Var menu_name_thai_cold = $12-02-01-0009.Name
Var menu_desc_thai_cold = $12-02-01-0009.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> "Strawberry Tea" </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> "Thai tea, Strawberry,
Water" </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> $12-02-02-0009.Button </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> $12-02-02-0009.Button </State>
<Value> StringFmt( $12-02-02-0009.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> $12-02-01-0009.Button </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> $12-02-01-0009.Button </State>
<Value> StringFmt( $12-02-01-0009.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
If $Sum12020200091202010009 = "Disable" Then
Var ice_tab_process_show = "Disable"
Else
Var ice_tab_process_show = "Enable"
EndIf
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 $Sum12020200091202010009 = "Disable" Then
STRCONTAIN "ERR" $12-02-02-0009.TAG tag1_is_disable
STRCONTAIN "ERR" $12-02-01-0009.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> $Sum12020200091202010009 </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
</Block>
; - - -
; ==================> Len = 21

View file

@ -17,7 +17,7 @@
Var Timeout = Timeout + 1
If Timeout > 3 Then
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
;include="ROOT/taobin_project/inc/return_condition.ev"
EndIf
TimerReset

View file

@ -3,7 +3,6 @@
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
;<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
<Volume> SoundVolume </Volume>
<EventOpen>
SAVELOG " spiral sell v3"
@ -103,7 +102,22 @@
;include="ROOT/taobin_project/inc/video.inc"
<EventUnitTest7>
<Name> "LastMakeSpiralResult set success" </Name>
<Script>
Var LastMakeSpiralResult = 1
</Script>
</EventUnitTest7>
<EventUnitTest8>
<Name> "LastMakeSpiralResult set fail" </Name>
<Script>
Var LastMakeSpiralResult = 2
</Script>
</EventUnitTest8>

View file

@ -13,6 +13,9 @@
EndIf
Machine WakeUp
Var MachineEvent = 0
Var MachineSpiralStage = "-"
Var OverridePrice = 100
Var Seeker.orderFromNewTopping = 1
@ -780,6 +783,8 @@
Var LidState = "Enable"
Var MAT_ID_9701 = StrawState
Var SubMenuGroupIDSlot6_1 = 0
@ -886,6 +891,7 @@
Var MenuReasonStage = "Invisible"
Var AdvertOpened = "false"
Var SpiralReady = 0
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -936,6 +942,14 @@
DEBUGVAR Seeker
If SelectDrinkType = 1 Then
If Seeker.SmoothieToPayment = 1 Then
If SpiralReady = 1 Then
Else
Var MenuReady = "WaitSpiral"
EndIf
EndIf
If MenuReady = "YES" Then
DEBUGVAR ToppingDetail
DEBUGVAR SelectToppingType
@ -1276,6 +1290,25 @@
Var bottom_y = 1060 + bottom_offset
Var accept_y = 1075 + bottom_offset
If Seeker.SmoothieToPayment = 1 Then
DEBUGVAR MachineSpiralStage
If MachineEvent = 1 Then
If MachineSpiralStage = "-" Then
Else
If MachineSpiralStage = "spiral-valid" Then
Function 2
Var SpiralReady = 1
Else
; Verify error
DEBUGVAR MachineSpiralErrorCode
Open "ROOT/taobin_project/xml/page_spiral_invalid_failed.xml"
EndIf
EndIf
EndIf
EndIf
Refresh
TimerReset
</EventTimeout>
@ -2851,6 +2884,10 @@
DEBUGVAR MAT_ID_9701
DEBUGVAR StrawState
If Seeker.SmoothieToPayment = 1 Then
Var StrawState = "Press"
EndIf
If StrawState = "Press" Then
Var Seeker.thankStrawFlag = 1
Else
@ -3871,6 +3908,19 @@
Var CustomCoffeeQuantityAdditionalPrice = "(25฿)"
TRY "/mnt/sdcard/coffeevending/taobin_project/flash_deal/topping_page.ev"
If Seeker.SmoothieToPayment = 1 Then
Var MachineEvent = 1
DEBUGVAR LinkProductCodeAnotherMachine[0]
Var MachineSpiralStage = "-"
GenHashWithTimeStamp SpiralRef
SPIRAL_VERIFY LinkProductCodeAnotherMachine[0] SpiralRef
EndIf
Function 2
EndIf
@ -12249,4 +12299,20 @@
</EventUnitTest4>
<EventUnitTest7>
<Name> "MachineSpiralStage set spiral-valid" </Name>
<Script>
Var MachineSpiralStage = "spiral-valid"
</Script>
</EventUnitTest7>
<EventUnitTest8>
<Name> "MachineSpiralStage set error" </Name>
<Script>
Var MachineSpiralStage = "Error"
</Script>
</EventUnitTest8>
</Popup>