Merge branch 'masterpiece' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
5b64ceaf13
95 changed files with 3213 additions and 4522 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1387,11 +1387,10 @@
|
|||
Var InternationalShow = 0
|
||||
|
||||
Var CatalogLayoutV3 = 1
|
||||
|
||||
|
||||
|
||||
If BoxID = 123456 Then
|
||||
Var SpiralOnline = "true"
|
||||
Var SpiralOnline = "false"
|
||||
|
||||
Var InternationalShow = 0
|
||||
EndIf
|
||||
|
|
@ -1412,15 +1411,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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
;EndIf
|
||||
|
||||
Var ErrorCause = ""
|
||||
Var MAX_EMA_CODE = 6
|
||||
|
||||
Var PreScaleCanculate = 100
|
||||
|
||||
|
|
@ -411,7 +412,7 @@
|
|||
Else
|
||||
Var CameraState = "Invisible"
|
||||
Var alphaState = "Enable"
|
||||
Var PopupCancelButtonState = "Enable"
|
||||
Var PopupCancelButtonState = "Disable"
|
||||
Var EMAEnterNumberButtonState = "Disable"
|
||||
|
||||
Var popup_cancel_button_y = 1390
|
||||
|
|
@ -818,9 +819,11 @@
|
|||
|
||||
Var QR_POPUP = "/img_popup8-2.png"
|
||||
Var EMAPopupErrorState = "Enable"
|
||||
Var PopupCancelButtonState = "Enable"
|
||||
Var popup_cancel_button_y = 1225
|
||||
|
||||
Var EMAEnterNumberButtonState = "Invisible"
|
||||
Var LOADING_STATE = "Invisible"
|
||||
Var popup_cancel_button_y = 1225
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
|
|
@ -1437,13 +1440,18 @@
|
|||
|
||||
<EventScanQRResult>
|
||||
|
||||
SAVELOG "SCAN_QR_RESULT"
|
||||
|
||||
DEBUGVAR scanresult
|
||||
DEBUGVAR scanmsg
|
||||
|
||||
If scanresult = "true" Then
|
||||
|
||||
StrLen scanmsg textLen
|
||||
If textLen = 8 Then
|
||||
|
||||
DEBUGVAR textLen
|
||||
|
||||
If textLen = MAX_EMA_CODE Then
|
||||
|
||||
Var EMAMemberID = scanmsg
|
||||
|
||||
|
|
@ -1519,11 +1527,13 @@
|
|||
EndIf
|
||||
Else
|
||||
Var QR_POPUP = "/img_popup8-2.png"
|
||||
Var EMAPopupErrorState = "Enable"
|
||||
Var alphaState = "Enable"
|
||||
Var EMAPopupErrorState = "Enable"
|
||||
Var PopupCancelButtonState = "Enable"
|
||||
Var popup_cancel_button_y = 1225
|
||||
|
||||
Var LOADING_STATE = "Invisible"
|
||||
Var EMAEnterNumberButtonState = "Invisible"
|
||||
Var popup_cancel_button_y = 1225
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -1976,7 +1986,7 @@ EndIf
|
|||
<State> EMAEnterNumberButtonState </State>
|
||||
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_ema_enter_code.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_ema_enter_code.png" </FilenamePress>
|
||||
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_ema_enter_code.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_ema_enter_code.png" </FilenameDisable>
|
||||
<EventClick>
|
||||
Open "ROOT/taobin_project/inter/gbr/xml/page_payment_with_ema.lxml"
|
||||
</EventClick>
|
||||
|
|
@ -2062,6 +2072,7 @@ EndIf
|
|||
<State> PopupCancelButtonState </State>
|
||||
<Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/bp_cancel.png" )</FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
<EventOpen>
|
||||
; On open
|
||||
Var ECommerce = ""
|
||||
Var CodeActionOK = 0
|
||||
Var Seeker.FreeVendingCampaign = 0
|
||||
|
||||
Var Timeout = 0
|
||||
|
|
@ -56,7 +57,7 @@
|
|||
Var DirImage = "ROOT/taobin_project/image/collectiing_msc/"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If web_readyOK = "true" Then
|
||||
Var web_readyOK = "false"
|
||||
|
|
@ -159,6 +160,261 @@
|
|||
Refresh
|
||||
EndIf
|
||||
|
||||
If Seeker.CodeChannel = 1 Then
|
||||
If CodeActionOK = 1 Then
|
||||
|
||||
DEBUGVAR CodeActionOK
|
||||
DEBUGVAR ECommerce
|
||||
|
||||
If ECommerce = "" Then
|
||||
|
||||
Else
|
||||
Var ShowLoadingText = "Invisible"
|
||||
|
||||
SPLIT ECommerce "/" 5 Seeker.VendingCode
|
||||
SPLIT ECommerce "/" 7 Seeker.VendingCampaignRI3
|
||||
SPLIT ECommerce "/" 8 VendingCampaign1
|
||||
SPLIT ECommerce "/" 9 ShouldCollectPoint
|
||||
SPLIT ECommerce "/" 10 PaymentButtonControl
|
||||
|
||||
DEBUGVAR PaymentButtonControl
|
||||
|
||||
If PaymentButtonControl = "" Then
|
||||
Var PaymentEnableAll = "true"
|
||||
Else
|
||||
If PaymentButtonControl = "*" Then
|
||||
Var PaymentEnableAll = "true"
|
||||
Else
|
||||
Var PaymentEnableAll = "false"
|
||||
STRCONTAIN "TWN" PaymentButtonControl TWN_CashOtherEnable
|
||||
STRCONTAIN "KBA" PaymentButtonControl KBA_CashOtherEnable
|
||||
STRCONTAIN "LPY" PaymentButtonControl LPY_CashOtherEnable
|
||||
STRCONTAIN "AIR" PaymentButtonControl AIR_CashOtherEnable
|
||||
STRCONTAIN "MAX" PaymentButtonControl MAX_CashOtherEnable
|
||||
STRCONTAIN "WEC" PaymentButtonControl WEC_CashOtherEnable
|
||||
STRCONTAIN "ALP" PaymentButtonControl ALP_CashOtherEnable
|
||||
STRCONTAIN "UNP" PaymentButtonControl UNP_CashOtherEnable
|
||||
STRCONTAIN "ACU" PaymentButtonControl ACU_CashOtherEnable
|
||||
STRCONTAIN "TAO" PaymentButtonControl TAO_CreditEnable
|
||||
STRCONTAIN "CSH" PaymentButtonControl CSH_CashEnable
|
||||
STRCONTAIN "CRD" PaymentButtonControl CRD_CreditCardEnable
|
||||
|
||||
If CSH_CashEnable = "true" Then
|
||||
|
||||
Else
|
||||
CoinVending OFF
|
||||
Var CPD_CouponCodeEnable = "true"
|
||||
EndIf
|
||||
|
||||
If TWN_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
If KBA_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
If LPY_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
If AIR_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
If MAX_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
If WEC_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
If ALP_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
If UNP_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
If ACU_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
|
||||
DEBUGVAR CSH_CashEnable
|
||||
DEBUGVAR TAO_CreditEnable
|
||||
DEBUGVAR CPD_CouponCodeEnable
|
||||
DEBUGVAR CRD_CreditCardEnable
|
||||
DEBUGVAR E_WalletEnable
|
||||
DEBUGVAR TWN_CashOtherEnable
|
||||
DEBUGVAR KBA_CashOtherEnable
|
||||
DEBUGVAR LPY_CashOtherEnable
|
||||
DEBUGVAR AIR_CashOtherEnable
|
||||
DEBUGVAR MAX_CashOtherEnable
|
||||
DEBUGVAR WEC_CashOtherEnable
|
||||
DEBUGVAR ALP_CashOtherEnable
|
||||
DEBUGVAR UNP_CashOtherEnable
|
||||
DEBUGVAR ACU_CashOtherEnable
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If Seeker.VendingCode = "" Then
|
||||
Var Seeker.VendingCode = "C00"
|
||||
EndIf
|
||||
|
||||
If Seeker.VendingCode = "KBA:2" Then
|
||||
Var Seeker.VendingCode = "C00"
|
||||
EndIf
|
||||
|
||||
If Seeker.VendingCode = "AIR:2" Then
|
||||
Var Seeker.VendingCode = "C00"
|
||||
EndIf
|
||||
|
||||
If Seeker.VendingCode = "TWN:2" Then
|
||||
Var Seeker.VendingCode = "C00"
|
||||
EndIf
|
||||
|
||||
SAVELOG Seeker.VendingCode
|
||||
SAVELOG Seeker.VendingCampaignRI3
|
||||
|
||||
SAVELOG ShouldCollectPoint
|
||||
INT ShouldCollectPoint
|
||||
|
||||
If Seeker.VendingCode = "C00" Then
|
||||
|
||||
Else
|
||||
Var VendingCreditRemain = ""
|
||||
|
||||
If VendingCampaign1 = "" Then
|
||||
Var IntVendingCampaign1 = -1
|
||||
Else
|
||||
Var IntVendingCampaign1 = VendingCampaign1
|
||||
INT IntVendingCampaign1
|
||||
|
||||
If IntVendingCampaign1 > 0 Then
|
||||
Var VendingCreditRemain = VendingCampaign1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
Var Seeker.IntVendingCampaign = Seeker.VendingCampaignRI3
|
||||
INT Seeker.IntVendingCampaign
|
||||
|
||||
Var VendingREFID = SessionID
|
||||
|
||||
|
||||
DEBUGVAR IntVendingCampaign1
|
||||
DEBUGVAR PayAmount
|
||||
DEBUGVAR Seeker.IntVendingCampaign
|
||||
|
||||
If Seeker.IntVendingCampaign > 0 Then
|
||||
Var QRChannel = 0
|
||||
|
||||
If Seeker.IntVendingCampaign >= PayAmount Then
|
||||
|
||||
If ShouldCollectPoint = 1 Then
|
||||
Var Seeker.CollectPointMain = 1
|
||||
|
||||
If PaymentCodeShouldCollectPromotionPoint = 1 Then
|
||||
Var Seeker.CollectPointPromotion = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
TRY "ROOT/taobin_project/xml/event/collect_promotion_point_condition.ev"
|
||||
|
||||
|
||||
;Open "ROOT/taobin_project/xml/page_payment_cash.xml"
|
||||
Var Seeker.VendingCampaign = PayAmount
|
||||
Var Seeker.FreeVendingCampaign = 1
|
||||
CoinVending OFF
|
||||
;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
|
||||
If CART_COUNT >= 1 Then
|
||||
|
||||
Cart "PreparID" 1
|
||||
Var CART_INDEX = 1
|
||||
Var PayReference = ""
|
||||
GenHashWithTimeStamp PayReference
|
||||
Cart "MakeID" CART_INDEX
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
Else
|
||||
Var CART_INDEX = 0
|
||||
|
||||
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
|
||||
EndIf
|
||||
Else
|
||||
If ShouldCollectPoint = 1 Then
|
||||
Var Seeker.CollectPointMain = 1
|
||||
EndIf
|
||||
|
||||
If PaymentCodeShouldCollectPromotionPoint = 1 Then
|
||||
Var Seeker.CollectPointPromotion = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
;Var SessionID2 = SelectSlot + ":"
|
||||
;Var SessionID2 = SessionID2 + Seeker.ExtendData
|
||||
|
||||
;Var CreditAmount1 = ""
|
||||
;Var ServiceAmountFlow = ""
|
||||
;Var TelephoneNumber2 = "0899999999"
|
||||
;Var ServiceType = "coffee"
|
||||
;Var ECommerce = ""
|
||||
;Var ECommerce = ECommerce + PriceDrink
|
||||
;Var ECommerce = ECommerce + "/"
|
||||
;Var ECommerce = ECommerce + DiscountDrink
|
||||
;Var ECommerce = ECommerce + "/"
|
||||
;Var ECommerce = ECommerce + SessionID2
|
||||
;Var ECommerce = ECommerce + "/"
|
||||
;Var ECommerce = ECommerce + SelectDrink
|
||||
;Var ECommerce = ECommerce + "/"
|
||||
;Var ECommerce = ECommerce + "KBA:2/"
|
||||
;Var ECommerce = ECommerce + Seeker.VendingCode
|
||||
;Var ECommerce = ECommerce + ":"
|
||||
;Var ECommerce = ECommerce + Seeker.CodeNumber
|
||||
;Var ECommerce = ECommerce + ":"
|
||||
;Var ECommerce = ECommerce + Seeker.VendingCampaignRI3
|
||||
;Var ServiceParameter = "max"
|
||||
;Var ServiceCharge = 0
|
||||
;Var AccountType = "new"
|
||||
;Var testservice = "kbank"
|
||||
;Var tc = ""
|
||||
;Var GetScore = ""
|
||||
;Var OperatorName = ""
|
||||
;Var SessionID = ""
|
||||
|
||||
|
||||
;GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
|
||||
;Var Timeout = 0
|
||||
;Var Seeker.CodeChannel = 2
|
||||
|
||||
Var Seeker.CodeChannel = 1
|
||||
|
||||
If CART_COUNT >= 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
|
||||
EndIf
|
||||
Else
|
||||
|
||||
Var ShowErrorText = "Enable"
|
||||
Var text_show_error = DirImage + "/text_show_error.png"
|
||||
Var GetPayInfoFlag = 0
|
||||
Var Seeker.CodeChannel = 0
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
||||
|
|
@ -192,282 +448,12 @@
|
|||
|
||||
<EventActionOk>
|
||||
|
||||
|
||||
If Seeker.CodeChannel = 1 Then
|
||||
|
||||
Var ShowLoadingText = "Invisible"
|
||||
|
||||
SAVELOG "Seeker.CodeChannel 1 > ActOK."
|
||||
Var CodeActionOK = 1
|
||||
EndIf
|
||||
|
||||
|
||||
DEBUGVAR ECommerce
|
||||
SAVELOG ECommerce
|
||||
|
||||
SPLIT ECommerce "/" 5 Seeker.VendingCode
|
||||
SPLIT ECommerce "/" 7 Seeker.VendingCampaignRI3
|
||||
SPLIT ECommerce "/" 8 VendingCampaign1
|
||||
SPLIT ECommerce "/" 9 ShouldCollectPoint
|
||||
SPLIT ECommerce "/" 10 PaymentButtonControl
|
||||
|
||||
DEBUGVAR PaymentButtonControl
|
||||
|
||||
If PaymentButtonControl = "" Then
|
||||
Var PaymentEnableAll = "true"
|
||||
Else
|
||||
If PaymentButtonControl = "*" Then
|
||||
Var PaymentEnableAll = "true"
|
||||
Else
|
||||
Var PaymentEnableAll = "false"
|
||||
STRCONTAIN "TWN" PaymentButtonControl TWN_CashOtherEnable
|
||||
STRCONTAIN "KBA" PaymentButtonControl KBA_CashOtherEnable
|
||||
STRCONTAIN "LPY" PaymentButtonControl LPY_CashOtherEnable
|
||||
STRCONTAIN "AIR" PaymentButtonControl AIR_CashOtherEnable
|
||||
STRCONTAIN "MAX" PaymentButtonControl MAX_CashOtherEnable
|
||||
STRCONTAIN "WEC" PaymentButtonControl WEC_CashOtherEnable
|
||||
STRCONTAIN "ALP" PaymentButtonControl ALP_CashOtherEnable
|
||||
STRCONTAIN "UNP" PaymentButtonControl UNP_CashOtherEnable
|
||||
STRCONTAIN "ACU" PaymentButtonControl ACU_CashOtherEnable
|
||||
STRCONTAIN "TAO" PaymentButtonControl TAO_CreditEnable
|
||||
STRCONTAIN "CSH" PaymentButtonControl CSH_CashEnable
|
||||
STRCONTAIN "CRD" PaymentButtonControl CRD_CreditCardEnable
|
||||
|
||||
If CSH_CashEnable = "true" Then
|
||||
|
||||
Else
|
||||
CoinVending OFF
|
||||
Var CPD_CouponCodeEnable = "true"
|
||||
EndIf
|
||||
|
||||
If TWN_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
If KBA_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
If LPY_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
If AIR_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
If MAX_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
If WEC_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
If ALP_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
If UNP_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
If ACU_CashOtherEnable = "true" Then
|
||||
Var E_WalletEnable = "true"
|
||||
EndIf
|
||||
|
||||
|
||||
DEBUGVAR CSH_CashEnable
|
||||
DEBUGVAR TAO_CreditEnable
|
||||
DEBUGVAR CPD_CouponCodeEnable
|
||||
DEBUGVAR CRD_CreditCardEnable
|
||||
DEBUGVAR E_WalletEnable
|
||||
DEBUGVAR TWN_CashOtherEnable
|
||||
DEBUGVAR KBA_CashOtherEnable
|
||||
DEBUGVAR LPY_CashOtherEnable
|
||||
DEBUGVAR AIR_CashOtherEnable
|
||||
DEBUGVAR MAX_CashOtherEnable
|
||||
DEBUGVAR WEC_CashOtherEnable
|
||||
DEBUGVAR ALP_CashOtherEnable
|
||||
DEBUGVAR UNP_CashOtherEnable
|
||||
DEBUGVAR ACU_CashOtherEnable
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If Seeker.VendingCode = "" Then
|
||||
Var Seeker.VendingCode = "C00"
|
||||
EndIf
|
||||
|
||||
If Seeker.VendingCode = "KBA:2" Then
|
||||
Var Seeker.VendingCode = "C00"
|
||||
EndIf
|
||||
|
||||
If Seeker.VendingCode = "AIR:2" Then
|
||||
Var Seeker.VendingCode = "C00"
|
||||
EndIf
|
||||
|
||||
If Seeker.VendingCode = "TWN:2" Then
|
||||
Var Seeker.VendingCode = "C00"
|
||||
EndIf
|
||||
|
||||
SAVELOG Seeker.VendingCode
|
||||
SAVELOG Seeker.VendingCampaignRI3
|
||||
|
||||
SAVELOG ShouldCollectPoint
|
||||
INT ShouldCollectPoint
|
||||
|
||||
If Seeker.VendingCode = "C00" Then
|
||||
|
||||
Else
|
||||
Var VendingCreditRemain = ""
|
||||
|
||||
If VendingCampaign1 = "" Then
|
||||
Var IntVendingCampaign1 = -1
|
||||
Else
|
||||
Var IntVendingCampaign1 = VendingCampaign1
|
||||
INT IntVendingCampaign1
|
||||
|
||||
If IntVendingCampaign1 > 0 Then
|
||||
Var VendingCreditRemain = VendingCampaign1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
Var Seeker.IntVendingCampaign = Seeker.VendingCampaignRI3
|
||||
INT Seeker.IntVendingCampaign
|
||||
|
||||
Var VendingREFID = SessionID
|
||||
|
||||
|
||||
DEBUGVAR IntVendingCampaign1
|
||||
DEBUGVAR PayAmount
|
||||
DEBUGVAR Seeker.IntVendingCampaign
|
||||
|
||||
If Seeker.IntVendingCampaign > 0 Then
|
||||
Var QRChannel = 0
|
||||
|
||||
If Seeker.IntVendingCampaign >= PayAmount Then
|
||||
|
||||
If ShouldCollectPoint = 1 Then
|
||||
Var Seeker.CollectPointMain = 1
|
||||
|
||||
If PaymentCodeShouldCollectPromotionPoint = 1 Then
|
||||
Var Seeker.CollectPointPromotion = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
TRY "ROOT/taobin_project/xml/event/collect_promotion_point_condition.ev"
|
||||
|
||||
|
||||
;Open "ROOT/taobin_project/xml/page_payment_cash.xml"
|
||||
Var Seeker.VendingCampaign = PayAmount
|
||||
Var Seeker.FreeVendingCampaign = 1
|
||||
CoinVending OFF
|
||||
;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
|
||||
If CART_COUNT >= 1 Then
|
||||
|
||||
Cart "PreparID" 1
|
||||
Var CART_INDEX = 1
|
||||
Var PayReference = ""
|
||||
GenHashWithTimeStamp PayReference
|
||||
Cart "MakeID" CART_INDEX
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
Else
|
||||
Var CART_INDEX = 0
|
||||
|
||||
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
|
||||
EndIf
|
||||
Else
|
||||
If ShouldCollectPoint = 1 Then
|
||||
Var Seeker.CollectPointMain = 1
|
||||
EndIf
|
||||
|
||||
If PaymentCodeShouldCollectPromotionPoint = 1 Then
|
||||
Var Seeker.CollectPointPromotion = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
;Var SessionID2 = SelectSlot + ":"
|
||||
;Var SessionID2 = SessionID2 + Seeker.ExtendData
|
||||
|
||||
;Var CreditAmount1 = ""
|
||||
;Var ServiceAmountFlow = ""
|
||||
;Var TelephoneNumber2 = "0899999999"
|
||||
;Var ServiceType = "coffee"
|
||||
;Var ECommerce = ""
|
||||
;Var ECommerce = ECommerce + PriceDrink
|
||||
;Var ECommerce = ECommerce + "/"
|
||||
;Var ECommerce = ECommerce + DiscountDrink
|
||||
;Var ECommerce = ECommerce + "/"
|
||||
;Var ECommerce = ECommerce + SessionID2
|
||||
;Var ECommerce = ECommerce + "/"
|
||||
;Var ECommerce = ECommerce + SelectDrink
|
||||
;Var ECommerce = ECommerce + "/"
|
||||
;Var ECommerce = ECommerce + "KBA:2/"
|
||||
;Var ECommerce = ECommerce + Seeker.VendingCode
|
||||
;Var ECommerce = ECommerce + ":"
|
||||
;Var ECommerce = ECommerce + Seeker.CodeNumber
|
||||
;Var ECommerce = ECommerce + ":"
|
||||
;Var ECommerce = ECommerce + Seeker.VendingCampaignRI3
|
||||
;Var ServiceParameter = "max"
|
||||
;Var ServiceCharge = 0
|
||||
;Var AccountType = "new"
|
||||
;Var testservice = "kbank"
|
||||
;Var tc = ""
|
||||
;Var GetScore = ""
|
||||
;Var OperatorName = ""
|
||||
;Var SessionID = ""
|
||||
|
||||
|
||||
;GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
|
||||
;Var Timeout = 0
|
||||
;Var Seeker.CodeChannel = 2
|
||||
|
||||
Var Seeker.CodeChannel = 1
|
||||
|
||||
If CART_COUNT >= 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
Else
|
||||
|
||||
Var ShowErrorText = "Enable"
|
||||
Var text_show_error = DirImage + "/text_show_error.png"
|
||||
Var GetPayInfoFlag = 0
|
||||
Var Seeker.CodeChannel = 0
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Else
|
||||
|
||||
;SAVELOG "Seeker.CodeChannel 2 > ActOK."
|
||||
;
|
||||
;Var CreditAmount = 0
|
||||
;Var QRCODE99 = SessionID
|
||||
;Var QRCODE99 = QRCODE99 + Ext1a
|
||||
;Var QRCODE99 = QRCODE99 + Ext21
|
||||
;Var QRCODETMP = QRCODE99
|
||||
;Var Seeker.CodeChannel = 1
|
||||
;
|
||||
;If CART_COUNT >= 1 Then
|
||||
; Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
|
||||
;Else
|
||||
; Open "ROOT/taobin_project/xml/page_payment_cash.xml"
|
||||
;EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
</EventActionOk>
|
||||
|
||||
<EventActionError>
|
||||
|
|
@ -1063,8 +1049,8 @@
|
|||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + Seeker.CodeNumber
|
||||
|
||||
Var ECommerce = ECommerce + ":"
|
||||
Var ECommerce = ECommerce + PromotionIDCurrentOrder
|
||||
Var ECommerce = ECommerce + ":"
|
||||
Var ECommerce = ECommerce + PromotionIDCurrentOrder
|
||||
|
||||
Var ServiceParameter = "max"
|
||||
Var ServiceCharge = 0
|
||||
|
|
@ -1081,6 +1067,7 @@
|
|||
|
||||
Var TelephoneNumber = Seeker.CodeNumber
|
||||
Var Seeker.CodeChannel = 1
|
||||
Var CodeActionOK = 0
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
@ -12255,4 +12305,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>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue