diff --git a/xml/page_brewing2.xml b/xml/page_brewing2.xml index 54552010..59081d1e 100644 --- a/xml/page_brewing2.xml +++ b/xml/page_brewing2.xml @@ -21,7 +21,7 @@ If ActionOKCase = 1 Then If CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -71,7 +71,7 @@ If ActionOKCase = 1 Then If CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -185,7 +185,7 @@ If ChangeOK = 4 Then If ActionOKCase = 0 Then Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" Var TelephoneNumber = "0899999999" diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 83ae5e4f..3a01b2fb 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -237,7 +237,8 @@ If ActionOKCase = 1 Then If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData + DEBUGVAR SessionID2 DEBUGVAR SessionID2 @@ -300,7 +301,8 @@ If ActionOKCase = 1 Then If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData + DEBUGVAR SessionID2 DEBUGVAR SessionID2 @@ -431,9 +433,14 @@ If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" +<<<<<<< HEAD Var SessionID2 = SessionID2 + ExtendData DEBUGVAR SessionID2 +======= + Var SessionID2 = SessionID2 + Seeker.ExtendData + DEBUGVAR SessionID2 +>>>>>>> 5e5a37195320147236c6a59c0b98defb59901dcb Var CreditAmount1 = "" Var ServiceAmountFlow = "" Var TelephoneNumber = "0899999999" diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index b95fd2f8..932a8a05 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -144,7 +144,7 @@ If ActionOKCase = 1 Then If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData DEBUGVAR SessionID2 @@ -207,7 +207,7 @@ If ActionOKCase = 1 Then If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData DEBUGVAR SessionID2 @@ -327,7 +327,7 @@ If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData DEBUGVAR SessionID2 diff --git a/xml/page_brewing3Multi.xml b/xml/page_brewing3Multi.xml index d947a6b5..9ad12fc2 100644 --- a/xml/page_brewing3Multi.xml +++ b/xml/page_brewing3Multi.xml @@ -12,7 +12,7 @@ Var ServiceAmount2 = CART1_PRICE Var SelectDrink = CART1_PDCODE - Var ExtendData = CART1_ONTOP + Var Seeker.ExtendData = CART1_ONTOP EndIf @@ -20,7 +20,7 @@ Var ServiceAmount2 = CART2_PRICE Var SelectDrink = CART2_PDCODE - Var ExtendData = CART2_ONTOP + Var Seeker.ExtendData = CART2_ONTOP EndIf @@ -28,13 +28,13 @@ Var ServiceAmount2 = CART3_PRICE Var SelectDrink = CART3_PDCODE - Var ExtendData = CART3_ONTOP + Var Seeker.ExtendData = CART3_ONTOP EndIf Var SessionID2 = "" + CART_INDEX Var SessionID2 = SessionID2 + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -211,7 +211,7 @@ If ActionOKCase = 1 Then If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -270,7 +270,7 @@ If ActionOKCase = 1 Then If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -381,7 +381,7 @@ If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" diff --git a/xml/page_cannotConti.xml b/xml/page_cannotConti.xml index 021f40ce..a20bb2b1 100644 --- a/xml/page_cannotConti.xml +++ b/xml/page_cannotConti.xml @@ -66,14 +66,21 @@ ;Topping "Select3-ID" Seeker.topping3 ; Pack +<<<<<<< HEAD ; no change ; Topping "Pack" ExtendData +======= + Topping "Pack" ExtendDataCurr + DEBUGVAR ExtendDataCurr + Var Seeker.ExtendData = ExtendDataCurr +>>>>>>> 5e5a37195320147236c6a59c0b98defb59901dcb Var ExtendData = Seeker.ExtendData Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData - + Var SessionID2 = SessionID2 + Seeker.ExtendData + + DEBUGVAR SessionID2 Topping "ClearNextOrder" "-" EndIf @@ -242,7 +249,7 @@ If ActionOKCase = 1 Then If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -303,7 +310,7 @@ If ActionOKCase = 1 Then If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -387,7 +394,7 @@ If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" diff --git a/xml/page_payment.xml b/xml/page_payment.xml index b3968fc2..860661f6 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -246,8 +246,8 @@ ; Reset Var MachineState_Result = 0 - - DEBUGVAR ExtendData + DEBUGVAR Seeker + DEBUGVAR Seeker.ExtendData EndIf diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index c22e9edb..55f2b33f 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -338,7 +338,7 @@ Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -399,7 +399,7 @@ Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -615,7 +615,7 @@ If PayInfoCFlag = 1 Then If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -1127,7 +1127,7 @@ Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -1263,7 +1263,7 @@ Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -1343,7 +1343,7 @@ Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" diff --git a/xml/page_payment_cashMore.xml b/xml/page_payment_cashMore.xml index 3d85a378..66f81895 100644 --- a/xml/page_payment_cashMore.xml +++ b/xml/page_payment_cashMore.xml @@ -528,7 +528,7 @@ If PayInfoCFlag = 1 Then If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -1113,7 +1113,7 @@ EndIf If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -1372,7 +1372,7 @@ Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -1440,7 +1440,7 @@ Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -2003,7 +2003,7 @@ EndIf ;Var MachineStage = "make-drink" ; make drink - MakeDrinkV1 SelectDrink ExtendData + MakeDrinkV1 SelectDrink Seeker.ExtendData Open "ROOT/taobin_project/xml/page_thankyou.xml" ;Var UnitTestType = "1" diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 24d72bb1..c897e6a8 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -54,7 +54,7 @@ ;PrepareDrink SelectDrink SelectSugarID Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -237,7 +237,7 @@ ;Var SessionID2 = SelectSlot + ":" - ;Var SessionID2 = SessionID2 + ExtendData + ;Var SessionID2 = SessionID2 + Seeker.ExtendData ;Var CreditAmount1 = "" ;Var ServiceAmountFlow = "" @@ -741,7 +741,7 @@ ;PrepareDrink SelectDrink SelectSugarID Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" diff --git a/xml/page_payment_codeAIS.xml b/xml/page_payment_codeAIS.xml index 6e45027e..5d0ff781 100644 --- a/xml/page_payment_codeAIS.xml +++ b/xml/page_payment_codeAIS.xml @@ -553,7 +553,7 @@ ;PrepareDrink SelectDrink SelectSugarID Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" diff --git a/xml/page_payment_codeDtac.xml b/xml/page_payment_codeDtac.xml index a48c706a..0cb08036 100644 --- a/xml/page_payment_codeDtac.xml +++ b/xml/page_payment_codeDtac.xml @@ -553,7 +553,7 @@ ;PrepareDrink SelectDrink SelectSugarID Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" diff --git a/xml/page_payment_codeLotus.xml b/xml/page_payment_codeLotus.xml index 7ce95567..77e7b1c0 100644 --- a/xml/page_payment_codeLotus.xml +++ b/xml/page_payment_codeLotus.xml @@ -553,7 +553,7 @@ ;PrepareDrink SelectDrink SelectSugarID Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" diff --git a/xml/page_payment_codeThe1.xml b/xml/page_payment_codeThe1.xml index ea7a0e1d..1c123ccb 100644 --- a/xml/page_payment_codeThe1.xml +++ b/xml/page_payment_codeThe1.xml @@ -553,7 +553,7 @@ ;PrepareDrink SelectDrink SelectSugarID Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" diff --git a/xml/page_payment_multi.xml b/xml/page_payment_multi.xml index 459d24f8..f1c56240 100644 --- a/xml/page_payment_multi.xml +++ b/xml/page_payment_multi.xml @@ -250,7 +250,7 @@ - SAVELOG ExtendData + SAVELOG Seeker.ExtendData If GetPayInfoFlag = 0 Then If RoadShow = "false" Then diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index 7ce5fd2b..66004a44 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -132,6 +132,7 @@ ;Var CountDownThankyou = CountDownThankyou - 1 DEBUGVAR MachineStage + DEBUGVAR stop_now DEBUGVAR CupOnArm DEBUGVAR buttonRemoveCup DEBUGVAR CART_COUNT @@ -144,6 +145,13 @@ DEBUGVAR NextOrder DEBUGVAR DoorCupPosition + If MachineStage = "close-maintenance" Then + If stop_now = "true" Then + Open "ROOT/taobin_project/xml/page_cannotConti.xml" + EndIf + EndIf + + If HaveCup = "true" Then Var Timeout = 0 Else diff --git a/xml/page_topping_alter.xml b/xml/page_topping_alter.xml index 8b0d6a55..c44045e1 100644 --- a/xml/page_topping_alter.xml +++ b/xml/page_topping_alter.xml @@ -280,7 +280,7 @@ If ToppingGotoPayment = "true" Then Topping "Select" SelectDrink ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData Open "ROOT/taobin_project/xml/page_payment.xml" EndIf @@ -372,7 +372,7 @@ Topping "Select3-ID" topping3 ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData Open "ROOT/taobin_project/xml/page_payment.xml" diff --git a/xml/page_topping_premix25percent.xml b/xml/page_topping_premix25percent.xml index aac6748f..b130ac6f 100644 --- a/xml/page_topping_premix25percent.xml +++ b/xml/page_topping_premix25percent.xml @@ -282,7 +282,7 @@ Topping "Select3-ID" topping3 ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData Open "ROOT/taobin_project/xml/page_payment.xml" diff --git a/xml/page_topping_premix25percent_no.xml b/xml/page_topping_premix25percent_no.xml index 352e911b..554f0106 100644 --- a/xml/page_topping_premix25percent_no.xml +++ b/xml/page_topping_premix25percent_no.xml @@ -319,7 +319,7 @@ Topping "Select3-ID" topping3 ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData Open "ROOT/taobin_project/xml/page_payment.xml" diff --git a/xml/page_topping_premix50percent.xml b/xml/page_topping_premix50percent.xml index 26843073..bfab6f11 100644 --- a/xml/page_topping_premix50percent.xml +++ b/xml/page_topping_premix50percent.xml @@ -252,7 +252,7 @@ Topping "Select3-ID" topping3 ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData Open "ROOT/taobin_project/xml/page_payment.xml" diff --git a/xml/page_topping_select2.xml b/xml/page_topping_select2.xml index a9cff3d1..c4cc0fa2 100644 --- a/xml/page_topping_select2.xml +++ b/xml/page_topping_select2.xml @@ -587,7 +587,7 @@ If ToppingGotoPayment = "true" Then Topping "Select" SelectDrink ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData Open "ROOT/taobin_project/xml/page_payment.xml" EndIf @@ -1487,7 +1487,7 @@ Topping "Select3-ID" topping3 ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData If CART1_STATUS = "EMPTY" Then Cart "AddMenuID" 1 @@ -1553,7 +1553,7 @@ Topping "Select3-ID" topping3 ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData If CART_COUNT = 0 Then Open "ROOT/taobin_project/xml/page_payment.xml" diff --git a/xml/page_topping_select3.xml b/xml/page_topping_select3.xml index 95c5f8e0..c0966b62 100644 --- a/xml/page_topping_select3.xml +++ b/xml/page_topping_select3.xml @@ -682,7 +682,7 @@ If ToppingGotoPayment = "true" Then Topping "Select" SelectDrink ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData Open "ROOT/taobin_project/xml/page_payment.xml" EndIf @@ -1511,7 +1511,7 @@ Topping "Select3-ID" topping3 ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData If CART1_STATUS = "EMPTY" Then Cart "AddMenuID" 1 @@ -1591,7 +1591,7 @@ Topping "Select3-ID" topping3 ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData If CART_COUNT = 0 Then Open "ROOT/taobin_project/xml/page_payment.xml" diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml index e0ac3ab2..91cf9aa0 100644 --- a/xml/page_topping_select4.xml +++ b/xml/page_topping_select4.xml @@ -947,7 +947,10 @@ If ToppingGotoPayment = "true" Then Topping "Select" SelectDrink ; Pack - Topping "Pack" ExtendData + + 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 @@ -2090,6 +2093,8 @@ ; Pack Topping "Pack" ExtendData + Var Seeker.ExtendData = ExtendData + If CART1_STATUS = "EMPTY" Then Cart "AddMenuID" 1 Else @@ -2269,7 +2274,6 @@ ; Pack Topping "Pack" ExtendDataCurr - Else Topping "SetNextOrder" UserSelectProductCode @@ -2282,8 +2286,9 @@ ; Pack Topping "__pack" ExtendDataNext - EndIf + DEBUGVAR Seeker + DEBUGVAR Seeker.ExtendData Var Seeker.PictureDrink = PictureDrink Var Seeker.showname = showname diff --git a/xml/page_topping_select5.xml b/xml/page_topping_select5.xml index b902e215..b181c80f 100644 --- a/xml/page_topping_select5.xml +++ b/xml/page_topping_select5.xml @@ -717,7 +717,7 @@ If ToppingGotoPayment = "true" Then Topping "Select" SelectDrink ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData Open "ROOT/taobin_project/xml/page_payment.xml" EndIf @@ -1599,7 +1599,7 @@ Topping "Select3-ID" topping3 ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData If CART1_STATUS = "EMPTY" Then Cart "AddMenuID" 1 @@ -1701,7 +1701,7 @@ Topping "Select3-ID" topping3 ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData Else Topping "SetNextOrder" UserSelectProductCode EndIf diff --git a/xml/page_topping_sugar_sufficiency.xml b/xml/page_topping_sugar_sufficiency.xml index 51e7376b..53b70bf7 100644 --- a/xml/page_topping_sugar_sufficiency.xml +++ b/xml/page_topping_sugar_sufficiency.xml @@ -244,7 +244,7 @@ Topping "Select3-ID" topping3 ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData Open "ROOT/taobin_project/xml/page_payment.xml" diff --git a/xml/page_topping_with_barista.xml b/xml/page_topping_with_barista.xml index 9660da46..fca5080d 100644 --- a/xml/page_topping_with_barista.xml +++ b/xml/page_topping_with_barista.xml @@ -384,7 +384,7 @@ DEBUGVAR topping2 DEBUGVAR topping3 - ; Below this. Process get ExtendData 1:_____ len 5 + ; Below this. Process get Seeker.ExtendData 1:_____ len 5 ; Set drink Topping "Select" SelectDrink @@ -395,7 +395,7 @@ Topping "Select3-ID" topping3 ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData Open "ROOT/taobin_project/xml/page_payment.xml"