diff --git a/image/page_payment_en/page_payment/img_popup_ema.png b/image/page_payment_en/page_payment/img_popup_ema.png index 0c552d0d..452c1876 100644 Binary files a/image/page_payment_en/page_payment/img_popup_ema.png and b/image/page_payment_en/page_payment/img_popup_ema.png differ diff --git a/image/page_payment_en/page_payment/img_popup_ema_error.png b/image/page_payment_en/page_payment/img_popup_ema_error.png new file mode 100644 index 00000000..5f4cf0e8 Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup_ema_error.png differ diff --git a/image/page_payment_en/page_payment/img_popup_ema_success.png b/image/page_payment_en/page_payment/img_popup_ema_success.png new file mode 100644 index 00000000..d21426f2 Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup_ema_success.png differ diff --git a/inter/aus/image/payment_cash/bd_eam_enter_code.png b/inter/aus/image/payment_cash/bd_ema_enter_code.png similarity index 100% rename from inter/aus/image/payment_cash/bd_eam_enter_code.png rename to inter/aus/image/payment_cash/bd_ema_enter_code.png diff --git a/inter/aus/image/payment_cash/bd_try_again.png b/inter/aus/image/payment_cash/bd_try_again.png new file mode 100644 index 00000000..b496ed6d Binary files /dev/null and b/inter/aus/image/payment_cash/bd_try_again.png differ diff --git a/inter/aus/image/payment_cash/bn_try_again.png b/inter/aus/image/payment_cash/bn_try_again.png new file mode 100644 index 00000000..92e7da4c Binary files /dev/null and b/inter/aus/image/payment_cash/bn_try_again.png differ diff --git a/inter/aus/image/payment_cash/bp_try_again.png b/inter/aus/image/payment_cash/bp_try_again.png new file mode 100644 index 00000000..a0bd83ef Binary files /dev/null and b/inter/aus/image/payment_cash/bp_try_again.png differ diff --git a/inter/aus/image/payment_cash/edit_border.png b/inter/aus/image/payment_cash/edit_border.png new file mode 100644 index 00000000..806beaf8 Binary files /dev/null and b/inter/aus/image/payment_cash/edit_border.png differ diff --git a/inter/aus/image/payment_cash/ema_member_icon.png b/inter/aus/image/payment_cash/ema_member_icon.png new file mode 100644 index 00000000..11832c26 Binary files /dev/null and b/inter/aus/image/payment_cash/ema_member_icon.png differ diff --git a/inter/aus/image/payment_cash/enter_ema_number_text.png b/inter/aus/image/payment_cash/enter_ema_number_text.png new file mode 100644 index 00000000..511d4ecf Binary files /dev/null and b/inter/aus/image/payment_cash/enter_ema_number_text.png differ diff --git a/inter/aus/xml/page_catalog_group_other.lxml b/inter/aus/xml/page_catalog_group_other.lxml index c65e23b9..da71b741 100644 --- a/inter/aus/xml/page_catalog_group_other.lxml +++ b/inter/aus/xml/page_catalog_group_other.lxml @@ -897,7 +897,7 @@ Var DescLang[0][3] = "" Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "FLYING TURTLE\nENERGY DRINK SODA" + Var NameLang[1][0] = "FLYING TURTLE ENERGY DRINK SODA" Var NameLang[1][1] = "เต่าทรงพลังโซดา" Var NameLang[1][2] = "" Var NameLang[1][3] = "" diff --git a/inter/aus/xml/page_catalog_group_recommend.lxml b/inter/aus/xml/page_catalog_group_recommend.lxml index d63f8113..62c4da2d 100644 --- a/inter/aus/xml/page_catalog_group_recommend.lxml +++ b/inter/aus/xml/page_catalog_group_recommend.lxml @@ -11580,7 +11580,7 @@ Var DescLang[0][3] = "" Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "FLYING TURTLE\nENERGY DRINK SODA" + Var NameLang[1][0] = "FLYING TURTLE ENERGY DRINK SODA" Var NameLang[1][1] = "เต่าทรงพลังโซดา" Var NameLang[1][2] = "" Var NameLang[1][3] = "" diff --git a/inter/aus/xml/page_catalog_group_recommend_multi_pro.lxml b/inter/aus/xml/page_catalog_group_recommend_multi_pro.lxml index 944a4f92..16933cfa 100644 --- a/inter/aus/xml/page_catalog_group_recommend_multi_pro.lxml +++ b/inter/aus/xml/page_catalog_group_recommend_multi_pro.lxml @@ -11557,7 +11557,7 @@ Var DescLang[0][3] = "" Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "FLYING TURTLE\nENERGY DRINK SODA" + Var NameLang[1][0] = "FLYING TURTLE ENERGY DRINK SODA" Var NameLang[1][1] = "เต่าทรงพลังโซดา" Var NameLang[1][2] = "" Var NameLang[1][3] = "" diff --git a/inter/aus/xml/page_collect_point_1.lxml b/inter/aus/xml/page_collect_point_1.lxml index 4ef0f18f..ce3fc591 100644 --- a/inter/aus/xml/page_collect_point_1.lxml +++ b/inter/aus/xml/page_collect_point_1.lxml @@ -20,7 +20,7 @@ Var TimeOutPlay = 0 - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/collect_point1_en" ;Play "ROOT/taobin_project/sound_eng/Reward_final.mp3" @@ -53,7 +53,7 @@ Var CampaingRef1 = "" Var CampaingRef2 = "" - + SUBSTRING CampaingRef 0 6 CampaingRef1 SUBSTRING CampaingRef 12 18 CampaingRef2 @@ -61,13 +61,13 @@ Var CampaingRef1 = CampaingRef1 + CampaingRef2 Var ParamCP = ParamCP + CampaingRef1 - + If Seeker.TNumberTaobinCredit = "" Then - + If web_telnumOK = "" Then - If show_eng = "true" Then + If show_eng = "true" Then Play "ROOT/taobin_project/sound_eng/Reward_final.mp3" Else Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3" @@ -78,7 +78,7 @@ Var StepGetPoint = 1 Var PdpaAsk = 0 - + Var OperatorTemp = "" Var CreditAmount = 0 Var OperatorStatus = "" @@ -98,15 +98,15 @@ AddData 45 TelPhoneNum drink_price param2 param3 EndIf - + ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc - Var Param1 = TelephoneNumber + "/" + Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP GETACCEXT Param1 23 - Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_2.lxml" + Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_2.lxml" EndIf Else @@ -124,7 +124,7 @@ Var StepGetPoint = 1 Var PdpaAsk = 0 - + Var OperatorTemp = "" Var CreditAmount = 0 Var OperatorStatus = "" @@ -133,15 +133,15 @@ SAVELOG "collect_point1-p71." Var TelephoneNumberX = TelephoneNumber DEBUGVAR TelephoneNumber - + ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc - Var Param1 = TelephoneNumber + "/" + Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP - + GETACCEXT Param1 23 - Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_2.lxml" + Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_2.lxml" EndIf @@ -149,24 +149,24 @@ 1000 - + Var CountDownBrewing = BREW_CNT - + Var ShowCountDownBrewing = CountDownBrewing - + StrLen TelephoneNumber TelNumLen If TelNumLen > 0 Then Var ShowTextNumber = "Invisible" - + Else ; Add Var TimeOutPlay = TimeOutPlay + 1 If TimeOutPlay > 10 Then Var TimeOutPlay = 0 - If show_eng = "true" Then + If show_eng = "true" Then Play "ROOT/taobin_project/sound_eng/Reward_final.mp3" Else Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3" @@ -175,17 +175,17 @@ ; EndIf - + DEBUGVAR Timeout Var Timeout = Timeout + 1 If Timeout > 30 Then SAVELOG "collect_point1-p107." - ;Open "ROOT/taobin_project/xml/page_catalog.xml" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf If Timeout = 18 Then @@ -203,7 +203,7 @@ Refresh TimerReset - + @@ -229,13 +229,13 @@ "ROOT/taobin_project/image/collectiing/bp_1.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "1" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -245,9 +245,9 @@ TimerReset Refresh - - + + @@ -259,13 +259,13 @@ "ROOT/taobin_project/image/collectiing/bp_2.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "2" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -284,13 +284,13 @@ "ROOT/taobin_project/image/collectiing/bp_3.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "3" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -309,13 +309,13 @@ "ROOT/taobin_project/image/collectiing/bp_4.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "4" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -334,13 +334,13 @@ "ROOT/taobin_project/image/collectiing/bp_5.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "5" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -359,13 +359,13 @@ "ROOT/taobin_project/image/collectiing/bp_6.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "6" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -384,13 +384,13 @@ "ROOT/taobin_project/image/collectiing/bp_7.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "7" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -409,13 +409,13 @@ "ROOT/taobin_project/image/collectiing/bp_8.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "8" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -434,13 +434,13 @@ "ROOT/taobin_project/image/collectiing/bp_9.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "9" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -449,7 +449,7 @@ TimerReset Refresh - + @@ -460,13 +460,13 @@ "ROOT/taobin_project/image/collectiing/bp_0.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "0" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -485,24 +485,24 @@ "ROOT/taobin_project/image/collectiing/bp_back-1.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Trim TelephoneNumber -1 StrLen TelephoneNumber TelNumLen - If TelNumLen < 10 Then + If TelNumLen < 10 Then Var Tel_Confirm_State = "Invisible" EndIf - - - If TelNumLen = 0 Then + + + If TelNumLen = 0 Then Var ShowTextNumber = "Enable" EndIf TimerReset Refresh - + @@ -526,11 +526,11 @@ Var( DirImage + "/bp_negative.png") "ROOT/sounds/codebuttom.wav" SoundVolume - + ; goto lid straw - ;Open "ROOT/taobin_project/xml/page_catalog.xml" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" SAVELOG "collect_point1-p589." - + Open "ROOT/taobin_project/xml/page_lid_straw.xml" @@ -545,9 +545,9 @@ Var( DirImage + "/bn_positive.png") "ROOT/sounds/codebuttom.wav" SoundVolume - + + - If Tel_Confirm_Flag = 1 Then @@ -563,7 +563,7 @@ Var StepGetPoint = 1 Var PdpaAsk = 0 - + Var OperatorTemp = "" Var CreditAmount = 0 Var OperatorStatus = "" @@ -582,25 +582,25 @@ AddData 45 TelPhoneNum drink_price param2 param3 EndIf - + If ChildrenFree = 1 Then Var Seeker.TNumberTaobinMember = TelephoneNumber - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf - - Var Param1 = TelephoneNumber + "/" + + Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP GETACCEXT Param1 23 - Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_2.lxml" + Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_2.lxml" - Else + Else - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage2 = "ROOT/taobin_project/image/collectiing_en" Else Var DirImage2 = "ROOT/taobin_project/image/collectiing" @@ -613,7 +613,7 @@ Var Tel_Confirm_State = "Invisible" Refresh - + EndIf @@ -635,6 +635,12 @@ Var( DirImage + "/text_edit.png") + + 236 + 699 + Var( DirImage + "/text_2.png") + + ;include="ROOT/taobin_project/inc/video.inc" @@ -670,11 +676,11 @@ ShowErrorText text_show_error - - - - Open "/media/bt/xml/security_alarm.xml" + + + + Open "/media/bt/xml/security_alarm.xml" If MachineStage = "drink-success" Then diff --git a/inter/aus/xml/page_member_topup.lxml b/inter/aus/xml/page_member_topup.lxml index 07b91ec4..a848f34b 100644 --- a/inter/aus/xml/page_member_topup.lxml +++ b/inter/aus/xml/page_member_topup.lxml @@ -261,6 +261,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/inter/aus/xml/page_topping_select6.lxml b/inter/aus/xml/page_topping_select6.lxml index 248807f8..4546cd4f 100644 --- a/inter/aus/xml/page_topping_select6.lxml +++ b/inter/aus/xml/page_topping_select6.lxml @@ -6,13 +6,13 @@ SoundVolume OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - + Var UserSelectedSugar = 0 SAVELOG "Event Open Select 6 AUS" Var y_topping_bg = 912 - + Var CHECK_EventOpen_Double = CHECK_EventOpen_Double + 1 If CHECK_EventOpen_Double > 1 Then WRITE_FILE "/mnt/sdcard/xml_alert_bug" "double called" @@ -28,10 +28,10 @@ DEBUGVAR SelectDrink DEBUGVAR PictureDrink - + Var SaveProductCodeSelect = "-" Var UserSelectProductCode = "-" - + Var showText4 = "Invisible" Var showText7 = "Invisible" @@ -39,8 +39,8 @@ Var blendedState = "Enable" Var DisableUsingCode = "false" - Var ShowLidStraw = "Invisible" - Var ShowLidOnly = "Invisible" + Var ShowLidStraw = "Invisible" + Var ShowLidOnly = "Invisible" Var ShowCollagenOnly = "Invisible" Var blendedStateShow = "Invisible" @@ -49,7 +49,7 @@ Var ShowLidStraw = "Invisible" Var ShowStrawOnly = "Invisible" Var ShowLidOnly = "Invisible" - + ; On open Var lidAndStrawOldPageIgnore = "true" Var SugarState1 = "Invisible" @@ -58,9 +58,9 @@ Var SugarState4 = "Invisible" Var SugarState5 = "Invisible" Var SugarState6 = "Invisible" - + Var AddShotEnable = "Invisible" - + Var BGSugar = "Invisible" Var ShotCoffeeBG = "Invisible" @@ -73,7 +73,7 @@ ; Customer Coffee Var CustomCoffeeEnable = "False" - Var EnableLightRoast = "Disable" + Var EnableLightRoast = "Disable" Var showCoffeeWater = "Invisible" Var showCoffeeQuantity = "Invisible" @@ -117,7 +117,7 @@ ; End Customer Coffee -; Sugar Zero Cal +; Sugar Zero Cal ; Test Sugar Zero Cal ;Var SugarZeroCalEnable = "true" Var SugarZeroCalOption = "Invisible" @@ -135,7 +135,7 @@ ; On open Var LidState = Lid1Status - + ;SAVELOG PreviseXMLFileName2 @@ -146,8 +146,8 @@ Var BugFlag = 0 - If show_eng = "true" Then - + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/topping2_en" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" @@ -179,7 +179,7 @@ Else - + Var DirImage = "ROOT/taobin_project/image/topping2" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" @@ -208,23 +208,23 @@ Var custom_coffee_level_darker_text_x = 880 Var custom_coffee_level_dark_text_x = 790 - + EndIf Var bg_strawlid = DirImage + "/bg_strawlid.png" Var bg_straw_only = DirImage + "/bg_straw_only.png" Var bg_lid_only = DirImage + "/bg_lid_only.png" - + Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png" Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png" - + Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png" Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png" - - + + ;Var blendedState = "Enable" ;Var ShotCoffeeBG = "Enable" ;Var showShotEnable = "Enable" @@ -234,16 +234,16 @@ Var ShiftSugarStep = 1 - + CRLFToSpace showname CRLFToSpace showdesc - + ;- Begin Var PriceDrinkNoTop = PriceDrink Var PriceDrinkTmp = PriceDrink Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp Var Timeout = 0 - + ;SAVELOG PriceDrinkTmp ;- End @@ -265,19 +265,19 @@ DEBUGVAR backGroundAddExtra DEBUGVAR backGroundAddShotPremium - + DEBUGVAR MultiPayEnable DEBUGVAR CART_COUNT Var btnAddCart = "Invisible" - If MultiPayEnable = "true" Then + If MultiPayEnable = "true" Then Var btnAddCart = "Enable" If CART_COUNT = 3 Then - Var btnAddCart = "Invisible" + Var btnAddCart = "Invisible" EndIf EndIf - Var LidDeactiveButton = "Invisible" - Var StrawDeactiveButton = "Invisible" + Var LidDeactiveButton = "Invisible" + Var StrawDeactiveButton = "Invisible" Machine DoorClose Machine DoorLidClose @@ -287,7 +287,7 @@ Var NEW_MULTI = "Invisible" Var high_light_drink_type = "Invisible" - + Var text_hot_color = "0x84776F" Var text_cold_color = "0x84776F" Var text_blender_color = "0x84776F" @@ -328,20 +328,20 @@ If hot_button_state = "Disable2" Then Var text_price_d1 = "" Else - Var text_price_d1 !assigned StringFmt( PriceD1 , DisplayFormatFull, PreScaleConvertShow) + Var text_price_d1 !assigned StringFmt( PriceD1 , DisplayFormatFull, PreScaleConvertShow) EndIf If cold_button_state = "Disable2" Then Var text_price_d2 = "" Else - Var text_price_d2 !assigned StringFmt( PriceD2 , DisplayFormatFull, PreScaleConvertShow) + Var text_price_d2 !assigned StringFmt( PriceD2 , DisplayFormatFull, PreScaleConvertShow) EndIf - + If blend_button_state = "Disable2" Then Var text_price_d3 = "" Else - Var text_price_d3 !assigned StringFmt( PriceD3 , DisplayFormatFull, PreScaleConvertShow) + Var text_price_d3 !assigned StringFmt( PriceD3 , DisplayFormatFull, PreScaleConvertShow) EndIf If RoadShow = "true" Then @@ -410,27 +410,38 @@ Var SugarZeroCalCheck = "Enable" EndIf + Strlen showname show_name_len + If show_eng = "true" Then + If show_name_len > 24 Then + Var showname = showname + "###size=54" + EndIf + Else + If show_name_len > 0 Then + Var showname = showname + "###size=68" + EndIf + EndIf + 1000 - + DEBUGVAR Timeout Var Timeout = Timeout + 1 - + If Timeout > 40 Then Var Timeout = 0 - If Seeker = "next" Then + If Seeker = "next" Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" Else OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf - + EndIf - If MultiPayEnable = "true" Then + If MultiPayEnable = "true" Then If NEW_MULTI = "Invisible" Then Var NEW_MULTI = "Enable" Else @@ -440,18 +451,18 @@ If Seeker = "curr" Then If DoorCupPosition = "bottom" Then - ; It normal + ; It normal Var EmergencyStop = "false" Else Var EmergencyStop = "true" - + EndIf EndIf Refresh TimerReset - + 0 @@ -473,17 +484,17 @@ show_btp "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ; eng SAVELOG "Lang change!" - If show_eng = "true" Then + If show_eng = "true" Then Var show_eng = "false" Else Var show_eng = "true" EndIf - If show_eng = "true" Then - + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/topping2_en" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" @@ -503,7 +514,7 @@ Var custom_coffee_level_darker_text_x = 880 Var custom_coffee_level_dark_text_x = 785 Else - + Var DirImage = "ROOT/taobin_project/image/topping2" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" @@ -522,35 +533,35 @@ Var custom_coffee_level_darker_text_x = 880 Var custom_coffee_level_dark_text_x = 790 - + EndIf Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png" Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png" - + Var bg_strawlid = DirImage + "/bg_strawlid.png" Var bg_straw_only = DirImage + "/bg_straw_only.png" Var bg_lid_only = DirImage + "/bg_lid_only.png" - + Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png" Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png" - + Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png" Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png" - + CRLFToSpace showname CRLFToSpace showdesc - + If SugarSoundFlag = 1 Then If SelectDrinkType = 1 Then - If show_eng = "true" Then + If show_eng = "true" Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" Else Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" - + ; Play Sound #zone Play PlaySoundLag EndIf @@ -560,8 +571,8 @@ Function 2 - - + + RefreshAll @@ -574,7 +585,7 @@ show_btp "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ; @@ -609,17 +620,17 @@ Var SugarZeroCalPrice_X = 540 Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" EndIf - + If SelectDrinkType = 1 Then Var showname = NameLang[IndexDrinktType][LanguageShowByIndex] Var showdesc = DescLang[IndexDrinktType][LanguageShowByIndex] - + Else Var showname = aliasName[LanguageShowByIndex] Var showdesc = aliasName[LanguageShowByIndex] - + EndIf - + BackslashNToEnter showname BackslashNToEnter showdesc CRLFToSpace showname @@ -637,16 +648,16 @@ "ROOT/taobin_project/image/page2/bn_back_arrow.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ;Open PreviseXMLFileName2 DEBUGVAR OpenFromXML - + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - + Open OpenFromXML - - + + @@ -654,7 +665,7 @@ DEBUGVAR MAT_ID_STRAW_OFFER DEBUGVAR MAT_ID_LID_OFFER DEBUGVAR MAT_ID_511215 - + DEBUGVAR TOPPING1 DEBUGVAR TOPPING1_EXT_2 @@ -677,7 +688,7 @@ DEBUGVAR toppingID1index7 DEBUGVAR toppingID1index8 DEBUGVAR toppingID1index9 - + DEBUGVAR toppingID2index1 DEBUGVAR toppingID2index2 DEBUGVAR toppingID2index3 @@ -704,7 +715,7 @@ DEBUGVAR toppingID9index2 DEBUGVAR toppingID9index3 DEBUGVAR toppingID9index4 - + DEBUGVAR toppingID10index1 DEBUGVAR toppingID10index2 DEBUGVAR toppingID10index3 @@ -712,7 +723,7 @@ DEBUGVAR toppingID1Default DEBUGVAR toppingID2Default DEBUGVAR toppingID3Default - + DEBUGVAR MenuCodeName1 DEBUGVAR MenuCodeName1_State DEBUGVAR MenuCodeName2 @@ -732,21 +743,21 @@ If TOPPING6 = "Topping-Volcano" Then - - If toppingID6price2 > 0 Then + + If toppingID6price2 > 0 Then DEBUGVAR toppingID6price2 DEBUGVAR DisplayFormat Var toppingID6price2Conv !assigned StringFmt( toppingID6price2 , DisplayFormat, PreScaleConvertShow) - + DEBUGVAR toppingID6price2Conv Var text_price_6 = "" Var text_price_6 = toppingID6price2Conv + ")" Var text_price_6 = "(+" + text_price_6 - - + + DEBUGVAR text_price_6 Else @@ -757,7 +768,7 @@ If blend_button_state = "PressForever" Then Var showOreoAddEnable = "Enable" - Var showText8 = "Invisible" + Var showText8 = "Invisible" Else Var showOreoAddEnable = "Disable" Var showText8 = "Enable" @@ -771,7 +782,7 @@ If hot_button_state = "Disable2" Then If cold_button_state = "PressForever" Then Var showOreoAddEnable = "Enable" - Var showText8 = "Invisible" + Var showText8 = "Invisible" EndIf EndIf EndIf @@ -791,7 +802,7 @@ Var PriceCustomCoffeeFormat = "%.1f" - + If TOPPING7 = "water-level" Then Var CustomCoffeeEnable = "True" Var showCustomCoffee = "Enable" @@ -857,7 +868,7 @@ If toppingID9Default = "" Then Var CustomCoffeeLevelState[1] = "PressForever" Else - + If toppingID9index1 = toppingID9Default Then Var CurrentCoffeeLevelId = toppingID9index1 Var CustomCoffeeLevelState[0] = "PressForever" @@ -936,7 +947,7 @@ If toppingID9Default = "" Then Var CustomCoffeeLevelState[1] = "PressForever" Else - + If toppingID9index1 = toppingID9Default Then Var CurrentCoffeeLevelId = toppingID9index1 Var CustomCoffeeLevelState[0] = "PressForever" @@ -1017,7 +1028,7 @@ If toppingID8Default = "" Then Var CustomCoffeeTampingState[1] = "PressForever" Else - + If toppingID8index1 = toppingID8Default Then Var CurrentCoffeeTampingId = toppingID8index1 Var CustomCoffeeTampingState[0] = "PressForever" @@ -1039,7 +1050,7 @@ Var CustomCoffeeTampingState[1] = "Enable" Var CustomCoffeeTampingState[2] = "PressForever" EndIf - + EndIf EndIf @@ -1053,7 +1064,7 @@ EndIf EndIf - + ; i f cold menu disable away If cold_button_state = "PressForever" Then If showOreoAddEnable = "Enable" Then @@ -1075,21 +1086,21 @@ EndIf EndIf - STRCONTAIN "9701" BrewParam IgnoreLidStraw + STRCONTAIN "9701" BrewParam IgnoreLidStraw DEBUGVAR BrewParam DEBUGVAR IgnoreLidStraw - + Var h_block_of_sugar = 210 - - + + If IgnoreLidStraw = "true" Then Var IgnoreLidStraw = "false" - Var ShowLidStraw = "Invisible" - Var ShowLidOnly = "Invisible" + Var ShowLidStraw = "Invisible" + Var ShowLidOnly = "Invisible" Var ShowStrawOnly = "Invisible" - + Else DEBUGVAR MAT_ID_STRAW_OFFER @@ -1097,7 +1108,7 @@ DEBUGVAR StrawState - Var ShowLidStraw = "Enable" + Var ShowLidStraw = "Enable" If StrawState = "Enable" Then If MAT_ID_STRAW_OFFER = "Enable" Then Var StrawState = MAT_ID_STRAW_OFFER @@ -1105,7 +1116,7 @@ Var StrawState = MAT_ID_STRAW_OFFER EndIf EndIf - + If StrawState = "Press" Then Var Seeker.thankStrawFlag = 1 Else @@ -1123,45 +1134,45 @@ DEBUGVAR MAT_ID_STRAW_OFFER DEBUGVAR MAT_ID_LID_OFFER - + EndIf - + ; Override all If Service_LidStraw = "Disable" Then - Var ShowLidStraw = "Enable" - ;Var ShowLidOnly = "Invisible" + Var ShowLidStraw = "Enable" + ;Var ShowLidOnly = "Invisible" ;Var ShowStawOnly = "Invisible" - + Var StrawState = "Disable" Var LidState = "Disable" EndIf If StrawState = "Enable" Then - Var StrawDeactiveButton = "Invisible" + Var StrawDeactiveButton = "Invisible" Else If StrawState = "Press" Then - Var StrawDeactiveButton = "Invisible" + Var StrawDeactiveButton = "Invisible" Else - Var StrawDeactiveButton = "Enable" + Var StrawDeactiveButton = "Enable" EndIf EndIf - + If LidState = "Enable" Then - Var LidDeactiveButton = "Invisible" + Var LidDeactiveButton = "Invisible" Else If LidState = "Press" Then - Var LidDeactiveButton = "Invisible" + Var LidDeactiveButton = "Invisible" Else - Var LidDeactiveButton = "Enable" + Var LidDeactiveButton = "Enable" EndIf EndIf - - - If UserSelectedSugar = 0 Then + + + If UserSelectedSugar = 0 Then If SugarModeUpdateWhenChangeDrinkType = 1 Then Var SugarModeUpdateWhenChangeDrinkType = 0 RefreshAll @@ -1175,11 +1186,11 @@ EndIf Var sugar_default_flag = 0 - + ; Suger 4 step cold If TOPPING1 = "Suger 4 step cold" Then Var SugarZeroCalOption = "Enable" - + Var BGSugar = "Invisible" Var ShiftSugarStep = 1 @@ -1194,12 +1205,12 @@ ; select no sugar Var SugarZeroCalCheck = "Disable" EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index3 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -1220,7 +1231,7 @@ ; Suger 4 step hot If TOPPING1 = "Suger 4 step hot" Then Var SugarZeroCalOption = "Enable" - + Var BGSugar = "Invisible" Var ShiftSugarStep = 1 @@ -1235,12 +1246,12 @@ ; select no sugar Var SugarZeroCalCheck = "Disable" EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index3 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -1259,7 +1270,7 @@ EndIf DEBUGVAR RecipeTag2 - ; + ; If TOPPING1 = "Sugar" Then Var SugarZeroCalOption = "Enable" If RecipeTag2 = "Topping6Step" Then @@ -1268,7 +1279,7 @@ Else Var BGSugar = "Enable" EndIf - + Var ShiftSugarStep = 1 Var SugarState1 = "Enable" Var SugarState2 = "Enable" @@ -1281,12 +1292,12 @@ Var sugar_default_flag = 1 Var SugarZeroCalOption = "Invisible" EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index3 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -1307,9 +1318,9 @@ Var SugarZeroCalOption = "Invisible" EndIf - + EndIf - + If TOPPING1 = "Powder Sugar" Then Var SugarZeroCalOption = "Enable" @@ -1319,7 +1330,7 @@ Else Var BGSugar = "Enable" EndIf - + Var ShiftSugarStep = 1 Var SugarState1 = "Enable" Var SugarState2 = "Enable" @@ -1335,12 +1346,12 @@ Var sugar_default_flag = 1 Var SugarZeroCalOption = "Invisible" EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index3 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -1364,7 +1375,7 @@ DEBUGVAR toppingID1Default DEBUGVAR SugarState1 EndIf - + If TOPPING1 = "Sugar Premix 25" Then Var SugarZeroCalOption = "Enable" @@ -1375,7 +1386,7 @@ Else Var BGSugar = "Enable" EndIf - + Var ShiftSugarStep = 2 Var SugarState1 = "Disable" Var SugarState2 = "Enable" @@ -1384,12 +1395,12 @@ Var SugarState4 = "Enable" Var SugarState5 = "Enable" Var SugarState6 = "Enable" - + If toppingID1index1 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -1406,7 +1417,7 @@ Var SugarState5 = "PressForever" Var sugar_default_flag = 1 EndIf - + If sugar_default_flag = 0 Then Var SugarState2 = "PressForever" EndIf @@ -1415,7 +1426,7 @@ If TOPPING1 = "Powder Sugar Premix 50" Then Var SugarZeroCalOption = "Enable" - + If RecipeTag2 = "Topping6Step" Then Var BGSugar = "Invisible" Var BGSugarNew = "Enable" @@ -1433,7 +1444,7 @@ Var SugarState4 = "Enable" Var SugarState5 = "Enable" Var SugarState6 = "Enable" - + If toppingID1index1 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -1468,18 +1479,18 @@ EndIf Var ShiftSugarStep = 2 - + Var SugarState2 = "Enable" - + Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" - + If toppingID1index1 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -1496,7 +1507,7 @@ Var SugarState5 = "PressForever" Var sugar_default_flag = 1 EndIf - + If sugar_default_flag = 0 Then Var SugarState2 = "PressForever" EndIf @@ -1511,7 +1522,7 @@ Var ShiftSugarStep = 1 Var SugarModeUpdateWhenChangeDrinkType = 1 EndIf - + If TOPPING1 = "Suger 4 step hot" Then Var BGSugarHotHealthy = "Enable" Var BGSugarColdHealthy = "Invisible" @@ -1537,7 +1548,7 @@ Var ShowCollagenOnly = "Enable" Var BugFlag = 1 - + Var topping1 = toppingID1Default @@ -1546,11 +1557,11 @@ Var SugarSoundFlag = 0 If BGSugarNew = "Enable" Then Var SugarSoundFlag = 1 - + EndIf If BGSugar = "Enable" Then Var SugarSoundFlag = 1 - + EndIf If BGSugarHotHealthy = "Enable" Then @@ -1562,14 +1573,14 @@ If BGSugarNew = "Enable" Then Var SugarSoundFlag = 1 EndIf - + If SugarSoundFlag = 1 Then If SelectDrinkType = 1 Then - If show_eng = "true" Then + If show_eng = "true" Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" Else Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" - + ; Play Sound #zone Play PlaySoundLag EndIf @@ -1585,17 +1596,17 @@ Var SugarState4 = "Enable" Var SugarState5 = "Enable" EndIf - + Else - EndIf - ; End of UserSelectedSugar = 0 + EndIf + ; End of UserSelectedSugar = 0 Refresh - + Var collagenShow = "true" ;-BEGIN shot layout - + If topping_price_refresh = 1 Then Var topping_price_refresh = 0 @@ -1603,133 +1614,133 @@ Var shot_h_layout = 218 If TOPPING2 = "shot coffee" Then - + Var ShotCoffeeBG = "Enable" Var showShotEnable = "Enable" Var ExtraTopping = "Enable" Var toppingID2price2Conv !assigned StringFmt( toppingID2price2 , DisplayFormat, PreScaleConvertShow) - + DEBUGVAR toppingID2price2Conv Var text_shot_normal_add = toppingID2price2Conv + ")" - Var text_shot_normal_add = "(+" + text_shot_normal_add - + Var text_shot_normal_add = "(+" + text_shot_normal_add + Refresh EndIf - + If TOPPING2 = "shot coffee termtem" Then - + Var ShotCoffeeBG = "Enable" Var showShotEnable = "Enable" - + Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "shot coffee 1003" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "shot coffee 1007" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "shot coffee 1008" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "add-show-1009" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "add-show-1101" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "add-show-1102" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf - + If TOPPING2 = "add-show-1103" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "add-show-1104" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf - + If TOPPING2 = "add-show-1105" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "add-show-1106" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If ShotCoffeePremium = "Enable" Then Var toppingID2price2Conv !assigned StringFmt( toppingID2price2 , DisplayFormat, PreScaleConvertShow) - + DEBUGVAR toppingID2price2Conv Var text_price_topping = toppingID2price2Conv + ")" - Var text_price_topping = "(+" + text_price_topping + Var text_price_topping = "(+" + text_price_topping EndIf @@ -1741,7 +1752,7 @@ If toppingID2Default = "" Then Var CustomCoffeeQuantityState[1] = "PressForever" Else - + If toppingID2index1 = toppingID2Default Then Var CurrentCoffeeLevelId = toppingID2index1 Var CustomCoffeeQuantityState[0] = "PressForever" @@ -1800,19 +1811,19 @@ Var ShowCollagenOnly = "Invisible" EndIf - EndIf + EndIf ;topping_price_refresh = 0 If MenuCodeName1 = "OatMilk" Then Var OatMilkToppingEnable = "Enable" - + DEBUGVAR OatMilkOnTopPrice Var OatMilkOnTopPriceStr !assigned StringFmt( OatMilkOnTopPrice , DisplayFormat, PreScaleConvertShow) - + Var text_price_oat_milk = OatMilkOnTopPriceStr + ")" - Var text_price_oat_milk = "(+" + text_price_oat_milk + Var text_price_oat_milk = "(+" + text_price_oat_milk Var OatMilkAddAmount = OatMilkOnTopPrice @@ -1825,21 +1836,21 @@ Var OatMilkEnable = "Enable" EndIf EndIf - - + + SAVELOG ToppingGotoPayment If ToppingGotoPayment = "true" Then Topping "Select" SelectDrink ; Pack - + Topping "Pack" ExtendDataCurr Var Seeker.ExtendDataCurr = ExtendDataCurr OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" Open "ROOT/taobin_project/xml/page_payment.xml" EndIf - - + + If RoadShow = "true" Then Var PriceShowValue = "Free" EndIf @@ -1865,8 +1876,8 @@ ;Var BugFlag = 1 If CartUpdate = "true" Then Var CartUpdate = "-" - - + + If CART_COUNT = 3 Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" Open "ROOT/taobin_project/xml/page_payment_multi.xml" @@ -1876,7 +1887,7 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" Else OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf EndIf EndIf @@ -1896,14 +1907,14 @@ 374 399 - eval( + eval( If IsSmoRet = "true" Then Var return = "Enable" Else Var return = "Invisible" EndIf -) - +) + "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1949,7 +1960,7 @@ ; ; ;- FRAME SCORELLL - + 52 881 1080 @@ -1959,12 +1970,12 @@ 1 - + ; show_select_type 988 162 20 - show_select_type + show_select_type "ROOT/taobin_project/image/topping_inter/drink_select_type.png" @@ -1995,9 +2006,9 @@ "ROOT/taobin_project/image/topping_inter/bt_hot_selected.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var SelectDrinkType = 1 - + SAVELOG "Press hot" Var hot_button_state = "PressForever" @@ -2031,7 +2042,7 @@ Var high_light_drink_type = "Invisible" Var IndexDrinktType = 0 - + @@ -2060,9 +2071,9 @@ "ROOT/taobin_project/image/topping_inter/bt_cold_selected_no.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var SelectDrinkType = 1 - + SAVELOG "Press cold" Var cold_button_state = "PressForever" @@ -2086,7 +2097,7 @@ Var blend_button_state = "Enable" EndIf EndIf - + Var BugFlag = 0 Var topping_price_refresh = 0 Topping "Load" PD_CODE2 @@ -2115,9 +2126,9 @@ "ROOT/taobin_project/image/topping_inter/bt_cold_selected_no.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var SelectDrinkType = 1 - + SAVELOG "Press cold" Var normal_button_state = "PressForever" @@ -2141,7 +2152,7 @@ Var blend_button_state = "Enable" EndIf EndIf - + Var BugFlag = 0 Var topping_price_refresh = 0 Topping "Load" PD_CODE2 @@ -2172,8 +2183,8 @@ "ROOT/taobin_project/image/topping_inter/bt_smoothie_selected_no.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - - + + SAVELOG "Press blend" Var SelectDrinkType = 1 @@ -2277,7 +2288,7 @@ EndIf EndIf ) - + ; sugar layout "Enable" @@ -2307,7 +2318,7 @@ "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + DEBUGVAR SugarState1 SAVELOG "SUGAR1" @@ -2317,7 +2328,7 @@ Else If ShiftSugarStep = 1 Then - + Var SugarState1 = "PressForever" Var SugarState2 = "Enable" Var SugarState3 = "Enable" @@ -2364,7 +2375,7 @@ "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR2" DEBUGVAR SelectDrinkType DEBUGVAR UserSelectedSugar @@ -2430,7 +2441,7 @@ "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR3" If SelectDrinkType = 0 Then @@ -2450,7 +2461,7 @@ If ShiftSugarStep = 2 Then Var SugarState2 = "Enable" - + Var SugarState3 = "PressForever" Var SugarState4 = "Enable" Var SugarState5 = "Enable" @@ -2492,7 +2503,7 @@ "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR4" If SelectDrinkType = 0 Then @@ -2512,7 +2523,7 @@ If ShiftSugarStep = 2 Then Var SugarState2 = "Enable" - + Var SugarState3 = "Enable" Var SugarState4 = "PressForever" Var SugarState5 = "Enable" @@ -2562,7 +2573,7 @@ "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR5" If SelectDrinkType = 0 Then @@ -2582,7 +2593,7 @@ If ShiftSugarStep = 2 Then Var SugarState2 = "Enable" - + Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "PressForever" @@ -2632,7 +2643,7 @@ "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR6" If SelectDrinkType = 0 Then @@ -2652,7 +2663,7 @@ If ShiftSugarStep = 2 Then Var SugarState2 = "Enable" - + Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" @@ -2726,7 +2737,7 @@ EndIf EndIf ) - + ; sugar layout BGSugarHotHealthy @@ -2755,7 +2766,7 @@ "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + DEBUGVAR SugarState1 SAVELOG "SUGAR1" @@ -2765,7 +2776,7 @@ Else If ShiftSugarStep = 1 Then - + Var SugarState1 = "PressForever" Var SugarState2 = "Enable" Var SugarState3 = "Enable" @@ -2811,7 +2822,7 @@ "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR2" DEBUGVAR SelectDrinkType DEBUGVAR UserSelectedSugar @@ -2865,7 +2876,7 @@ "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR3" If SelectDrinkType = 0 Then @@ -2918,7 +2929,7 @@ "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR4" If SelectDrinkType = 0 Then @@ -2995,7 +3006,7 @@ EndIf EndIf ) - + ; sugar layout BGSugarColdHealthy @@ -3023,7 +3034,7 @@ "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + DEBUGVAR SugarState1 SAVELOG "SUGAR1" @@ -3033,7 +3044,7 @@ Else If ShiftSugarStep = 1 Then - + Var SugarState1 = "PressForever" Var SugarState2 = "Enable" Var SugarState3 = "Enable" @@ -3080,7 +3091,7 @@ "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR2" DEBUGVAR SelectDrinkType DEBUGVAR UserSelectedSugar @@ -3134,7 +3145,7 @@ "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR3" If SelectDrinkType = 0 Then @@ -3186,7 +3197,7 @@ "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR4" If SelectDrinkType = 0 Then @@ -3265,7 +3276,7 @@ Var return = "Invisible" EndIf ) - + ; sugar layout BGSugarNew @@ -3293,16 +3304,16 @@ "ROOT/taobin_project/image/topping_inter/radio_checked.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG " SugarNormalChecked " - + If SelectDrinkType = 0 Then SAVELOG "drink type popup" Var high_light_drink_type = "Enable" Else If SugarZeroCalCheck = "Disable2" Then - + Else Var SugarZeroCalCheck = "Enable" EndIf @@ -3331,13 +3342,13 @@ "ROOT/taobin_project/image/topping_inter/radio_checked.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG " SugarZeroCalChecked " - + If SelectDrinkType = 0 Then SAVELOG "drink type popup" Var high_light_drink_type = "Enable" - + Refresh Else Var SugarNormalCheck = "Enable" @@ -3416,19 +3427,19 @@ "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + DEBUGVAR SugarState1 SAVELOG "SUGAR1" If SelectDrinkType = 0 Then SAVELOG "drink type popup" Var high_light_drink_type = "Enable" - + Refresh Else If ShiftSugarStep = 1 Then - + Var SugarState1 = "PressForever" Var SugarState2 = "Enable" Var SugarState3 = "Enable" @@ -3442,7 +3453,7 @@ Var SugarNormalCheck = "PressForever" If SugarZeroCalEnable = "true" Then If SugarZeroCalCheck = "Disable2" Then - + Else Var SugarZeroCalCheck = "Disable" EndIf @@ -3481,7 +3492,7 @@ "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR2" DEBUGVAR SelectDrinkType DEBUGVAR UserSelectedSugar @@ -3514,7 +3525,7 @@ Var SugarNormalCheck = "PressForever" If SugarZeroCalEnable = "true" Then If SugarZeroCalCheck = "Disable2" Then - + Else Var SugarZeroCalCheck = "Disable" EndIf @@ -3560,7 +3571,7 @@ "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR3" If SelectDrinkType = 0 Then @@ -3580,7 +3591,7 @@ If ShiftSugarStep = 2 Then Var SugarState2 = "Enable" - + Var SugarState3 = "PressForever" Var SugarState4 = "Enable" Var SugarState5 = "Enable" @@ -3591,7 +3602,7 @@ Var SugarNormalCheck = "PressForever" If SugarZeroCalEnable = "true" Then If SugarZeroCalCheck = "Disable2" Then - + Else Var SugarZeroCalCheck = "Disable" EndIf @@ -3636,7 +3647,7 @@ "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR4" If SelectDrinkType = 0 Then @@ -3656,7 +3667,7 @@ If ShiftSugarStep = 2 Then Var SugarState2 = "Enable" - + Var SugarState3 = "Enable" Var SugarState4 = "PressForever" Var SugarState5 = "Enable" @@ -3675,7 +3686,7 @@ Var SugarNormalCheck = "PressForever" If SugarZeroCalEnable = "true" Then If SugarZeroCalCheck = "Disable2" Then - + Else Var SugarZeroCalCheck = "Disable" EndIf @@ -3721,7 +3732,7 @@ "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR5" If SelectDrinkType = 0 Then @@ -3741,7 +3752,7 @@ If ShiftSugarStep = 2 Then Var SugarState2 = "Enable" - + Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "PressForever" @@ -3795,7 +3806,7 @@ "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR6" If SelectDrinkType = 0 Then @@ -3815,7 +3826,7 @@ If ShiftSugarStep = 2 Then Var SugarState2 = "Enable" - + Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" @@ -3879,7 +3890,7 @@ Var return = "Invisible" EndIf ) - + ; sugar layout BGSugarHotHealthy @@ -3907,9 +3918,9 @@ "ROOT/taobin_project/image/topping_inter/radio_checked.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG " SugarNormalChecked " - + If SelectDrinkType = 0 Then SAVELOG "drink type popup" @@ -3918,7 +3929,7 @@ Else If SugarZeroCalEnable = "true" Then If SugarZeroCalCheck = "Disable2" Then - + Else Var SugarZeroCalCheck = "Enable" EndIf @@ -3947,9 +3958,9 @@ "ROOT/taobin_project/image/topping_inter/radio_checked.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG " SugarZeroCalChecked " - + If SelectDrinkType = 0 Then SAVELOG "drink type popup" Var high_light_drink_type = "Enable" @@ -4029,7 +4040,7 @@ "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + DEBUGVAR SugarState1 SAVELOG "SUGAR1" @@ -4040,7 +4051,7 @@ Else If ShiftSugarStep = 1 Then - + Var SugarState1 = "PressForever" Var SugarState2 = "Enable" Var SugarState3 = "Enable" @@ -4051,7 +4062,7 @@ Var SugarNormalCheck = "PressForever" If SugarZeroCalCheck = "Disable2" Then - + Else Var SugarZeroCalCheck = "Disable" EndIf @@ -4087,7 +4098,7 @@ "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR2" DEBUGVAR SelectDrinkType DEBUGVAR UserSelectedSugar @@ -4145,7 +4156,7 @@ "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR3" If SelectDrinkType = 0 Then @@ -4200,7 +4211,7 @@ "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR4" If SelectDrinkType = 0 Then @@ -4267,7 +4278,7 @@ Var return = "Invisible" EndIf ) - + ; sugar layout BGSugarColdHealthy @@ -4295,9 +4306,9 @@ "ROOT/taobin_project/image/topping_inter/radio_checked.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG " SugarNormalChecked " - + If SelectDrinkType = 0 Then SAVELOG "drink type popup" @@ -4306,7 +4317,7 @@ Else If SugarZeroCalEnable = "true" Then If SugarZeroCalCheck = "Disable2" Then - + Else Var SugarZeroCalCheck = "Enable" EndIf @@ -4335,9 +4346,9 @@ "ROOT/taobin_project/image/topping_inter/radio_checked.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG " SugarZeroCalChecked " - + If SelectDrinkType = 0 Then SAVELOG "drink type popup" Var high_light_drink_type = "Enable" @@ -4418,7 +4429,7 @@ "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + DEBUGVAR SugarState1 SAVELOG "SUGAR1" @@ -4428,7 +4439,7 @@ Else If ShiftSugarStep = 1 Then - + Var SugarState1 = "PressForever" Var SugarState2 = "Enable" Var SugarState3 = "Enable" @@ -4439,7 +4450,7 @@ Var SugarNormalCheck = "PressForever" If SugarZeroCalCheck = "Disable2" Then - + Else Var SugarZeroCalCheck = "Disable" EndIf @@ -4478,7 +4489,7 @@ "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR2" DEBUGVAR SelectDrinkType DEBUGVAR UserSelectedSugar @@ -4535,7 +4546,7 @@ "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR3" If SelectDrinkType = 0 Then @@ -4589,7 +4600,7 @@ "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR4" If SelectDrinkType = 0 Then @@ -4669,9 +4680,9 @@ "ROOT/taobin_project/image/topping2/bp_cereal.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG " OatMilkEnable " - + If OatMilkEnable = "Press" Then Var OatMilkEnable = "Enable" @@ -4686,7 +4697,7 @@ -; +; -; +; -; +; -; +; @@ -6138,7 +6149,7 @@ ; "0x00BDFF" 500 Var( DirImage + "/new_multi.png" ) - + @@ -6151,17 +6162,17 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ;Var Seeker = "curr" - + DEBUGVAR PriceDrinkTmp - + ;Var Seeker.PriceDrink = PriceDrinkTmp - + Var PriceDrink = PriceDrinkTmp - + SAVELOG "USER press next ( topping ) - new" If SugarState1 = "PressForever" Then @@ -6255,33 +6266,33 @@ If StrawState = "Press" Then - Machine StrawOrder + Machine StrawOrder Var LedLidBlink = "true" EndIf If LidState = "Press" Then - Machine LidOrder + Machine LidOrder Var LedLidBlink = "true" - Var bg_lidProblem_ST = "Enable" + Var bg_lidProblem_ST = "Enable" Else Var bg_lidProblem_ST = "Invisible" EndIf - + If SelectDrinkType = 0 Then - + Else Var StrawState = "Enable" Var LidState = "Enable" EndIf - ; - + ; + Var SelectDrink = UserSelectProductCode - + Var Seeker.selected_a_drink = UserSelectProductCode DEBUGVAR Seeker.selected_a_drink - ; Set drink + ; Set drink ; Post Topping If SugarZeroCalEnable = "true" Then @@ -6291,9 +6302,9 @@ Else Var sugarToppingID = 511000 EndIf - + Topping "PostTopping1-ID" sugarToppingID - + EndIf Var Seeker.topping1 = topping1 @@ -6327,7 +6338,7 @@ Topping "__select" UserSelectProductCode - ; Set option toppinng and pack + ; Set option toppinng and pack Topping "__select1-id" topping1 Topping "__select2-id" topping2 Topping "__select3-id" topping3 @@ -6345,7 +6356,7 @@ EndIf DEBUGVAR Seeker - DEBUGVAR Seeker.ExtendData + DEBUGVAR Seeker.ExtendData Var Seeker.PictureDrink = PictureDrink Var Seeker.showname = showname @@ -6363,7 +6374,7 @@ EndIf - + GetLongTimeInMinute LastTimeClickOrder If CART_COUNT = 0 Then @@ -6372,7 +6383,7 @@ Else If SelectDrinkType = 1 Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" - Open "ROOT/taobin_project/xml/page_payment.xml" + Open "ROOT/taobin_project/xml/page_payment.xml" EndIf EndIf @@ -6380,7 +6391,7 @@ Var high_light_drink_type = "Enable" EndIf Else - + If CART1_STATUS = "EMPTY" Then Cart "AddMenuID" 1 Else @@ -6450,7 +6461,7 @@ Var img_cold_dis = "/bt_cold_disable.png" Var img_cold_dis2 = "/bt_cold_disable2.png" EndIf - + If img_smth_no_flag = 1 Then SAVELOG "Smoothies change img. 1" Var img_smth = "/bt_smoothie_no.png" @@ -6485,12 +6496,12 @@ DEBUGVAR menu_name_thai_cold SAVELOG "FUNCTION2" - + Var TOPPING_PRICE = 0 Var SelectDrinkType = 0 - + ; Set default If SelectCountDrinkType = 1 Then If DefaultDrinkType = 1 Then @@ -6511,7 +6522,7 @@ Var normal_button_state = "PressForever" Var SelectDrinkType = 1 EndIf - + Var IndexDrinktType = 1 EndIf If DefaultDrinkType = 3 Then @@ -6548,7 +6559,7 @@ Machine PreparCup EndIf - + If cold_button_state = "PressForever" Then Var PriceDrinkNoTop = PriceD2 Var UserSelectProductCode = PD_CODE2 @@ -6556,7 +6567,7 @@ If showShotEnable = "Disable" Then Var showShotEnable = "Enable" EndIf - + If showCustomCoffee = "Invisible" Then If CustomCoffeeEnable = "True" Then Var showCustomCoffee = "Enable" @@ -6576,7 +6587,7 @@ Machine PreparCup EndIf - + If blend_button_state = "PressForever" Then Var PriceDrinkNoTop = PriceD3 Var UserSelectProductCode = PD_CODE3 @@ -6619,7 +6630,7 @@ BackslashNToEnter showdesc CRLFToSpace showname CRLFToSpace showdesc - + DEBUGVAR PriceDrinkNoTop DEBUGVAR PriceDiff @@ -6635,18 +6646,18 @@ Var TOPPING_PRICE = 0 Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 - + Var topping2 = toppingID2index2 - + Var DisableUsingCode = "true" - + Var showText7 = "Enable" SAVELOG "Select premi normal shot" Else - If showShotEnable = "Press" Then + If showShotEnable = "Press" Then If blendedState = "Press" Then Var PriceDrinkTmp = PriceDrinkNoTop EndIf @@ -6657,11 +6668,11 @@ ;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2 Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 - + Var topping2 = toppingID2index2 - + Var DisableUsingCode = "true" - + Var showText7 = "Enable" SAVELOG "Select add normal shot" @@ -6669,7 +6680,7 @@ If blendedState = "Disable" Then Var blendedState = "Enable" EndIf - + Var PriceDrinkTmp = PriceDrinkNoTop Var topping2 = toppingID2index1 @@ -6697,7 +6708,7 @@ Var topping6 = toppingID6index1 Var DisableUsingCode = "false" - + EndIf If SugarZeroCalEnable = "true" Then @@ -6707,7 +6718,7 @@ EndIf EndIf EndIf - + DEBUGVAR OatMilkEnable DEBUGVAR MenuCodeName1 DEBUGVAR MenuCodeName1_State @@ -6720,8 +6731,8 @@ EndIf EndIf EndIf - - + + Var CustomCoffeeDefault = "true" DEBUGVAR showCustomCoffee DEBUGVAR CustomCoffeeDefault @@ -6737,7 +6748,7 @@ If showCustomCoffee = "Enable" Then - If showCoffeeWater = "Enable" Then + If showCoffeeWater = "Enable" Then If CurrentCoffeeWaterId = toppingID7Default Then Else Var CustomCoffeeDefault = "false" @@ -6750,7 +6761,7 @@ Var CustomCoffeeDefault = "false" EndIf EndIf - + If showCoffeeLevel = "Enable" Then If CurrentCoffeeLevelId = toppingID9Default Then Else @@ -6772,7 +6783,7 @@ EndIf Else If showShotEnable = "Invisible" Then - + Else If blend_button_state = "PressForever" Then Else @@ -6780,8 +6791,8 @@ EndIf EndIf EndIf - - + + If CustomCoffeeQuantityState[0] = "PressForever" Then Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price1 EndIf @@ -6823,7 +6834,7 @@ SAVELOG PriceDrinkTmp If RoadShow = "true" Then - + Var PriceDrinkTmpShow = "Free" DEBUGVAR SelectDrink2 @@ -6841,9 +6852,19 @@ DEBUGVAR showname DEBUGVAR showdesc + Strlen showname show_name_len + If show_eng = "true" Then + If show_name_len > 24 Then + Var showname = showname + "###size=54" + EndIf + Else + If show_name_len > 0 Then + Var showname = showname + "###size=68" + EndIf + EndIf Var Timeout = 0 - + RefreshAll @@ -6876,7 +6897,7 @@ diff --git a/xml/page_payment_cash-AUS.xml b/xml/page_payment_cash-AUS.xml index 03a1dfe9..ac8d501c 100644 --- a/xml/page_payment_cash-AUS.xml +++ b/xml/page_payment_cash-AUS.xml @@ -84,12 +84,17 @@ ; Below original ; On open + Var popup_cancel_button_y = 1345 + Var PopupCancelButtonState = "Invisible" Var cancelState = "Invisible" Var CameraState = "Invisible" + Var EMAEnterNumberButtonState = "Invisible" + Var EMAPopupSuccessState = "Invisible" + Var EMAPopupErrorState = "Invisible" Var alphaState = "Invisible" Var alphaState2 = "Invisible" @@ -427,6 +432,87 @@ Var PayState5 = "Invisible" Var PayState6 = "Invisible" EndIf + + + If EMAMemberID = "" Then + + Else + Var CameraState = "Invisible" + Var alphaState = "Enable" + Var PopupCancelButtonState = "Enable" + Var EMAEnterNumberButtonState = "Disable" + + Var popup_cancel_button_y = 1390 + + If CoinInFlag = 0 Then + If CancelFlag = 0 Then + Var QR_POPUP = "/img_popup_ema.png" + Var QRCODE99 = "" + + Var LOADING_STATE = "Enable" + + VendingQR ON + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + Seeker.ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumberQR = "0899999999" + Var ServiceType = "coffee" + Var ECommerceQR = "" + Var ECommerceQR = ECommerceQR + PriceDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + "AUB:2:" + Var ECommerceQR = ECommerceQR + EMAMemberID + Var ECommerceQR = ECommerceQR + "/" + + If Seeker.IntVendingCampaign > 0 Then + Var ECommerceQR = ECommerceQR + Seeker.VendingCode + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.CodeNumber + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 + EndIf + + If Seeker.IntVendingCredit > 0 Then + If Seeker.IntVendingCampaign > 0 Then + Var ECommerceQR = ECommerceQR + "|" + EndIf + Var ECommerceQR = ECommerceQR + "CRD" + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + PointCrm + EndIf + + + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + Var PayDetail2 = Seeker.PayDetail2 + GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + Var ReqPayInfoFlag = 6 + Refresh + EndIf + EndIf + EndIf + + @@ -451,7 +537,9 @@ VendingQR OFF CoinVending OFF - + If ReqPayInfoFlag2 = 0 Then + Var Seeker.CampaignPayChanel = "unknown" + EndIf If ReqPayInfoFlag2 = 1 Then DEBUGVAR VendingBank Var Seeker.CampaignPayChanel = "malaymbb" @@ -468,6 +556,9 @@ If ReqPayInfoFlag2 = 5 Then Var Seeker.CampaignPayChanel = "linepay" EndIf + If ReqPayInfoFlag2 = 6 Then + Var Seeker.CampaignPayChanel = "aubpay" + EndIf @@ -671,27 +762,37 @@ EndIf EndIf - ;If ReqPayInfoFlag = 6 Then - ; If VendingQRTypeResult = "FZB:2" Then - ; Var CashTextWarning = "" - ; Var QRErrorState = "Invisible" - ; Var QRCODE99Shoppy = SessionID - ; Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a - ; SAVELOG Ext1a - ; SAVELOG QRCODE99Shoppy - ; Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21 - ; Var ReqPayInfoFlag = 0 - ; Var ReqPayInfoFlag2 = 5 - ; SAVELOG QRCODE99Shoppy - ; SAVELOG Ext21 + If ReqPayInfoFlag = 6 Then - ; Var employeeName = "Jhon" - ; Var + SPLIT ECommerceQR "/" 6 MemberData - ; ;Var QRCODE99 = QRCODE99Shoppy - ; Var LOADING_STATE = "Invisible" - ; EndIf - ;EndIf + If VendingQRTypeResult = "AUB" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var ReqPayInfoFlag = 0 + Var ReqPayInfoFlag2 = 6 + SAVELOG QRCODE99Shoppy + SAVELOG Ext21 + + SPLIT MemberData ":" 1 _EMAMemberName + SPLIT MemberData ":" 2 EMAMemberSurname + SPLIT MemberData ":" 3 _EMAMemberBalance + + Var EMAMemberName !assigned SprintFmt("[%s]", _EMAMemberName) + Var EMAMemberBalance !assigned SprintFmt("Remain Balance: $%s", _EMAMemberBalance) + + DEBUGVAR EMAMemberName + DEBUGVAR EMAMemberSurname + DEBUGVAR EMAMemberBalance + + Var QR_POPUP = "/img_popup_ema_success.png" + + Var EMAPopupSuccessState = "Enable" + Var EMAEnterNumberButtonState = "Invisible" + Var PopupCancelButtonState = "Invisible" + Var EMAEnterNumberButtonState = "Invisible" + EndIf + EndIf Else Var PayInfoCFlag = 1 @@ -762,12 +863,22 @@ Var LOADING_STATE = "Invisible" EndIf EndIf + If ReqPayInfoFlag = 5 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorImg = "/QRError.png" + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf If ReqPayInfoFlag = 6 Then Var QRErrorFlag = 1 If alphaState = "Enable" Then - Var QRErrorImg = "/QRError.png" - Var QRErrorState = "Enable" + Var QR_POPUP = "/img_popup_ema_error.png" + Var EMAPopupErrorState = "Enable" + Var EMAEnterNumberButtonState = "Invisible" Var LOADING_STATE = "Invisible" + Var popup_cancel_button_y = 1225 EndIf EndIf Else @@ -806,6 +917,7 @@ Var VendingCashless = "-" Var LOADING_STATE = "Enable" Var alphaState = "Enable" + Var PopupCancelButtonState = "Enable" Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign CashlessPay RemainAmountX CreditCardRef Var CashlessPayFlag = 1 @@ -851,26 +963,25 @@ Var Timeout = Timeout + 1 - If Timeout >= 120 Then - Var alphaState = "Invisible" + If Timeout >= 120 Then + Var alphaState = "Invisible" + Var PopupCancelButtonState = "Invisible" + Var CameraState = "Invisible" + Var EMAEnterNumberButtonState = "Invisible" + Var EMAPopupErrorState = "Invisible" - If CameraState = "Enable" Then - Var CameraState = "Invisible" - EndIf - - - If RoadShow = "true" Then - Else - Var PayState3 = "Disable" - Var PayState5 = "Disable" - Var PayState6 = "Disable" - EndIf + If RoadShow = "true" Then + Else + Var PayState3 = "Disable" + Var PayState5 = "Disable" + Var PayState6 = "Disable" + EndIf Var LOADING_STATE = "Invisible" Var QRErrorState = "Invisible" Var CreditCardErrorState = "Invisible" - EndIf + EndIf If Timeout > 210 Then @@ -1228,6 +1339,7 @@ If CoinInFlag = 0 Then ;VendingQR OFF Var alphaState = "Invisible" + Var PopupCancelButtonState = "Invisible" EndIf @@ -1292,10 +1404,6 @@ If CoinInOK = 0 Then - - - - Var RemainAmount = PayAmount - CoinAmount Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign Var RemainAmount = RemainAmount - Seeker.IntVendingCredit @@ -1388,82 +1496,90 @@ DEBUGVAR scanresult DEBUGVAR scanmsg - ;If scanresult = "true" Then - ; Var employeeCode = scanmsg - ; Open "ROOT/taobin_project/inter/aus/xml/page_payment_employee_ping - ;Else - - ;EndIf - If scanresult = "true" Then - If Timeout < 120 Then - If CoinInFlag = 0 Then - If CancelFlag = 0 Then - Var QR_POPUP = "/img_popup_AUS_QR.png" - Var QRCODE99 = "" - Var LOADING_STATE = "Enable" + StrLen scanmsg textLen + If textLen = 8 Then - VendingQR ON + Var EMAMemberID = scanmsg - Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + Seeker.ExtendData + If Timeout < 120 Then + If CoinInFlag = 0 Then + If CancelFlag = 0 Then + Var QR_POPUP = "/img_popup_ema.png" + Var QRCODE99 = "" - Var CreditAmount1 = "" - Var ServiceAmountFlow = "" - Var TelephoneNumberQR = "0899999999" - Var ServiceType = "coffee" - Var ECommerceQR = "" - Var ECommerceQR = ECommerceQR + PriceDrink - Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink - Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 - Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink - Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + "FZB:2/" + Var LOADING_STATE = "Enable" + Var EMAEnterNumberButtonState = "Disable" - If Seeker.IntVendingCampaign > 0 Then - Var ECommerceQR = ECommerceQR + Seeker.VendingCode - Var ECommerceQR = ECommerceQR + ":" - Var ECommerceQR = ECommerceQR + Seeker.CodeNumber - Var ECommerceQR = ECommerceQR + ":" - Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 - EndIf + VendingQR ON - If Seeker.IntVendingCredit > 0 Then - If Seeker.IntVendingCampaign > 0 Then - Var ECommerceQR = ECommerceQR + "|" - EndIf - Var ECommerceQR = ECommerceQR + "CRD" - Var ECommerceQR = ECommerceQR + ":" - Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit - Var ECommerceQR = ECommerceQR + ":" - Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit - Var ECommerceQR = ECommerceQR + ":" - Var ECommerceQR = ECommerceQR + PointCrm - EndIf + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + Seeker.ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumberQR = "0899999999" + Var ServiceType = "coffee" + Var ECommerceQR = "" + Var ECommerceQR = ECommerceQR + PriceDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + "AUB:2:" + Var ECommerceQR = ECommerceQR + EMAMemberID + Var ECommerceQR = ECommerceQR + "/" + + If Seeker.IntVendingCampaign > 0 Then + Var ECommerceQR = ECommerceQR + Seeker.VendingCode + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.CodeNumber + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 + EndIf + + If Seeker.IntVendingCredit > 0 Then + If Seeker.IntVendingCampaign > 0 Then + Var ECommerceQR = ECommerceQR + "|" + EndIf + Var ECommerceQR = ECommerceQR + "CRD" + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + PointCrm + EndIf - Var ServiceParameter = "max" - Var ServiceCharge = 0 - Var AccountType = "new" - Var testservice = "kbank" - Var tc = "" - Var GetScore = "" - Var OperatorName = "" - Var SessionID = "" + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" - Var PayDetail2 = Seeker.PayDetail2 - GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc - Var ReqPayInfoFlag = 6 - Refresh + Var PayDetail2 = Seeker.PayDetail2 + GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + Var ReqPayInfoFlag = 6 + Refresh + EndIf EndIf EndIf + Else + Var QR_POPUP = "/img_popup_ema_error.png" + Var EMAPopupErrorState = "Enable" + Var alphaState = "Enable" + Var LOADING_STATE = "Invisible" + Var EMAEnterNumberButtonState = "Invisible" + Var popup_cancel_button_y = 1225 EndIf - Else - Var scanmsg = "Please try agin" EndIf Var CameraState = "Invisible" @@ -1565,6 +1681,7 @@ If alphaState = "Invisible" Then If CancelFlag = 0 Then Var QR_POPUP = "/img_popup8-AUS.png" Var alphaState = "Enable" + Var PopupCancelButtonState = "Enable" Coin CARD EndIf EndIf @@ -1636,9 +1753,10 @@ EndIf + + + + 249 + 1186 + EMAPopupSuccessState + 583 + KanitLightTTF + 40 + 0x513C2F + center-vertical-horizontal + EMAMemberName + + + + 249 + 1233 + EMAPopupSuccessState + 583 + KanitLightTTF + 40 + 0x513C2F + center-vertical-horizontal + EMAMemberBalance + + + +