diff --git a/image/collectiing/bd_pay_with_ccard1.png b/image/collectiing/bd_pay_with_ccard1.png new file mode 100644 index 00000000..23a9f0c2 Binary files /dev/null and b/image/collectiing/bd_pay_with_ccard1.png differ diff --git a/image/collectiing/bd_pay_with_codeMCard.png b/image/collectiing/bd_pay_with_codeMCard.png new file mode 100644 index 00000000..7ee13cb9 Binary files /dev/null and b/image/collectiing/bd_pay_with_codeMCard.png differ diff --git a/image/collectiing/bd_pay_with_linepay.png b/image/collectiing/bd_pay_with_linepay.png new file mode 100644 index 00000000..fb0f81c9 Binary files /dev/null and b/image/collectiing/bd_pay_with_linepay.png differ diff --git a/image/collectiing/bn_pay_with_ccard1.png b/image/collectiing/bn_pay_with_ccard1.png new file mode 100644 index 00000000..1a613c09 Binary files /dev/null and b/image/collectiing/bn_pay_with_ccard1.png differ diff --git a/image/collectiing/bn_pay_with_codeMCard.png b/image/collectiing/bn_pay_with_codeMCard.png new file mode 100644 index 00000000..cdcc6ee7 Binary files /dev/null and b/image/collectiing/bn_pay_with_codeMCard.png differ diff --git a/image/collectiing/bn_pay_with_linepay.png b/image/collectiing/bn_pay_with_linepay.png new file mode 100644 index 00000000..1eeb47b0 Binary files /dev/null and b/image/collectiing/bn_pay_with_linepay.png differ diff --git a/image/collectiing/bp_pay_with_ccard1.png b/image/collectiing/bp_pay_with_ccard1.png new file mode 100644 index 00000000..bcbcc636 Binary files /dev/null and b/image/collectiing/bp_pay_with_ccard1.png differ diff --git a/image/collectiing/bp_pay_with_codeMCard.png b/image/collectiing/bp_pay_with_codeMCard.png new file mode 100644 index 00000000..1ed3a8d6 Binary files /dev/null and b/image/collectiing/bp_pay_with_codeMCard.png differ diff --git a/image/collectiing/bp_pay_with_linepay.png b/image/collectiing/bp_pay_with_linepay.png new file mode 100644 index 00000000..7a69a663 Binary files /dev/null and b/image/collectiing/bp_pay_with_linepay.png differ diff --git a/image/collectiing/img_popupGLX.png b/image/collectiing/img_popupGLX.png index ef308c0a..5707f199 100644 Binary files a/image/collectiing/img_popupGLX.png and b/image/collectiing/img_popupGLX.png differ diff --git a/image/collectiing/img_popupMCard.png b/image/collectiing/img_popupMCard.png new file mode 100644 index 00000000..c28bdddc Binary files /dev/null and b/image/collectiing/img_popupMCard.png differ diff --git a/image/collectiing/img_popupTrue.png b/image/collectiing/img_popupTrue.png index b2968acc..64de1e08 100644 Binary files a/image/collectiing/img_popupTrue.png and b/image/collectiing/img_popupTrue.png differ diff --git a/image/collectiing/text_39.png b/image/collectiing/text_39.png index e76ad284..0fbcf446 100644 Binary files a/image/collectiing/text_39.png and b/image/collectiing/text_39.png differ diff --git a/image/collectiing/text_40.png b/image/collectiing/text_40.png new file mode 100644 index 00000000..7a86a96d Binary files /dev/null and b/image/collectiing/text_40.png differ diff --git a/image/collectiing_en/bd_pay_with_ccard1.png b/image/collectiing_en/bd_pay_with_ccard1.png new file mode 100644 index 00000000..23a9f0c2 Binary files /dev/null and b/image/collectiing_en/bd_pay_with_ccard1.png differ diff --git a/image/collectiing_en/bd_pay_with_codeMCard.png b/image/collectiing_en/bd_pay_with_codeMCard.png new file mode 100644 index 00000000..7ee13cb9 Binary files /dev/null and b/image/collectiing_en/bd_pay_with_codeMCard.png differ diff --git a/image/collectiing_en/bd_pay_with_linepay.png b/image/collectiing_en/bd_pay_with_linepay.png new file mode 100644 index 00000000..fb0f81c9 Binary files /dev/null and b/image/collectiing_en/bd_pay_with_linepay.png differ diff --git a/image/collectiing_en/bn_pay_with_ccard1.png b/image/collectiing_en/bn_pay_with_ccard1.png new file mode 100644 index 00000000..1a613c09 Binary files /dev/null and b/image/collectiing_en/bn_pay_with_ccard1.png differ diff --git a/image/collectiing_en/bn_pay_with_codeMCard.png b/image/collectiing_en/bn_pay_with_codeMCard.png new file mode 100644 index 00000000..cdcc6ee7 Binary files /dev/null and b/image/collectiing_en/bn_pay_with_codeMCard.png differ diff --git a/image/collectiing_en/bn_pay_with_linepay.png b/image/collectiing_en/bn_pay_with_linepay.png new file mode 100644 index 00000000..1eeb47b0 Binary files /dev/null and b/image/collectiing_en/bn_pay_with_linepay.png differ diff --git a/image/collectiing_en/bp_pay_with_ccard1.png b/image/collectiing_en/bp_pay_with_ccard1.png new file mode 100644 index 00000000..bcbcc636 Binary files /dev/null and b/image/collectiing_en/bp_pay_with_ccard1.png differ diff --git a/image/collectiing_en/bp_pay_with_codeMCard.png b/image/collectiing_en/bp_pay_with_codeMCard.png new file mode 100644 index 00000000..1ed3a8d6 Binary files /dev/null and b/image/collectiing_en/bp_pay_with_codeMCard.png differ diff --git a/image/collectiing_en/bp_pay_with_linepay.png b/image/collectiing_en/bp_pay_with_linepay.png new file mode 100644 index 00000000..7a69a663 Binary files /dev/null and b/image/collectiing_en/bp_pay_with_linepay.png differ diff --git a/image/collectiing_en/img_popupGLX.png b/image/collectiing_en/img_popupGLX.png index ef308c0a..5707f199 100644 Binary files a/image/collectiing_en/img_popupGLX.png and b/image/collectiing_en/img_popupGLX.png differ diff --git a/image/collectiing_en/img_popupMCard.png b/image/collectiing_en/img_popupMCard.png new file mode 100644 index 00000000..c28bdddc Binary files /dev/null and b/image/collectiing_en/img_popupMCard.png differ diff --git a/image/collectiing_en/img_popupTrue.png b/image/collectiing_en/img_popupTrue.png index b2968acc..64de1e08 100644 Binary files a/image/collectiing_en/img_popupTrue.png and b/image/collectiing_en/img_popupTrue.png differ diff --git a/image/collectiing_en/text_39.png b/image/collectiing_en/text_39.png index 5fdc9a71..b61b5e5c 100644 Binary files a/image/collectiing_en/text_39.png and b/image/collectiing_en/text_39.png differ diff --git a/image/collectiing_en/text_40.png b/image/collectiing_en/text_40.png new file mode 100644 index 00000000..843ccaf0 Binary files /dev/null and b/image/collectiing_en/text_40.png differ diff --git a/image/page_payment/bd_pay_with_linepay.png b/image/page_payment/bd_pay_with_linepay.png new file mode 100644 index 00000000..fb0f81c9 Binary files /dev/null and b/image/page_payment/bd_pay_with_linepay.png differ diff --git a/image/page_payment/img_popup9.png b/image/page_payment/img_popup9.png new file mode 100644 index 00000000..64f121b0 Binary files /dev/null and b/image/page_payment/img_popup9.png differ diff --git a/image/page_payment_en/page_payment/bd_pay_with_linepay.png b/image/page_payment_en/page_payment/bd_pay_with_linepay.png new file mode 100644 index 00000000..fb0f81c9 Binary files /dev/null and b/image/page_payment_en/page_payment/bd_pay_with_linepay.png differ diff --git a/image/page_payment_en/page_payment/img_popup9.png b/image/page_payment_en/page_payment/img_popup9.png new file mode 100644 index 00000000..4bc99271 Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup9.png differ diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 4a2f0436..37cfaa19 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -18,7 +18,7 @@ Var QRChannel = 0 - ;Var PriceDrink = 5 + ;Var PriceDrink = 1 Var DiscountDrink = 0 Var SelectSlot = "1" diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 4990e083..0db0e627 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -647,6 +647,12 @@ Var ReqPayInfoFromCashOther = 0 EndIf + If ReqPayInfoFromCashOther = 2 Then + Var alphaState = "Enable" + Var ReqPayInfoFromCashOther = 0 + EndIf + + ;Open "ROOT/taobin_project/xml/page_page_camera.xml" @@ -885,6 +891,7 @@ Var Timeout = 0 Var QRErrorState = "Invisible" + Var LOADING_STATE = "Invisible" If ViewBill > 0 Then CoinVending BILLREJECT @@ -892,8 +899,7 @@ VendingQR OFF CoinVending OFF - - + Refresh If Seeker = "curr" Then MakeDrinkV1 SelectDrink SelectSugarID diff --git a/xml/page_payment_cashOther.xml b/xml/page_payment_cashOther.xml index 1b828804..6c2ad76f 100644 --- a/xml/page_payment_cashOther.xml +++ b/xml/page_payment_cashOther.xml @@ -406,6 +406,26 @@ + + + + @@ -420,7 +440,7 @@ SoundVolume - + diff --git a/xml/page_payment_codeMCard.xml b/xml/page_payment_codeMCard.xml new file mode 100644 index 00000000..7919f2ea --- /dev/null +++ b/xml/page_payment_codeMCard.xml @@ -0,0 +1,699 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + PlaySoundCodeLang + SoundVolume + "Partial" + + ; On open + Var ECommerce = "" + Var Seeker.FreeVendingCampaign = 0 + + Var Timeout = 0 + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + ;Var VendingQRCode = "ERROR" + ;VendingQR ON + ;Var QRCODE99 = "" + + ;CoinVending OFF + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + Var ErrorCause = "" + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + + Var Mode# = 0 + Var Str# = "" + Var TelephoneNumber# = "" + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + + Open "ROOT/taobin_project/xml/page_payment_codeOther.xml" + + Refresh + EndIf + + TimerReset + + + + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + + + + + + + If Seeker.CodeChannel = 1 Then + + SAVELOG "Seeker.CodeChannel 1 > ActOK." + + SAVELOG ECommerce + + SPLIT ECommerce "/" 5 Seeker.VendingCode + SPLIT ECommerce "/" 7 Seeker.VendingCampaignRI3 + SPLIT ECommerce "/" 8 VendingCampaign1 + + If Seeker.VendingCode = "" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "KBA:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "AIR:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "TWN:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + SAVELOG Seeker.VendingCode + SAVELOG Seeker.VendingCampaignRI3 + + + If Seeker.VendingCode = "C00" Then + + Else + + Var VendingCreditRemain = "" + Var IntVendingCampaign1 = VendingCampaign1 + INT IntVendingCampaign1 + + If IntVendingCampaign1 > 0 Then + Var VendingCreditRemain = VendingCampaign1 + EndIf + + + + Var Seeker.IntVendingCampaign = Seeker.VendingCampaignRI3 + INT Seeker.IntVendingCampaign + + Var VendingREFID = SessionID + + If Seeker.IntVendingCampaign > 0 Then + Var QRChannel = 0 + + If Seeker.IntVendingCampaign >= PayAmount Then + ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Var Seeker.VendingCampaign = PayAmount + Var Seeker.FreeVendingCampaign = 1 + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + If CART_COUNT >= 1 Then + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Cart "MakeID" CART_INDEX + Open "ROOT/taobin_project/xml/page_thankyou.xml" + Else + Var CART_INDEX = 0 + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 + + Var DrinkPaid = SelectDrink + Var PaidPaymentFromNextStage = 1 + EndIf + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + EndIf + + Var Seeker.CodeChannel = 1 + + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf + + + + Else + + Var ShowErrorText = "Enable" + Var text_show_error = DirImage + "/text_show_error.png" + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + EndIf + EndIf + + Else + + + + + EndIf + + + + + If Seeker.CodeChannel = 1 Then + Var TelephoneNumber = "" + + Var ShowErrorText = "Enable" + + SAVELOG ShowErrorText + + Var text_show_error = DirImage + "/text_show_error2.png" + + If ErrorCause = "failed_fromoper_0002" Then + Var text_show_error = DirImage + "/text_show_error.png" + EndIf + + If ErrorCause = "failed_fromoper_0005" Then + Var text_show_error = DirImage + "/text_show_error3.png" + EndIf + + If ErrorCause = "failed_fromoper_0006" Then + Var text_show_error = DirImage + "/text_show_error4.png" + EndIf + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + Var Tel_Confirm_State = "Disable" + Refresh + EndIf + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 667 + "ROOT/taobin_project/image/collectiing/img_popup1.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 217 + 868 + Var( DirImage + "/img3.png" ) + + + + 244 + 882 + ShowTextNumber + "Enable" + Var( DirImage + "/text_12.png" ) + + + + + 0 + 883 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + "Enable" + TelephoneNumber# + + + + + + + 188 + 760 + Var( DirImage + "/text_40.png" ) + + + + 152 + 1001 + "Enable" + ShowErrorText + text_show_error + + + + 158 + 513 + Var( DirImage + "/img_popupMCard.png" ) + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + + diff --git a/xml/page_payment_codeOther.xml b/xml/page_payment_codeOther.xml index 8442c706..ebc86d69 100644 --- a/xml/page_payment_codeOther.xml +++ b/xml/page_payment_codeOther.xml @@ -227,14 +227,14 @@ 673 1196 "Enable" - "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" - "ROOT/taobin_project/image/collectiing/bp_pay_with_codeXXX.png" - "ROOT/taobin_project/image/collectiing/bd_pay_with_codeXXX.png" + "ROOT/taobin_project/image/collectiing/bn_pay_with_codeMCard.png" + "ROOT/taobin_project/image/collectiing/bp_pay_with_codeMCard.png" + "ROOT/taobin_project/image/collectiing/bd_pay_with_codeMCard.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Open "ROOT/taobin_project/xml/page_payment_codeMCard.xml"