diff --git a/image/page_payment/bn_codeS.png b/image/page_payment/bn_codeS.png new file mode 100644 index 00000000..62689666 Binary files /dev/null and b/image/page_payment/bn_codeS.png differ diff --git a/image/page_payment/bp_codeS.png b/image/page_payment/bp_codeS.png new file mode 100644 index 00000000..9b152d1e Binary files /dev/null and b/image/page_payment/bp_codeS.png differ diff --git a/image/page_payment_en/page_payment/bn_codeS.png b/image/page_payment_en/page_payment/bn_codeS.png new file mode 100644 index 00000000..7bd79275 Binary files /dev/null and b/image/page_payment_en/page_payment/bn_codeS.png differ diff --git a/image/page_payment_en/page_payment/bp_codeS.png b/image/page_payment_en/page_payment/bp_codeS.png new file mode 100644 index 00000000..7f78a74d Binary files /dev/null and b/image/page_payment_en/page_payment/bp_codeS.png differ diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 8b64ed6e..dcb51011 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -22,7 +22,7 @@ Open "ROOT/taobin_project/xml/page_brewing3Multi.xml" Else Var PayReference = "" - Var PayType = "" + Var PayType = "newpay" EndIf Var SelectDrink = Seeker.selected_a_drink diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index d80fbf28..a4a1b2fa 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -56,7 +56,7 @@ Var TimeoutWaitPay = 10 Var PayReference = "" - Var PayType = "" + Var PayType = "newpay" Var MachineState_Result = 0 If LastMakeDrinkResult = "success" Then diff --git a/xml/page_member_topup3.xml b/xml/page_member_topup3.xml index 47731347..5e6b71ae 100644 --- a/xml/page_member_topup3.xml +++ b/xml/page_member_topup3.xml @@ -174,6 +174,23 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 217 + 802 + Var( DirImage + "/img3.png" ) + + + + 244 + 816 + ShowTextNumber + "Enable" + Var( DirImage + "/text_12.png" ) + + + + + 0 + 817 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + "Enable" + CouponNumber + + + + + + + 188 + 636 + Var( DirImage + "/text_11.png" ) + + + + 152 + 935 + "Enable" + ShowErrorText + text_show_error + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + Open "ROOT/taobin_project/xml/page_member_topupCode.xml" + + + + + diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 35411a15..345e9974 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -139,6 +139,7 @@ Var Seeker.VendingCampaign = 0 Var Seeker.VendingTSID = "" + Var Seeker.CreditNotEnoughRefID = "" Var PayType = "" Var CART_INDEX = 0 diff --git a/xml/page_payment_credit.xml b/xml/page_payment_credit.xml index 77e1850e..a33be64d 100644 --- a/xml/page_payment_credit.xml +++ b/xml/page_payment_credit.xml @@ -127,21 +127,6 @@ DEBUGVAR PinNumberUser - - If Seeker = "next" Then - Var Curr = "curr" - - DEBUGVAR CoffeeCredit - DEBUGVAR Curr.CurrCreditUse - - If TelephoneNumber = Curr.CurrCreditTelNum Then - - Var CoffeeCredit = CoffeeCredit - Curr.CurrCreditUse - If CoffeeCredit < 0 Then - Var CoffeeCredit = 0 - EndIf - EndIf - EndIf Open "ROOT/taobin_project/xml/page_payment_credit2.xml" Else @@ -151,7 +136,7 @@ DEBUGVAR Curr.CurrCreditTelNum If Seeker = "next" Then - If Ext1a = "new customer" Then + If Ext1a = "new customer" Then Var Curr = "curr" diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index 91996ffc..3c727b5c 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -944,12 +944,12 @@ If ReqAdddata22 = 0 Then - If Seeker = "next" Then - Var Curr = "curr" - If TelephoneNumber = Curr.CurrCreditTelNum Then - Var SumCreditAmount = CoffeeCredit + Curr.CurrCreditAmount - EndIf - EndIf + ;If Seeker = "next" Then + ; Var Curr = "curr" + ; If TelephoneNumber = Curr.CurrCreditTelNum Then + ; Var SumCreditAmount = CoffeeCredit + Curr.CurrCreditAmount + ; EndIf + ;EndIf Var useCreditAmount = PayAmountSubDiscount Var BmiYear = useCreditAmount @@ -960,31 +960,7 @@ Else - If Seeker = "next" Then - Var Curr = "curr" - If TelephoneNumber = Curr.CurrCreditTelNum Then - - Var SumCreditAmount = CoffeeCredit + Curr.CurrCreditAmount - If SumCreditAmount >= PayAmountSubDiscount Then - If ReqAdddata22 = 0 Then - - Var useCreditTemp = PayAmountSubDiscount - CoffeeCredit - - Var useCreditAmount = CoffeeCredit - Var BmiYear = useCreditAmount - Var GetScore = "useCredit" - AddData 22 TelephoneNumber BmiYear PointCrm GetScore - Var ReqAdddata22 = 1 - EndIf - Else - Open "ROOT/taobin_project/xml/page_payment_credit3.xml" - EndIf - Else - Open "ROOT/taobin_project/xml/page_payment_credit3.xml" - EndIf - Else - Open "ROOT/taobin_project/xml/page_payment_credit3.xml" - EndIf + Open "ROOT/taobin_project/xml/page_payment_credit3.xml" EndIf Else diff --git a/xml/page_payment_credit3.xml b/xml/page_payment_credit3.xml index e068b777..72ee6064 100644 --- a/xml/page_payment_credit3.xml +++ b/xml/page_payment_credit3.xml @@ -46,12 +46,12 @@ Var AcceptAuto = "false" - If Seeker = "next" Then - Var Curr = "curr" - If TelephoneNumber = Curr.CurrCreditTelNum Then - Var SumCreditAmount2 = SumCreditAmount + Curr.CurrCreditAmount - EndIf - EndIf + ;If Seeker = "next" Then + ; Var Curr = "curr" + ; If TelephoneNumber = Curr.CurrCreditTelNum Then + ; Var SumCreditAmount2 = SumCreditAmount + Curr.CurrCreditAmount + ; EndIf + ;EndIf If show_eng = "true" Then @@ -215,6 +215,7 @@ Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/" Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm + Var Seeker.CreditNotEnoughRefID = PointCrm Var Seeker.StoreCreditFlag = 1 diff --git a/xml/page_payment_storeCredit.xml b/xml/page_payment_storeCredit.xml index 55a1ade2..fa80c1a5 100644 --- a/xml/page_payment_storeCredit.xml +++ b/xml/page_payment_storeCredit.xml @@ -100,27 +100,6 @@ INT CoffeeCredit Var Seeker.CoffeePinNumber = Ext1c - - If Seeker = "next" Then - Var Curr = "curr" - - DEBUGVAR CoffeeCredit - DEBUGVAR Curr.CurrCreditAmount - - If TelephoneNumber = Curr.CurrCreditTelNum Then - - Var CoffeeCredit = CoffeeCredit + Curr.CurrCreditAmount - - If Curr.CurrCreditUse > 0 Then - Var CoffeeCredit = CoffeeCredit - Curr.CurrCreditUse - If CoffeeCredit < 0 Then - Var CoffeeCredit = 0 - EndIf - EndIf - - EndIf - EndIf - Var Seeker.TNumberTaobinCredit = TelephoneNumber If Seeker.pageStoreCredit0 = 1 Then diff --git a/xml/page_payment_storeCredit3.xml b/xml/page_payment_storeCredit3.xml index 51b3608b..9fc72712 100644 --- a/xml/page_payment_storeCredit3.xml +++ b/xml/page_payment_storeCredit3.xml @@ -58,7 +58,13 @@ Var Seeker.CurrCreditPinNum = Seeker.CoffeePinNumber DEBUGVAR Seeker.CurrCreditAmount - + + Var CurrAmount = Seeker.CurrCreditAmount + Var CurrTelePhoneNum = Seeker.CurrCreditTelNum + Var CurrPinNum = Seeker.CurrCreditPinNum + Var RefID = "" + + AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID If Seeker.FreeVendingCampaign = 1 Then Open "ROOT/taobin_project/xml/page_lid_straw.xml" diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 698ecfb6..a5506013 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -360,6 +360,34 @@ DEBUGVAR Seeker.CurrCreditAmount + If Seeker.CreditNotEnoughRefID = "" Then + Var CurrAmount = Seeker.CurrCreditAmount + Var CurrTelePhoneNum = Seeker.CurrCreditTelNum + Var CurrPinNum = Seeker.CurrCreditPinNum + Var RefID = "" + AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID + Else + + Var ServiceAmountSupCampain = Seeker.ServiceAmount2 - Seeker.IntVendingCampaign + + If CoinAmount >= ServiceAmountSupCampain Then + Var CurrAmount = Seeker.CurrCreditAmount + Var RefID = "0/" + Seeker.CreditNotEnoughRefID + Var Seeker.CreditReferenceTmp = RefID + Else + Var CurrAmount = CoinAmount + Var RefID = "" + ServiceAmountSupCampain + Var RefID = RefID + "/" + Var RefID = RefID + Seeker.CreditNotEnoughRefID + Var Seeker.CreditReferenceTmp = RefID + EndIf + + Var CurrTelePhoneNum = Seeker.CurrCreditTelNum + Var CurrPinNum = Seeker.CurrCreditPinNum + + AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID + EndIf + If Seeker.FreeVendingCampaign = 1 Then Open "ROOT/taobin_project/xml/page_lid_straw.xml" Else