diff --git a/inter/tha/xml/page_payment_pack_and_send.xml b/inter/tha/xml/page_payment_pack_and_send.xml index f609679b..71f86af2 100644 --- a/inter/tha/xml/page_payment_pack_and_send.xml +++ b/inter/tha/xml/page_payment_pack_and_send.xml @@ -5,11 +5,11 @@ ; - ** topping. ; - TelephoneNumber ; - Market Code -; - +; - ; Set ; - Amount 0 baht -; +; "Enable" @@ -25,7 +25,7 @@ Var ProcessCupDebugText = "" Var TimeOutSmoothiesProcess = 1 - + 1000 @@ -35,27 +35,16 @@ If TimeOutSmoothiesProcess > 0 Then Var TimeOutSmoothiesProcess = TimeOutSmoothiesProcess - 1 - + EndIf If TimeOutSmoothiesProcess = 0 Then Var OverrideVideoThankyou = 1 - Var IgnoreLidStrawAll = 1 - - Var ModeFreeEnable = 2 - Var PriceDrink = 30 - Var DiscountDrink = PriceDrink - Var StrawState = "Enable" - Var LidState = "Enable" - Var Seeker.get_a_straw = StrawState - Var Seeker.get_a_lid = LidState - Var Seeker.showname = " Smoothie " - Var Seeker.PictureDrink = "" - Var Seeker.CollectPointMain = 1 + + MakeDrinkV1 SelectDrink SelectSugarID - ;Open "ROOT/taobin_project/xml/page_payment.xml" Open "ROOT/taobin_project/xml/page_thankyou.xml" diff --git a/inter/tha/xml/page_smoothie_suggest_and_process.xml b/inter/tha/xml/page_smoothie_suggest_and_process.xml index 034d5d36..3d99f3b1 100644 --- a/inter/tha/xml/page_smoothie_suggest_and_process.xml +++ b/inter/tha/xml/page_smoothie_suggest_and_process.xml @@ -95,7 +95,7 @@ EndIf If CH9994_Status = "READY" Then - ;Var ArmIDForMakeOrder = 4 + Var ArmIDForMakeOrder = 4 EndIf DEBUGVAR ArmIDForMakeOrder @@ -309,20 +309,6 @@ -; back -; ; ; @@ -411,8 +397,14 @@ SoundVolume Var SmoothieProcessState = "press" - __CMD "UseArm" "2" "-" "-" - Machine InsertCupAndOpen + If DoorCupPosition = "top" Then + + Else + Var ArmIDForMakeOrderStr = "" + ArmIDForMakeOrder + DEBUGVAR ArmIDForMakeOrderStr + __CMD "UseArm" ArmIDForMakeOrderStr "-" "-" + Machine InsertCupAndOpen + EndIf diff --git a/xml/vending_info.xml b/xml/vending_info.xml index bc5af263..1db627af 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -12,7 +12,7 @@ DEBUGVAR CH9992_Status DEBUGVAR CH9993_Status DEBUGVAR CH9994_Status - + DEBUGVAR GetFreeFromError Var info_startX = 11 Var info_1Y = 250