From be2d7faddb8d4e5c1d49e71b92833808ae82d5bc Mon Sep 17 00:00:00 2001 From: kong Date: Thu, 19 May 2022 15:52:16 +0700 Subject: [PATCH 1/2] After Seeker --- xml/page_brewing2.xml | 6 +++--- xml/page_brewing3.xml | 6 +++--- xml/page_brewing3Conti.xml | 6 +++--- xml/page_brewing3Multi.xml | 14 +++++++------- xml/page_cannotConti.xml | 10 +++++----- xml/page_payment.xml | 6 +++--- xml/page_payment_cash.xml | 12 ++++++------ xml/page_payment_cashMore.xml | 10 +++++----- xml/page_payment_code.xml | 6 +++--- xml/page_payment_codeAIS.xml | 2 +- xml/page_payment_codeDtac.xml | 2 +- xml/page_payment_codeLotus.xml | 2 +- xml/page_payment_codeThe1.xml | 2 +- xml/page_payment_multi.xml | 2 +- xml/page_thankyouConti.xml | 4 ++-- xml/page_topping_alter.xml | 4 ++-- xml/page_topping_premix25percent.xml | 2 +- xml/page_topping_premix25percent_no.xml | 2 +- xml/page_topping_premix50percent.xml | 2 +- xml/page_topping_select2.xml | 6 +++--- xml/page_topping_select3.xml | 6 +++--- xml/page_topping_select4.xml | 12 ++++++------ xml/page_topping_select5.xml | 6 +++--- xml/page_topping_sugar_sufficiency.xml | 2 +- xml/page_topping_with_barista.xml | 4 ++-- 25 files changed, 68 insertions(+), 68 deletions(-) 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 759712ab..cd086867 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -232,7 +232,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 = "" @@ -293,7 +293,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 = "" @@ -422,7 +422,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_brewing3Conti.xml b/xml/page_brewing3Conti.xml index 2560ed1b..35a0b6f8 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -143,7 +143,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 = "" @@ -204,7 +204,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 = "" @@ -322,7 +322,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_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 dacc718b..b85f30f8 100644 --- a/xml/page_cannotConti.xml +++ b/xml/page_cannotConti.xml @@ -66,12 +66,12 @@ Topping "Select3-ID" Seeker.topping3 ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Topping "ClearNextOrder" "-" @@ -241,7 +241,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 = "" @@ -302,7 +302,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 = "" @@ -386,7 +386,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 38e494af..fbe24d30 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -187,7 +187,7 @@ If CountStepPackPayment >= CountStepForCupFlagDelay Then - SAVELOG ExtendData + SAVELOG Seeker.ExtendData If GetPayInfoFlag = 0 Then SaveLog "RoadShow test" @@ -204,7 +204,7 @@ Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData ;Var CreditAmount1 = "" ;Var ServiceAmountFlow = "" @@ -241,7 +241,7 @@ Var MachineState_Result = 0 - DEBUGVAR ExtendData + DEBUGVAR Seeker.ExtendData ;If web_readyOK = "true" Then diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 4fe39b9c..c10b92d5 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -336,7 +336,7 @@ Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -397,7 +397,7 @@ Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -613,7 +613,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 = "" @@ -1125,7 +1125,7 @@ Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -1261,7 +1261,7 @@ Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -1341,7 +1341,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 6eba6915..1ac642cd 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -93,12 +93,12 @@ Topping "Select3-ID" Seeker.topping3 ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData Var MachineStage = "NextOrder" Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + Seeker.ExtendData Topping "ClearNextOrder" "-" 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 d7e2161f..e14720f8 100644 --- a/xml/page_topping_select4.xml +++ b/xml/page_topping_select4.xml @@ -947,7 +947,7 @@ If ToppingGotoPayment = "true" Then Topping "Select" SelectDrink ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" Open "ROOT/taobin_project/xml/page_payment.xml" EndIf @@ -2088,7 +2088,7 @@ Topping "Select3-ID" topping3 ; Pack - Topping "Pack" ExtendData + Topping "Pack" Seeker.ExtendData If CART1_STATUS = "EMPTY" Then Cart "AddMenuID" 1 @@ -2267,9 +2267,9 @@ Topping "Select3-ID" topping3 ; Pack - Topping "Pack" ExtendDataCurr + Topping "Pack" Seeker.ExtendDataCurr - Var ExtendData = ExtendDataCurr + Var Seeker.ExtendData = Seeker.ExtendDataCurr Else Topping "SetNextOrder" UserSelectProductCode @@ -2280,9 +2280,9 @@ Topping "__select2-id" topping2 Topping "__select3-id" topping3 ; Pack - Topping "__pack" ExtendDataNext + Topping "__pack" Seeker.ExtendDataNext - Var ExtendData = ExtendDataNext + Var Seeker.ExtendData = Seeker.ExtendDataNext EndIf 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" From 5e5a37195320147236c6a59c0b98defb59901dcb Mon Sep 17 00:00:00 2001 From: kong Date: Thu, 19 May 2022 18:10:37 +0700 Subject: [PATCH 2/2] DO --- xml/page_brewing3.xml | 4 +++- xml/page_cannotConti.xml | 7 +++++-- xml/page_payment.xml | 4 ++-- xml/page_thankyouConti.xml | 15 +++++++++++++-- xml/page_topping_select4.xml | 20 ++++++++++++++------ 5 files changed, 37 insertions(+), 13 deletions(-) diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index cd086867..f70e81ba 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -233,6 +233,7 @@ If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData + DEBUGVAR SessionID2 Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -294,6 +295,7 @@ If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData + DEBUGVAR SessionID2 Var CreditAmount1 = "" Var ServiceAmountFlow = "" @@ -423,7 +425,7 @@ If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData - + DEBUGVAR SessionID2 Var CreditAmount1 = "" Var ServiceAmountFlow = "" Var TelephoneNumber = "0899999999" diff --git a/xml/page_cannotConti.xml b/xml/page_cannotConti.xml index b85f30f8..ce2ca052 100644 --- a/xml/page_cannotConti.xml +++ b/xml/page_cannotConti.xml @@ -66,13 +66,16 @@ Topping "Select3-ID" Seeker.topping3 ; Pack - Topping "Pack" Seeker.ExtendData + Topping "Pack" ExtendDataCurr + DEBUGVAR ExtendDataCurr + Var Seeker.ExtendData = ExtendDataCurr Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData - + + DEBUGVAR SessionID2 Topping "ClearNextOrder" "-" EndIf diff --git a/xml/page_payment.xml b/xml/page_payment.xml index fbe24d30..74480a1a 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -187,7 +187,7 @@ If CountStepPackPayment >= CountStepForCupFlagDelay Then - SAVELOG Seeker.ExtendData + SAVELOG ExtendData If GetPayInfoFlag = 0 Then SaveLog "RoadShow test" @@ -240,7 +240,7 @@ ; Reset Var MachineState_Result = 0 - + DEBUGVAR Seeker DEBUGVAR Seeker.ExtendData diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index 1ac642cd..3f727adf 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -93,13 +93,16 @@ Topping "Select3-ID" Seeker.topping3 ; Pack - Topping "Pack" Seeker.ExtendData + Topping "Pack" ExtendDataCurr + + Var Seeker.ExtendData = ExtendDataCurr Var MachineStage = "NextOrder" Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData - + + DEBUGVAR SessionID2 Topping "ClearNextOrder" "-" EndIf @@ -127,6 +130,7 @@ ;Var CountDownThankyou = CountDownThankyou - 1 DEBUGVAR MachineStage + DEBUGVAR stop_now DEBUGVAR CupOnArm DEBUGVAR buttonRemoveCup DEBUGVAR CART_COUNT @@ -139,6 +143,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_select4.xml b/xml/page_topping_select4.xml index e14720f8..4e0a8c4d 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" Seeker.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 @@ -2088,7 +2091,9 @@ Topping "Select3-ID" topping3 ; Pack - Topping "Pack" Seeker.ExtendData + Topping "Pack" ExtendData + + Var Seeker.ExtendData = ExtendData If CART1_STATUS = "EMPTY" Then Cart "AddMenuID" 1 @@ -2267,9 +2272,10 @@ Topping "Select3-ID" topping3 ; Pack - Topping "Pack" Seeker.ExtendDataCurr + Topping "Pack" ExtendDataCurr + + Var Seeker.ExtendData = ExtendDataCurr - Var Seeker.ExtendData = Seeker.ExtendDataCurr Else Topping "SetNextOrder" UserSelectProductCode @@ -2280,12 +2286,14 @@ Topping "__select2-id" topping2 Topping "__select3-id" topping3 ; Pack - Topping "__pack" Seeker.ExtendDataNext + Topping "__pack" ExtendDataNext - Var Seeker.ExtendData = Seeker.ExtendDataNext + Var Seeker.ExtendData = ExtendDataNext EndIf + DEBUGVAR Seeker + DEBUGVAR Seeker.ExtendData Var Seeker.PictureDrink = PictureDrink Var Seeker.showname = showname