diff --git a/image/collectiing/bd_pay_with_codeGrab.png b/image/collectiing/bd_pay_with_codeGrab.png new file mode 100644 index 00000000..4cb285cf Binary files /dev/null and b/image/collectiing/bd_pay_with_codeGrab.png differ diff --git a/image/collectiing/bd_pay_with_lazpay.png b/image/collectiing/bd_pay_with_lazpay.png index 6838f4fd..f8a5f2e1 100644 Binary files a/image/collectiing/bd_pay_with_lazpay.png and b/image/collectiing/bd_pay_with_lazpay.png differ diff --git a/image/collectiing/bn_pay_with_codeGrab.png b/image/collectiing/bn_pay_with_codeGrab.png new file mode 100644 index 00000000..a44d6a81 Binary files /dev/null and b/image/collectiing/bn_pay_with_codeGrab.png differ diff --git a/image/collectiing/bn_pay_with_lazpay.png b/image/collectiing/bn_pay_with_lazpay.png index 5a6c854b..d7aa7c54 100644 Binary files a/image/collectiing/bn_pay_with_lazpay.png and b/image/collectiing/bn_pay_with_lazpay.png differ diff --git a/image/collectiing/bp_pay_with_codeGrab.png b/image/collectiing/bp_pay_with_codeGrab.png new file mode 100644 index 00000000..929a24c2 Binary files /dev/null and b/image/collectiing/bp_pay_with_codeGrab.png differ diff --git a/image/collectiing/bp_pay_with_lazpay.png b/image/collectiing/bp_pay_with_lazpay.png index eb2c74e8..5c598770 100644 Binary files a/image/collectiing/bp_pay_with_lazpay.png and b/image/collectiing/bp_pay_with_lazpay.png differ diff --git a/image/collectiing/img_popupGrab.png b/image/collectiing/img_popupGrab.png new file mode 100644 index 00000000..833fabdd Binary files /dev/null and b/image/collectiing/img_popupGrab.png differ diff --git a/image/collectiing/text_43.png b/image/collectiing/text_43.png new file mode 100644 index 00000000..a2020d60 Binary files /dev/null and b/image/collectiing/text_43.png differ diff --git a/image/collectiing_en/bd_pay_with_lazpay.png b/image/collectiing_en/bd_pay_with_lazpay.png index 6838f4fd..f8a5f2e1 100644 Binary files a/image/collectiing_en/bd_pay_with_lazpay.png and b/image/collectiing_en/bd_pay_with_lazpay.png differ diff --git a/image/collectiing_en/bn_pay_with_lazpay.png b/image/collectiing_en/bn_pay_with_lazpay.png index 5a6c854b..d7aa7c54 100644 Binary files a/image/collectiing_en/bn_pay_with_lazpay.png and b/image/collectiing_en/bn_pay_with_lazpay.png differ diff --git a/image/collectiing_en/bp_pay_with_lazpay.png b/image/collectiing_en/bp_pay_with_lazpay.png index eb2c74e8..5c598770 100644 Binary files a/image/collectiing_en/bp_pay_with_lazpay.png and b/image/collectiing_en/bp_pay_with_lazpay.png differ diff --git a/image/collectiing_en/img_popupGrab.png b/image/collectiing_en/img_popupGrab.png new file mode 100644 index 00000000..833fabdd Binary files /dev/null and b/image/collectiing_en/img_popupGrab.png differ diff --git a/image/collectiing_en/text_43.png b/image/collectiing_en/text_43.png new file mode 100644 index 00000000..9215ee57 Binary files /dev/null and b/image/collectiing_en/text_43.png differ diff --git a/image/page_payment/bd_qrcode.png b/image/page_payment/bd_qrcode.png index 56beba9b..4e8c0a4d 100644 Binary files a/image/page_payment/bd_qrcode.png and b/image/page_payment/bd_qrcode.png differ diff --git a/image/page_payment/bn_qrcode.png b/image/page_payment/bn_qrcode.png index 9d97886e..b93d6372 100644 Binary files a/image/page_payment/bn_qrcode.png and b/image/page_payment/bn_qrcode.png differ diff --git a/image/page_payment/bp_qrcode.png b/image/page_payment/bp_qrcode.png index 05d580b0..d32f0067 100644 Binary files a/image/page_payment/bp_qrcode.png and b/image/page_payment/bp_qrcode.png differ diff --git a/image/page_payment/img_popup1.png b/image/page_payment/img_popup1.png index 302e1213..5b22ab53 100644 Binary files a/image/page_payment/img_popup1.png and b/image/page_payment/img_popup1.png differ diff --git a/image/page_payment_en/page_payment/bd_qrcode.png b/image/page_payment_en/page_payment/bd_qrcode.png index 56beba9b..4e8c0a4d 100644 Binary files a/image/page_payment_en/page_payment/bd_qrcode.png and b/image/page_payment_en/page_payment/bd_qrcode.png differ diff --git a/image/page_payment_en/page_payment/bn_qrcode.png b/image/page_payment_en/page_payment/bn_qrcode.png index 9d97886e..b93d6372 100644 Binary files a/image/page_payment_en/page_payment/bn_qrcode.png and b/image/page_payment_en/page_payment/bn_qrcode.png differ diff --git a/image/page_payment_en/page_payment/bp_qrcode.png b/image/page_payment_en/page_payment/bp_qrcode.png index 05d580b0..d32f0067 100644 Binary files a/image/page_payment_en/page_payment/bp_qrcode.png and b/image/page_payment_en/page_payment/bp_qrcode.png differ diff --git a/image/page_payment_en/page_payment/img_popup1.png b/image/page_payment_en/page_payment/img_popup1.png index a3ce22a9..979c5c41 100644 Binary files a/image/page_payment_en/page_payment/img_popup1.png and b/image/page_payment_en/page_payment/img_popup1.png differ diff --git a/xml/page_payment_cash-MYR.xml b/xml/page_payment_cash-MYR.xml index 12cabf0c..286ac1b8 100644 --- a/xml/page_payment_cash-MYR.xml +++ b/xml/page_payment_cash-MYR.xml @@ -175,6 +175,8 @@ Var PayState1 = "Press" EndIf + Var PayState3 = "Enable" + If Seeker.IntVendingCampaign = 0 Then Var PayState2 = "Enable" Var PayState4 = "Enable" @@ -186,8 +188,9 @@ Var PayState4 = "Disable" Var PayState5 = "Enable" Var PayState6 = "Disable" + Var PayState3 = "Disable" EndIf - Var PayState3 = "Enable" + DEBUGVAR CoinAmount @@ -207,6 +210,7 @@ Var PayState4 = "Disable" Var PayState5 = "Disable" Var PayState6 = "Disable" + Var PayState3 = "Disable" EndIf @@ -381,7 +385,7 @@ Var PayState1 = "Disable" EndIf ; override - Var PayState1 = "Disable" + Var PayState1 = "Invisible" ;cancel order If SELLSTATUS = "DEACTIVE" Then @@ -450,6 +454,8 @@ ;Open "ROOT/taobin_project/xml/page_page_camera.xml" + ;Var PayState4 = "Invisible" + @@ -480,20 +486,9 @@ Var Seeker.CampaignPayChanel = "malaymbb" EndIf If ReqPayInfoFlag2 = 2 Then - Var Seeker.CampaignPayChanel = "shopee" + Var Seeker.CampaignPayChanel = "alipay" EndIf - If ReqPayInfoFlag2 = 3 Then - Var Seeker.CampaignPayChanel = "true" - EndIf - If ReqPayInfoFlag2 = 4 Then - Var Seeker.CampaignPayChanel = "dolfin" - EndIf - If ReqPayInfoFlag2 = 5 Then - Var Seeker.CampaignPayChanel = "linepay" - EndIf - - - + If Seeker = "curr" Then MakeDrinkV1 SelectDrink SelectSugarID @@ -536,36 +531,10 @@ EndIf - If VendingQRTypeResult = "IND:2" Then - Var CashTextWarning = "" - Var QRErrorState = "Invisible" - Var QRCODE99KBANK = SessionID - Var QRCODE99KBANK = QRCODE99KBANK + Ext1a - SAVELOG Ext1a - SAVELOG QRCODE99KBANK - Var QRCODE99KBANK = QRCODE99KBANK + Ext21 - Var QRCODETMP = QRCODE99KBANK - Var ReqPayInfoFlag = 0 - Var ReqPayInfoFlag2 = 1 - SAVELOG QRCODE99KBANK - SAVELOG Ext21 - - Var QRCODE99 = QRCODE99KBANK - 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 If ReqPayInfoFlag = 2 Then - If VendingQRTypeResult = "AIR:2" Then + If VendingQRTypeResult = "ALI:2" Then Var CashTextWarning = "" Var QRErrorState = "Invisible" Var QRCODE99Shoppy = SessionID @@ -590,84 +559,6 @@ EndIf EndIf - If ReqPayInfoFlag = 3 Then - If VendingQRTypeResult = "TWN:2" Then - Var CashTextWarning = "" - Var QRErrorState = "Invisible" - Var QRCODE99Shoppy = SessionID - Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a - SAVELOG Ext1a - SAVELOG QRCODE99Shoppy - Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21 - Var ReqPayInfoFlag = 0 - Var ReqPayInfoFlag2 = 3 - SAVELOG QRCODE99Shoppy - SAVELOG Ext21 - - 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 - - If ReqPayInfoFlag = 4 Then - If VendingQRTypeResult = "DOL:2" Then - Var CashTextWarning = "" - Var QRErrorState = "Invisible" - Var QRCODE99Shoppy = SessionID - Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a - SAVELOG Ext1a - SAVELOG QRCODE99Shoppy - Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21 - Var ReqPayInfoFlag = 0 - Var ReqPayInfoFlag2 = 4 - SAVELOG QRCODE99Shoppy - SAVELOG Ext21 - - 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 - - If ReqPayInfoFlag = 5 Then - If VendingQRTypeResult = "LPY:2" Then - Var CashTextWarning = "" - Var QRErrorState = "Invisible" - Var QRCODE99Shoppy = SessionID - Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a - SAVELOG Ext1a - SAVELOG QRCODE99Shoppy - Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21 - Var ReqPayInfoFlag = 0 - Var ReqPayInfoFlag2 = 5 - SAVELOG QRCODE99Shoppy - SAVELOG Ext21 - - 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 @@ -1460,8 +1351,8 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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_43.png" ) + + + + 152 + 1001 + "Enable" + ShowErrorText + text_show_error + + + + 158 + 513 + Var( DirImage + "/img_popupGrab.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 7a5b7cbf..7c59534b 100644 --- a/xml/page_payment_codeOther.xml +++ b/xml/page_payment_codeOther.xml @@ -243,14 +243,14 @@ 211 1385 "Enable" - "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" - "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" - "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" + "ROOT/taobin_project/image/collectiing/bn_pay_with_codeGrab.png" + "ROOT/taobin_project/image/collectiing/bp_pay_with_codeGrab.png" + "ROOT/taobin_project/image/collectiing/bd_pay_with_codeGrab.png" "ROOT/sounds/codebuttom.wav" SoundVolume - ;Open "ROOT/taobin_project/xml/page_payment_codeRabbit.xml" + Open "ROOT/taobin_project/xml/page_payment_codeGrab.xml"