diff --git a/image/collectiing/bd_pay_with_wechat.png b/image/collectiing/bd_pay_with_wechat.png new file mode 100644 index 00000000..4c5e12eb Binary files /dev/null and b/image/collectiing/bd_pay_with_wechat.png differ diff --git a/image/collectiing/bn_pay_with_wechat.png b/image/collectiing/bn_pay_with_wechat.png new file mode 100644 index 00000000..0c76afdb Binary files /dev/null and b/image/collectiing/bn_pay_with_wechat.png differ diff --git a/image/collectiing/bp_pay_with_wechat.png b/image/collectiing/bp_pay_with_wechat.png new file mode 100644 index 00000000..de333c36 Binary files /dev/null and b/image/collectiing/bp_pay_with_wechat.png differ diff --git a/image/collectiing/img_popup17.png b/image/collectiing/img_popup17.png index 5b317f8d..7f2e4f15 100644 Binary files a/image/collectiing/img_popup17.png and b/image/collectiing/img_popup17.png differ diff --git a/image/collectiing_en/bd_pay_with_wechat.png b/image/collectiing_en/bd_pay_with_wechat.png new file mode 100644 index 00000000..4c5e12eb Binary files /dev/null and b/image/collectiing_en/bd_pay_with_wechat.png differ diff --git a/image/collectiing_en/bn_pay_with_wechat.png b/image/collectiing_en/bn_pay_with_wechat.png new file mode 100644 index 00000000..0c76afdb Binary files /dev/null and b/image/collectiing_en/bn_pay_with_wechat.png differ diff --git a/image/collectiing_en/bp_pay_with_wechat.png b/image/collectiing_en/bp_pay_with_wechat.png new file mode 100644 index 00000000..de333c36 Binary files /dev/null and b/image/collectiing_en/bp_pay_with_wechat.png differ diff --git a/image/collectiing_en/img_popup17.png b/image/collectiing_en/img_popup17.png index 2085dc24..85c371e6 100644 Binary files a/image/collectiing_en/img_popup17.png and b/image/collectiing_en/img_popup17.png differ diff --git a/image/page_payment/img_popup13.png b/image/page_payment/img_popup13.png new file mode 100644 index 00000000..d5d1d218 Binary files /dev/null and b/image/page_payment/img_popup13.png differ diff --git a/image/page_payment_en/page_payment/img_popup13.png b/image/page_payment_en/page_payment/img_popup13.png new file mode 100644 index 00000000..27d8c7aa Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup13.png differ diff --git a/xml/page_collect_point_1-3.xml b/xml/page_collect_point_1-3.xml index 20b142b1..8b825bd2 100644 --- a/xml/page_collect_point_1-3.xml +++ b/xml/page_collect_point_1-3.xml @@ -89,6 +89,11 @@ Var TelephoneNumberX = TelephoneNumber DEBUGVAR TelephoneNumber + + If PromotionIDCurrentOrder > 1 Then + Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml" + EndIf + ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP @@ -112,6 +117,11 @@ SAVELOG "collect_point1-p71." Var TelephoneNumberX = TelephoneNumber DEBUGVAR TelephoneNumber + + If PromotionIDCurrentOrder > 1 Then + Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml" + EndIf + ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP @@ -582,6 +592,10 @@ ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc DEBUGVAR TelephoneNumber + If PromotionIDCurrentOrder > 1 Then + Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml" + EndIf + Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index 9939e2e5..4c0e690d 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -89,6 +89,11 @@ Var TelephoneNumberX = TelephoneNumber DEBUGVAR TelephoneNumber + + If PromotionIDCurrentOrder > 1 Then + Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml" + EndIf + ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP @@ -112,6 +117,10 @@ SAVELOG "collect_point1-p71." Var TelephoneNumberX = TelephoneNumber DEBUGVAR TelephoneNumber + If PromotionIDCurrentOrder > 1 Then + Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml" + EndIf + ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP @@ -584,6 +593,10 @@ ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc DEBUGVAR TelephoneNumber + If PromotionIDCurrentOrder > 1 Then + Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml" + EndIf + Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP @@ -591,6 +604,9 @@ GETACCEXT Param1 23 ;Open "ROOT/taobin_project/xml/page_catalog.xml" + + + Open "ROOT/taobin_project/xml/page_collect_point_2.xml" Else diff --git a/xml/page_display_Promo1Get1Free.xml b/xml/page_display_Promo1Get1Free.xml index 38bc18a7..e03d75d3 100644 --- a/xml/page_display_Promo1Get1Free.xml +++ b/xml/page_display_Promo1Get1Free.xml @@ -24,11 +24,11 @@ Var promoTxt = "" + PromotionIDCurrentOrder Var promoTxt = promoTxt + "/1" - ;AddData 27 Seeker.TNumberTaobinMember promoTxt "" "" + Var Cid = 27 Var PointCrm = "" Var GetScore = "1" - AddData Cid Seeker.TNumberTaobinMember promoTxt PointCrm GetScore + AddData Cid TelephoneNumber promoTxt PointCrm GetScore If PromotionIDCurrentOrder = 2 Then diff --git a/xml/page_drinkfail2-2.xml b/xml/page_drinkfail2-2.xml index 61594041..efa2e039 100644 --- a/xml/page_drinkfail2-2.xml +++ b/xml/page_drinkfail2-2.xml @@ -31,7 +31,7 @@ - + DEBUGVAR TelephoneNumberProblem 1000 @@ -43,6 +43,8 @@ If Timeout > 9 Then + DEBUGVAR TelephoneNumberProblem + StrLen TelephoneNumberProblem TelNumLen If TelNumLen >= 10 Then diff --git a/xml/page_drinkfail4.xml b/xml/page_drinkfail4.xml index 5c48afb5..6a0eae50 100644 --- a/xml/page_drinkfail4.xml +++ b/xml/page_drinkfail4.xml @@ -27,7 +27,7 @@ - + DEBUGVAR TelephoneNumberProblem @@ -44,6 +44,9 @@ If GetFreeFlag = 1 Then If Timeout > 240 Then + + DEBUGVAR TelephoneNumberProblem + StrLen TelephoneNumberProblem TelNumLen If TelNumLen >= 10 Then @@ -77,6 +80,9 @@ Else If MachineStage = "show-menu" Then + + DEBUGVAR TelephoneNumberProblem + StrLen TelephoneNumberProblem TelNumLen If TelNumLen >= 10 Then @@ -100,6 +106,9 @@ Else If Timeout > 5 Then + + DEBUGVAR TelephoneNumberProblem + StrLen TelephoneNumberProblem TelNumLen If TelNumLen >= 10 Then @@ -241,6 +250,8 @@ Machine RemoveCup + DEBUGVAR TelephoneNumberProblem + StrLen TelephoneNumberProblem TelNumLen If TelNumLen >= 10 Then diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index af9e33c7..4f8b38f6 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -774,7 +774,7 @@ If web_payment = "MAXME" Then - Var QR_POPUP = "/img_popup10.png" + Var QR_POPUP = "/img_popup11.png" Var LOADING_STATE = "Enable" Var FlagQROpened = 1 @@ -815,6 +815,50 @@ Var ReqPayInfoFlag = 7 EndIf + If web_payment = "WECHAT" Then + + Var QR_POPUP = "/img_popup12.png" + Var LOADING_STATE = "Enable" + + Var FlagQROpened = 1 + Var alphaState = "Enable" + ;CoinVending OFF + VendingQR ON + + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + Seeker.ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumberQR = "0899999999" + Var ServiceType = "coffee" + Var ECommerceQR = "" + Var ECommerceQR = ECommerceQR + PriceDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + "WEC:2/" + + + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + Var ReqPayInfoFlag = 8 + EndIf + + EndIf @@ -895,6 +939,10 @@ If ReqPayInfoFlag2 = 7 Then Var Seeker.CampaignPayChanel = "maxme" EndIf + If ReqPayInfoFlag2 = 8 Then + Var Seeker.CampaignPayChanel = "wechat" + EndIf + @@ -1132,6 +1180,35 @@ EndIf EndIf + If ReqPayInfoFlag = 8 Then + If VendingQRTypeResult = "WEC:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99Shoppy = "" + Var QRCODE99Shoppy = QRCODE99Shoppy + SessionID + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a + SAVELOG Ext1a + SAVELOG QRCODE99Shoppy + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21 + Var ReqPayInfoFlag = 0 + Var ReqPayInfoFlag2 = 8 + SAVELOG QRCODE99Shoppy + SAVELOG Ext21 + + DEBUGVAR QRCODE99Shoppy + + Var QRCODE99 = QRCODE99Shoppy + Var LOADING_STATE = "Invisible" + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + EndIf + + EndIf + EndIf + Else Var PayInfoCFlag = 1 EndIf diff --git a/xml/page_payment_cashOther.xml b/xml/page_payment_cashOther.xml index b54bae79..b8c3a877 100644 --- a/xml/page_payment_cashOther.xml +++ b/xml/page_payment_cashOther.xml @@ -154,14 +154,14 @@ 158 - 712 + 567 Var( DirImage + "/img_popup17.png") + + + + + +