diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 2a6a7ef5..129caaca 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -9,6 +9,9 @@ DEBUGVAR MachineStage + Var StrawStateX = "Enable" + Var LidStateX = "Enable" + If CART_COUNT >= 1 Then Open "ROOT/taobin_project/xml/page_brewing3Multi.xml" @@ -120,7 +123,7 @@ Var PointCrm = "pdpa1" EndIf Var GetScore = VendingTSID - If TaobinErrorNetwork = 0 Then + If Seeker.TaobinErrorNetwork = 0 Then Var Cid = 11 Var AddData = 1 ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore @@ -1065,5 +1068,100 @@ +; +; +; +;; straw left +; +; +; +; +; +; +;; LID left +; +; +; + diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index 1c9d71ea..8de61ee3 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -64,7 +64,7 @@ Var PointCrm = "pdpa1" EndIf Var GetScore = VendingTSIDTmp1 - If TaobinErrorNetwork = 0 Then + If Seeker.TaobinErrorNetwork = 0 Then Var Cid = 11 Var AddData = 1 AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore diff --git a/xml/page_brewing3Multi.xml b/xml/page_brewing3Multi.xml index 0e1515c0..03a9f348 100644 --- a/xml/page_brewing3Multi.xml +++ b/xml/page_brewing3Multi.xml @@ -145,7 +145,7 @@ If AddPointFlag = 0 Then Var AddPointFlag = 1 - If TaobinErrorNetwork = 0 Then + If Seeker.TaobinErrorNetwork = 0 Then AddData 11 Seeker.TNumberTaobinMember BmiYear PointCrm GetScore Else Var PointCrm = "" diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml index e5c534d7..3a8756e1 100644 --- a/xml/page_collect_point_2.xml +++ b/xml/page_collect_point_2.xml @@ -18,10 +18,10 @@ Var TaobinLevel = 0 - Var TaobinErrorNetwork = 0 + Var Seeker.TaobinErrorNetwork = 0 If PayOfflineMode = 1 Then - Var TaobinErrorNetwork = 1 + Var Seeker.TaobinErrorNetwork = 1 Var Seeker.PointTaobinStr = "" + PayAmount Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" Var Seeker.TNumberTaobinMember= TelephoneNumber @@ -46,7 +46,7 @@ Var TaobinLevel = 0 Var CoffeePoint = 1 - Var TaobinErrorNetwork = 1 + Var Seeker.TaobinErrorNetwork = 1 Var Seeker.PointTaobinStr = "" + PayAmount Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" If TelephoneNumber = "" Then @@ -89,7 +89,7 @@ If Ext1a = "" Then ;Var CoffeePoint = 1 ;Var Seeker.TNumberTaobinMember = TelephoneNumber - Var TaobinErrorNetwork = 1 + Var Seeker.TaobinErrorNetwork = 1 Var Seeker.PointTaobinStr = "" + PayAmount Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" Var Seeker.TNumberTaobinMember = TelephoneNumber @@ -129,7 +129,13 @@ Var CoffeePoint = PointTaobin + CoffeePoint1 Var CoffeePointOld = CoffeePoint1 - Var CoffeePointRank = CoffeePointRank + PointTaobin + + If TaobinLevel = 1 Then + Var CoffeePointRank = CoffeePointRank + 0 + Else + Var CoffeePointRank = CoffeePointRank + PointTaobin + EndIf + Var CoffeePointRankTmp = CoffeePointRank Open "ROOT/taobin_project/xml/page_collect_point_3.xml" @@ -137,7 +143,7 @@ Else ;Var CoffeePoint = 1 ;Var Seeker.TNumberTaobinMember = TelephoneNumber - Var TaobinErrorNetwork = 1 + Var Seeker.TaobinErrorNetwork = 1 Var Seeker.PointTaobinStr = "" + PayAmount Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" Var Seeker.TNumberTaobinMember = TelephoneNumber @@ -159,7 +165,7 @@ Open "ROOT/taobin_project/xml/page_show_consent.xml" Else ;Var CoffeePoint = 1 - Var TaobinErrorNetwork = 1 + Var Seeker.TaobinErrorNetwork = 1 Var Seeker.PointTaobinStr = "" + PayAmount Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" Var Seeker.TNumberTaobinMember= TelephoneNumber diff --git a/xml/page_drinkfail2Multi.xml b/xml/page_drinkfail2Multi.xml index caf6b885..2097dd49 100644 --- a/xml/page_drinkfail2Multi.xml +++ b/xml/page_drinkfail2Multi.xml @@ -136,6 +136,8 @@ Var SuggestID = "" Var SessionID2 = + DEBUGVAR CART2_PRICE + Var ServiceAmount2 = CART2_PRICE Var ServiceAmountSum = ServiceAmountSum - ServiceAmount2 @@ -178,6 +180,8 @@ Var SuggestID = "" Var SessionID2 = + DEBUGVAR CART3_PRICE + Var ServiceAmount2 = CART3_PRICE Var ServiceAmountSum = ServiceAmountSum - ServiceAmount2 diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 7bdd9c77..56ea9f17 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -33,6 +33,8 @@ Var CountStepPackPayment = 0 + Var Seeker.TaobinErrorNetwork = 0 + Var Seeker.VendingCode = "C00" Var Seeker.VendingCampaignRI3 = 0 Var Seeker.IntVendingCampaign = 0 diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index fa3e3d41..1db9feab 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -777,7 +777,7 @@