diff --git a/image/collectiing/bd_pay_with_linepay.png b/image/collectiing/bd_pay_with_linepay.png index fb0f81c9..a97df7a1 100644 Binary files a/image/collectiing/bd_pay_with_linepay.png and b/image/collectiing/bd_pay_with_linepay.png differ diff --git a/image/collectiing/bn_pay_with_linepay.png b/image/collectiing/bn_pay_with_linepay.png index 1eeb47b0..785d448f 100644 Binary files a/image/collectiing/bn_pay_with_linepay.png and b/image/collectiing/bn_pay_with_linepay.png differ diff --git a/image/collectiing/bp_pay_with_linepay.png b/image/collectiing/bp_pay_with_linepay.png index 7a69a663..99e68856 100644 Binary files a/image/collectiing/bp_pay_with_linepay.png and b/image/collectiing/bp_pay_with_linepay.png differ diff --git a/image/collectiing_en/bd_pay_with_linepay.png b/image/collectiing_en/bd_pay_with_linepay.png index fb0f81c9..a97df7a1 100644 Binary files a/image/collectiing_en/bd_pay_with_linepay.png and b/image/collectiing_en/bd_pay_with_linepay.png differ diff --git a/image/collectiing_en/bn_pay_with_linepay.png b/image/collectiing_en/bn_pay_with_linepay.png index 1eeb47b0..785d448f 100644 Binary files a/image/collectiing_en/bn_pay_with_linepay.png and b/image/collectiing_en/bn_pay_with_linepay.png differ diff --git a/image/collectiing_en/bp_pay_with_linepay.png b/image/collectiing_en/bp_pay_with_linepay.png index 7a69a663..99e68856 100644 Binary files a/image/collectiing_en/bp_pay_with_linepay.png and b/image/collectiing_en/bp_pay_with_linepay.png differ diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 54ca55cd..77a7444b 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -792,26 +792,16 @@ Var SessionID2 = SessionID2 + Seeker.CodeNumber Var SessionID2 = SessionID2 + "/" + If Seeker.CreditCard = 1 Then + + CashlessReq SUCCESS + ;CashlessReq FAIL + + EndIf + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Else - If Seeker.CodeChannel = 2 Then - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + "" - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + Seeker.VendingCode - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + SelectDrink - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + BoxID - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + "S" - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + Seeker.CodeNumber - Var SessionID2 = SessionID2 + "/" - - Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - Else - + If Seeker.CreditCard = 1 Then CashlessReq SUCCESS @@ -820,7 +810,7 @@ EndIf Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - EndIf + EndIf diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index 52d9af21..e433c3cd 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -620,25 +620,16 @@ Var SessionID2 = SessionID2 + Seeker.CodeNumber Var SessionID2 = SessionID2 + "/" + If Seeker.CreditCard = 1 Then + + CashlessReq SUCCESS + ;CashlessReq FAIL + + EndIf + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Else - If Seeker.CodeChannel = 2 Then - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + "" - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + Seeker.VendingCode - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + SelectDrink - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + BoxID - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + "S" - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + Seeker.CodeNumber - Var SessionID2 = SessionID2 + "/" - - Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - Else + If Seeker.CreditCard = 1 Then @@ -649,7 +640,7 @@ EndIf Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - EndIf + EndIf diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml index d6f64fef..1b5f2bcd 100644 --- a/xml/page_collect_point_2.xml +++ b/xml/page_collect_point_2.xml @@ -21,14 +21,15 @@ Var Seeker.TaobinErrorNetwork = 0 + If show_eng = "true" Then - + Var DirImage = "ROOT/taobin_project/image/collectiing_en" Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png" Else - + Var DirImage = "ROOT/taobin_project/image/collectiing" Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" EndIf @@ -230,7 +231,7 @@ 178 680 - "ROOT/taobin_project/image/collectiing/text20.png" + Var( DirImage + "/text20.png" ) diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 37cfaa19..1bf0d20f 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -18,7 +18,7 @@ Var QRChannel = 0 - ;Var PriceDrink = 1 + Var PriceDrink = 2 Var DiscountDrink = 0 Var SelectSlot = "1" diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 799ceba5..4813f047 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -981,7 +981,7 @@ Var QR_POPUP = "/img_popup8-2.png" Var VendingCashless = "-" Var LOADING_STATE = "Enable" - CashlessPay PriceDrink CreditCardRef + CashlessPay RemainAmount CreditCardRef Var CashlessPayFlag = 1 EndIf