diff --git a/adv/sync_1.file b/adv/sync_1.file
index 6d6d4393..fbdd8796 100644
--- a/adv/sync_1.file
+++ b/adv/sync_1.file
@@ -1,9 +1,9 @@
-total 128416
--rw-rw---- 1 root sdcard_rw 0 2025-04-07 23:26 sync_1.file
+total 134600
+-rw-rw---- 1 root sdcard_rw 0 2025-05-20 11:23 sync_1.file
-rw-rw---- 1 root sdcard_rw 3772465 2023-09-18 18:44 taobin_adv_00.mp4
-rw-rw---- 1 root sdcard_rw 2625751 2023-09-18 18:44 taobin_adv_menu_00.mp4
-rw-rw---- 1 root sdcard_rw 7417004 2024-07-23 09:12 taobin_adv_menu_01.mp4
--rw-rw---- 1 root sdcard_rw 7499002 2025-03-27 15:23 taobin_adv_menu_02.mp4
+-rw-rw---- 1 root sdcard_rw 7570852 2025-05-16 09:08 taobin_adv_menu_02.mp4
-rw-rw---- 1 root sdcard_rw 11268391 1980-01-01 00:00 taobin_adv_menu_03.mp4
-rw-rw---- 1 root sdcard_rw 1209432 1980-01-01 00:00 taobin_adv_menu_04.mp4
-rw-rw---- 1 root sdcard_rw 13899670 2025-03-04 15:57 taobin_adv_menu_05.mp4
@@ -21,4 +21,4 @@ total 128416
-rw-rw---- 1 root sdcard_rw 18310974 2023-09-18 18:44 taobin_adv_menu_17.mp4
-rw-rw---- 1 root sdcard_rw 10038728 2024-11-19 11:49 taobin_adv_menu_18.mp4
-rw-rw---- 1 root sdcard_rw 10498599 2023-10-31 17:06 taobin_adv_menu_19.mp4
--rw-rw---- 1 root sdcard_rw 2750154 2025-02-24 16:34 taobin_adv_menu_20.mp4
+-rw-rw---- 1 root sdcard_rw 9036256 2025-05-13 09:30 taobin_adv_menu_20.mp4
diff --git a/adv/taobin_adv_menu_02.mp4 b/adv/taobin_adv_menu_02.mp4
old mode 100644
new mode 100755
index ccfa4af3..4fead64b
Binary files a/adv/taobin_adv_menu_02.mp4 and b/adv/taobin_adv_menu_02.mp4 differ
diff --git a/image/page2/bn_soda_20B.png b/image/page2/bn_soda_20B.png
new file mode 100644
index 00000000..bf25cec5
Binary files /dev/null and b/image/page2/bn_soda_20B.png differ
diff --git a/image/page2/bp_soda_20B.png b/image/page2/bp_soda_20B.png
new file mode 100644
index 00000000..740a0331
Binary files /dev/null and b/image/page2/bp_soda_20B.png differ
diff --git a/image/page2_en/page2/bn_soda_20B.png b/image/page2_en/page2/bn_soda_20B.png
new file mode 100644
index 00000000..66d9e7dd
Binary files /dev/null and b/image/page2_en/page2/bn_soda_20B.png differ
diff --git a/image/page2_en/page2/bp_soda_20B.png b/image/page2_en/page2/bp_soda_20B.png
new file mode 100644
index 00000000..e249b888
Binary files /dev/null and b/image/page2_en/page2/bp_soda_20B.png differ
diff --git a/image/page2_inter/bn_soda_20B_EN.png b/image/page2_inter/bn_soda_20B_EN.png
new file mode 100644
index 00000000..865fc40f
Binary files /dev/null and b/image/page2_inter/bn_soda_20B_EN.png differ
diff --git a/image/page2_inter/bn_soda_20B_TH.png b/image/page2_inter/bn_soda_20B_TH.png
new file mode 100644
index 00000000..dede4ab4
Binary files /dev/null and b/image/page2_inter/bn_soda_20B_TH.png differ
diff --git a/image/page2_inter/bp_soda_20B_EN.png b/image/page2_inter/bp_soda_20B_EN.png
new file mode 100644
index 00000000..08cca2b6
Binary files /dev/null and b/image/page2_inter/bp_soda_20B_EN.png differ
diff --git a/image/page2_inter/bp_soda_20B_TH.png b/image/page2_inter/bp_soda_20B_TH.png
new file mode 100644
index 00000000..407ddb59
Binary files /dev/null and b/image/page2_inter/bp_soda_20B_TH.png differ
diff --git a/image/page3_2/bn_20_baht.png b/image/page3_2/bn_20_baht.png
new file mode 100644
index 00000000..e15ab6f7
Binary files /dev/null and b/image/page3_2/bn_20_baht.png differ
diff --git a/image/page3_2/bp_20_baht.png b/image/page3_2/bp_20_baht.png
new file mode 100644
index 00000000..1bb540d7
Binary files /dev/null and b/image/page3_2/bp_20_baht.png differ
diff --git a/image/page3_2_en/bn_20_baht.png b/image/page3_2_en/bn_20_baht.png
new file mode 100644
index 00000000..54b70df7
Binary files /dev/null and b/image/page3_2_en/bn_20_baht.png differ
diff --git a/image/page3_2_en/bp_20_baht.png b/image/page3_2_en/bp_20_baht.png
new file mode 100644
index 00000000..19e0f169
Binary files /dev/null and b/image/page3_2_en/bp_20_baht.png differ
diff --git a/image/page3_2_v2/bn_20_baht.png b/image/page3_2_v2/bn_20_baht.png
new file mode 100644
index 00000000..451ec1e5
Binary files /dev/null and b/image/page3_2_v2/bn_20_baht.png differ
diff --git a/image/page3_2_v2/bp_20_baht.png b/image/page3_2_v2/bp_20_baht.png
new file mode 100644
index 00000000..ae83aea3
Binary files /dev/null and b/image/page3_2_v2/bp_20_baht.png differ
diff --git a/image/page3_2_v2_en/bn_20_baht.png b/image/page3_2_v2_en/bn_20_baht.png
new file mode 100644
index 00000000..54822da0
Binary files /dev/null and b/image/page3_2_v2_en/bn_20_baht.png differ
diff --git a/image/page3_2_v2_en/bp_20_baht.png b/image/page3_2_v2_en/bp_20_baht.png
new file mode 100644
index 00000000..cdc6ee84
Binary files /dev/null and b/image/page3_2_v2_en/bp_20_baht.png differ
diff --git a/inc/language_toggle_mode.inc b/inc/language_toggle_mode.inc
index fc257ba4..e4c5e187 100644
--- a/inc/language_toggle_mode.inc
+++ b/inc/language_toggle_mode.inc
@@ -1,3 +1,6 @@
+
+
+SAVELOG "language_toggle_mode language_toggle_mode language_toggle_mode"
If CountryName = "Thailand" Then
If ENABLE_LANGUAGE_COUNT = 2 Then
If LanguageShow = "ENG" Then
diff --git a/inter/aus/image/collect_point/redeem/redeem_1dollar_content.png b/inter/aus/image/collect_point/redeem/redeem_1dollar_content.png
index bc01a6dd..da90c652 100644
Binary files a/inter/aus/image/collect_point/redeem/redeem_1dollar_content.png and b/inter/aus/image/collect_point/redeem/redeem_1dollar_content.png differ
diff --git a/inter/aus/image/collect_point/redeem/redeem_2dollar_content.png b/inter/aus/image/collect_point/redeem/redeem_2dollar_content.png
index eb83c27f..1bdf0826 100644
Binary files a/inter/aus/image/collect_point/redeem/redeem_2dollar_content.png and b/inter/aus/image/collect_point/redeem/redeem_2dollar_content.png differ
diff --git a/inter/aus/image/collect_point/redeem/redeem_fail_content.png b/inter/aus/image/collect_point/redeem/redeem_fail_content.png
index ff3e71ab..488f1681 100644
Binary files a/inter/aus/image/collect_point/redeem/redeem_fail_content.png and b/inter/aus/image/collect_point/redeem/redeem_fail_content.png differ
diff --git a/inter/aus/image/collect_point/redeem/redeem_get_free_content.png b/inter/aus/image/collect_point/redeem/redeem_get_free_content.png
index 81386175..f62b2386 100644
Binary files a/inter/aus/image/collect_point/redeem/redeem_get_free_content.png and b/inter/aus/image/collect_point/redeem/redeem_get_free_content.png differ
diff --git a/inter/aus/image/collect_point/redeem/redeem_success_content.png b/inter/aus/image/collect_point/redeem/redeem_success_content.png
index 8946e844..2cb4711a 100644
Binary files a/inter/aus/image/collect_point/redeem/redeem_success_content.png and b/inter/aus/image/collect_point/redeem/redeem_success_content.png differ
diff --git a/inter/aus/xml/page_NewBrewing3.lxml b/inter/aus/xml/page_NewBrewing3.lxml
new file mode 100644
index 00000000..07ab4f34
--- /dev/null
+++ b/inter/aus/xml/page_NewBrewing3.lxml
@@ -0,0 +1,1534 @@
+
+ "Enable"
+ 1080
+ 1920
+ "0xeae6e1"
+ SoundVolume
+
+
+ RootLayoutVisible 3 "hide"
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payext_setup.ev"
+
+ Var SendNotiPaySuccess = 2
+
+ Var GetMoreStrawCount = 3
+
+ Var CountUpWhenBREW_CNT = 0
+ DEBUGVAR TxRef1
+
+ SAVELOG "AUS page_NewBrewing3.lxml"
+ DEBUGVAR MachineStage
+ DEBUGVAR Seeker.ORDER_ID
+
+ __CMD "PayWasSent" Seeker.ORDER_ID "-" "-"
+ __CMD "machine-cleanliness-score" Seeker.CleanFeedbackScore "-" "-"
+
+ Var PictureFileTextDesctionState = "Enable"
+
+
+ If CART_COUNT >= 1 Then
+ Open "ROOT/taobin_project/xml/page_brewing3Multi.xml"
+ Else
+ Var PayReference = ""
+ Var PayType = "newpay"
+ EndIf
+
+ Var SelectDrink = Seeker.selected_a_drink
+ Var ExtendData = Seeker.ExtendData
+
+ Var ServiceAmount2 = Seeker.ServiceAmount2
+
+ DEBUGVAR Seeker
+ DEBUGVAR Seeker.selected_a_drink
+ DEBUGVAR Seeker.ServiceAmount2
+ DEBUGVAR Seeker.CashlessVendingTrackNumber
+
+ DEBUGVAR Seeker.CodeNumber
+
+ Var SessionID2 = SelectSlot + ":"
+ Var SessionID2 = SessionID2 + ExtendData
+
+ ; On open move from page_brewing3.xml
+ Var countClick2 = 0
+
+ Var Timeout = 0
+
+ Var PrintCoinAmount = 0
+
+ Var DirImageDoing = "ROOT/taobin_project/inter/aus/image/page_doing"
+
+ WRITE_FILE "/mnt/sdcard/coffeevending/log/drink-success" "--"
+
+
+ If show_eng = "true" Then
+
+ Var IMG_CNT = DirImageDoing + "/img2_eng.png"
+
+ Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
+
+ Var bnGetMoreStrawFileName = DirImageDoing + "/bn_get_more_straw.png"
+ Var bpGetMoreStrawFileName = DirImageDoing + "/bp_get_more_straw.png"
+
+ Var bnStrawProblemReport = DirImageDoing + "/bn_send_report_straw_en.png"
+ Var bpStrawProblemReport = DirImageDoing + "/bp_send_report_straw_en.png"
+
+ Var bnLidProblemReport = DirImageDoing + "/bn_send_report_lid_en.png"
+ Var bpLidProblemReport = DirImageDoing + "/bp_send_report_lid_en.png"
+
+
+ Var bn_get_lid_image = DirImageDoing + "/bn_get_lid.png"
+ Var bp_get_lid_image = DirImageDoing + "/bp_get_lid.png"
+
+ Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_en.png"
+ Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png"
+
+ Var XStraw = 274
+ Else
+ Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3"
+
+ ; Play Sound #zone
+ If SoundBackToSchoolEnable = 1 Then
+
+ If SoundBackToSchoolType = 1 Then
+ Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
+ EndIf
+ If SoundBackToSchoolType = 2 Then
+ Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
+ EndIf
+ Var PlaySoundLag = RootPathSoundBackToSchool + "thankyou.wav"
+ EndIf
+
+ Play PlaySoundLag
+
+ Var IMG_CNT = DirImageDoing + "/img2.png"
+
+
+ Var bnGetMoreStrawFileName = DirImageDoing + "/bn_get_more_straw.png"
+ Var bpGetMoreStrawFileName = DirImageDoing + "/bp_get_more_straw.png"
+
+ Var bnStrawProblemReport = DirImageDoing + "/bn_send_report_straw.png"
+ Var bpStrawProblemReport = DirImageDoing + "/bp_send_report_straw.png"
+
+ Var bnLidProblemReport = DirImageDoing + "/bn_send_report_lid.png"
+ Var bpLidProblemReport = DirImageDoing + "/bp_send_report_lid.png"
+
+
+ Var bn_get_lid_image = DirImageDoing + "/bn_get_lid.png"
+ Var bp_get_lid_image = DirImageDoing + "/bp_get_lid.png"
+
+ Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3.png"
+ Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1.png"
+
+ Var XStraw = 274
+ EndIf
+
+ Var waitAckPay = 0
+ Var VendingTSIDTmp = ""
+ Var VendingTSIDProblem = ""
+ Var CreditReference = ""
+ Var PayCredit = 0
+
+
+
+ If Seeker.PayWithQR = 1 Then
+ Var VendingTSIDTmp = Seeker.VendingTSID
+ EndIf
+
+ If Seeker.TNumberTaobinCredit = "" Then
+
+ If Seeker.TNumberTaobinMember = "" Then
+ Var TelephoneNumberProblem = ""
+ Else
+ Var TelephoneNumberProblem = Seeker.TNumberTaobinMember
+ EndIf
+
+ Else
+ Var TelephoneNumberProblem = Seeker.TNumberTaobinCredit
+ EndIf
+
+ DEBUGVAR Seeker.TNumberTaobinMember
+ DEBUGVAR Seeker.PointTaobinStr
+
+ If GetFreeFromError = 1 Then
+ Var TelephoneNumberProblem = TelephoneNumberGOTFree
+ EndIf
+
+
+ If LedLidBlink = "true" Then
+ Var LedLidBlink = "no"
+ LED LedDoorLid Blink 255 255 255 255
+ EndIf
+
+
+ Var CreditReference = Seeker.CreditReferenceTmp
+ Var VendingDiscount = Seeker.VendingDiscount
+ Var VendingCampaign = Seeker.VendingCampaign
+ Var TxReference = Seeker.TxRef1
+ DEBUGVAR TxReference
+
+
+ If show_eng = "true" Then
+ Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
+ Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
+ Else
+ Var DirImage = "ROOT/taobin_project/image/page_payment"
+ Var DirImage2 = "ROOT/taobin_project/image/topping2"
+ EndIf
+
+ DEBUGVAR show_eng
+
+ Var next_pic_bn = DirImage + "/bn_add_order.png"
+ Var next_pic_bp = DirImage + "/bp_add_order.png"
+ Var text_next_order = DirImage + "/text_next_order.png"
+ Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
+
+
+ Var Seeker.strawAction = 0
+ Var Seeker.lidAction = 0
+
+ If Seeker.thankLidFlag = 1 Then
+ Var bg_strawlid = DirImage2 + "/bg_strawSmall.png"
+ Var LidStateX = "Invisible"
+ Var Seeker.lidAction = 2
+ EndIf
+
+
+ DEBUGVAR LastMakeDrinkResult
+
+ If LastMakeDrinkResult = "success" Then
+ Var MachineState_Result = 1
+ EndIf
+
+ If LastMakeDrinkResult = "fail" Then
+ SAVELOG "LastMakeDrinkResult is 2"
+ Var MachineState_Result = 2
+ EndIf
+
+
+ DEBUGVAR VendingCampaign
+
+
+ If MachineState_Result > 0 Then
+ Var SelectMenuBetweenBrewEnable1 = "Invisible"
+ Else
+ Var SelectMenuBetweenBrewEnable1 = "Enable"
+ EndIf
+
+ If GetFreeFromError = 1 Then
+ Var SelectMenuBetweenBrewEnable1 = "Invisible"
+ EndIf
+
+ If SelectMenuBetweenBrewEnable1 = "Enable" Then
+ Var EnableGetMoreStrawFileName = "Enable"
+ Var SelectMenuBetweenBrewEnable1Blink = "Enable"
+ Else
+ Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
+
+ Var EnableGetMoreStrawFileName = "Invisible"
+ EndIf
+
+
+ ; Hide
+ Var bg_strawProblem_ST = "Invisible"
+ Var StrawProblemStatus = 1
+ Var StrawStateX = "Invisible"
+ Var LidStateX = "Invisible"
+
+ ; Override from config
+ If StrawGetMoreState = "Invisible" Then
+ Var bg_strawProblem_ST = "Enable"
+ Var EnableGetMoreStrawFileName = "Invisible"
+ EndIf
+
+ If Seeker.CreditCard = 1 Then
+ Var SelectMenuBetweenBrewEnable1Blink = "Enable"
+ Var SelectMenuBetweenBrewEnable1 = "Enable"
+ EndIf
+
+ If NeedUpgrade = "true" Then
+ Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
+ Var SelectMenuBetweenBrewEnable1 = "Invisible"
+ EndIf
+
+ If NeedReboot = "true" Then
+ Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
+ Var SelectMenuBetweenBrewEnable1 = "Invisible"
+ EndIf
+
+ ;Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
+ ;Var SelectMenuBetweenBrewEnable1 = "Invisible"
+
+ If SELLSTATUS = "DEACTIVE" Then
+ Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
+ Var SelectMenuBetweenBrewEnable1 = "Invisible"
+ EndIf
+
+ DEBUGVAR NeedUpgrade
+ DEBUGVAR NeedReboot
+ DEBUGVAR SELLSTATUS
+
+ ; copy stage
+ Var bg_lidProblem_ST2 = bg_lidProblem_ST
+ DEBUGVAR bg_lidProblem_ST2
+
+ ; zone Language
+ If LanguageObjectShow = "Enable" Then
+ Var XStraw = 350
+ Var IMG_CNT = DirImageDoing + "/bg_show_time_remaining.png"
+ EndIf
+
+ DEBUGVAR LanguageObjectShow
+
+ Var CreditCardVoid = 0
+ If InternationalEnable = 1 Then
+ Var adver_brewing_en = 0
+ RootLayoutVisible 3 "hide"
+ EndIf
+
+ If adver_brewing_en = 1 Then
+ Var adver_brewing_playing = 1
+ Var adver_brewing_play_index = 2
+ Var adver_brewing_count_down = 10
+ Var VideoPlayFile = DirImageDoing + "/tao_adv1.png"
+ Var PictureFile = brew_txt1
+ EndIf
+
+ Var CampaignEnable = 0
+
+
+ Var GetLidButtonCountDown = 0
+
+ ; language instance
+
+ If bg_lidProblem_ST = "Enable" Then
+ Var GetLidButtonState = "Invisible"
+ EndIf
+
+ If bg_strawProblem_ST = "Enable" Then
+ Var EnableGetMoreStrawFileName = "Invisible"
+ EndIf
+
+ DEBUGVAR SelectMenuBetweenBrewEnable1
+ DEBUGVAR SelectMenuBetweenBrewEnable2
+
+ Var SelectMenuBetweenBrewEnable1Text = SelectMenuBetweenBrewEnable1
+
+
+ ; echo 1 > /mnt/sdcard/game_enable
+ READ_FILE "/mnt/sdcard/game_enable" game_mode_str
+ STRCONTAIN "1" game_mode_str game_mode_enable
+ DEBUGVAR game_mode_enable
+
+
+ If GameEnableFromTrickerEv = 1 Then
+ Var game_mode_enable = "true"
+ EndIf
+
+ If GameOverrideDisable = 1 Then
+ Var game_mode_enable = "false"
+ EndIf
+
+ READ_FILE "/mnt/sdcard/game_disable" game_mode_str
+ STRCONTAIN "1" game_mode_str game_mode_disable
+ DEBUGVAR game_mode_disable
+
+ If game_mode_disable = "true" Then
+ Var game_mode_enable = "false"
+ EndIf
+
+ DEBUGVAR GameEnableFromTrickerEv
+ DEBUGVAR GameOverrideDisable
+ DEBUGVAR game_mode_enable
+
+ DEBUGVAR Seeker
+ If game_mode_enable = "true" Then
+
+ DEBUGVAR GameInstalled
+
+ If GameInstalled = "true" Then
+ If Seeker.TNumberTaobinCredit = "" Then
+ Var TelephoneNumber = "0899999999"
+
+ If Seeker.TNumberTaobinMember = "" Then
+ Else
+ Var TelephoneNumber = Seeker.TNumberTaobinMember
+ EndIf
+
+ Else
+ Var TelephoneNumber = Seeker.TNumberTaobinCredit
+ EndIf
+
+ StrLen TelephoneNumber TelNumLen
+
+ DEBUGVAR TelephoneNumber
+ DEBUGVAR TelNumLen
+
+ If TelNumLen = 10 Then
+
+ ; reset
+ WRITE_FILE "/mnt/sdcard/config_taobingame.yaml" ""
+ ;APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://10.0.16.233:30487/taobingame"\r\n"
+ APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://game.au.taobin.local:26969"\r\n"
+
+
+ If TelephoneNumber = "0899999999" Then
+ ; Coupon or customer not input phone number.
+ Var ACCString !assigned SprintFmt("ACC: ""\r\n", "")
+ Else
+
+ Var ACCString !assigned SprintFmt("ACC: "%s"\r\n", TelephoneNumber)
+ EndIf
+
+ DEBUGVAR ACCString
+
+ Var LangString = "LANG: "EN"\r\n"
+
+ Var BoxIDString !assigned SprintFmt("BOX_ID: "%s"\r\n", BoxID)
+
+ ; reset
+ WRITE_FILE "/mnt/sdcard/taobingame_acc.yaml" ""
+ APPEND_FILE "/mnt/sdcard/taobingame_acc.yaml" ACCString
+ APPEND_FILE "/mnt/sdcard/taobingame_acc.yaml" LangString
+ APPEND_FILE "/mnt/sdcard/taobingame_acc.yaml" BoxIDString
+
+
+ Var Game01Enable = 1
+ Else
+ ; reset
+ WRITE_FILE "/mnt/sdcard/config_taobingame.yaml" ""
+ ;APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://10.0.16.233:30487/taobingame"\r\n"
+ APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://10.0.16.231:30460"\r\n"
+
+ Var ACCString !assigned SprintFmt("ACC: ""\r\n", "")
+ DEBUGVAR ACCString
+
+ Var LangString = "LANG: "EN"\r\n"
+
+ Var BoxIDString !assigned SprintFmt("BOX_ID: "%s"\r\n", BoxID)
+
+ ; reset
+ WRITE_FILE "/mnt/sdcard/taobingame_acc.yaml" ""
+ APPEND_FILE "/mnt/sdcard/taobingame_acc.yaml" ACCString
+ APPEND_FILE "/mnt/sdcard/taobingame_acc.yaml" LangString
+ APPEND_FILE "/mnt/sdcard/taobingame_acc.yaml" BoxIDString
+
+ Var Game01Enable = 1
+ EndIf
+ EndIf
+ EndIf
+
+
+
+ DEBUGVAR Game01Enable
+ DEBUGVAR BREW_CNT
+ If Game01Enable = 1 Then
+ If BREW_CNT > 75 Then
+ Var ButtonGameCountDown = BREW_CNT - 60
+ If ButtonGameCountDown > 10 Then
+ Var ButtonGameCountDown = 10
+ EndIf
+
+ Var ButtonGameCountDownState = "PressForever"
+ Else
+ Var Game01Enable = 0
+ Var ButtonGameCountDownState = "Invisible"
+ Var ButtonGamePressToPlayState = "Invisible"
+
+ Var ButtonGameCountDown = 0
+ EndIf
+
+ Else
+ Var ButtonGameCountDown = 0
+ Var ButtonGameCountDownState = "Invisible"
+ EndIf
+
+ DEBUGVAR ButtonGameCountDown
+
+ Var ButtonGamePressToPlayState = "Invisible"
+
+
+
+ ; BREW_CNT > 15 ( pre-time ) + 60 ( Game Time ) Game01Enable
+ ; BREW_CNT > 15 ( pre-time ) + 50 ( Game Time ) + 10 (Debound Time) Game01Enable
+
+ If Game01Enable = 1 Then
+
+ If ButtonGameCountDownState = "Enable" Then
+ If BREW_CNT < 75 Then
+ If Game01Enable = 1 Then
+ SAVELOG "Game01Enable set zero event open 2"
+ EndIf
+ Var Game01Enable = 0
+ Var ButtonGameCountDownState = "Invisible"
+ Var ButtonGamePressToPlayState = "Invisible"
+ EndIf
+ EndIf
+
+ If BREW_CNT > 70 Then
+
+ Else
+ If Game01Enable = 1 Then
+ SAVELOG "Game01Enable set zero event open 1"
+ EndIf
+ Var Game01Enable = 0
+ Var ButtonGamePressToPlayState = "Invisible"
+
+ EndIf
+ EndIf
+
+ __CMD "SetErrorCodeHandleByXML" 1028 "-" "-"
+ __CMD "SetErrorCodeHandleByXML" 1029 "-" "-"
+ __CMD "SetErrorCodeHandleByXML" 1030 "-" "-"
+ __CMD "SetErrorCodeHandleByXML" 1031 "-" "-"
+
+
+
+ Var XPosiShowCountDownBrew = 768
+ Refresh
+
+
+
+
+ If CreditCardVoid = 1 Then
+ Var ChangeOK = 2
+ EndIf
+
+
+ If ActionOKCase = 1 Then
+ If Seeker.CodeChannel = 1 Then
+ Var SessionID2 = SelectSlot + ":"
+ Var SessionID2 = SessionID2 + ExtendData
+ DEBUGVAR SessionID2
+
+ DEBUGVAR SessionID2
+
+ Var CreditAmount1 = ""
+ Var ServiceAmountFlow = ""
+ Var TelephoneNumber = "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 + Seeker.VendingCode
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + Seeker.CodeNumber
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + "C:"
+ Var ECommerce = ECommerce + Seeker.IntVendingCampaign
+ Var ServiceParameter = "max"
+ Var ServiceCharge = 0
+ Var AccountType = "new"
+ Var testservice = "kbank"
+ Var tc = ""
+ Var GetScore = ""
+ Var OperatorName = ""
+ Var SessionID = ""
+
+ GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+ ;Var Timeout = 0
+ Var ActionOKCase = 2
+
+ SAVELOG "back_to_main from line > 142."
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+
+ Else
+
+ SAVELOG "back_to_main from line > 147."
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+ EndIf
+ EndIf
+
+
+
+
+ If ActionOKCase = 1 Then
+ If Seeker.CodeChannel = 1 Then
+ Var SessionID2 = SelectSlot + ":"
+ Var SessionID2 = SessionID2 + ExtendData
+
+ DEBUGVAR SessionID2
+
+ Var CreditAmount1 = ""
+ Var ServiceAmountFlow = ""
+ Var TelephoneNumber = "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 + Seeker.VendingCode
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + Seeker.CodeNumber
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + "C:"
+ Var ECommerce = ECommerce + Seeker.IntVendingCampaign
+ Var ServiceParameter = "max"
+ Var ServiceCharge = 0
+ Var AccountType = "new"
+ Var testservice = "kbank"
+ Var tc = ""
+ Var GetScore = ""
+ Var OperatorName = ""
+ Var SessionID = ""
+
+ GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+ ;Var Timeout = 0
+ Var ActionOKCase = 2
+
+ SAVELOG "back_to_main from line > 204."
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+
+ Else
+ SAVELOG "back_to_main from line > 173."
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+ EndIf
+ EndIf
+
+
+
+ 1000
+
+
+
+ Var Timeout = Timeout + 1
+
+ If Timeout < 2 Then
+ If GameInstalled = "true" Then
+ If Game01Enable = 0 Then
+ If game_mode_enable = "true" Then
+ If BREW_CNT > 75 Then
+ SAVELOG "Button game enable from EventTimeout"
+ Var Game01Enable = 1
+ Var ButtonGameCountDownState = "Invisible"
+ Var ButtonGamePressToPlayState = "Enable"
+ EndIf
+ EndIf
+ EndIf
+ EndIf
+
+ EndIf
+
+ DEBUGVAR MachineState_Result
+ DEBUGVAR BREW_COUNT_DOWN_FROM_APP
+
+ If MOVE_CUP_TO_DOOR = "true" Then
+ Var MOVE_CUP_TO_DOOR = "false"
+ Endif
+
+ Var CountDownBrewing = BREW_CNT
+
+
+ If SelectMenuBetweenBrewEnable1 = "Enable" Then
+ If Timeout = 5 Then
+ If show_eng = "true" Then
+ PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3"
+ Else
+
+ Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/next_drink.mp3"
+
+ ; Play Sound #zone
+ If SoundBackToSchoolEnable = 1 Then
+
+ If SoundBackToSchoolType = 1 Then
+ Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
+ EndIf
+ If SoundBackToSchoolType = 2 Then
+ Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
+ EndIf
+ Var PlaySoundLag = RootPathSoundBackToSchool + "next_drink.wav"
+ EndIf
+
+ PlayLong PlaySoundLag
+ EndIf
+ EndIf
+ If Timeout = 9 Then
+ If OpenFromCollectPoint3 = 0 Then
+ PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
+ EndIf
+ EndIf
+ Else
+ If Timeout = 4 Then
+ If OpenFromCollectPoint3 = 0 Then
+ PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
+ EndIf
+ EndIf
+ EndIf
+
+ Var ShowCountDownBrewing = CountDownBrewing
+
+ ; TODO
+ DEBUGVAR EnableDoubleCupNoError
+ DEBUGVAR HURR_FOREVER
+ DEBUGVAR RequestPickupCupAlert
+ If RequestPickupCupAlert = "true" Then
+ Open "ROOT/taobin_project/xml/page_pickup_cup_between_order.xml"
+ EndIf
+
+ If Timeout > 540 Then
+ SAVELOG "back_to_main from line > 217."
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+ EndIf
+
+
+ If BREW_CNT = 0 Then
+ If CountUpWhenBREW_CNT > 56 Then
+ Var CountUpWhenBREW_CNT = 0
+ Var drink_success_set = "-"
+ READ_FILE "/mnt/sdcard/coffeevending/log/drink-success" drink_success_set
+ DEBUGVAR drink_success_set
+ If drink_success_set = "1" Then
+ Var MachineState_Result = 1
+ EndIf
+
+ EndIf
+
+ Var CountUpWhenBREW_CNT = CountUpWhenBREW_CNT + 1
+
+ EndIf
+
+ If Timeout > 480 Then
+ SAVELOG " Timeout > 480"
+ Var MachineState_Result = 2
+ EndIf
+
+ If ChangeFlag = 1 Then
+ Var ChangeTimeout = ChangeTimeout + 1
+ EndIf
+
+ If waitAckPay = 2 Then
+ If Timeout > 10 Then
+
+ If Seeker.CodeChannel = 1 Then
+ Var SessionID2 = SelectSlot + ":"
+ Var SessionID2 = SessionID2 + ExtendData
+
+ DEBUGVAR SessionID2
+
+ Var CreditAmount1 = ""
+ Var ServiceAmountFlow = ""
+ Var TelephoneNumber = "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 + Seeker.VendingCode
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + Seeker.CodeNumber
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + "C:"
+ Var ECommerce = ECommerce + Seeker.IntVendingCampaign
+ Var ServiceParameter = "max"
+ Var ServiceCharge = 0
+ Var AccountType = "new"
+ Var testservice = "kbank"
+ Var tc = ""
+ Var GetScore = ""
+ Var OperatorName = ""
+ Var SessionID = ""
+
+ GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+ ;Var Timeout = 0
+ EndIf
+
+ SAVELOG "back_to_main from line > 309."
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+ EndIf
+ EndIf
+
+
+ If ChangeOK = 2 Then
+ If ActionOKCase = 0 Then
+
+ If Seeker.TNumberTaobinCredit = "" Then
+ Var TelephoneNumber = "0899999999"
+ Var PayO2 = ""
+
+ If Seeker.TNumberTaobinMember = "" Then
+ Else
+ Var TelephoneNumber = Seeker.TNumberTaobinMember
+ EndIf
+
+ Else
+ Var TelephoneNumber = Seeker.TNumberTaobinCredit
+ Var PayO2 = Seeker.CoffeePinNumber
+ EndIf
+
+
+ Var ServiceType = "coffee-refund"
+ Var ServiceCredit = SelectDrink
+ Var SuggestID = ""
+ Var SessionID2 = ""
+
+ Var VendingDiscount = 0
+ Var VendingCampaign = 0
+ Var PayDetail = ""
+ Var PayDetail2 = ""
+ Var VendingOrderID = Seeker.ORDER_ID
+ Var ServiceRefund = 0
+ Var ServiceCharge = Seeker.ServiceCharge
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate
+
+ Var waitAckPay = 2
+ Var Timeout = 5
+ Var ActionOKCase = 1
+ SAVELOG "ActionOKCase = change OK 2"
+
+ EndIf
+ EndIf
+
+ If ChangeTimeout > 30 Then
+ If ActionOKCase = 0 Then
+ If Seeker.TNumberTaobinCredit = "" Then
+ Var TelephoneNumber = "0899999999"
+ Var PayO2 = ""
+
+ If Seeker.TNumberTaobinMember = "" Then
+ Else
+ Var TelephoneNumber = Seeker.TNumberTaobinMember
+ EndIf
+
+ Else
+ Var TelephoneNumber = Seeker.TNumberTaobinCredit
+ Var PayO2 = Seeker.CoffeePinNumber
+ EndIf
+
+
+ Var ServiceType = "coffee-refund"
+ Var ServiceCredit = SelectDrink
+ Var SuggestID = ""
+ Var SessionID2 = ""
+
+ Var VendingDiscount = 0
+ Var VendingCampaign = 0
+ Var PayDetail = ""
+ Var PayDetail2 = ""
+ Var VendingOrderID = Seeker.ORDER_ID
+ Var ServiceRefund = 0
+ Var ServiceCharge = Seeker.ServiceCharge
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate
+
+ Var waitAckPay = 2
+ Var Timeout = 5
+ Var ActionOKCase = 1
+ SAVELOG "ActionOKCase = change time out"
+
+ EndIf
+ EndIf
+
+ If ChangeOK = 3 Then
+ If ActionOKCase = 0 Then
+
+ Var ActionOKCase = 1
+ SAVELOG "ActionOKCase = change OK 3"
+ If Seeker.CodeChannel = 0 Then
+ SAVELOG "back_to_main from line > 391."
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+ EndIf
+
+ Var waitAckPay = 2
+ Var Timeout = 5
+
+ EndIf
+ EndIf
+
+ If MachineState_Result = 1 Then
+ ;Var MachineState_Result = 2
+ EndIf
+
+ If MachineState_Result = 1 Then
+ DEBUGVAR PaySuccessWithDaemonTask
+
+ If waitAckPay = 0 Then
+
+ Var waitAckPay = 0
+ Var Timeout = 0
+
+ If Seeker.PayWithQR = 0 Then
+
+ If Seeker.CreditCard = 1 Then
+ CashlessReq SUCCESS Seeker.CashlessVendingTrackNumber
+ EndIf
+
+ Else
+
+ EndIf
+
+ EndIf
+
+ __CMD "clear-stock-data" 0 "-" "-"
+
+
+ Var ServiceSuccess = "yes"
+ If waitAckPay = 0 Then
+ SAVELOG "waitAckPay=0"
+ Open "ROOT/taobin_project/xml/page_drinkok.xml"
+ EndIf
+
+ EndIf
+
+ If MachineState_Result = 2 Then
+
+ SAVELOG MachineStage
+
+ If ErrTimeout = 0 Then
+ Var ErrTimeout = 1
+
+ If Seeker.PayWithQR = 0 Then
+
+ If Seeker.CreditCard = 1 Then
+ ;CashlessReq FAIL ""
+ Var ChangeFlag = 1
+ Var CreditCardVoid = 1
+ Else
+
+ If Seeker.CodeChannel = 0 Then
+ If ChangeFlag = 0 Then
+ Var ChangeFlag = 1
+
+ If Seeker.StoreCreditFlag = 1 Then
+ Var ChangeOK = 2
+ Else
+ If GetFreeFromError = 1 Then
+ Var ChangeOK = 2
+ Else
+ Change ServiceAmount2
+ EndIf
+
+ EndIf
+
+ EndIf
+
+ Else
+
+ If ChangeFlag = 0 Then
+ Var ChangeFlag = 1
+ Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
+
+ If Seeker.StoreCreditFlag = 1 Then
+ Var ChangeOK = 2
+ Else
+ Change ServiceAmount3
+ EndIf
+
+ EndIf
+ EndIf
+
+ EndIf
+
+ Else
+ Var ChangeOK = 3
+ EndIf
+
+
+ EndIf
+ EndIf
+
+
+ If MachineStage = "close-maintenance" Then
+ If MachineState_Result = 0 Then
+ SAVELOG "back_to_main from line > 663."
+ Var MachineState_Result = 2
+ EndIf
+ EndIf
+
+ If MachineStage = "drink-success" Then
+ Var MachineState_Result = 1
+ EndIf
+
+ If MachineStage = "drink-failed" Then
+ If RoadShow = "true" Then
+ Open "ROOT/taobin_project/xml/page_back_to_error.xml"
+ Else
+ SAVELOG " drink-failed...."
+ Var MachineState_Result = 2
+ EndIf
+ EndIf
+
+ If MachineState_Result > 0 Then
+ Var SelectMenuBetweenBrewEnable1 = "Invisible"
+ Var SelectMenuBetweenBrewEnable1Text = "Invisible"
+ EndIf
+
+ ; Close next button.
+ If CLOSE_ORDER_NOW = "true" Then
+ Var SelectMenuBetweenBrewEnable1 = "Invisible"
+ Var SelectMenuBetweenBrewEnable1Text = "Invisible"
+ EndIf
+
+ If SelectMenuBetweenBrewEnable1 = "Enable" Then
+ If SelectMenuBetweenBrewEnable1Blink = "Enable" Then
+ Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
+ Else
+ Var SelectMenuBetweenBrewEnable1Blink = "Enable"
+ EndIf
+
+ Else
+ Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
+ EndIf
+
+ DEBUGVAR CountUpBrewing
+
+ ; animation video loop
+ If AnimationOn = "true" Then
+
+
+ If adver_brewing_playing = 1 Then
+
+ DEBUGVAR adver_brewing_play_index
+ If adver_brewing_play_index = 2 Then
+ DEBUGVAR adver_brewing_count_down
+
+ If adver_brewing_count_down > 0 Then
+ Var adver_brewing_count_down = adver_brewing_count_down - 1
+
+
+ Var PictureFile = brew_txt1
+
+ EndIf
+
+ If adver_brewing_count_down = 0 Then
+
+
+ Var adver_brewing_play_index = 1
+ Var adver_brewing_count_down = 0
+
+ ; Next video follow script.
+ TRY "ROOT/taobin_project/video/script3_brew.ev"
+
+
+ EndIf
+ EndIf
+
+ If adver_brewing_play_index = 1 Then
+ DEBUGVAR adver_brewing_count_down
+ DEBUGVAR brew_vdo2
+
+ If adver_brewing_count_down > 0 Then
+ Var adver_brewing_count_down = adver_brewing_count_down - 1
+
+ If brew_vdo2 = "" Then
+ Var VideoPlayFile = "ROOT/taobin_project/video/brewing_adv3.mp4"
+ Else
+ Var VideoPlayFile = brew_vdo2
+ EndIf
+ Var PictureFile = brew_txt2
+
+ EndIf
+
+ If adver_brewing_count_down = 0 Then
+ Var adver_brewing_play_index = 0
+ If adver_brewing_video_full_file_name = "" Then
+ Var adver_brewing_playing = 0
+ Else
+ Var adver_brewing_playing = 2
+ EndIf
+ EndIf
+ EndIf
+
+
+
+ Else
+ If adver_brewing_playing = 2 Then
+ DEBUGVAR adver_brewing_video_full_file_name
+ If adver_brewing_video_full_file_name = "" Then
+ Var adver_brewing_playing = 0
+ Else
+ Var VideoPlayFile = adver_brewing_video_full_file_name
+ Var PictureFile = brew_txt2
+ Var PictureFileTextDesctionState = "Invisible"
+
+ Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
+ Var SelectMenuBetweenBrewEnable1Text = "Invisible"
+ EndIf
+
+
+
+
+ Else
+
+ Var CountUpBrewing = CountUpBrewing + 1
+
+ ;CampaignEnable
+ Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime
+
+ If PreviseStepVideo = SlotVideo Then
+ ;SAVELOG SlotVideo
+ Else
+ Var PreviseStepVideo = SlotVideo
+ ;SAVELOG PreviseStepVideo
+ ;SAVELOG SlotVideo
+ ;SAVELOG CountUpBrewing
+
+ ;Var CountDownVideoTime = CountDownVideoTimeReload
+
+ Var StepVideo = SlotVideo + 2
+
+ ;SAVELOG StepVideo
+
+ If StepVideo = 1 Then
+ Var videoID = VideoID1
+ EndIf
+ If StepVideo = 2 Then
+ Var videoID = VideoID2
+ EndIf
+ If StepVideo = 3 Then
+ Var videoID = VideoID3
+ EndIf
+ If StepVideo = 4 Then
+ Var videoID = VideoID4
+ EndIf
+ If StepVideo = 5 Then
+ Var videoID = VideoID5
+ EndIf
+ If StepVideo = 6 Then
+ Var videoID = VideoID6
+ EndIf
+ If StepVideo = 7 Then
+ Var videoID = VideoID7
+ EndIf
+ If StepVideo = 8 Then
+ Var videoID = VideoID8
+ EndIf
+ If StepVideo = 9 Then
+ Var videoID = VideoID9
+ EndIf
+
+ ;SAVELOG videoID
+
+ If videoID = 0 Then
+
+ Else
+ If videoID = "---" Then
+
+ Else
+
+ Var VideoPlayFile = VideoPath
+ Var VideoPlayFile = VideoPlayFile + VideoFileBegin
+ Var VideoPlayFile = VideoPlayFile + videoID
+ Var VideoPlayFile = VideoPlayFile + VideoFileEnd
+
+ Var PictureFile = PicturePath
+ Var PictureFile = PictureFile + PictureBegin
+ Var PictureFile = PictureFile + videoID
+ Var PictureFile = PictureFile + PictureEnd
+
+ DEBUGVAR VideoPlayFile
+ DEBUGVAR PictureFile
+ EndIf
+ EndIf
+ EndIf
+ EndIf
+ EndIf
+ ; CampaignEnable
+ EndIf
+ ; AnimationOn = true
+
+
+ If IgnoreNetCore = "true" Then
+ If CountDownBrewing = 0 Then
+ SAVELOG "CountDownBrewing=0"
+ Open "ROOT/taobin_project/xml/page_drinkok.xml"
+ EndIf
+ EndIf
+
+ DEBUGVAR EnableGetMoreStrawFileName
+
+ If EnableGetMoreStrawFileName = "PressForever" Then
+ DEBUGVAR GetMoreStrawCount
+ If GetMoreStrawCount > 0 Then
+ If EnableGetMoreStrawFileNameCountDown > 0 Then
+ Var EnableGetMoreStrawFileNameCountDown = EnableGetMoreStrawFileNameCountDown - 1
+
+ If EnableGetMoreStrawFileNameCountDown = 0 Then
+ Var EnableGetMoreStrawFileName = "Enable"
+ EndIf
+ EndIf
+
+ EndIf
+ EndIf
+
+ If GetMoreStrawCount <= 0 Then
+ If StrawProblemStatus = 1 Then
+ Var StrawProblemStatus = 2
+ Var bg_strawProblem_ST = "Enable"
+ Var EnableGetMoreStrawFileName = "Invisible"
+ EndIf
+
+ EndIf
+
+
+ If GetLidButtonCountDown > 0 Then
+ Var GetLidButtonCountDown = GetLidButtonCountDown - 1
+ DEBUGVAR GetLidButtonCountDown
+ EndIf
+
+ DEBUGVAR GetLidButtonState
+ DEBUGVAR DoorLidSensorDetect
+
+ ;If DoorLidSensorDetect = "true" Then
+ ; Var DoorLidSensorDetect = "-"
+ ; Var GetLidButtonState = "Invisible"
+ ; Var bg_lidProblem_ST = "Invisible"
+ ; Var GetLidButtonCountDown = 0
+ ;EndIf
+
+ If GetLidButtonCountDown = 1 Then
+ Var GetLidButtonState = "Invisible"
+ Var bg_lidProblem_ST = "Enable"
+ Var EnableTopupCreditBetweenBrew = "Invisible"
+ ;Var XStraw = 356
+
+ If EnableGetMoreStrawFileName = "Enable" Then
+ Var XStraw = 280
+ EndIf
+ EndIf
+
+ If ButtonGameCountDown > 0 Then
+ If ButtonGameCountDown = 1 Then
+ Var ButtonGameCountDownState = "Invisible"
+ Var ButtonGamePressToPlayState = "Enable"
+ EndIf
+ Var ButtonGameCountDown = ButtonGameCountDown - 1
+
+ EndIf
+
+
+ If ButtonGameCountDownState = "Enable" Then
+ If BREW_CNT < 85 Then
+ If Game01Enable = 1 Then
+ SAVELOG "Game01Enable set zero event timeout 2"
+ EndIf
+ Var Game01Enable = 0
+ Var ButtonGameCountDownState = "Invisible"
+ Var ButtonGamePressToPlayState = "Invisible"
+ EndIf
+ EndIf
+
+
+ DEBUGVAR ButtonGamePressToPlayState
+ DEBUGVAR BREW_CNT
+ If BREW_CNT > 60 Then
+
+ Else
+ Var ButtonGamePressToPlayState = "Invisible"
+ If Game01Enable = 1 Then
+ SAVELOG "Game01Enable set zero event timeout"
+ EndIf
+ Var Game01Enable = 0
+ EndIf
+
+ Refresh
+ TimerReset
+
+
+
+
+
+ If MachineStage = "drink-success" Then
+ Var MachineState_Result = 1
+ EndIf
+
+
+ DEBUGVAR MachineStage
+ DEBUGVAR RoadShow
+
+ If MachineStage = "drink-failed" Then
+ If RoadShow = "true" Then
+ Open "ROOT/taobin_project/xml/page_back_to_error.xml"
+ Else
+ SAVELOG "Event Machine drink fail"
+ Var MachineState_Result = 2
+ EndIf
+ EndIf
+
+ Refresh
+
+
+
+; this copy in file menu_brew2.xml and menu_lid_straw.xml
+
+ If ChangeStatus = "payout-end" Then
+ If ChangeFlag = 1 Then
+ Var ChangeOK = 2
+ EndIf
+ EndIf
+
+
+
+
+
+ 60
+ 1290
+ PictureFileTextDesctionState
+ PictureFile
+
+
+
+
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+ 0
+ 1655
+ SelectMenuBetweenBrewEnable1Text
+ text_next_order
+
+
+
+
+ 835
+ 1735
+SelectMenuBetweenBrewEnable1Blink
+ "ROOT/taobin_project/image/page_payment/arrow_1.png"
+
+
+
+
+; zone show time remaining
+
+ 751
+ 413
+ IMG_CNT
+
+;
+
+ XPosiShowCountDownBrew
+ 470
+ End
+ 153
+ 88
+ RobotoBold
+ 0x513C2F
+ ShowCountDownBrewing
+
+
+
+ 816
+ 429
+ LanguageObjectShow
+
+ 000405
+
+
+
+
+ 941
+ 518
+ LanguageObjectShow
+
+ 000406
+
+
+
+
+ Var BREW_COUNT_DOWN_FROM_APP = "off"
+ Var CountDownBrewing = 121
+
+
+ Var BREW_COUNT_DOWN_FROM_APP = "off"
+ Var CountDownBrewing = 2
+
+;
+;
+;
+;
+;
+;
+; Next Order
+;
+
+
+
+;
+;
+;
+;
+;
+;
+; Button Straw, More request and report.
+;
+
+
+
+
+
+
+
+
+ 440
+ 1680
+ 241
+ 204
+ ButtonGamePressToPlayState
+ "ROOT/taobin_project/app/game/TAMATIAN-01_en.gif"
+
+
+
+ 440
+ 1680
+ 241
+ 204
+ ButtonGamePressToPlayState
+
+ DEBUGVAR Game01Enable
+ SAVELOG "Press play game"
+ Var Game01Enable = 0
+ Var ButtonGamePressToPlayState = "Invisible"
+ RunApp "com.NDF.taobin"
+
+
+
+;
+;
+;
+;
+;
+;
+; Lid button, Get one and report
+;
+
+
+
+
+
+
+ ; test drinkfail with phone number
+ Var TelephoneNumberProblem = "1234567890"
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+
+
+
diff --git a/inter/aus/xml/page_NewBrewing3Conti.lxml b/inter/aus/xml/page_NewBrewing3Conti.lxml
new file mode 100644
index 00000000..b8b9f0ad
--- /dev/null
+++ b/inter/aus/xml/page_NewBrewing3Conti.lxml
@@ -0,0 +1,987 @@
+
+ "Enable"
+ 1080
+ 1920
+ "0xeae6e1"
+ SoundVolume
+
+
+ Var ActionOKCase = 0
+ Var Seeker = "curr"
+
+ If show_eng = "true" Then
+ Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
+ Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
+ Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+ Else
+ Var DirImage = "ROOT/taobin_project/image/page_payment"
+ Var DirImage2 = "ROOT/taobin_project/image/topping2"
+ Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+ EndIf
+
+ Var next_pic_bn = DirImage + "/bn_add_order.png"
+ Var next_pic_bp = DirImage + "/bp_add_order.png"
+ Var text_next_order = DirImage + "/text_next_order.png"
+
+ Var topup_credit_bn = DirImage + "/bn_topup_credit.png"
+ Var topup_credit_bp = DirImage + "/bp_topup_credit.png"
+
+ Var EnableTopupCreditBetweenBrew = "Invisible"
+
+ If NextOrder = "true" Then
+ Var EnableSelectMenuBetweenBrew = "Invisible"
+ Else
+ Var EnableSelectMenuBetweenBrew = "Enable"
+ EndIf
+
+ If GetFreeFromError = 1 Then
+ Var EnableSelectMenuBetweenBrew = "Invisible"
+ Var EnableTopupCreditBetweenBrew = "Invisible"
+ EndIf
+
+ If EnableSelectMenuBetweenBrew = "Enable" Then
+ Var EnableSelectMenuBetweenBrewBlink = "Enable"
+ Else
+ Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+ EndIf
+
+
+ Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
+ If Seeker.thankLidFlag = 1 Then
+ Var bg_strawlid = DirImage2 + "/bg_strawSmall.png"
+ Var LidStateX = "Invisible"
+ EndIf
+
+ Var TimeoutWaitPay = 10
+
+ Var PayReference = ""
+ Var PayType = "newpay"
+ Var MachineState_Result = 0
+
+ If LastMakeDrinkResult = "success" Then
+ Var MachineState_Result = 1
+ EndIf
+
+ If LastMakeDrinkResult = "fail" Then
+ Var MachineState_Result = 2
+ EndIf
+
+
+ Var ExtendData = Seeker.ExtendData
+ Var SelectDrink = Seeker.selected_a_drink
+ Var ServiceAmount2 = Seeker.ServiceAmount2
+ Var PriceDrink = Seeker.ServiceAmount2
+
+ DEBUGVAR Seeker
+ DEBUGVAR Seeker.selected_a_drink
+ DEBUGVAR Seeker.ServiceAmount2
+ DEBUGVAR Seeker.CashlessVendingTrackNumber
+
+ DEBUGVAR Seeker.CodeNumber
+
+ Var SessionID2 = SelectSlot + ":"
+ Var SessionID2 = SessionID2 + ExtendData
+
+
+ ; On open move from page_brewing3.xml
+ Var countClick2 = 0
+
+ Var Timeout = 0
+
+ Var PrintCoinAmount = 0
+
+ DEBUGVAR Seeker.TNumberTaobinMember
+ DEBUGVAR Seeker.PointTaobinStr
+
+ If LedLidBlink = "true" Then
+ Var LedLidBlink = "no"
+ LED LedDoorLid Blink 255 255 255 255
+ EndIf
+
+
+ Var CreditReference = Seeker.CreditReferenceTmp
+ Var VendingDiscount = Seeker.VendingDiscount
+ Var VendingCampaign = Seeker.VendingCampaign
+ Var TxReference = Seeker.TxRef1
+ DEBUGVAR TxReference
+
+
+ Var DirImage = "ROOT/taobin_project/image/complete/"
+ Var next_pic_bg = DirImage + "/Preparing.png"
+
+ Var bg_strawlid_ST = "Invisible"
+ Var bg_strawProblem_ST = "Invisible"
+ Var StrawStateX = "Invisible"
+ Var LidStateX = "Invisible"
+
+ If MachineState_Result > 0 Then
+ Var EnableTopupCreditBetweenBrew = "Invisible"
+ EndIf
+
+ Var CreditCardVoid = 0
+
+ DEBUGVAR ButtonGameCountDownState
+
+ DEBUGVAR ButtonGameCountDownState
+
+ SAVELOG "New brewing3 conti AUS"
+
+
+
+
+
+
+ If CreditCardVoid = 1 Then
+ Var ChangeOK = 2
+ EndIf
+
+ If ActionOKCase = 1 Then
+ If Seeker.CodeChannel = 1 Then
+ Var SessionID2 = SelectSlot + ":"
+ Var SessionID2 = SessionID2 + ExtendData
+
+ DEBUGVAR SessionID2
+
+ Var CreditAmount1 = ""
+ Var ServiceAmountFlow = ""
+ Var TelephoneNumber = "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 + Seeker.VendingCode
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + Seeker.CodeNumber
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + "C:"
+ Var ECommerce = ECommerce + Seeker.IntVendingCampaign
+ Var ServiceParameter = "max"
+ Var ServiceCharge = 0
+ Var AccountType = "new"
+ Var testservice = "kbank"
+ Var tc = ""
+ Var GetScore = ""
+ Var OperatorName = ""
+ Var SessionID = ""
+
+ GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+ ;Var Timeout = 0
+ Var ActionOKCase = 2
+
+ SAVELOG "back_to_main from line > 142."
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+
+ Else
+
+ SAVELOG "back_to_main from line > 147."
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+ EndIf
+
+ Else
+
+
+
+ EndIf
+
+
+
+
+ If ActionOKCase = 1 Then
+ If Seeker.CodeChannel = 1 Then
+ Var SessionID2 = SelectSlot + ":"
+ Var SessionID2 = SessionID2 + ExtendData
+
+ DEBUGVAR SessionID2
+
+ Var CreditAmount1 = ""
+ Var ServiceAmountFlow = ""
+ Var TelephoneNumber = "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 + Seeker.VendingCode
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + Seeker.CodeNumber
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + "C:"
+ Var ECommerce = ECommerce + Seeker.IntVendingCampaign
+ Var ServiceParameter = "max"
+ Var ServiceCharge = 0
+ Var AccountType = "new"
+ Var testservice = "kbank"
+ Var tc = ""
+ Var GetScore = ""
+ Var OperatorName = ""
+ Var SessionID = ""
+
+ GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+ ;Var Timeout = 0
+ Var ActionOKCase = 2
+
+ SAVELOG "back_to_main from line > 204."
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+
+ Else
+ SAVELOG "back_to_main from line > 173."
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+ EndIf
+
+ Else
+
+
+
+ EndIf
+
+
+
+ 1000
+
+
+ Var Timeout = Timeout + 1
+
+ If MOVE_CUP_TO_DOOR = "true" Then
+ Var MOVE_CUP_TO_DOOR = "false"
+ EndIf
+
+ If BREW_COUNT_DOWN_FROM_APP = "on" Then
+ Var CountDownBrewing = BREW_CNT
+ Else
+
+ If CountDownBrewing > 0 Then
+ Var CountDownBrewing = CountDownBrewing - 1
+ EndIf
+ Endif
+
+
+ If Timeout = 4 Then
+ PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
+ EndIf
+
+ Var ShowCountDownBrewing = CountDownBrewing
+
+
+ If Timeout > 540 Then
+ SAVELOG "back_to_main from line > 217."
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+ EndIf
+
+
+ If Timeout > 480 Then
+ Var MachineState_Result = 2
+ EndIf
+
+ If ChangeFlag = 1 Then
+ Var ChangeTimeout = ChangeTimeout + 1
+ EndIf
+
+ If waitAckPay = 2 Then
+ If Timeout > TimeoutWaitPay Then
+
+ If Seeker.CodeChannel = 1 Then
+ Var SessionID2 = SelectSlot + ":"
+ Var SessionID2 = SessionID2 + ExtendData
+
+ DEBUGVAR SessionID2
+
+ Var CreditAmount1 = ""
+ Var ServiceAmountFlow = ""
+ Var TelephoneNumber = "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 + Seeker.VendingCode
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + Seeker.CodeNumber
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + "C:"
+ Var ECommerce = ECommerce + Seeker.IntVendingCampaign
+ Var ServiceParameter = "max"
+ Var ServiceCharge = 0
+ Var AccountType = "new"
+ Var testservice = "kbank"
+ Var tc = ""
+ Var GetScore = ""
+ Var OperatorName = ""
+ Var SessionID = ""
+
+ GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+ ;Var Timeout = 0
+ EndIf
+
+ SAVELOG "back_to_main from line > 309."
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+ EndIf
+ EndIf
+
+
+ If ChangeOK = 2 Then
+ If ActionOKCase = 0 Then
+
+ If Seeker.TNumberTaobinCredit = "" Then
+ Var TelephoneNumber = "0899999999"
+ Var PayO2 = ""
+
+ If Seeker.TNumberTaobinMember = "" Then
+ Else
+ Var TelephoneNumber = Seeker.TNumberTaobinMember
+ EndIf
+
+ Else
+ Var TelephoneNumber = Seeker.TNumberTaobinCredit
+ Var PayO2 = Seeker.CoffeePinNumber
+ EndIf
+
+
+ If HURR_FOREVER = "S:0" Then
+ Var HURR_FOREVER = "F:1303"
+ EndIf
+
+
+ Var ServiceType = "coffee-refund"
+ Var ServiceCredit = SelectDrink
+ Var SuggestID = ""
+ Var SessionID2 = ""
+
+ Var VendingDiscount = 0
+ Var VendingCampaign = 0
+ Var PayDetail = ""
+ Var PayDetail2 = ""
+ Var VendingOrderID = Seeker.ORDER_ID
+ Var ServiceRefund = 0
+ Var ServiceCharge = Seeker.ServiceCharge
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate
+
+ Var waitAckPay = 2
+ Var TimeoutWaitPay = 45
+ Var Timeout = 5
+ Var ActionOKCase = 1
+
+ EndIf
+ EndIf
+
+ If ChangeTimeout > 30 Then
+ If ActionOKCase = 0 Then
+ If Seeker.TNumberTaobinCredit = "" Then
+ Var TelephoneNumber = "0899999999"
+ Var PayO2 = ""
+
+ If Seeker.TNumberTaobinMember = "" Then
+ Else
+ Var TelephoneNumber = Seeker.TNumberTaobinMember
+ EndIf
+
+ Else
+ Var TelephoneNumber = Seeker.TNumberTaobinCredit
+ Var PayO2 = Seeker.CoffeePinNumber
+ EndIf
+
+
+ Var ServiceType = "coffee-refund"
+ Var ServiceCredit = SelectDrink
+ Var SuggestID = ""
+ Var SessionID2 = ""
+
+ Var VendingDiscount = 0
+ Var VendingCampaign = 0
+ Var PayDetail = ""
+ Var PayDetail2 = ""
+ Var VendingOrderID = Seeker.ORDER_ID
+ Var ServiceRefund = 0
+ Var ServiceCharge = Seeker.ServiceCharge
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate
+
+ Var waitAckPay = 2
+ Var TimeoutWaitPay = 45
+ Var Timeout = 5
+ Var ActionOKCase = 1
+
+ EndIf
+ EndIf
+
+ If ChangeOK = 3 Then
+ If ActionOKCase = 0 Then
+
+ Var ActionOKCase = 1
+ If Seeker.CodeChannel = 0 Then
+ SAVELOG "back_to_main from line > 391."
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+ EndIf
+
+ Var waitAckPay = 2
+ Var TimeoutWaitPay = 45
+ Var Timeout = 5
+
+ EndIf
+ EndIf
+
+ If MachineState_Result = 1 Then
+
+ ;Var MachineState_Result = 2
+
+ EndIf
+
+ If MachineState_Result = 1 Then
+ DEBUGVAR PaySuccessWithDaemonTask
+
+ If waitAckPay = 0 Then
+
+ Var waitAckPay = 0
+ Var Timeout = 0
+
+ If Seeker.PayWithQR = 0 Then
+
+ If Seeker.CreditCard = 1 Then
+ CashlessReq SUCCESS Seeker.CashlessVendingTrackNumber
+ EndIf
+
+ Else
+
+ EndIf
+
+ EndIf
+
+ __CMD "clear-stock-data" 0 "-" "-"
+
+ Var ServiceSuccess = "yes"
+ If waitAckPay = 0 Then
+
+ SAVELOG "waitAckPay = 0 Timeout"
+
+ Open "ROOT/taobin_project/xml/page_drinkok.xml"
+ EndIf
+
+ EndIf
+
+ If MachineState_Result = 2 Then
+
+ SAVELOG MachineStage
+
+ If ErrTimeout = 0 Then
+ Var ErrTimeout = 1
+
+ If Seeker.PayWithQR = 0 Then
+
+ If Seeker.CreditCard = 1 Then
+ CashlessReq FAIL Seeker.CashlessVendingTrackNumber
+ Var ChangeFlag = 1
+ Var CreditCardVoid = 1
+ Else
+
+
+ If Seeker.CodeChannel = 0 Then
+ If ChangeFlag = 0 Then
+ Var ChangeFlag = 1
+
+ If Seeker.StoreCreditFlag = 1 Then
+ Var ChangeOK = 2
+ Else
+ If GetFreeFromError = 1 Then
+ Var ChangeOK = 2
+ Else
+ Change ServiceAmount2
+ EndIf
+
+ EndIf
+
+ EndIf
+
+ Else
+
+
+
+ If ChangeFlag = 0 Then
+ Var ChangeFlag = 1
+ Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
+
+ If Seeker.StoreCreditFlag = 1 Then
+ Var ChangeOK = 2
+ Else
+ Change ServiceAmount3
+ EndIf
+
+ EndIf
+
+
+
+ EndIf
+ EndIf
+
+ Else
+ Var ChangeOK = 3
+ EndIf
+
+ EndIf
+ EndIf
+
+
+
+ DEBUGVAR LastMakeDrinkResult
+ DEBUGVAR MachineStage
+
+
+ If LastMakeDrinkResult = "success" Then
+ Var MachineState_Result = 1
+ EndIf
+
+ If LastMakeDrinkResult = "fail" Then
+ Var MachineState_Result = 2
+ EndIf
+
+ If MachineStage = "drink-success" Then
+ Var MachineState_Result = 1
+ EndIf
+
+ If MachineStage = "drink-failed" Then
+ If RoadShow = "true" Then
+ Open "ROOT/taobin_project/xml/page_back_to_error.xml"
+ Else
+ Var MachineState_Result = 2
+ EndIf
+ EndIf
+
+ If MachineState_Result > 0 Then
+ Var EnableSelectMenuBetweenBrew = "Invisible"
+ Var EnableTopupCreditBetweenBrew = "Invisible"
+ EndIf
+
+ If EnableSelectMenuBetweenBrew = "Enable" Then
+ If EnableSelectMenuBetweenBrewBlink = "Enable" Then
+ Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+ Else
+ Var EnableSelectMenuBetweenBrewBlink = "Enable"
+ EndIf
+
+ Else
+ Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+ EndIf
+
+ DEBUGVAR CountUpBrewing
+ ; animation video loop
+ If AnimationOn = "true" Then
+ Var CountUpBrewing = CountUpBrewing + 1
+
+ Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime
+
+ If PreviseStepVideo = SlotVideo Then
+ ;SAVELOG SlotVideo
+ Else
+ Var PreviseStepVideo = SlotVideo
+ ;SAVELOG PreviseStepVideo
+ ;SAVELOG SlotVideo
+ ;SAVELOG CountUpBrewing
+
+ ;Var CountDownVideoTime = CountDownVideoTimeReload
+
+ Var StepVideo = SlotVideo + 2
+
+ ;SAVELOG StepVideo
+
+ If StepVideo = 1 Then
+ Var videoID = VideoID1
+ EndIf
+ If StepVideo = 2 Then
+ Var videoID = VideoID2
+ EndIf
+ If StepVideo = 3 Then
+ Var videoID = VideoID3
+ EndIf
+ If StepVideo = 4 Then
+ Var videoID = VideoID4
+ EndIf
+ If StepVideo = 5 Then
+ Var videoID = VideoID5
+ EndIf
+ If StepVideo = 6 Then
+ Var videoID = VideoID6
+ EndIf
+ If StepVideo = 7 Then
+ Var videoID = VideoID7
+ EndIf
+ If StepVideo = 8 Then
+ Var videoID = VideoID8
+ EndIf
+ If StepVideo = 9 Then
+ Var videoID = VideoID9
+ EndIf
+
+ ;SAVELOG videoID
+
+ If videoID = 0 Then
+
+ Else
+ If videoID = "---" Then
+
+ Else
+
+ Var VideoPlayFile = VideoPath
+ Var VideoPlayFile = VideoPlayFile + VideoFileBegin
+ Var VideoPlayFile = VideoPlayFile + videoID
+ Var VideoPlayFile = VideoPlayFile + VideoFileEnd
+
+ Var PictureFile = PicturePath
+ Var PictureFile = PictureFile + PictureBegin
+ Var PictureFile = PictureFile + videoID
+ Var PictureFile = PictureFile + PictureEnd
+
+ DEBUGVAR VideoPlayFile
+ DEBUGVAR PictureFile
+ EndIf
+ EndIf
+ EndIf
+ EndIf
+
+
+ If IgnoreNetCore = "true" Then
+ If CountDownBrewing = 0 Then
+ SAVELOG "CountDownBrewing = 0"
+ Open "ROOT/taobin_project/xml/page_drinkok.xml"
+ EndIf
+ EndIf
+
+
+ If ButtonGameCountDown > 0 Then
+ If ButtonGameCountDown = 1 Then
+ Var ButtonGameCountDownState = "Invisible"
+ Var ButtonGamePressToPlayState = "Enable"
+ EndIf
+ Var ButtonGameCountDown = ButtonGameCountDown - 1
+ DEBUGVAR ButtonGameCountDown
+ EndIf
+
+
+ DEBUGVAR BREW_CNT
+ DEBUGVAR ButtonGamePressToPlayState
+ If BREW_CNT > 60 Then
+
+ Else
+ Var ButtonGamePressToPlayState = "Invisible"
+ Var Game01Enable = 0
+ EndIf
+
+
+ ; TODO
+ DEBUGVAR EnableDoubleCupNoError
+ DEBUGVAR HURR_FOREVER
+ DEBUGVAR RequestPickupCupAlert
+ If RequestPickupCupAlert = "true" Then
+ Open "ROOT/taobin_project/xml/page_pickup_cup_between_order.xml"
+ EndIf
+
+
+
+
+
+ ;include="ROOT/taobin_project/inc/timeout_lid_and_straw_step.inc"
+
+
+
+ Refresh
+ TimerReset
+
+
+
+
+
+
+
+; this copy in file menu_brew2.xml and menu_lid_straw.xml
+
+ If ChangeStatus = "payout-end" Then
+ If ChangeFlag = 1 Then
+ Var ChangeOK = 2
+ EndIf
+ EndIf
+
+
+
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+;
+; 0
+; 0
+; "ROOT/taobin_project/image/ad_medium_2.png"
+;
+
+
+
+
+
+
+ 60
+ 1290
+ PictureFile
+
+
+;
+; 60
+; 1649
+; BottomText
+;
+
+
+ 0
+ 1655
+EnableSelectMenuBetweenBrew
+ text_next_order
+
+
+
+ 835
+ 1735
+EnableSelectMenuBetweenBrewBlink
+ "ROOT/taobin_project/image/page_payment/arrow_1.png"
+
+
+
+
+
+;
+
+ 751
+ 413
+ IMG_CNT
+
+;
+
+ XPosiShowCountDownBrew
+ 470
+ End
+ 153
+ 88
+ RobotoBold
+ 0x513C2F
+ ShowCountDownBrewing
+
+
+
+ 816
+ 429
+ LanguageObjectShow
+
+ 000405
+
+
+
+
+ 941
+ 518
+ LanguageObjectShow
+
+ 000406
+
+
+
+
+
+
+
+ 526
+ 1680
+ 241
+ 204
+ ButtonGamePressToPlayState
+ "ROOT/taobin_project/app/game/TAMATIAN-01.gif"
+
+
+
+ 526
+ 1680
+ 241
+ 204
+ ButtonGamePressToPlayState
+
+ DEBUGVAR Game01Enable
+ SAVELOG "Press play game conti"
+ Var Game01Enable = 0
+ Var ButtonGamePressToPlayState = "Invisible"
+ RunApp "com.NDF.taobin"
+
+
+
+
+
+
+
+; straw left
+
+
+
+
+
+
+; LID left
+
+
+
+
+
+
+
+;include="ROOT/taobin_project/inc/button_request_lid_and_straw.inc"
+
+
diff --git a/inter/aus/xml/page_brewing3.lxml b/inter/aus/xml/page_brewing3.lxml
index a6e6fa0a..0ce2be47 100644
--- a/inter/aus/xml/page_brewing3.lxml
+++ b/inter/aus/xml/page_brewing3.lxml
@@ -5,6 +5,11 @@
"0xeae6e1"
SoundVolume
+
+ If New_Payment = 1 Then
+ Open "ROOT/taobin_project/inter/aus/xml/page_NewBrewing3.lxml"
+ EndIf
+
Var SendNotiPaySuccess = 2
Var GetMoreStrawCount = 3
diff --git a/inter/aus/xml/page_brewing3Conti.xml b/inter/aus/xml/page_brewing3Conti.xml
index 655da3ff..74c270bf 100644
--- a/inter/aus/xml/page_brewing3Conti.xml
+++ b/inter/aus/xml/page_brewing3Conti.xml
@@ -6,6 +6,10 @@
SoundVolume
+ If New_Payment = 1 Then
+ Open "ROOT/taobin_project/inter/aus/xml/page_NewBrewing3Conti.lxml"
+ EndIf
+
If CoffeeFreeEnable = "true" Then
Var RoadShow = "false"
EndIf
diff --git a/inter/tha/animation01/play_list.tsv b/inter/tha/animation01/play_list.tsv
index 09df5337..c5e329c5 100644
--- a/inter/tha/animation01/play_list.tsv
+++ b/inter/tha/animation01/play_list.tsv
@@ -1389,29 +1389,29 @@ Macallan Lumina Mizuwari 11-99-05-0055 1 27 28 24 100 7:40 32
มะม่วงมัทฉะเต่าปั่น 12-06-03-0005 1 8 9 65 24 100 12:40 32
มะม่วงชาไต้หวันเต่าปั่น 12-06-03-0006 1 10 65 24 100 13:40 32
-อเมริกาโนแอปเปิ้ลร้อน 12-01-01-0088 1 2 3 4 5 24 100 7:40 32
-อเมริกาโนแอปเปิ้ลเย็น 12-01-02-0088 1 2 3 4 5 23 24 100 7:40 32
-อเมริกาโนแอปเปิ้ลร้อน 12-21-01-0088 1 2 3 4 5 24 100 7:40 32
-อเมริกาโนแอปเปิ้ลเย็น 12-21-02-0088 1 2 3 4 5 23 24 100 7:40 32
-เพียวมัทฉะแอปเปิ้ลร้อน 12-02-01-0088 1 8 9 24 100 7:40 32
-เพียวมัทฉะแอปเปิ้ลเย็น 12-02-02-0088 1 8 9 23 24 100 7:40 32
-เพียวมัทฉะแอปเปิ้ลปั่น 12-02-03-0088 1 8 9 23 41 24 100 7:40 32
-ลองแบล็คแอปเปิ้ลฟรอฟเย็น 12-01-02-0091 1 2 3 4 5 23 24 100 7:40 32
-ลองแบล็คแอปเปิ้ลฟรอฟเย็น 12-21-02-0091 1 2 3 4 5 23 24 100 7:40 32
-น้ำแอปเปิ้ลร้อน 12-05-01-0134 1 16 24 100 7:40 32
-น้ำแอปเปิ้ลเย็น 12-05-02-0134 1 16 23 24 100 7:40 32
-น้ำแอปเปิ้ลปั่น 12-05-03-0134 1 16 23 41 24 100 7:40 32
-แอปเปิ้ลโซดาเย็น 12-05-02-0135 1 13 23 24 100 7:40 32
-แอปเปิ้ลโซดาปั่น 12-05-03-0135 1 13 23 41 24 100 7:40 32
-แอปเปิ้ลพันซ์เย็น 12-05-02-0151 1 63 23 24 100 7:40 32
-แอปเปิ้ลพันซ์ปั่น 12-05-03-0151 1 63 23 41 24 100 7:40 32
-แอปเปิ้ลจัสมินร้อน 12-02-01-0102 1 16 10 24 100 7:40 32
-แอปเปิ้ลจัสมินเย็น 12-02-02-0102 1 16 10 23 24 100 7:40 32
-แอปเปิ้ลจัสมินปั่น 12-02-03-0102 1 16 10 23 41 24 100 7:40 32
-แอปเปิ้ลโอริโอปั่น 12-03-03-0107 1 40 23 41 24 100 7:40 32
-แอปเปิ้ลขิงร้อน 12-05-01-0152 1 16 10 24 100 7:40 32
-แอปเปิ้ลขิงเย็น 12-05-02-0152 1 16 10 23 24 100 7:40 32
-แอปเปิ้ลขิงปั่น 12-05-03-0152 1 16 10 23 41 24 100 7:40 32
-แอปเปิ้ลอู่หลงร้อน 12-02-01-0101 1 16 10 24 100 7:40 32
-แอปเปิ้ลอู่หลงเย็น 12-02-02-0101 1 16 10 23 24 100 7:40 32
-แอปเปิ้ลอู่หลงปั่น 12-02-03-0101 1 16 10 23 41 24 100 7:40 32
+อเมริกาโนแอปเปิ้ลร้อน 12-01-01-0088 1 66 2 3 4 5 24 100 7:40 32
+อเมริกาโนแอปเปิ้ลเย็น 12-01-02-0088 1 66 2 3 4 5 23 24 100 7:40 32
+อเมริกาโนแอปเปิ้ลร้อน 12-21-01-0088 1 66 2 3 4 5 24 100 7:40 32
+อเมริกาโนแอปเปิ้ลเย็น 12-21-02-0088 1 66 2 3 4 5 23 24 100 7:40 32
+เพียวมัทฉะแอปเปิ้ลร้อน 12-02-01-0088 1 66 8 9 24 100 7:40 32
+เพียวมัทฉะแอปเปิ้ลเย็น 12-02-02-0088 1 66 8 9 23 24 100 7:40 32
+เพียวมัทฉะแอปเปิ้ลปั่น 12-02-03-0088 1 66 8 9 23 41 24 100 7:40 32
+ลองแบล็คแอปเปิ้ลฟรอฟเย็น 12-01-02-0091 1 66 2 3 4 5 23 24 100 7:40 32
+ลองแบล็คแอปเปิ้ลฟรอฟเย็น 12-21-02-0091 1 66 2 3 4 5 23 24 100 7:40 32
+น้ำแอปเปิ้ลร้อน 12-05-01-0134 1 66 16 24 100 7:40 32
+น้ำแอปเปิ้ลเย็น 12-05-02-0134 1 66 16 23 24 100 7:40 32
+น้ำแอปเปิ้ลปั่น 12-05-03-0134 1 66 16 23 41 24 100 7:40 32
+แอปเปิ้ลโซดาเย็น 12-05-02-0135 1 66 13 23 24 100 7:40 32
+แอปเปิ้ลโซดาปั่น 12-05-03-0135 1 66 13 23 41 24 100 7:40 32
+แอปเปิ้ลพันซ์เย็น 12-05-02-0151 1 66 63 23 24 100 7:40 32
+แอปเปิ้ลพันซ์ปั่น 12-05-03-0151 1 66 63 23 41 24 100 7:40 32
+แอปเปิ้ลจัสมินร้อน 12-02-01-0102 1 66 16 10 24 100 7:40 32
+แอปเปิ้ลจัสมินเย็น 12-02-02-0102 1 66 16 10 23 24 100 7:40 32
+แอปเปิ้ลจัสมินปั่น 12-02-03-0102 1 66 16 10 23 41 24 100 7:40 32
+แอปเปิ้ลโอริโอปั่น 12-03-03-0107 1 66 40 23 41 24 100 7:40 32
+แอปเปิ้ลขิงร้อน 12-05-01-0152 1 66 16 10 24 100 7:40 32
+แอปเปิ้ลขิงเย็น 12-05-02-0152 1 66 16 10 23 24 100 7:40 32
+แอปเปิ้ลขิงปั่น 12-05-03-0152 1 66 16 10 23 41 24 100 7:40 32
+แอปเปิ้ลอู่หลงร้อน 12-02-01-0101 1 66 16 10 24 100 7:40 32
+แอปเปิ้ลอู่หลงเย็น 12-02-02-0101 1 66 16 10 23 24 100 7:40 32
+แอปเปิ้ลอู่หลงปั่น 12-02-03-0101 1 66 16 10 23 41 24 100 7:40 32
diff --git a/inter/tha/configure.ev b/inter/tha/configure.ev
index c4e25e3b..b97bb19f 100644
--- a/inter/tha/configure.ev
+++ b/inter/tha/configure.ev
@@ -23,9 +23,11 @@
If BoxID = 123456 Then
Var EnableMultiInstanceFromBoxID = 1
EndIf
+
If BoxID = 201193 Then
Var EnableMultiInstanceFromBoxID = 1
EndIf
+
If BoxID = 201729 Then
Var EnableMultiInstanceFromBoxID = 1
EndIf
@@ -45,3 +47,7 @@
If BoxID = 200005 Then
Var EnableMultiInstanceFromBoxID = 1
EndIf
+
+ If BoxID = 200010 Then
+ Var EnableMultiInstanceFromBoxID = 1
+ EndIf
diff --git a/inter/tha/hardware/exhaust_fan_schedule.ev b/inter/tha/hardware/exhaust_fan_schedule.ev
index 9bed8541..644ee3c9 100644
--- a/inter/tha/hardware/exhaust_fan_schedule.ev
+++ b/inter/tha/hardware/exhaust_fan_schedule.ev
@@ -18,11 +18,19 @@ DEBUGVAR ExhaustFanMode3
DEBUGVAR AirTemperature
DEBUGVAR AirHumidity
+DEBUGVAR ExhaustFanTime1Hour
+If ExhaustFanAuto = "2" Then
+ If SystemTimeHourInt = 4 Then
+ SAVELOG " Exhaust Fan mode 2 come back to mode auto2 "
+ __CMD "CLI" "set-fan-mode=Fan_Auto" "-" "-"
+ EndIf
+EndIf
+
If ExhaustFanAuto = "" Then
Var ExhaustFanAuto = "1"
EndIf
-DEBUGVAR ExhaustFanAuto
+DEBUGVAR ExhaustFanAuto
If ExhaustFanAuto = "0" Then
SAVELOG "ExhaustFan Override from server"
Var PreviseTime1ToTime2 = ""
@@ -42,13 +50,13 @@ If ExhaustFanAuto = "1" Then
EndIf
DEBUGVAR CurrentTime1ToTime2
- DEBUGVAR PreviseTime1ToTime2
+ DEBUGVAR PreviseTime1ToTime2
If PreviseTime1ToTime2 = CurrentTime1ToTime2 Then
-
+
Else
Var PreviseTime1ToTime2 = CurrentTime1ToTime2
If CurrentTime1ToTime2 = "true" Then
- Var fan_mode_str_final = fan_mode_str + ExhaustFanMode1
+ Var fan_mode_str_final = fan_mode_str + ExhaustFanMode1
__CMD "CLI" fan_mode_str_final "-" "-"
EndIf
EndIf
@@ -67,10 +75,10 @@ If ExhaustFanAuto = "1" Then
EndIf
DEBUGVAR CurrentTime2ToTime3
- DEBUGVAR PreviseTime2ToTime3
+ DEBUGVAR PreviseTime2ToTime3
If PreviseTime2ToTime3 = CurrentTime2ToTime3 Then
-
+
Else
Var PreviseTime2ToTime3 = CurrentTime2ToTime3
If CurrentTime2ToTime3 = "true" Then
diff --git a/inter/tha/xml/multi/control_and_lang_swith.ev b/inter/tha/xml/multi/control_and_lang_swith.ev
index 880aea8d..2474cc37 100644
--- a/inter/tha/xml/multi/control_and_lang_swith.ev
+++ b/inter/tha/xml/multi/control_and_lang_swith.ev
@@ -7,7 +7,7 @@ EndIf
TRY "ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
TRY "ROOT/taobin_project/xml/event/tricker.ev"
-SAVELOG "=================== Control language and switch instance ========================="
+SAVELOG "=================================================== Control language and switch instance ========================="
OpenRedirect "/taobin_project/xml/page_catalog_group_coffee.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/coffee.ev"
OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/coffee.ev"
@@ -72,17 +72,27 @@ Else
OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/health.ev"
Var InstanceTabOpenFile6 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
Var InstanceTabOpenFile6 = InstanceTabOpenFile6 + "/page_catalog_group_health.lxml"
+EndIfi
+
+
+DEBUGVAR Catalog20BahtEnable
+
+If Catalog20BahtEnable = 1 Then
+ OpenRedirect "/taobin_project/xml/page_catalog_group_pepsi_7up.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/pepsi7up.ev"
+ OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_pepsi_7up.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/pepsi7up.ev"
+ Var InstanceTabOpenFile8 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
+ Var InstanceTabOpenFile8 = InstanceTabOpenFile8 + "/page_catalog_group_20_baht.lxml"
+
+Else
+
+ OpenRedirect "/taobin_project/xml/page_catalog_group_pepsi_7up.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/pepsi7up.ev"
+ OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_pepsi_7up.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/pepsi7up.ev"
+ Var InstanceTabOpenFile8 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
+ Var InstanceTabOpenFile8 = InstanceTabOpenFile8 + "/page_catalog_group_pepsi_7up.lxml"
+
EndIf
-OpenRedirect "/taobin_project/xml/page_catalog_group_pepsi_7up.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/pepsi7up.ev"
-OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_pepsi_7up.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/pepsi7up.ev"
-Var InstanceTabOpenFile8 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
-Var InstanceTabOpenFile8 = InstanceTabOpenFile8 + "/page_catalog_group_pepsi_7up.lxml"
-
-
-
-
OpenRedirect "/taobin_project/xml/page_catalog_group_frozen_fruit.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/frozenfruilt.ev"
OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_frozen_fruit.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/frozenfruilt.ev"
Var InstanceTabOpenFile9 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
@@ -107,6 +117,8 @@ DEBUGVAR InstanceTabOpenFile4
DEBUGVAR InstanceTabOpenFile5
DEBUGVAR InstanceTabOpenFile6
DEBUGVAR InstanceTabOpenFile7
+DEBUGVAR InstanceTabOpenFile8
+DEBUGVAR InstanceTabOpenFile9
DEBUGVAR InstanceTabOpenFile10
diff --git a/inter/tha/xml/multi/menu_catalog_default_init.lxml b/inter/tha/xml/multi/menu_catalog_default_init.lxml
index 0af7d3fe..fd71db5a 100644
--- a/inter/tha/xml/multi/menu_catalog_default_init.lxml
+++ b/inter/tha/xml/multi/menu_catalog_default_init.lxml
@@ -184,3 +184,11 @@
Var ButtonLanguageListXPosition = 990
Var ButtonLanguageListYPosition = 450 - 38
+
+ If Catalog20BahtEnable = 1 Then
+ Var Menu61Selected = "Invisible"
+ Var Menu63Selected = "Enable"
+ Else
+ Var Menu61Selected = "Enable"
+ Var Menu63Selected = "Invisible"
+ EndIf
diff --git a/inter/tha/xml/multi/page_catalog.lxml b/inter/tha/xml/multi/page_catalog.lxml
index 7e85d584..fb475856 100644
--- a/inter/tha/xml/multi/page_catalog.lxml
+++ b/inter/tha/xml/multi/page_catalog.lxml
@@ -279,6 +279,16 @@
RootLayoutVisible 15 "hide"
+ DEBUGVAR Catalog20BahtEnable
+
+ If Catalog20BahtEnable = 1 Then
+ Var PepsiCatalogStage = "Invisible"
+ Var Menu20BahtStage = "Enable"
+ Else
+ Var PepsiCatalogStage = "Enable"
+ Var Menu20BahtStage = "Invisible"
+ EndIf
+
1000
@@ -879,7 +889,7 @@
296
344
42
- "Enable"
+ PepsiCatalogStage
+
+
+ 296
+ 344
+ 42
+ Menu20BahtStage
+
+
+
+
diff --git a/inter/tha/xml/multi/pepsi7up.ev b/inter/tha/xml/multi/pepsi7up.ev
index d4b1b064..7b567ca7 100644
--- a/inter/tha/xml/multi/pepsi7up.ev
+++ b/inter/tha/xml/multi/pepsi7up.ev
@@ -1,3 +1,3 @@
-SAVELOG "Call other other"
+SAVELOG "Call pepsi"
TabMenuVisibleInst 9
Var RedirectTo = "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
diff --git a/inter/tha/xml/multi/tab_menu.lxml b/inter/tha/xml/multi/tab_menu.lxml
index 11fe1b26..59dc11ef 100644
--- a/inter/tha/xml/multi/tab_menu.lxml
+++ b/inter/tha/xml/multi/tab_menu.lxml
@@ -50,6 +50,8 @@
EndIf
EndIf
+
+
DEBUGVAR Menu0Selected
DEBUGVAR NextPage
@@ -270,6 +272,23 @@
+
+
+
+
+
+
+
diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv
index 302fd47a..737211ba 100644
--- a/menu/new-layout.tsv
+++ b/menu/new-layout.tsv
@@ -2,7 +2,7 @@ test ลำดับ Name Name Description Description ร้อน เย็
Name=recommend,file=page_catalog_group_recommend.skt
ซูเปอร์โอรีโอปั่น\nภูเขาไฟ Super Oocano นม น้ำตาล โอรีโอ Milk, Sugar, Oreo, Ice - - 12-03-03-0032 bn_super_oreo_volcano.png - - - posi1 - - - -
- มัทฉะลาเต้ Matcha Latte มัทฉะ นม Matcha, Milk, Sugar, Ice 12-02-01-0026 12-02-02-0026 12-02-03-0026 bn_hot_matcha_milk_tea.png - - - posi1 2025/06/01T00:00:00 Signature 3 #REF! #REF! #REF! #REF! #REF!
+ มัทฉะลาเต้ Matcha Latte มัทฉะ นม Matcha, Milk, Sugar, Ice 12-02-01-0026 12-02-02-0026 12-02-03-0026 bn_hot_matcha_milk_tea.png - - - posi1 2025/06/01T00:00:00 - Signature 3 #REF! #REF! #REF! #REF! #REF!
ชานมไทย Thai Milk Tea ชาไทย และ นม Thai tea, Sugar, milk 12-02-01-0039 12-02-02-0039 12-02-03-0039 bn_thai_milk_tea_SingPark.png - - - posi1 - - Signature - #REF! #REF! #REF! #REF! #REF!
ชานมไทย Thai Milk Tea ชาไทย และ นมอุ่น Thai tea, Sugar, Warm milk 12-02-01-0024 12-02-02-0024 12-02-03-0024 bn_hot_thai_milk_tea_tacc.png - - - posi1 - - Signature - #REF! #REF! #REF! #REF! #REF!
เต่าพลังโซดา\n(เพิ่มปริมาณ) Energy Drink\nSoda Extra เครื่องดื่มเต่าทรงพลัง โซดา\nและน้ำแข็ง (มีคาเฟอีน) Medicine Drink, Soda, Ice - 12-05-02-0143 12-05-03-0143 bn_iced_energy_drink_soda_Extra.png - - - posi1 - - Signature 3
@@ -73,8 +73,8 @@ IGNORE เป๊ปซี่นมโอรีโอภูเขาไฟ Pepsi
Name=Coffee,file=page_catalog_group_coffee.skt
อเมริกาโน Americano กาแฟ และน้ำ Espresso, Water 12-01-01-0003 12-01-02-0001 - bn_hot_america_no.png 12-21-01-0003 12-21-02-0001 - posi1 - - - - #REF! #REF! - #REF! #REF!
- อเมริกาโนแอปเปิ้ล Apple Americano กาแฟ แอปเปิ้ล Coffee Apple 12-01-01-0088 12-01-02-0088 - bn_Apple_Americano.png 12-21-01-0088 12-21-02-0088 - posi1 2025/06/01T00:00:00 - -
- ลองแบล็คแอปเปิ้ลฟรอฟ Apple Frop Longback กาแฟ แอปเปิ้ล Coffee Apple - 12-01-02-0091 - bn_Apple_Frop_Longback.png - 12-21-02-0091 - posi1 2025/06/01T00:00:00 - -
+ อเมริกาโนแอปเปิ้ล Apple Americano กาแฟ แอปเปิ้ล Coffee Apple 12-01-01-0088 12-01-02-0088 - bn_Apple_Americano.png 12-21-01-0088 12-21-02-0088 - posi1 2025/06/01T00:00:00 - - -
+ ลองแบล็คแอปเปิ้ลฟรอฟ Apple Frop Longback กาแฟ แอปเปิ้ล Coffee Apple - 12-01-02-0091 - bn_Apple_Frop_Longback.png - 12-21-02-0091 - posi1 2025/06/01T00:00:00 - - -
เอสเพรสโซ่ Espresso กาแฟ (30 ml) Espresso (30 ml) 12-01-01-0001 - - bn_hot_espresso.png 12-21-01-0001 - - posi1 - - - - #REF! - - #REF! NN
ดับเบิลเอสเพรสโซ่ Double \nEspresso กาแฟ (60 ml) Espresso (60 ml) 12-11-01-0001 - - bn_hot_double_espresso.png 12-31-01-0001 - - posi1 - - - - #REF! - - #REF! NN
เอสเพรสโซ่ช็อต \nGeisha Geisha Espresso กาแฟคั่วอ่อน (natural process) ดอกไม้สีขาว/ส้มบลัดออเรนจ์/เกรปฟรุต Light Roast (Natural Process) White flower/Blood orange/Grape fruit 12-01-01-0036 - - bn_hot_espresso_light_geisha.png - - - posi2 - - - - #REF! - - #REF! NN
@@ -1346,9 +1346,9 @@ Name=SchoolOvaltine,file=page_catalog_group_pro_school_ovaltine.skt
รุ่นน้องหน้าหวาน Sweet Freshie โอวัลติน นม มะพร้าว Ovaltine Milk Coconut - - 12-03-03-0110 bn_Ovaltine_Milk_Coconut.png - - - posi1 - - - 3
Name=AppleFarmFestival,file=page_catalog_group_pro_apple_farm_festival.skt
- อเมริกาโนแอปเปิ้ล Apple Americano กาแฟ แอปเปิ้ล Coffee Apple 12-01-01-0088 12-01-02-0088 - bn_Apple_Americano.png 12-21-01-0088 12-21-02-0088 - posi1 - - -
+ อเมริกาโนแอปเปิ้ล Apple Americano กาแฟ แอปเปิ้ล Coffee Apple 12-01-01-0088 12-01-02-0088 - bn_Apple_Americano.png 12-21-01-0088 12-21-02-0088 - posi1 - - - -
เพียวมัทฉะแอปเปิ้ล Apple Pure Matcha ชาเขียว แอปเปิ้ล Matcha Apple 12-02-01-0088 12-02-02-0088 12-02-03-0088 bn_Apple_Pure_matcha.png - - - posi1 - - - 3
- ลองแบล็คแอปเปิ้ลฟรอฟ Apple Frop Longback กาแฟ แอปเปิ้ล Coffee Apple - 12-01-02-0091 - bn_Apple_Frop_Longback.png - 12-21-02-0091 - posi1 - - -
+ ลองแบล็คแอปเปิ้ล\nฟรอฟ Apple Frop\nLongback กาแฟ แอปเปิ้ล Coffee Apple - 12-01-02-0091 - bn_Apple_Frop_Longback.png - 12-21-02-0091 - posi1 - - - 2
น้ำแอปเปิ้ล Apple Juice แอปเปิ้ล น้ำ Apple Water 12-05-01-0134 12-05-02-0134 12-05-03-0134 bn_Apple_Juice.png - - - posi1 - - - 3
แอปเปิ้ลโซดา Apple Soda แอปเปิ้ล โซดา Apple Soda - 12-05-02-0135 12-05-03-0135 bn_Apple_Soda.png - - - posi1 - - - 3
แอปเปิ้ลพันซ์ Apple Punch Drink แอปเปิ้ล คอลลาเจน Apple Collagen - 12-05-02-0151 12-05-03-0151 bn_Apple_Punch_Drink.png - - - posi1 - - - 3
diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev
index 992fa8c9..f81a07a7 100644
--- a/xml/event/tricker.ev
+++ b/xml/event/tricker.ev
@@ -167,12 +167,15 @@ If SystemDateDayOfWeek = "Wednesday" Then
EndIf
-Var ToppingNewUINewSystem = 0
+Var Catalog20BahtEnable = 0
-If BoxID = 201193 Then
- Var BoostEnergyPro = 1
+STRCONTAIN "Catalog20" XMLProfile Catalog20Enable
+If Catalog20Enable = "true" Then
+ Var Catalog20BahtEnable = 1
EndIf
+Var ToppingNewUINewSystem = 0
+
If BoxID = 105005 Then
Var NewFlowPaymentCode = 1
Var New_Payment = 1
@@ -189,27 +192,14 @@ EndIf
If BoxID = 201714 Then
-
-EndIf
-
-If BoxID = 201729 Then
- Var KingdomThaiTeaPro = 1
- Var SongkranSoundCampaign = 1
- Var NewMatchaPremiumX3 = 1
-EndIf
-
-If BoxID = 173149 Then
- Var MomCocoaPro = 0
- Var MomCocoaProDiscountEnable = 0
- Var RobinsonBeautyPro = 0
-
- Var JemilaToppingFlag = 1
-
+ Var Catalog20BahtEnable = 1
EndIf
If BoxID = 123456 Then
Var ToppingNewUINewSystem = 0
- Var BoostEnergyPro = 1
+ Var Catalog20BahtEnable = 1
+ Var AppleFarmFestivalPro = 1
+ Var HappyTriosPro = 1
EndIf
DEBUGVAR ConfigNumer
diff --git a/xml/menu_catalog_default_init.xml b/xml/menu_catalog_default_init.xml
index 7cd5fff9..154d86dc 100644
--- a/xml/menu_catalog_default_init.xml
+++ b/xml/menu_catalog_default_init.xml
@@ -116,6 +116,15 @@
+
+ If Catalog20BahtEnable = 1 Then
+ Var Menu61Selected = "Invisible"
+ Var Menu63Selected = "Enable"
+
+ Else
+ Var Menu61Selected = "Enable"
+ Var Menu63Selected = "Invisible"
+ EndIf
diff --git a/xml/menu_catalog_new.xml b/xml/menu_catalog_new.xml
index 734d15c3..8e403816 100644
--- a/xml/menu_catalog_new.xml
+++ b/xml/menu_catalog_new.xml
@@ -391,6 +391,7 @@
+
+
+
+