diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index 2a5363b4..7c3b0970 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -1357,3 +1357,9 @@ Macallan Lumina Mizuwari 11-99-05-0055 1 27 28 24 100 7:40 32 มัทฉะลาเต้ คูณ 3 ร้อน 12-02-01-0104 1 8 9 70 24 100 7:40 32 มัทฉะลาเต้ คูณ 3 เย็น 12-02-02-0104 1 8 9 70 23 24 100 7:40 32 มัทฉะลาเต้ คูณ 3 ปั่น 12-02-03-0104 1 8 9 70 23 41 24 100 7:40 32 + + + + + +ผลไม้ปั่น 12-01-07-0001 1 41 41 41 41 41 24 100 7:40 32 diff --git a/inter/tha/animation01/play_list.tsv b/inter/tha/animation01/play_list.tsv index 2a5363b4..7c3b0970 100644 --- a/inter/tha/animation01/play_list.tsv +++ b/inter/tha/animation01/play_list.tsv @@ -1357,3 +1357,9 @@ Macallan Lumina Mizuwari 11-99-05-0055 1 27 28 24 100 7:40 32 มัทฉะลาเต้ คูณ 3 ร้อน 12-02-01-0104 1 8 9 70 24 100 7:40 32 มัทฉะลาเต้ คูณ 3 เย็น 12-02-02-0104 1 8 9 70 23 24 100 7:40 32 มัทฉะลาเต้ คูณ 3 ปั่น 12-02-03-0104 1 8 9 70 23 41 24 100 7:40 32 + + + + + +ผลไม้ปั่น 12-01-07-0001 1 41 41 41 41 41 24 100 7:40 32 diff --git a/inter/tha/xml/page_payment_pack_and_send.xml b/inter/tha/xml/page_payment_pack_and_send.xml index 9b765086..e53d0770 100644 --- a/inter/tha/xml/page_payment_pack_and_send.xml +++ b/inter/tha/xml/page_payment_pack_and_send.xml @@ -24,7 +24,9 @@ Var ProcessCupDebugText = "" - Var TimeOutSmoothiesProcess = 3 + Var TimeOutSmoothiesProcess = 2 + + 1000 @@ -32,13 +34,37 @@ ;SAVELOG SoundPlaying If TimeOutSmoothiesProcess > 0 Then - Var TimeOutSmoothiesProcess = countDownRetrun - 1 + Var TimeOutSmoothiesProcess = TimeOutSmoothiesProcess - 1 EndIf - If TimeOutSmoothiesProcess = 0 Then - Open "ROOT/taobin_project/xml/page_back_to_main.xml" + + Var RemainAmountStr = "Free###size=150" + + If RoadShowMarketCode = "" Then + Var RoadShowMarketCode = "" + EndIf + + Var Seeker.VendingCode = RoadShowMarketCode + DEBUGVAR RoadShowMarketCode + + Var Seeker.IntVendingCampaign = PriceDrink + Var Seeker.FreeVendingCampaign = 1 + Var Seeker.CodeChannel = 1 + Var Seeker.CodeNumber = IDNum + + SAVELOG "ModeFreeEnable ModeFreeEnable ModeFreeEnable ModeFreeEnable ModeFreeEnable" + If New_Payment = 1 Then + Var Seeker.ORDER_ID = "" + GenHashWithTimeStamp Seeker.ORDER_ID + __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID + EndIf + + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + + + EndIf diff --git a/inter/tha/xml/page_smoothie_suggest_and_process.xml b/inter/tha/xml/page_smoothie_suggest_and_process.xml index 3489226d..fe87a544 100644 --- a/inter/tha/xml/page_smoothie_suggest_and_process.xml +++ b/inter/tha/xml/page_smoothie_suggest_and_process.xml @@ -54,7 +54,7 @@ Var ProcessCupDebugText = "" Var TimeOutSmoothiesProcess = 120 - Var TextDoorButtonID = 001201 + Var TextDoorButtonID = 001202 Var SmoothieProcessState = "idle" Var CountDownCertainConfuse = 5 @@ -143,8 +143,29 @@ If SmoothieProcessState = "blendnow" Then Var TextDoorButtonID = 001206 + + Var SelectDrink = "12-01-07-0001" + Var SelectSugarID = "" + + Topping "Select" SelectDrink + + Var SmoothieProcessState = "blending" + EndIf + If SmoothieProcessState = "blending" Then + + MakeDrinkV1 SelectDrink SelectSugarID + + Menu "set-name" "Smoothie " + Menu "set-image" Seeker.PictureDrink + + + Open "ROOT/taobin_project/inter/tha/xml/page_payment_pack_and_send.xml" + + EndIf + + DEBUGVAR TextDoorButtonID Refresh diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 61e83e2b..8433c87d 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -387,14 +387,7 @@ Var Seeker.PayWithQR = 0 Var NoGotoMenupage = "false" - ;If show_eng = "true" Then - ;Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png" - ;Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png" - ;Else - ;Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png" - ;Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png" - ;EndIf Var X_CASH1 = 216 Var X_CASH2 = 439 @@ -414,16 +407,6 @@ EndIf - ;If RoadShow = "true" Then - ;Var X_CASH1 = 287 - ;If show_eng = "true" Then - ;Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png" - ;Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png" - ;Else - ;Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png" - ;Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png" - ;EndIf - ;EndIf If GetFreeFromError = 1 Then Var Seeker.FreeVendingCampaign = 1