diff --git a/image/page_payment/img_popup8_with_service_charge.png b/image/page_payment/img_popup8_with_service_charge.png new file mode 100644 index 00000000..285e20ea Binary files /dev/null and b/image/page_payment/img_popup8_with_service_charge.png differ diff --git a/image/page_payment_en/page_payment/img_popup8_with_service_charge.png b/image/page_payment_en/page_payment/img_popup8_with_service_charge.png new file mode 100644 index 00000000..cc4e82a5 Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup8_with_service_charge.png differ diff --git a/inter/aus/xml/page_brewing3.lxml b/inter/aus/xml/page_brewing3.lxml index 627efa18..a6e6fa0a 100644 --- a/inter/aus/xml/page_brewing3.lxml +++ b/inter/aus/xml/page_brewing3.lxml @@ -1172,8 +1172,8 @@ If Seeker.CreditCard = 1 Then - ;CashlessReq SUCCESS - ;CashlessReq FAIL + ;CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -1182,8 +1182,8 @@ If Seeker.CreditCard = 1 Then - ;CashlessReq SUCCESS - ;CashlessReq FAIL + ;CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -1251,7 +1251,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - ;CashlessReq FAIL + ;CashlessReq FAIL "" Var ChangeFlag = 1 Var CreditCardVoid = 1 Else diff --git a/inter/aus/xml/page_brewing3Conti.xml b/inter/aus/xml/page_brewing3Conti.xml index 1da90519..98cecdd3 100644 --- a/inter/aus/xml/page_brewing3Conti.xml +++ b/inter/aus/xml/page_brewing3Conti.xml @@ -678,8 +678,8 @@ If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf Var PayDetail2 = Seeker.PayDetail2 @@ -690,8 +690,8 @@ If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf Var PayDetail2 = Seeker.PayDetail2 @@ -770,7 +770,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - ;CashlessReq FAIL + ;CashlessReq FAIL "" Var ChangeFlag = 1 Var CreditCardVoid = 1 Var ChangeOK = 2 diff --git a/inter/aus/xml/page_member_topup.lxml b/inter/aus/xml/page_member_topup.lxml index 2fc4d490..7cbe6c17 100644 --- a/inter/aus/xml/page_member_topup.lxml +++ b/inter/aus/xml/page_member_topup.lxml @@ -80,9 +80,9 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" Else - CashlessReq OFF + CashlessReq OFF "" EndIf VendingQR OFF @@ -163,7 +163,7 @@ EndIf If VendingCashless = "OK" Then - CashlessReq SUCCESS + CashlessReq SUCCESS "" Var PayCreditChannel = "credit-card" @@ -184,7 +184,7 @@ Var LOADING_STATE = "Invisible" EndIf - CashlessReq FAIL + CashlessReq FAIL "" EndIf @@ -492,10 +492,10 @@ SAVELOG "Canceling credit card" Var QR_POPUP = "/img_popup8-2.png" - CashlessReq OFF + CashlessReq OFF "" If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf diff --git a/inter/mys/xml/page_brewing3Conti_event.lxml b/inter/mys/xml/page_brewing3Conti_event.lxml index 418d5f10..5e669b6a 100644 --- a/inter/mys/xml/page_brewing3Conti_event.lxml +++ b/inter/mys/xml/page_brewing3Conti_event.lxml @@ -512,8 +512,8 @@ If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf Var PayDetail2 = Seeker.PayDetail2 @@ -524,8 +524,8 @@ If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf Var PayDetail2 = Seeker.PayDetail2 diff --git a/inter/mys/xml/page_brewing3_event.lxml b/inter/mys/xml/page_brewing3_event.lxml index 12673df5..a616cf32 100644 --- a/inter/mys/xml/page_brewing3_event.lxml +++ b/inter/mys/xml/page_brewing3_event.lxml @@ -602,8 +602,8 @@ If Seeker.CreditCard = 1 Then WRITE_FILE "/mnt/sdcard/app_run_flag" "1" - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -613,8 +613,8 @@ If Seeker.CreditCard = 1 Then WRITE_FILE "/mnt/sdcard/app_run_flag" "1" - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -673,7 +673,7 @@ If Seeker.CreditCard = 1 Then ;DEBUGVAR "Credit::void.switch(app: finexus)" ;WRITE_FILE "/mnt/sdcard/app_run_flag" "1" - ;CashlessReq FAIL + ;CashlessReq FAIL "" ;Var ChangeFlag = 1 ;Var CreditCardVoid = 1 diff --git a/inter/mys/xml/page_member_topup.lxml b/inter/mys/xml/page_member_topup.lxml index 7fd59487..f90114d4 100644 --- a/inter/mys/xml/page_member_topup.lxml +++ b/inter/mys/xml/page_member_topup.lxml @@ -69,9 +69,9 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" Else - CashlessReq OFF + CashlessReq OFF "" EndIf Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml" @@ -90,7 +90,7 @@ If VendingCashless = "OK" Then - CashlessReq SUCCESS + CashlessReq SUCCESS "" Var ToppupSuccessPage = CountryRootPath + "xml/page_member_topupSuccess.lxml" Open ToppupSuccessPage @@ -108,7 +108,7 @@ Var LOADING_STATE = "Invisible" EndIf - CashlessReq FAIL + CashlessReq FAIL "" EndIf @@ -277,7 +277,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml" @@ -332,11 +332,11 @@ Var QRErrorState = "Invisible" Var alphaState = "Invisible" - CashlessReq OFF + CashlessReq OFF "" If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf DEBUGVAR LOADING_STATE diff --git a/inter/mys/xml/page_void_credit_card.lxml b/inter/mys/xml/page_void_credit_card.lxml index 00f29781..0169e458 100644 --- a/inter/mys/xml/page_void_credit_card.lxml +++ b/inter/mys/xml/page_void_credit_card.lxml @@ -14,7 +14,7 @@ DEBUGVAR "Credit::void.switch(app: finexus)" WRITE_FILE "/mnt/sdcard/app_run_flag" "1" - CashlessReq FAIL + CashlessReq FAIL "" Var ChangeFlag = 1 Var CreditCardVoid = 1 diff --git a/inter/mys/xml/page_void_credit_cardConti.lxml b/inter/mys/xml/page_void_credit_cardConti.lxml index 3334f3f9..0e5f4cd9 100644 --- a/inter/mys/xml/page_void_credit_cardConti.lxml +++ b/inter/mys/xml/page_void_credit_cardConti.lxml @@ -14,7 +14,7 @@ DEBUGVAR "Credit::void.switch(app: finexus).next(true)" WRITE_FILE "/mnt/sdcard/app_run_flag" "1" - CashlessReq FAIL + CashlessReq FAIL "" Var ChangeFlag = 1 Var CreditCardVoid = 1 diff --git a/inter/sgp/xml/page_brewing3.lxml b/inter/sgp/xml/page_brewing3.lxml index fad1a48a..98cbf42b 100644 --- a/inter/sgp/xml/page_brewing3.lxml +++ b/inter/sgp/xml/page_brewing3.lxml @@ -1020,8 +1020,8 @@ If Seeker.CreditCard = 1 Then - ;CashlessReq SUCCESS - ;CashlessReq FAIL + ;CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -1030,8 +1030,8 @@ If Seeker.CreditCard = 1 Then - ;CashlessReq SUCCESS - ;CashlessReq FAIL + ;CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -1094,7 +1094,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - ;CashlessReq FAIL + ;CashlessReq FAIL "" Var ChangeFlag = 1 Var CreditCardVoid = 1 Else diff --git a/inter/sgp/xml/page_brewing3Conti.xml b/inter/sgp/xml/page_brewing3Conti.xml index ff4732bf..1ce2065a 100644 --- a/inter/sgp/xml/page_brewing3Conti.xml +++ b/inter/sgp/xml/page_brewing3Conti.xml @@ -709,8 +709,8 @@ If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf Var PayDetail2 = Seeker.PayDetail2 @@ -721,8 +721,8 @@ If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf Var PayDetail2 = Seeker.PayDetail2 @@ -798,7 +798,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - CashlessReq FAIL + CashlessReq FAIL "" Var ChangeFlag = 1 Var CreditCardVoid = 1 Else diff --git a/inter/sgp/xml/page_brewing3_blue.lxml b/inter/sgp/xml/page_brewing3_blue.lxml index 677b3779..fb7f7b69 100644 --- a/inter/sgp/xml/page_brewing3_blue.lxml +++ b/inter/sgp/xml/page_brewing3_blue.lxml @@ -472,7 +472,7 @@ Var XPercent = 0 EndIf - CashlessReq SUCCESS + CashlessReq SUCCESS "" @@ -1048,8 +1048,8 @@ If Seeker.CreditCard = 1 Then - ;CashlessReq SUCCESS - ;CashlessReq FAIL + ;CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -1058,8 +1058,8 @@ If Seeker.CreditCard = 1 Then - ;CashlessReq SUCCESS - ;CashlessReq FAIL + ;CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -1122,7 +1122,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - ;CashlessReq FAIL + ;CashlessReq FAIL "" Var ChangeFlag = 1 Var CreditCardVoid = 1 Else diff --git a/inter/sgp/xml/page_member_topup.lxml b/inter/sgp/xml/page_member_topup.lxml index 3de37ec1..36e6e45b 100644 --- a/inter/sgp/xml/page_member_topup.lxml +++ b/inter/sgp/xml/page_member_topup.lxml @@ -69,9 +69,9 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" Else - CashlessReq OFF + CashlessReq OFF "" EndIf Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml" @@ -90,7 +90,7 @@ If VendingCashless = "OK" Then - CashlessReq SUCCESS + CashlessReq SUCCESS "" Var ToppupSuccessPage = CountryRootPath + "xml/page_member_topupSuccess.lxml" Open ToppupSuccessPage @@ -108,7 +108,7 @@ Var LOADING_STATE = "Invisible" EndIf - CashlessReq FAIL + CashlessReq FAIL "" EndIf @@ -277,7 +277,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml" @@ -332,11 +332,11 @@ Var QRErrorState = "Invisible" Var alphaState = "Invisible" - CashlessReq OFF + CashlessReq OFF "" If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf DEBUGVAR LOADING_STATE diff --git a/inter/uae_dubai/xml/page_brewing3.lxml b/inter/uae_dubai/xml/page_brewing3.lxml index f3385937..b119dabd 100644 --- a/inter/uae_dubai/xml/page_brewing3.lxml +++ b/inter/uae_dubai/xml/page_brewing3.lxml @@ -1163,8 +1163,8 @@ If Seeker.CreditCard = 1 Then - ;CashlessReq SUCCESS - ;CashlessReq FAIL + ;CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -1173,8 +1173,8 @@ If Seeker.CreditCard = 1 Then - ;CashlessReq SUCCESS - ;CashlessReq FAIL + ;CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -1231,7 +1231,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - ;CashlessReq FAIL + ;CashlessReq FAIL "" Var ChangeFlag = 1 Var CreditCardVoid = 1 Else diff --git a/inter/uae_dubai/xml/page_brewing3Conti.xml b/inter/uae_dubai/xml/page_brewing3Conti.xml index 2d5bef47..03ee9117 100644 --- a/inter/uae_dubai/xml/page_brewing3Conti.xml +++ b/inter/uae_dubai/xml/page_brewing3Conti.xml @@ -666,8 +666,8 @@ If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -678,8 +678,8 @@ If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -750,7 +750,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - CashlessReq FAIL + CashlessReq FAIL "" Var ChangeFlag = 1 Var CreditCardVoid = 1 Else diff --git a/inter/uae_dubai/xml/page_brewing3Conti_blue.lxml b/inter/uae_dubai/xml/page_brewing3Conti_blue.lxml index 80bef503..71b2ebc0 100644 --- a/inter/uae_dubai/xml/page_brewing3Conti_blue.lxml +++ b/inter/uae_dubai/xml/page_brewing3Conti_blue.lxml @@ -712,8 +712,8 @@ If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -724,8 +724,8 @@ If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -796,7 +796,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - CashlessReq FAIL + CashlessReq FAIL "" Var ChangeFlag = 1 Var CreditCardVoid = 1 Else diff --git a/inter/uae_dubai/xml/page_brewing3_blue.lxml b/inter/uae_dubai/xml/page_brewing3_blue.lxml index 48d65bcd..edfe7697 100644 --- a/inter/uae_dubai/xml/page_brewing3_blue.lxml +++ b/inter/uae_dubai/xml/page_brewing3_blue.lxml @@ -475,7 +475,7 @@ Var XPercent = 0 EndIf - ;CashlessReq SUCCESS + ;CashlessReq SUCCESS "" @@ -1069,8 +1069,8 @@ If Seeker.CreditCard = 1 Then - ;CashlessReq SUCCESS - ;CashlessReq FAIL + ;CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -1079,8 +1079,8 @@ If Seeker.CreditCard = 1 Then - ;CashlessReq SUCCESS - ;CashlessReq FAIL + ;CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -1137,7 +1137,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - ;CashlessReq FAIL + ;CashlessReq FAIL "" Var ChangeFlag = 1 Var CreditCardVoid = 1 Else diff --git a/inter/uae_dubai/xml/page_member_topup.lxml b/inter/uae_dubai/xml/page_member_topup.lxml index 3e795a3f..392aec36 100644 --- a/inter/uae_dubai/xml/page_member_topup.lxml +++ b/inter/uae_dubai/xml/page_member_topup.lxml @@ -69,9 +69,9 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" Else - CashlessReq OFF + CashlessReq OFF "" EndIf Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml" @@ -90,7 +90,7 @@ If VendingCashless = "OK" Then - CashlessReq SUCCESS + CashlessReq SUCCESS "" Var ToppupSuccessPage = CountryRootPath + "xml/page_member_topupSuccess.lxml" Open ToppupSuccessPage @@ -108,7 +108,7 @@ Var LOADING_STATE = "Invisible" EndIf - CashlessReq FAIL + CashlessReq FAIL "" EndIf @@ -277,7 +277,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml" @@ -332,11 +332,11 @@ Var QRErrorState = "Invisible" Var alphaState = "Invisible" - CashlessReq OFF + CashlessReq OFF "" If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf DEBUGVAR LOADING_STATE diff --git a/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml b/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml index c34baa11..b9942e7c 100644 --- a/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml +++ b/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml @@ -24,7 +24,7 @@ Var PreScaleCanculate = 100 DEBUGVAR VendingCashless - CashlessReq FAIL + CashlessReq FAIL "" Var CashlessPayFlag = 0 @@ -844,7 +844,7 @@ If CancelFlag = 1 Then DEBUGVAR CancelFlag Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf @@ -1050,19 +1050,19 @@ If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Var CancelCounter = 0 @@ -1527,18 +1527,18 @@ If CashlessPayFlag = 0 Then If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf @@ -1756,18 +1756,18 @@ EndIf If CashlessPayFlag = 0 Then If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf @@ -1858,24 +1858,24 @@ EndIf ;CoinVending ON ;VendingQR OFF - CashlessReq OFF + CashlessReq OFF "" If CashlessPayFlag = 0 Then If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf @@ -1969,18 +1969,18 @@ EndIf If CashlessPayFlag = 0 Then If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf @@ -2038,18 +2038,18 @@ EndIf If CashlessPayFlag = 0 Then If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf @@ -2092,18 +2092,18 @@ EndIf If CashlessPayFlag = 0 Then If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf @@ -2216,19 +2216,19 @@ EndIf If CashlessPayFlag = 0 Then If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf DEBUGVAR UserChoosePayment @@ -2303,18 +2303,18 @@ EndIf If CashlessPayFlag = 0 Then If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf DEBUGVAR UserChoosePayment diff --git a/inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml b/inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml index f2105424..7a1b0b61 100644 --- a/inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml +++ b/inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml @@ -788,7 +788,7 @@ Var Seeker.CreditCard = 1 Var Seeker.CreditCardRef = CreditCardRef - CashlessReq SUCCESS + CashlessReq SUCCESS "" Open "ROOT/taobin_project/xml/page_thankyou.xml" @@ -796,8 +796,8 @@ If VendingCashless = "END" Then If ReqPayInfoFromCashOther = 2 Then - DEBUGVAR "CashlessReq OFF" - CashlessReq OFF + DEBUGVAR "CashlessReq OFF """ + CashlessReq OFF "" EndIf EndIf @@ -1043,7 +1043,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Var CancelCounter = 0 @@ -1494,7 +1494,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Var CancelContinue = 0 @@ -1718,7 +1718,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Var CancelContinue = 0 @@ -1820,7 +1820,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Refresh @@ -2001,13 +2001,13 @@ If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf diff --git a/spiral/xml/page_spiral_failmuti.xml b/spiral/xml/page_spiral_failmuti.xml index 34932899..7a718c7b 100644 --- a/spiral/xml/page_spiral_failmuti.xml +++ b/spiral/xml/page_spiral_failmuti.xml @@ -509,8 +509,8 @@ If Seeker.thankToppingFlag = 1 Then If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -525,8 +525,8 @@ If Seeker.thankToppingFlag = 1 Then If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf diff --git a/spiral/xml/page_spiral_payment_cash.xml b/spiral/xml/page_spiral_payment_cash.xml index 1adb1604..60a70a50 100644 --- a/spiral/xml/page_spiral_payment_cash.xml +++ b/spiral/xml/page_spiral_payment_cash.xml @@ -828,7 +828,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Var CancelCounter = 0 @@ -1520,7 +1520,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf @@ -1639,11 +1639,11 @@ ;CoinVending ON ;VendingQR OFF - CashlessReq OFF + CashlessReq OFF "" If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Refresh @@ -1696,7 +1696,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf EndIf diff --git a/spiral/xml/page_spiral_payment_cashMore.xml b/spiral/xml/page_spiral_payment_cashMore.xml index c2fc93e6..28444d94 100644 --- a/spiral/xml/page_spiral_payment_cashMore.xml +++ b/spiral/xml/page_spiral_payment_cashMore.xml @@ -835,7 +835,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Var CancelCounter = 0 @@ -1535,7 +1535,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf @@ -1654,11 +1654,11 @@ ;CoinVending ON ;VendingQR OFF - CashlessReq OFF + CashlessReq OFF "" If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Refresh @@ -1711,7 +1711,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf EndIf diff --git a/spiral/xml/page_spiral_thankyou3.xml b/spiral/xml/page_spiral_thankyou3.xml index 5999f4d2..be26bac9 100644 --- a/spiral/xml/page_spiral_thankyou3.xml +++ b/spiral/xml/page_spiral_thankyou3.xml @@ -213,8 +213,8 @@ If Seeker.thankToppingFlag = 1 Then If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf @@ -227,8 +227,8 @@ If Seeker.thankToppingFlag = 1 Then If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf diff --git a/spiral/xml/page_spiral_thankyou_creditcard.xml b/spiral/xml/page_spiral_thankyou_creditcard.xml index 325c860f..71b1c5b1 100644 --- a/spiral/xml/page_spiral_thankyou_creditcard.xml +++ b/spiral/xml/page_spiral_thankyou_creditcard.xml @@ -172,8 +172,8 @@ EndIf Else If Seeker.CreditCard = 1 Then - ;CashlessReq SUCCESS - CashlessReq FAIL + ;CashlessReq SUCCESS "" + CashlessReq FAIL "" EndIf Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate @@ -220,8 +220,8 @@ EndIf Else If Seeker.CreditCard = 1 Then - ;CashlessReq SUCCESS - CashlessReq FAIL + ;CashlessReq SUCCESS "" + CashlessReq FAIL "" EndIf Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate @@ -234,7 +234,7 @@ If LastMakeSpiralResult = 2 Then If CreditCardVoid = 0 Then - CashlessReq FAIL + CashlessReq FAIL "" Var ChangeFlag = 1 Var CreditCardVoid = 1 EndIf @@ -244,7 +244,7 @@ If Timeout > 210 Then If CreditCardVoid = 0 Then - CashlessReq FAIL + CashlessReq FAIL "" Var ChangeFlag = 1 Var CreditCardVoid = 1 EndIf diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 3af6c03c..c0ee52b5 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -8,6 +8,8 @@ Var ChildrenFree = 0 +Var KBankCashlessMachine = 0 + Var OreoDueEnable = 0 Var OreoForFreeEnable = 0 Var SoundBackToSchoolEnable = 0 @@ -353,4 +355,11 @@ If BoxID = 176757 Then Var SaveOrderNameAndPictureEnable = 1 EndIf -DEBUGVAR SystemDateDayOfWeek \ No newline at end of file +DEBUGVAR SystemDateDayOfWeek + +READ_FILE "/mnt/sdcard/coffeevending/kbank_cashless_machine" KBankCashlessMachineContent +DEBUGVAR KBankCashlessMachineContent +If KBankCashlessMachineContent = 1 Then + Var KBankCashlessMachine = 1 +EndIf +DEBUGVAR KBankCashlessMachine \ No newline at end of file diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index 13ada39a..6e2ea766 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -42,6 +42,7 @@ DEBUGVAR Seeker DEBUGVAR Seeker.selected_a_drink DEBUGVAR Seeker.ServiceAmount2 + DEBUGVAR Seeker.CashlessVendingTrackNumber DEBUGVAR Seeker.CodeNumber @@ -948,7 +949,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS + CashlessReq SUCCESS Seeker.CashlessVendingTrackNumber EndIf Else @@ -978,7 +979,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - CashlessReq FAIL + CashlessReq FAIL Seeker.CashlessVendingTrackNumber Var ChangeFlag = 1 Var CreditCardVoid = 1 Else diff --git a/xml/page_NewBrewing3Conti.xml b/xml/page_NewBrewing3Conti.xml index 06e48471..3253ad55 100644 --- a/xml/page_NewBrewing3Conti.xml +++ b/xml/page_NewBrewing3Conti.xml @@ -85,6 +85,7 @@ DEBUGVAR Seeker DEBUGVAR Seeker.selected_a_drink DEBUGVAR Seeker.ServiceAmount2 + DEBUGVAR Seeker.CashlessVendingTrackNumber DEBUGVAR Seeker.CodeNumber @@ -457,7 +458,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS + CashlessReq SUCCESS Seeker.CashlessVendingTrackNumber EndIf Else @@ -487,7 +488,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - CashlessReq FAIL + CashlessReq FAIL Seeker.CashlessVendingTrackNumber Var ChangeFlag = 1 Var CreditCardVoid = 1 Else diff --git a/xml/page_NewCannotConti.xml b/xml/page_NewCannotConti.xml index 374a6b53..fe0e5e77 100644 --- a/xml/page_NewCannotConti.xml +++ b/xml/page_NewCannotConti.xml @@ -55,6 +55,7 @@ DEBUGVAR Seeker.TNumberTaobinCredit DEBUGVAR TelephoneNumber DEBUGVAR Seeker.StoreCreditFlag + DEBUGVAR Seeker.CashlessVendingTrackNumber DEBUGVAR Seeker @@ -519,7 +520,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - CashlessReq FAIL + CashlessReq FAIL Seeker.CashlessVendingTrackNumber Var ChangeFlag = 1 Var CreditCardVoid = 1 Else diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 18ab3534..f721f670 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -1261,8 +1261,8 @@ If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf Var PayDetail2 = Seeker.PayDetail2 @@ -1271,8 +1271,8 @@ If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf Var PayDetail2 = Seeker.PayDetail2 @@ -1340,7 +1340,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - CashlessReq FAIL + CashlessReq FAIL "" Var ChangeFlag = 1 Var CreditCardVoid = 1 Else diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index 70bbbd03..28ef8da2 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -709,8 +709,8 @@ If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf Var PayDetail2 = Seeker.PayDetail2 @@ -721,8 +721,8 @@ If Seeker.CreditCard = 1 Then - CashlessReq SUCCESS - ;CashlessReq FAIL + CashlessReq SUCCESS "" + ;CashlessReq FAIL "" EndIf Var PayDetail2 = Seeker.PayDetail2 @@ -793,7 +793,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - CashlessReq FAIL + CashlessReq FAIL "" Var ChangeFlag = 1 Var CreditCardVoid = 1 Else diff --git a/xml/page_cannotConti.xml b/xml/page_cannotConti.xml index 6335a491..60a89e2b 100644 --- a/xml/page_cannotConti.xml +++ b/xml/page_cannotConti.xml @@ -635,7 +635,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - CashlessReq FAIL + CashlessReq FAIL "" Var ChangeFlag = 1 Var CreditCardVoid = 1 Else diff --git a/xml/page_payment_cash-AUS.xml b/xml/page_payment_cash-AUS.xml index befbb2e0..d76cb140 100644 --- a/xml/page_payment_cash-AUS.xml +++ b/xml/page_payment_cash-AUS.xml @@ -744,7 +744,7 @@ Var Seeker.CreditCard = 1 Var Seeker.CreditCardRef = CreditCardRef - CashlessReq SUCCESS + CashlessReq SUCCESS "" Open "ROOT/taobin_project/xml/page_thankyou.xml" @@ -1033,7 +1033,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Var CancelCounter = 0 @@ -1573,7 +1573,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf @@ -1656,7 +1656,7 @@ EndIf If CancelFlag = 0 Then If IsCardlessEnable = 1 Then - CashlessReq OFF + CashlessReq OFF "" Var IsCardlessEnable = 0 EndIf Var TelephoneNumber = "" @@ -1690,7 +1690,7 @@ EndIf If IsCardlessEnable = 1 Then - CashlessReq OFF + CashlessReq OFF "" Var IsCardlessEnable = 0 EndIf @@ -1731,7 +1731,7 @@ EndIf Var PopupCancelButtonState = "Enable" If IsCardlessEnable = 1 Then - CashlessReq OFF + CashlessReq OFF "" Var IsCardlessEnable = 0 EndIf VendingQR ON @@ -1842,7 +1842,7 @@ EndIf Var EMAMemberID = "" If IsCardlessEnable = 1 Then - CashlessReq OFF + CashlessReq OFF "" Var IsCardlessEnable = 0 EndIf @@ -1894,7 +1894,7 @@ EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf @@ -2089,7 +2089,7 @@ EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf diff --git a/xml/page_payment_cash-HKG.xml b/xml/page_payment_cash-HKG.xml index bb337d0e..8405703b 100644 --- a/xml/page_payment_cash-HKG.xml +++ b/xml/page_payment_cash-HKG.xml @@ -1676,9 +1676,9 @@ X_CASH TopRowY CreditCardButtonState - Var( CountryRootPath + "/image/page_payment/bn_pay_with_ccard.png") - Var( CountryRootPath + "/image/page_payment/bd_pay_with_ccard.png") - Var( CountryRootPath + "/image/page_payment/bd_pay_with_ccard.png") + Var( CountryRootPath + "/image/page_payment/bn_credit_card.png") + Var( CountryRootPath + "/image/page_payment/bp_credit_card.png") + Var( CountryRootPath + "/image/page_payment/bd_credit_card.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1727,9 +1727,9 @@ EndIf 439 TopRowY QRCodeButtonState - Var( CountryRootPath + "/image/page_payment/bn_pay_with_qr_code.png") - Var( CountryRootPath + "/image/page_payment/bp_pay_with_qr_code.png") - Var( CountryRootPath + "/image/page_payment/bd_pay_with_qr_code.png") + Var( CountryRootPath + "/image/page_payment/bn_qr_code.png") + Var( CountryRootPath + "/image/page_payment/bp_qr_code.png") + Var( CountryRootPath + "/image/page_payment/bd_qr_code.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume diff --git a/xml/page_payment_cash-IDR.xml b/xml/page_payment_cash-IDR.xml index 6aab323a..7df0b6ec 100644 --- a/xml/page_payment_cash-IDR.xml +++ b/xml/page_payment_cash-IDR.xml @@ -843,7 +843,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Var CancelCounter = 0 @@ -1310,7 +1310,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf @@ -1621,7 +1621,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf @@ -1712,11 +1712,11 @@ ;CoinVending ON ;VendingQR OFF - CashlessReq OFF + CashlessReq OFF "" If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf diff --git a/xml/page_payment_cash-MYR.xml b/xml/page_payment_cash-MYR.xml index 9856980e..76bc58af 100644 --- a/xml/page_payment_cash-MYR.xml +++ b/xml/page_payment_cash-MYR.xml @@ -709,12 +709,12 @@ Var LOADING_STATE = "Invisible" EndIf - CashlessReq OFF + CashlessReq OFF "" Coin CARDOFF If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf @@ -929,7 +929,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Var CancelCounter = 0 @@ -1371,7 +1371,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Coin CARDOFF @@ -1804,12 +1804,12 @@ EndIf Var CancelNumber = 12 EndIf - CashlessReq OFF + CashlessReq OFF "" Coin CARDOFF If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf EndIf @@ -1909,12 +1909,12 @@ EndIf Var alphaStateQR = "Invisible" Var QRCODE99 = "" - CashlessReq OFF + CashlessReq OFF "" Coin CARDOFF If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf diff --git a/xml/page_payment_cash-SGP.xml b/xml/page_payment_cash-SGP.xml index 670d3809..d5a63da0 100644 --- a/xml/page_payment_cash-SGP.xml +++ b/xml/page_payment_cash-SGP.xml @@ -30,7 +30,7 @@ Var PreScaleCanculate = 100 DEBUGVAR VendingCashless - CashlessReq FAIL + CashlessReq FAIL "" Var CashlessPayFlag = 0 @@ -738,7 +738,7 @@ Var Seeker.CreditCard = 1 Var Seeker.CreditCardRef = CreditCardRef - CashlessReq SUCCESS + CashlessReq SUCCESS "" DEBUGVAR UserChoosePayment Var UserChoosePayment = "" @@ -859,7 +859,7 @@ If CancelFlag = 1 Then DEBUGVAR CancelFlag Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf @@ -1065,19 +1065,19 @@ If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Var CancelCounter = 0 @@ -1542,18 +1542,18 @@ If CashlessPayFlag = 0 Then If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf @@ -1771,18 +1771,18 @@ EndIf If CashlessPayFlag = 0 Then If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf @@ -1873,24 +1873,24 @@ EndIf ;CoinVending ON ;VendingQR OFF - CashlessReq OFF + CashlessReq OFF "" If CashlessPayFlag = 0 Then If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf @@ -1984,18 +1984,18 @@ EndIf If CashlessPayFlag = 0 Then If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf @@ -2053,18 +2053,18 @@ EndIf If CashlessPayFlag = 0 Then If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf @@ -2107,18 +2107,18 @@ EndIf If CashlessPayFlag = 0 Then If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf @@ -2233,19 +2233,19 @@ EndIf If CashlessPayFlag = 0 Then If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf DEBUGVAR UserChoosePayment @@ -2320,18 +2320,18 @@ EndIf If CashlessPayFlag = 0 Then If UserChoosePayment = "CreditCashless" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf If UserChoosePayment = "" Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf DEBUGVAR UserChoosePayment diff --git a/xml/page_payment_cash-UAE.xml b/xml/page_payment_cash-UAE.xml index 3d7a2328..486e7e09 100644 --- a/xml/page_payment_cash-UAE.xml +++ b/xml/page_payment_cash-UAE.xml @@ -746,7 +746,7 @@ Var Seeker.CreditCard = 1 Var Seeker.CreditCardRef = CreditCardRef - CashlessReq SUCCESS + CashlessReq SUCCESS "" Open "ROOT/taobin_project/xml/page_thankyou.xml" @@ -754,8 +754,8 @@ If VendingCashless = "END" Then If ReqPayInfoFromCashOther = 2 Then - DEBUGVAR "CashlessReq OFF" - CashlessReq OFF + DEBUGVAR "CashlessReq OFF """ + CashlessReq OFF "" EndIf EndIf @@ -996,7 +996,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Var CancelCounter = 0 @@ -1446,7 +1446,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Var CancelContinue = 0 @@ -1670,7 +1670,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf EndIf @@ -1770,7 +1770,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL "" EndIf Var CancelContinue = 1 diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 0cf43150..cc0df31d 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -1870,8 +1870,19 @@ EndIf + DEBUGVAR VendingCashless If VendingCashless = "OK" Then DEBUGVAR CashlessCode + + If KBankCashlessMachine = 1 Then + + Var Seeker.CashlessVendingTrackNumber = VendingTrackNumber + + DEBUGVAR VendingTrackNumber + DEBUGVAR Var Seeker.CashlessVendingTrackNumber + + EndIf + Var Timeout = 0 Var QRErrorState = "Invisible" @@ -1948,23 +1959,43 @@ GenHashWithTimeStamp CreditCardRef DEBUGVAR VendingCashless - If VendingCashless = "READY" Then - Var QRCODE99 = "" - If CoinInOK = 1 Then + If KBankCashlessMachine = 1 Then + If VendingCashless = "READY" Then + Var QRCODE99 = "" + If CoinInOK = 1 Then - Else - Var Timeout = 0 + Else + Var Timeout = 0 + EndIf + + Var QRErrorState = "Invisible" + Var VendingCashless = "-" + Var ServiceCharge = 3 + Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign + Var RemainAmountX = RemainAmountX + ServiceCharge + CashlessPay RemainAmountX CreditCardRef + Var CashlessPayFlag = 1 EndIf + Else + If VendingCashless = "READY" Then + Var QRCODE99 = "" + If CoinInOK = 1 Then - Var QRErrorState = "Invisible" - Var QR_POPUP = "/img_popup8-2.png" - Var VendingCashless = "-" - Var LOADING_STATE = "Enable" - Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign - CashlessPay RemainAmountX CreditCardRef - Var CashlessPayFlag = 1 + Else + Var Timeout = 0 + EndIf + + Var QRErrorState = "Invisible" + Var QR_POPUP = "/img_popup8-2.png" + Var VendingCashless = "-" + Var LOADING_STATE = "Enable" + Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign + CashlessPay RemainAmountX CreditCardRef + Var CashlessPayFlag = 1 + EndIf EndIf + Refresh @@ -2144,7 +2175,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL Seeker.CashlessVendingTrackNumber EndIf Var CancelCounter = 0 @@ -2295,13 +2326,13 @@ EndIf If ReqPayInfoFromCashOther = 2 Then - DEBUGVAR "CashlessReq OFF by user" - CashlessReq OFF + DEBUGVAR "CashlessReq OFF "" by user" + CashlessReq OFF Seeker.CashlessVendingTrackNumber EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL Seeker.CashlessVendingTrackNumber EndIf EndIf EndIf @@ -2687,7 +2718,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL Seeker.CashlessVendingTrackNumber EndIf EndIf @@ -2949,9 +2980,14 @@ If alphaState = "Invisible" Then If CoinInFlag = 0 Then If CancelFlag = 0 Then - Var QR_POPUP = "/img_popup8.png" + If KBankCashlessMachine = 1 Then + Var QR_POPUP = "/img_popup8_with_service_charge.png" + Var cancelButtonQRPopupState = "Invisible" + Else + Var QR_POPUP = "/img_popup8.png" + Var cancelButtonQRPopupState = "Enable" + EndIf Var alphaState = "Enable" - Var cancelButtonQRPopupState = "Enable" Coin CARD Var ReqPayInfoFromCashOther = 2 EndIf @@ -3047,7 +3083,7 @@ If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 - CashlessReq FAIL + CashlessReq FAIL Seeker.CashlessVendingTrackNumber EndIf EndIf