diff --git a/image/page_payment_cash_extend/bn_keep.png b/image/page_payment_cash_extend/bn_keep.png index fc1eec0e..2cbe921b 100644 Binary files a/image/page_payment_cash_extend/bn_keep.png and b/image/page_payment_cash_extend/bn_keep.png differ diff --git a/image/page_payment_cash_extend/bp_keep.png b/image/page_payment_cash_extend/bp_keep.png index 6b1f8e7a..a2e684ec 100644 Binary files a/image/page_payment_cash_extend/bp_keep.png and b/image/page_payment_cash_extend/bp_keep.png differ diff --git a/image/page_payment_cash_extend/img_popup12.png b/image/page_payment_cash_extend/img_popup12.png index ae7ac9ce..4818b505 100644 Binary files a/image/page_payment_cash_extend/img_popup12.png and b/image/page_payment_cash_extend/img_popup12.png differ diff --git a/image/page_payment_cash_extend_en/bn_keep.png b/image/page_payment_cash_extend_en/bn_keep.png index afbebf9f..63a49e2c 100644 Binary files a/image/page_payment_cash_extend_en/bn_keep.png and b/image/page_payment_cash_extend_en/bn_keep.png differ diff --git a/image/page_payment_cash_extend_en/bp_keep.png b/image/page_payment_cash_extend_en/bp_keep.png index 1d1c7b58..70cf6f2f 100644 Binary files a/image/page_payment_cash_extend_en/bp_keep.png and b/image/page_payment_cash_extend_en/bp_keep.png differ diff --git a/image/page_payment_cash_extend_en/img_popup12.png b/image/page_payment_cash_extend_en/img_popup12.png index 9767bb55..3a7c2540 100644 Binary files a/image/page_payment_cash_extend_en/img_popup12.png and b/image/page_payment_cash_extend_en/img_popup12.png differ diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index b3413cfb..6e12e771 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -31,11 +31,7 @@ EndIf - Var waitAckPay = 0 - Var VendingTSIDTmp = "" - If PayWithQR = 1 Then - Var VendingTSIDTmp = VendingTSID - EndIf + @@ -307,6 +303,9 @@ Var ServiceCredit = SelectDrink Var SuggestID = "" + + Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" + If PayWithQR = 0 Then If CodeChannel = 1 Then Var SessionID2 = SessionID2 + "/" @@ -349,6 +348,9 @@ Else + + + If ChangeFlag2 = 1 Then Var TelephoneNumber = "0899999999" Var VendingDiscount = 0 @@ -375,6 +377,13 @@ ;no wait ack pay Var waitAckPay = 0 + + Var SVT = "coffee" + Var ACC = "089999999" + Var DEE = "1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" + + PAYEXT SVT ACC VendingTSID DEE + EndIf diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 583a254d..cbedc870 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -107,7 +107,7 @@ Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + SelectDrink Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + "KBA" + Var ECommerce = ECommerce + "KBA:1" Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 415bee55..afe2553c 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -1004,17 +1004,17 @@ - - 0 - 1041 - 100 - Center - 1080 - KanitRegularTTF - alphaState3 - 0xDE794E - RemainAmountKeep - +; +; 0 +; 1041 +; 100 +; Center +; 1080 +; KanitRegularTTF +; alphaState3 +; 0xDE794E +; RemainAmountKeep +; diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index c72f033e..80d2574f 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -120,7 +120,7 @@ Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + SelectDrink Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + "KBA/" + Var ECommerce = ECommerce + "KBA:1/" Var ECommerce = ECommerce + VendingCode Var ECommerce = ECommerce + ":" Var ECommerce = ECommerce + CodeNumber @@ -187,6 +187,14 @@ Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf + If VendingCode = "C36" Then + Var VendingCampaign = PayAmount + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + Var ShowErrorText = "Enable" Var GetPayInfoFlag = 0