diff --git a/font/Noto_Sans_Thai/NotoSansThai-Black.ttf b/font/Noto_Sans_Thai/NotoSansThai-Black.ttf new file mode 100644 index 00000000..e2e19470 Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-Black.ttf differ diff --git a/font/Noto_Sans_Thai/NotoSansThai-Bold.ttf b/font/Noto_Sans_Thai/NotoSansThai-Bold.ttf new file mode 100644 index 00000000..0d93c1f2 Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-Bold.ttf differ diff --git a/font/Noto_Sans_Thai/NotoSansThai-ExtraBold.ttf b/font/Noto_Sans_Thai/NotoSansThai-ExtraBold.ttf new file mode 100644 index 00000000..695b6b14 Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-ExtraBold.ttf differ diff --git a/font/Noto_Sans_Thai/NotoSansThai-ExtraLight.ttf b/font/Noto_Sans_Thai/NotoSansThai-ExtraLight.ttf new file mode 100644 index 00000000..bc5c80c5 Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-ExtraLight.ttf differ diff --git a/font/Noto_Sans_Thai/NotoSansThai-Light.ttf b/font/Noto_Sans_Thai/NotoSansThai-Light.ttf new file mode 100644 index 00000000..ff65f51d Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-Light.ttf differ diff --git a/font/Noto_Sans_Thai/NotoSansThai-Medium.ttf b/font/Noto_Sans_Thai/NotoSansThai-Medium.ttf new file mode 100644 index 00000000..94f4a7bb Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-Medium.ttf differ diff --git a/font/Noto_Sans_Thai/NotoSansThai-Regular.ttf b/font/Noto_Sans_Thai/NotoSansThai-Regular.ttf new file mode 100644 index 00000000..638e709b Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-Regular.ttf differ diff --git a/font/Noto_Sans_Thai/NotoSansThai-SemiBold.ttf b/font/Noto_Sans_Thai/NotoSansThai-SemiBold.ttf new file mode 100644 index 00000000..0baa3971 Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-SemiBold.ttf differ diff --git a/font/Noto_Sans_Thai/NotoSansThai-Thin.ttf b/font/Noto_Sans_Thai/NotoSansThai-Thin.ttf new file mode 100644 index 00000000..30de0630 Binary files /dev/null and b/font/Noto_Sans_Thai/NotoSansThai-Thin.ttf differ diff --git a/image/collectiing/bd_pay_with_cashACU.png b/image/collectiing/bd_pay_with_cashACU.png new file mode 100644 index 00000000..24305cbc Binary files /dev/null and b/image/collectiing/bd_pay_with_cashACU.png differ diff --git a/image/collectiing/bn_pay_with_cashACU.png b/image/collectiing/bn_pay_with_cashACU.png new file mode 100644 index 00000000..864d8674 Binary files /dev/null and b/image/collectiing/bn_pay_with_cashACU.png differ diff --git a/image/collectiing/bp_pay_with_cashACU.png b/image/collectiing/bp_pay_with_cashACU.png new file mode 100644 index 00000000..71cda60f Binary files /dev/null and b/image/collectiing/bp_pay_with_cashACU.png differ diff --git a/xml/page_board.xml b/xml/page_board.xml index e6ab9cb2..9df2cfb6 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -98,6 +98,8 @@ Var OpunThinTTF = "ROOT/taobin_project/font/Opun/Opun-Thin.ttf" Var OpunBoldTTF = "ROOT/taobin_project/font/Opun/Opun-Bold.ttf" + Var NotoSansThaiBold = "ROOT/taobin_project/font/Noto_Sans_Thai/NotoSansThai-Bold.ttf" + Var KanitSemiBoldTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf" Var BlinkStar = "ROOT/taobin_project/image/animation/blink_star.gif" diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 518d4264..ba1e3e63 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -22,6 +22,8 @@ Var QRCODE99 = "" Var QRCODETMP = "" + Var QRPopupOpenFlag = 0 + Var QRChannel = 0 ;Var PriceDrink = 2 diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index f0098e08..9d45907c 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -15,44 +15,45 @@ DEBUGVAR cash_disable ;If AdultFlag = 1 Then - ; Open "ROOT/taobin_project/xml/page_payment_camera.xml" + ; Open "ROOT/taobin_project/xml/page_payment_camera.xml" ;EndIf ;inter-xml-open If CountryName = "Malaysia" Then - Open "ROOT/taobin_project/xml/page_payment_cash-MYR.xml" + Open "ROOT/taobin_project/xml/page_payment_cash-MYR.xml" EndIf ;inter-xml-open If CountryName = "Indonesia" Then - Open "ROOT/taobin_project/xml/page_payment_cash-IDR.xml" + Open "ROOT/taobin_project/xml/page_payment_cash-IDR.xml" EndIf ;inter-xml-open If CountryName = "Australia" Then - Open "ROOT/taobin_project/xml/page_payment_cash-AUS.xml" + Open "ROOT/taobin_project/xml/page_payment_cash-AUS.xml" EndIf ;inter-xml-open If CountryName = "Singapore" Then - Open "ROOT/taobin_project/xml/page_payment_cash-SGP.xml" + Open "ROOT/taobin_project/xml/page_payment_cash-SGP.xml" EndIf ;inter-xml-open If CountryName = "UnitedArabEmirates Dubai" Then - Open "ROOT/taobin_project/xml/page_payment_cash-UAE.xml" + Open "ROOT/taobin_project/xml/page_payment_cash-UAE.xml" EndIf ;inter-xml-open If CountryName = "HongKong" Then - Open "ROOT/taobin_project/xml/page_payment_cash-HKG.xml" + Open "ROOT/taobin_project/xml/page_payment_cash-HKG.xml" EndIf Var PreScaleCanculate = 1 - + + Var CashlessPayFlag = 0 Var RemainAmountStrENG = "" Var AdultState = "Invisible" @@ -73,9 +74,9 @@ Var sdateday = "" Var sdatemonth = "" Var sdateyear = "" - SPLIT sdate "/" 1 sdateday + SPLIT sdate "/" 1 sdateday SPLIT sdate "/" 2 sdatemonth - SPLIT sdate "/" 3 sdateyear + SPLIT sdate "/" 3 sdateyear INT sdateday INT sdatemonth INT sdateyear @@ -91,7 +92,7 @@ Var ReqPayInfoFlag2 = 0 - DEBUGVAR QRCODETMP + DEBUGVAR QRCODETMP DEBUGVAR IsSmoRet Var countClick2 = 0 @@ -111,20 +112,20 @@ Var FlagQROpened = 0 Var PayInfoCFlag = 0 Var ActionOKCase = 0 - Var VendingCampaign = Seeker.IntVendingCampaign - Var Seeker.VendingCampaign = Seeker.IntVendingCampaign + Var VendingCampaign = Seeker.IntVendingCampaign + Var Seeker.VendingCampaign = Seeker.IntVendingCampaign Var PayAmount = PriceDrink - + Var LOADING_STATE = "Invisible" - ; Below original + ; Below original ; On open Var cancelState = "Invisible" - + Var alphaState = "Invisible" Var alphaState2 = "Invisible" Var FlagalphaState2 = 0 @@ -132,16 +133,16 @@ Var alphaState3 = "Invisible" Var alphaState3_offline = "Invisible" - + Var CoinInFlag = 0 ;Var CoinAmount = 0 Var CancelFlag = 0 Var CancelCounter = 0 Var CoinInCounter = 0 Var CancelNumber = 3 - + Var PayAmount = PriceDrink - Var RemainAmount = PayAmount - Seeker.IntVendingCampaign + Var RemainAmount = PayAmount - Seeker.IntVendingCampaign Var RemainAmount = RemainAmount - CoinAmount Var RemainAmount = RemainAmount - Seeker.IntVendingCredit Var RemainAmountStr = "" + RemainAmount @@ -151,11 +152,11 @@ Var CoinInOK = 0 Var RemainAmountKeep = 0 - + Var showRemaining = charOfBaht + RemainAmountStr - + Var VendingREFID = "" - + Var TelephoneNumber = "0899999999" Var ServiceType = "coffee" @@ -163,14 +164,16 @@ Var ServiceAmount2 = PayAmount Var Seeker.ServiceAmount2 = PayAmount Var ServiceCharge = 0 - Var Donate = "" + Var Donate = "" Var SuggestID = "" Var CancleState = "Enable" Var Seeker.VendingDiscount = DiscountDrink - - Var CashTextWarning = "" + Var CancelingPopupFlag = "Invisible" + Var CancelingPopupCountDown = 0 + + Var CashTextWarning = "" Var QRErrorState = "Invisible" Var QRErrorFlag = 0 @@ -199,10 +202,10 @@ If From15THBPro = 1 Then Var Seeker.CodeChannel = 1 - EndIf - + EndIf + Var ExtendData = Seeker.ExtendData - + DEBUGVAR QRCODE99KBANK @@ -244,11 +247,11 @@ Var PayState5 = "Invisible" Var PayState6 = "Invisible" Var showRemaining = "Free" - + Else Var PayState1 = "Enable" - If cash_disable = "1" Then + If cash_disable = "1" Then Var PayState1 = "Press" EndIf @@ -257,7 +260,7 @@ Var PayState4 = "Enable" Var PayState5 = "Enable" Var PayState6 = "Enable" - Else + Else SAVELOG "Cash only IntVendingCampaign" Var PayState2 = "Disable" Var PayState4 = "Enable" @@ -282,8 +285,8 @@ Var PayState6 = "Disable" ;Var PayState4 = "Disable" EndIf - - + + DEBUGVAR CoinAmount If CoinAmount > 0 Then SAVELOG "Cash only CoinAmount" @@ -316,12 +319,12 @@ EndIf EndIf - + Var showRemaining = charOfBaht + RemainAmountStr - If show_eng = "true" Then + If show_eng = "true" Then Var showRemaining = charOfBaht + RemainAmountStr Else Var showRemaining = RemainAmountStr + " บาท" @@ -329,18 +332,18 @@ EndIf - + Var Seeker.PayWithQR = 0 Var NoGotoMenupage = "false" - If show_eng = "true" Then + If show_eng = "true" Then Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png" Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png" Else Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png" Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png" - + EndIf Var X_CASH1 = 216 @@ -359,7 +362,7 @@ If RoadShow = "true" Then Var X_CASH1 = 287 - If show_eng = "true" Then + If show_eng = "true" Then Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png" Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png" Else @@ -370,10 +373,10 @@ If GetFreeFromError = 1 Then Var Seeker.FreeVendingCampaign = 1 - CoinVending OFF - If Seeker = "curr" Then - - If New_Payment = 1 Then + CoinVending OFF + If Seeker = "curr" Then + + If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf MakeDrinkV1 SelectDrink SelectSugarID @@ -382,12 +385,12 @@ Else Var TxRef1 = "" CreateTxRef1 TxRef1 - + Var DrinkPaid = SelectDrink Var PaidPaymentFromNextStage = 1 - + EndIf - Open "ROOT/taobin_project/xml/page_thankyou.xml" + Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf @@ -395,10 +398,10 @@ Var RemainAmountStr = "Free###size=150" - CoinVending OFF - If Seeker = "curr" Then - - If New_Payment = 1 Then + CoinVending OFF + If Seeker = "curr" Then + + If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf MakeDrinkV1 SelectDrink SelectSugarID @@ -407,16 +410,16 @@ Else Var TxRef1 = "" CreateTxRef1 TxRef1 - + Var DrinkPaid = SelectDrink Var PaidPaymentFromNextStage = 1 - + EndIf - Open "ROOT/taobin_project/xml/page_thankyou.xml" + Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf - + If CoinInOK = 0 Then Var RemainAmount = PayAmount - CoinAmount @@ -424,7 +427,7 @@ Var RemainAmount = RemainAmount - Seeker.IntVendingCredit Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign Var SumCoinAmount = CoinAmount + Seeker.IntVendingCredit - If SumCoinAmount >= PayAmount Then + If SumCoinAmount >= PayAmount Then SAVELOG "CoinInOk First" DEBUGVAR CoinAmount @@ -438,7 +441,7 @@ Var RemainAmountStr = 0 Else - If show_eng = "true" Then + If show_eng = "true" Then Var RemainAmountStr = "Change " + Canout Var RemainAmountStr = RemainAmountStr + "###size=90" Else @@ -447,7 +450,7 @@ EndIf EndIf - + Var CancleState = "Disable" Var CoinInOK = 1 Var CoinInCounter = 0 @@ -467,7 +470,7 @@ EndIf - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" @@ -478,7 +481,7 @@ Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" EndIf - + Var EnoughChange = "yes" Var SELLONLINE = 0 @@ -491,7 +494,7 @@ If SELLONLINE = 0 Then SAVELOG "Cash only NetworkStatus down" - + Var PayState2 = "Disable" Var PayState3 = "Disable" Var PayState4 = "Disable" @@ -517,7 +520,7 @@ Var PayState1 = "Disable" EndIf - ;cancel order + ;cancel order If SELLSTATUS = "DEACTIVE" Then Var SELLONLINE = 1 EndIf @@ -525,18 +528,18 @@ ;If NetworkStatus = "ACTIVATE" Then ; Var ShowNetworkProblem = "Invisible" ; Var ShowNetworkProblemText = "" - ; + ; ;Else ; Var ShowNetworkProblem = "Enable" ; Var ShowButtonClick2 = "Invisible" ; Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" ;EndIf - + Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png" Var pay_with_chanel_text = DirImage + "/text_1.png" - + ;If DisableUsingCode = "true" Then If DisableUsingCode = "-" Then @@ -553,7 +556,7 @@ Var pay_with_chanel_text = DirImage + "/text_2.png" Else - + Var pay_with_code_image = DirImage + "/bp_pay_with_code.png" EndIf EndIf @@ -570,7 +573,7 @@ If web_readyOK = "true" Then - Var web_readyOK = "false" + Var web_readyOK = "false" If web_payment = "CASH" Then Var alphaState2 = "Enable" @@ -584,15 +587,16 @@ Else Var QR_POPUP = "/img_popup1.png" EndIf - + Var LOADING_STATE = "Enable" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON + Var QRPopupOpenFlag = 1 + - Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -603,11 +607,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" If IndoQR = 1 Then Var ECommerceQR = ECommerceQR + "IND:2/" @@ -648,7 +652,7 @@ EndIf If web_payment = "SHOPEE" Then - + Var QR_POPUP = "/img_popup2.png" Var LOADING_STATE = "Enable" @@ -656,8 +660,9 @@ Var alphaState = "Enable" ;CoinVending OFF VendingQR ON + Var QRPopupOpenFlag = 1 + - Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -668,11 +673,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "AIR:2/" @@ -700,7 +705,7 @@ EndIf If web_payment = "TRUE" Then - + Var QR_POPUP = "/img_popup3.png" Var LOADING_STATE = "Enable" @@ -708,8 +713,9 @@ Var alphaState = "Enable" ;CoinVending OFF VendingQR ON + Var QRPopupOpenFlag = 1 + - Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -720,11 +726,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "TWN:2/" @@ -743,7 +749,7 @@ EndIf If web_payment = "DOLFIN" Then - + Var QR_POPUP = "/img_popup5.png" Var LOADING_STATE = "Enable" @@ -751,8 +757,9 @@ Var alphaState = "Enable" ;CoinVending OFF VendingQR ON + Var QRPopupOpenFlag = 1 + - Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -763,11 +770,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "DOL:2/" @@ -786,7 +793,7 @@ EndIf If web_payment = "LINEPAY" Then - + Var QR_POPUP = "/img_popup9.png" Var LOADING_STATE = "Enable" @@ -794,8 +801,9 @@ Var alphaState = "Enable" ;CoinVending OFF VendingQR ON + Var QRPopupOpenFlag = 1 + - Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -806,11 +814,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "LPY:2/" @@ -829,7 +837,7 @@ EndIf If web_payment = "LAZADAPAY" Then - + Var QR_POPUP = "/img_popup10.png" Var LOADING_STATE = "Enable" @@ -837,8 +845,9 @@ Var alphaState = "Enable" ;CoinVending OFF VendingQR ON + Var QRPopupOpenFlag = 1 + - Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -849,11 +858,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "LZP:2/" @@ -872,7 +881,7 @@ EndIf If web_payment = "MAXME" Then - + Var QR_POPUP = "/img_popup11.png" Var LOADING_STATE = "Enable" @@ -880,8 +889,9 @@ Var alphaState = "Enable" ;CoinVending OFF VendingQR ON + Var QRPopupOpenFlag = 1 + - Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -892,11 +902,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "MAX:2/" @@ -915,7 +925,7 @@ EndIf If web_payment = "WECHAT" Then - + Var QR_POPUP = "/img_popup12.png" Var LOADING_STATE = "Enable" @@ -923,8 +933,9 @@ Var alphaState = "Enable" ;CoinVending OFF VendingQR ON + Var QRPopupOpenFlag = 1 + - Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -935,11 +946,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "WEC:2/" @@ -958,7 +969,7 @@ EndIf If web_payment = "ALIPAY" Then - + Var QR_POPUP = "/img_popup20.png" Var LOADING_STATE = "Enable" @@ -966,8 +977,9 @@ Var alphaState = "Enable" ;CoinVending OFF VendingQR ON + Var QRPopupOpenFlag = 1 + - Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -978,11 +990,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "ALP:2/" @@ -1001,7 +1013,7 @@ EndIf If web_payment = "UNIONPAY" Then - + Var QR_POPUP = "/img_popup21.png" Var LOADING_STATE = "Enable" @@ -1009,8 +1021,9 @@ Var alphaState = "Enable" ;CoinVending OFF VendingQR ON + Var QRPopupOpenFlag = 1 + - Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -1021,11 +1034,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "UNP:2/" @@ -1055,8 +1068,9 @@ Var FlagQROpened = 1 Var alphaState = "Enable" - + VendingQR ON + Var QRPopupOpenFlag = 1 Var ReqPayInfoFromCashOther = 0 EndIf @@ -1078,9 +1092,9 @@ DEBUGVAR ECommerceQR SPLIT ECommerceQR "/" 5 VendingQRTypeResult - - If ActionOKCase = 0 Then + + If ActionOKCase = 0 Then If VendingREFID = "" Then SAVELOG "menu_page4-QR.xml > ActOK_REFID" Refresh @@ -1138,28 +1152,28 @@ - - + + Var Seeker.PayWithQR = 1 Var Seeker.VendingTSID = VendingTSID If Seeker = "curr" Then - If New_Payment = 1 Then + If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf MakeDrinkV1 SelectDrink SelectSugarID ;Var TxRef1 = "" ;CreateTxRef1 TxRef1 EndIf - + Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" Var BrewingTextThai = "เตรียมแก้ว" - Open "ROOT/taobin_project/xml/page_thankyou.xml" - + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf - If ReqPayInfoFlag = 1 Then + If ReqPayInfoFlag = 1 Then If VendingQRTypeResult = "KBA:2" Then Var CashTextWarning = "" Var QRErrorState = "Invisible" @@ -1177,26 +1191,26 @@ Var QRCODE99 = QRCODE99KBANK Var LOADING_STATE = "Invisible" - If show_eng = "true" Then + If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_mobile.mp3" Else - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_mobile.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_mobile.mp3" ; Play Sound #zone If SoundBackToSchoolEnable = 1 Then - - If SoundBackToSchoolType = 1 Then + + If SoundBackToSchoolType = 1 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" EndIf - If SoundBackToSchoolType = 2 Then + If SoundBackToSchoolType = 2 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" EndIf Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_mobile.wav" EndIf - Play PlaySoundLag - + Play PlaySoundLag + EndIf EndIf @@ -1218,33 +1232,33 @@ Var QRCODE99 = QRCODE99KBANK Var LOADING_STATE = "Invisible" - If show_eng = "true" Then + If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" ; Play Sound #zone If SoundBackToSchoolEnable = 1 Then - - If SoundBackToSchoolType = 1 Then + + If SoundBackToSchoolType = 1 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" EndIf - If SoundBackToSchoolType = 2 Then + If SoundBackToSchoolType = 2 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" EndIf Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" EndIf - Play PlaySoundLag - + Play PlaySoundLag + EndIf - + EndIf - - + + EndIf - If ReqPayInfoFlag = 2 Then + If ReqPayInfoFlag = 2 Then If VendingQRTypeResult = "AIR:2" Then Var CashTextWarning = "" Var QRErrorState = "Invisible" @@ -1261,30 +1275,30 @@ Var QRCODE99 = QRCODE99Shoppy Var LOADING_STATE = "Invisible" - If show_eng = "true" Then + If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" ; Play Sound #zone If SoundBackToSchoolEnable = 1 Then - - If SoundBackToSchoolType = 1 Then + + If SoundBackToSchoolType = 1 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" EndIf - If SoundBackToSchoolType = 2 Then + If SoundBackToSchoolType = 2 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" EndIf Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" EndIf - Play PlaySoundLag + Play PlaySoundLag EndIf EndIf EndIf - If ReqPayInfoFlag = 3 Then + If ReqPayInfoFlag = 3 Then If VendingQRTypeResult = "TWN:2" Then Var CashTextWarning = "" Var QRErrorState = "Invisible" @@ -1301,30 +1315,30 @@ Var QRCODE99 = QRCODE99Shoppy Var LOADING_STATE = "Invisible" - If show_eng = "true" Then + If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" ; Play Sound #zone If SoundBackToSchoolEnable = 1 Then - - If SoundBackToSchoolType = 1 Then + + If SoundBackToSchoolType = 1 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" EndIf - If SoundBackToSchoolType = 2 Then + If SoundBackToSchoolType = 2 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" EndIf Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" EndIf - Play PlaySoundLag + Play PlaySoundLag EndIf EndIf EndIf - If ReqPayInfoFlag = 4 Then + If ReqPayInfoFlag = 4 Then If VendingQRTypeResult = "DOL:2" Then Var CashTextWarning = "" Var QRErrorState = "Invisible" @@ -1341,30 +1355,30 @@ Var QRCODE99 = QRCODE99Shoppy Var LOADING_STATE = "Invisible" - If show_eng = "true" Then + If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" ; Play Sound #zone If SoundBackToSchoolEnable = 1 Then - - If SoundBackToSchoolType = 1 Then + + If SoundBackToSchoolType = 1 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" EndIf - If SoundBackToSchoolType = 2 Then + If SoundBackToSchoolType = 2 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" EndIf Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" EndIf - Play PlaySoundLag + Play PlaySoundLag EndIf EndIf EndIf - If ReqPayInfoFlag = 5 Then + If ReqPayInfoFlag = 5 Then If VendingQRTypeResult = "LPY:2" Then Var CashTextWarning = "" Var QRErrorState = "Invisible" @@ -1381,30 +1395,30 @@ Var QRCODE99 = QRCODE99Shoppy Var LOADING_STATE = "Invisible" - If show_eng = "true" Then + If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" ; Play Sound #zone If SoundBackToSchoolEnable = 1 Then - - If SoundBackToSchoolType = 1 Then + + If SoundBackToSchoolType = 1 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" EndIf - If SoundBackToSchoolType = 2 Then + If SoundBackToSchoolType = 2 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" EndIf Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" EndIf - Play PlaySoundLag + Play PlaySoundLag EndIf EndIf EndIf - If ReqPayInfoFlag = 6 Then + If ReqPayInfoFlag = 6 Then If VendingQRTypeResult = "LZP:2" Then Var CashTextWarning = "" Var QRErrorState = "Invisible" @@ -1426,30 +1440,30 @@ ;Var QRCODE_UTF8 = QRCODE99Shoppy Var LOADING_STATE = "Invisible" - If show_eng = "true" Then + If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" ; Play Sound #zone If SoundBackToSchoolEnable = 1 Then - - If SoundBackToSchoolType = 1 Then + + If SoundBackToSchoolType = 1 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" EndIf - If SoundBackToSchoolType = 2 Then + If SoundBackToSchoolType = 2 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" EndIf Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" EndIf - Play PlaySoundLag + Play PlaySoundLag EndIf EndIf EndIf - If ReqPayInfoFlag = 7 Then + If ReqPayInfoFlag = 7 Then If VendingQRTypeResult = "MAX:2" Then Var CashTextWarning = "" Var QRErrorState = "Invisible" @@ -1469,30 +1483,30 @@ Var QRCODE99 = QRCODE99Shoppy Var LOADING_STATE = "Invisible" - If show_eng = "true" Then + If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" ; Play Sound #zone If SoundBackToSchoolEnable = 1 Then - - If SoundBackToSchoolType = 1 Then + + If SoundBackToSchoolType = 1 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" EndIf - If SoundBackToSchoolType = 2 Then + If SoundBackToSchoolType = 2 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" EndIf Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" EndIf - Play PlaySoundLag + Play PlaySoundLag EndIf EndIf EndIf - If ReqPayInfoFlag = 8 Then + If ReqPayInfoFlag = 8 Then If VendingQRTypeResult = "WEC:2" Then Var CashTextWarning = "" Var QRErrorState = "Invisible" @@ -1512,18 +1526,18 @@ Var QRCODE99 = QRCODE99Shoppy Var LOADING_STATE = "Invisible" - If show_eng = "true" Then + If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" ; Play Sound #zone If SoundBackToSchoolEnable = 1 Then - - If SoundBackToSchoolType = 1 Then + + If SoundBackToSchoolType = 1 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" EndIf - If SoundBackToSchoolType = 2 Then + If SoundBackToSchoolType = 2 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" EndIf Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" @@ -1536,7 +1550,7 @@ EndIf - If ReqPayInfoFlag = 9 Then + If ReqPayInfoFlag = 9 Then If VendingQRTypeResult = "ALP:2" Then Var CashTextWarning = "" Var QRErrorState = "Invisible" @@ -1556,18 +1570,18 @@ Var QRCODE99 = QRCODE99Shoppy Var LOADING_STATE = "Invisible" - If show_eng = "true" Then + If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" ; Play Sound #zone If SoundBackToSchoolEnable = 1 Then - - If SoundBackToSchoolType = 1 Then + + If SoundBackToSchoolType = 1 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" EndIf - If SoundBackToSchoolType = 2 Then + If SoundBackToSchoolType = 2 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" EndIf Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" @@ -1579,7 +1593,7 @@ EndIf EndIf - If ReqPayInfoFlag = 10 Then + If ReqPayInfoFlag = 10 Then If VendingQRTypeResult = "UNP:2" Then Var CashTextWarning = "" Var QRErrorState = "Invisible" @@ -1599,18 +1613,61 @@ Var QRCODE99 = QRCODE99Shoppy Var LOADING_STATE = "Invisible" - If show_eng = "true" Then + If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" Else - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" ; Play Sound #zone If SoundBackToSchoolEnable = 1 Then - - If SoundBackToSchoolType = 1 Then + + If SoundBackToSchoolType = 1 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" EndIf - If SoundBackToSchoolType = 2 Then + If SoundBackToSchoolType = 2 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" + EndIf + Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" + EndIf + + Play PlaySoundLag + EndIf + + EndIf + EndIf + + If ReqPayInfoFlag = 11 Then + If VendingQRTypeResult = "ACU: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 = 10 + 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 + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + + ; Play Sound #zone + If SoundBackToSchoolEnable = 1 Then + + If SoundBackToSchoolType = 1 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" + EndIf + If SoundBackToSchoolType = 2 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" EndIf Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav" @@ -1637,13 +1694,13 @@ If ViewBill > 0 Then CoinVending BILLREJECT EndIf - + VendingQR OFF CoinVending OFF Refresh If Seeker = "curr" Then - If New_Payment = 1 Then + If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf MakeDrinkV1 SelectDrink SelectSugarID @@ -1651,7 +1708,7 @@ Var Seeker.CreditCard = 1 Var Seeker.CreditCardRef = CreditCardRef - Open "ROOT/taobin_project/xml/page_thankyou.xml" + Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf @@ -1662,8 +1719,8 @@ DEBUGVAR VendingCashless DEBUGVAR CoinInOK - If ActionOKCase = 0 Then - If ReqPayInfoFlag > 0 Then + If ActionOKCase = 0 Then + If ReqPayInfoFlag > 0 Then Var QRErrorFlag = 1 If alphaState = "Enable" Then Var QRErrorState = "Enable" @@ -1671,7 +1728,7 @@ Var QRCODE99 = "" EndIf EndIf - + Else Var PayInfoCFlag = 1 EndIf @@ -1687,7 +1744,7 @@ ;Var QRErrorFlag = 1 If alphaState = "Enable" Then Var QRErrorState = "Enable" - Var LOADING_STATE = "Invisible" + Var LOADING_STATE = "Invisible" EndIf EndIf @@ -1703,7 +1760,7 @@ Var CreditCardRef = "" GenHashWithTimeStamp CreditCardRef - DEBUGVAR VendingCashless + DEBUGVAR VendingCashless If VendingCashless = "READY" Then Var QRCODE99 = "" @@ -1712,12 +1769,12 @@ 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 + Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign CashlessPay RemainAmountX CreditCardRef Var CashlessPayFlag = 1 EndIf @@ -1728,7 +1785,7 @@ 1000 - + If ReadyForBrew = "false" Then SAVELOG "Back to main1" Open "ROOT/taobin_project/xml/page_back_to_main.xml" @@ -1744,14 +1801,14 @@ If CamFlag = 1 Then Var CamCount = CamCount + 1 If CamCount > 2 Then - facecompare 10 + facecompare 10 Var CamFlag = 0 Var CamCount = 0 EndIf EndIf - + If AdultState2 = "Enable" Then Var countAdultS2 = countAdultS2 + 1 @@ -1763,19 +1820,19 @@ Var countAdultS2 = 0 EndIf - + Var Timeout = Timeout + 1 If Timeout >= 120 Then Var alphaState = "Invisible" - + If RoadShow = "true" Then Else Var PayState3 = "Disable" Var PayState5 = "Disable" - EndIf + EndIf Var LOADING_STATE = "Invisible" Var QRErrorState = "Invisible" @@ -1790,7 +1847,7 @@ EndIf If PayInfoCFlag = 1 Then - If Seeker.CodeChannel = 1 Then + If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -1801,11 +1858,11 @@ Var ECommerce = "" Var ECommerce = ECommerce + PriceDrink Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + DiscountDrink Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + SessionID2 Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + SelectDrink Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + Seeker.VendingCode Var ECommerce = ECommerce + "/" @@ -1826,24 +1883,24 @@ EndIf If Seeker = "curr" Then If PressCancel_CashPopup = 2 Then - Open "ROOT/taobin_project/xml/page_payment.xml" + Open "ROOT/taobin_project/xml/page_payment.xml" EndIf - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.xml" Else - + If PressCancel_CashPopup = 2 Then - Open "ROOT/taobin_project/xml/page_payment.xml" + Open "ROOT/taobin_project/xml/page_payment.xml" EndIf - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" EndIf EndIf - If TestLoopMakeDrink = 1 Then + If TestLoopMakeDrink = 1 Then MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" + Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf - + If CoinInOK = 1 Then @@ -1866,10 +1923,10 @@ If Timeout > 180 Then If PayOK = 1 Then - + If Seeker = "curr" Then - If New_Payment = 1 Then + If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf MakeDrinkV1 SelectDrink SelectSugarID @@ -1883,7 +1940,7 @@ EndIf - Open "ROOT/taobin_project/xml/page_thankyou.xml" + Open "ROOT/taobin_project/xml/page_thankyou.xml" Else If CancelFlag = 0 Then @@ -1898,7 +1955,7 @@ Var cancelState = "Enable" If CashlessPayFlag = 1 Then - Var CashlessPayFlag = 0 + Var CashlessPayFlag = 0 CashlessReq FAIL EndIf @@ -1918,14 +1975,14 @@ If Seeker.IntVendingCampaign = 0 Then VendingQR OFF If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.xml" Else - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" EndIf EndIf EndIf - - EndIf + + EndIf EndIf EndIf @@ -1945,11 +2002,11 @@ ;Change CoinAmount If CoinAmount > 0 Then If Seeker.StoreCreditFlag = 1 Then - Var ChangeOK = 1 + Var ChangeOK = 1 Else Change CoinAmount EndIf - + Else If ActionOKCase = 0 Then Var ActionOKCase = 1 @@ -1958,7 +2015,7 @@ If PressCancel_CashPopup = 1 Then Var PressCancel_CashPopup = 2 - EndIf + EndIf EndIf @@ -1966,11 +2023,11 @@ EndIf If CancelCounter >= 43 Then - Var ChangeOK = 1 + Var ChangeOK = 1 EndIf - + ; This copy in file menu_catalog.xml - + If ChangeOK = 1 Then If ActionOKCase = 0 Then @@ -1981,7 +2038,7 @@ Var TelephoneNumber = Seeker.TNumberTaobinCredit Var PayO2 = Seeker.CoffeePinNumber EndIf - + Var VendingDiscount = 0 Var VendingCampaign = 0 Var ServiceType = "credit" @@ -1991,14 +2048,14 @@ Var PayDetail2 = Seeker.PayDetail2 Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Var PayCredit = 1 - + Var ActionOKCase = 1 - If Seeker = "curr" Then + If Seeker = "curr" Then If Seeker.IntVendingCampaign = 0 Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.xml" Else - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" EndIf EndIf Else @@ -2006,7 +2063,7 @@ EndIf EndIf EndIf - + EndIf ;Var CoinInCounter = CoinInCounter + 1 @@ -2014,7 +2071,7 @@ ; If CoinInCounter = 3 Then ; ; Var RemainAmount = PayAmount - CoinAmount - ; If CoinAmount >= PayAmount Then + ; If CoinAmount >= PayAmount Then ; Var Canout = CoinAmount - PayAmount ; If Canout > 0 Then ; Change Canout @@ -2026,19 +2083,43 @@ ; Var PayOK = 1 ; ; MakeDrinkV1 SelectDrink SelectSugarID - ; - ; Open "ROOT/taobin_project/xml/page_thankyou.xml" - ; + ; + ; Open "ROOT/taobin_project/xml/page_thankyou.xml" + ; ; EndIf ; EndIf ;EndIf + If CancelingPopupFlag = "Enable" Then + Var CancelingPopupCountDown = CancelingPopupCountDown + 1 + + If CancelingPopupCountDown > 3 Then + + Var CancelingPopupFlag = "Invisible" + Var alphaState = "Invisible" + + If QRPopupOpenFlag = 1 Then + VendingQR OFF + EndIf + + If ReqPayInfoFromCashOther = 2 Then + DEBUGVAR "CashlessReq OFF by user" + CashlessReq OFF + EndIf + + If CashlessPayFlag = 1 Then + Var CashlessPayFlag = 0 + CashlessReq FAIL + EndIf + EndIf + EndIf + Refresh TimerReset - + - If ChangeStatus = "payout-end" Then + If ChangeStatus = "payout-end" Then Var ChangeOK = 1 EndIf @@ -2061,7 +2142,7 @@ Var AdultState2 = "Enable" Var AdultState1 = "Invisible" Var AdultState3 = "Invisible" - + Refresh EndIf EndIf @@ -2072,16 +2153,16 @@ If IDCardData = "ERROR" Then Var AdultState2 = "Invisible" Var AdultState3 = "Enable" - + Refresh EndIf EndIf EndIf - If IDCardStatus = "ERROR" Then + If IDCardStatus = "ERROR" Then Var AdultState2 = "Invisible" Var AdultState3 = "Enable" - + Refresh EndIf @@ -2116,14 +2197,14 @@ Var AgeNumber = sdateyear - StrYear DEBUGVAR AgeNumber - If AgeNumber >= 20 Then + If AgeNumber >= 20 Then If AgeNumber = 20 Then - If sdatemonth > StrMon Then + If sdatemonth > StrMon Then Var Adult20 = 1 Else - If sdatemonth = StrMon Then - If sdateday >= StrDay Then + If sdatemonth = StrMon Then + If sdateday >= StrDay Then Var Adult20 = 1 EndIf EndIf @@ -2132,15 +2213,15 @@ Var Adult20 = 1 EndIf - If Adult20 = 1 Then + If Adult20 = 1 Then Var AdultState3 = "Invisible" Var AdultState2 = "Invisible" Var AdultState1 = "Invisible" Var AdultState = "Invisible" ;CoinVending XBILL - Open "ROOT/taobin_project/xml/page_payment_camera.xml" + Open "ROOT/taobin_project/xml/page_payment_camera.xml" Refresh - + Else Var AdultState2 = "Invisible" Var AdultState3 = "Enable" @@ -2155,7 +2236,7 @@ Var AdultFlag2 = 1 - + EndIf EndIf EndIf @@ -2177,7 +2258,7 @@ Var alphaState = "Invisible" EndIf - + Var CoinInFlag = 1 @@ -2186,11 +2267,11 @@ If ViewBill > 0 Then If PayOfflineMode = 1 Then - Var alphaState3_offline = "Enable" + Var alphaState3_offline = "Enable" ;CoinVending BILLREJECT Else - If Seeker.StoreCreditFlag = 1 Then + If Seeker.StoreCreditFlag = 1 Then CoinVending BILLSTACKALL Else @@ -2213,7 +2294,7 @@ Var showRemaining = charOfBaht + RemainAmountStr - + If SELLONLINE = 1 Then Var alphaState3 = "Enable" Else @@ -2221,19 +2302,19 @@ EndIf - If show_eng = "true" Then + If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3" Else PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3" EndIf EndIf - + EndIf - + Else - + If CoinInOK = 0 Then @@ -2243,7 +2324,7 @@ Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit - If SumCoinAmount >= PayAmount Then + If SumCoinAmount >= PayAmount Then ;Var VendingQRCode = "ERROR" CoinVending OFF VendingQR OFF @@ -2251,7 +2332,7 @@ If Canout = 0 Then Var RemainAmountStr = 0 Else - If show_eng = "true" Then + If show_eng = "true" Then Var RemainAmountStr = "Change " + Canout Var RemainAmountStr = RemainAmountStr + "###size=90" Else @@ -2260,7 +2341,7 @@ EndIf EndIf - + Var CancleState = "Disable" Var CoinInOK = 1 Var CoinInCounter = 0 @@ -2282,18 +2363,18 @@ Var alphaState2t = "Invisible" EndIf - + EndIf EndIf - - + + Refresh - If CoinInFlag = 1 Then + If CoinInFlag = 1 Then If CoinInOK = 0 Then If CancelFlag = 0 Then SAVELOG "VDCancle > Cancle Order." @@ -2303,22 +2384,22 @@ Var cancelState = "Enable" Var CancelCounter = 0 ;If CoinAmount = 0 Then - ; Open "ROOT/taobin_project/xml/page_catalog.xml" + ; Open "ROOT/taobin_project/xml/page_catalog.xml" ;EndIf - - If show_eng = "true" Then + + If show_eng = "true" Then Var showRemaining = "Refund" Else Var showRemaining = "คืนเงิน" EndIf ;Open "ROOT/taobin_project/xml/page_catalog.xml" - If FlagQROpened = 1 Then + If FlagQROpened = 1 Then Var CancelNumber = 12 EndIf - EndIf + EndIf EndIf ;VendingQR OFF Refresh @@ -2337,17 +2418,17 @@ 1180 MenuCautionImageStage0 eval( - If show_eng = "true" Then + If show_eng = "true" Then Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink_en.png" Else Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink.png" - + EndIf ) -; +; ;include="ROOT/taobin_project/inc/video.inc" @@ -2372,8 +2453,8 @@ Var( DirImage + "/bn_back_arrow2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - - + + If CoinInOK = 0 Then If CancelFlag = 0 Then @@ -2388,18 +2469,18 @@ Var cancelState = "Enable" Var CancelCounter = 0 - If FlagQROpened = 1 Then + If FlagQROpened = 1 Then Var CancelNumber = 12 EndIf If CashlessPayFlag = 1 Then - Var CashlessPayFlag = 0 + Var CashlessPayFlag = 0 CashlessReq FAIL EndIf - + EndIf EndIf - + @@ -2417,14 +2498,14 @@ 375 623 - eval( + eval( If IsSmoRet = "true" Then Var return = "Enable" Else Var return = "Invisible" EndIf -) - +) + "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2437,7 +2518,7 @@ FilenameShowbuttonCashBP "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If alphaState = "Invisible" Then @@ -2451,9 +2532,9 @@ Var MachineStage = "make-drink" Var BrewingTextThai = "เตรียมแก้ว" MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" + Open "ROOT/taobin_project/xml/page_thankyou.xml" ;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - + EndIf Else @@ -2478,15 +2559,15 @@ pay_with_code_image "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If alphaState = "Invisible" Then - + If CoinInFlag = 0 Then If CancelFlag = 0 Then Var TelephoneNumber = "" Var Tel_Confirm_State = "Disable" - Open "ROOT/taobin_project/xml/page_payment_code.xml" + Open "ROOT/taobin_project/xml/page_payment_code.xml" EndIf EndIf @@ -2500,10 +2581,10 @@ PayState3 Var( DirImage + "/bn_prompt_pay.png") Var( DirImage + "/bp_prompt_pay.png") - Var( DirImage + "/bd_prompt_pay.png") + Var( DirImage + "/bd_prompt_pay.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If Timeout < 120 Then @@ -2521,13 +2602,15 @@ Var QRCODE99 = "" Var LOADING_STATE = "Enable" + Var CancelingPopupFlag = "Invisible" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON + Var QRPopupOpenFlag = 1 + - Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -2538,11 +2621,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" If IndoQR = 1 Then Var ECommerceQR = ECommerceQR + "IND:2/" @@ -2550,7 +2633,7 @@ Var ECommerceQR = ECommerceQR + "KBA:2/" EndIf - + @@ -2584,14 +2667,14 @@ Var GetScore = "" Var OperatorName = "" Var SessionID = "" - + Var PayDetail2 = Seeker.PayDetail2 GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 1 Refresh - - + + ;If CoinAmount > 0 Then ; Change CoinAmount @@ -2599,7 +2682,7 @@ ; Var CancelFlag = 1x ; Var CancelCounter = 0 ; Var NoGotoMenupage = "true" - ; + ; ;EndIf EndIf EndIf @@ -2611,7 +2694,7 @@ ; Var PayState1 = "Enable" ; Var PayState2 = "PressForever" ; Var QRChannel = 1 -; Open "ROOT/taobin_project/xml/page_payment_qr.xml" +; Open "ROOT/taobin_project/xml/page_payment_qr.xml" ; ; EndIf @@ -2628,16 +2711,16 @@ pay_with_credit_image "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If alphaState = "Invisible" Then - + If CoinInFlag = 0 Then If CancelFlag = 0 Then Var TelephoneNumber = "" Var Tel_Confirm_State = "Disable" - Open "ROOT/taobin_project/xml/page_payment_credit.xml" + Open "ROOT/taobin_project/xml/page_payment_credit.xml" EndIf EndIf @@ -2656,7 +2739,7 @@ Var( DirImage + "/bd_pay_with_ccard.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If alphaState = "Invisible" Then If CoinInFlag = 0 Then @@ -2684,14 +2767,14 @@ Var( DirImage + "/bd_pay_with_ewallet.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If alphaState = "Invisible" Then - + If CoinInFlag = 0 Then If CancelFlag = 0 Then - Open "ROOT/taobin_project/xml/page_payment_cashOther.xml" + Open "ROOT/taobin_project/xml/page_payment_cashOther.xml" EndIf EndIf @@ -2710,15 +2793,15 @@ Var( DirImage + "/bp_pay_with_codeOther.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If alphaState = "Invisible" Then - + If CoinInFlag = 0 Then If CancelFlag = 0 Then Var TelephoneNumber = "" Var Tel_Confirm_State = "Disable" - Open "ROOT/taobin_project/xml/page_payment_codeOther.xml" + Open "ROOT/taobin_project/xml/page_payment_codeOther.xml" EndIf EndIf @@ -2736,10 +2819,10 @@ Var( DirImage + "/bp_cancel_all.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ;VendingQR OFF - + If CoinInOK = 0 Then If CancelFlag = 0 Then SAVELOG "ButtonCancleMain > Cancle Order." @@ -2752,20 +2835,20 @@ Var cancelState = "Enable" Var CancelCounter = 0 - If FlagQROpened = 1 Then + If FlagQROpened = 1 Then Var CancelNumber = 12 EndIf If CashlessPayFlag = 1 Then - Var CashlessPayFlag = 0 + Var CashlessPayFlag = 0 CashlessReq FAIL EndIf - + EndIf EndIf Refresh - + @@ -2820,6 +2903,26 @@ + + 267 + 1065 + CancelingPopupFlag + 546 + 75 + NotoSansThaiBold + 58 + 0x5A5A5A + +eval( + If show_eng = "true" Then + Var return = "Canceling..." + Else + Var return = "กำลังยกเลิก..." + EndIf +) + + center-vertical-horizontal + 267 @@ -2828,10 +2931,6 @@ Var( DirImage + "/loadingText.png" ) - - - - + + ; begin cash popup 0 @@ -2906,9 +2997,9 @@ Var( DirImage + "/bp_cancel_all.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ;VendingQR OFF - + If CoinInOK = 0 Then If CancelFlag = 0 Then SAVELOG "ButtonCancleMain > Cancle Order." @@ -2921,10 +3012,10 @@ Var cancelState = "Enable" Var CancelCounter = 0 - If FlagQROpened = 1 Then + If FlagQROpened = 1 Then Var CancelNumber = 12 EndIf - + EndIf EndIf @@ -2955,9 +3046,9 @@ Var( DirImage + "/bp_cancel_all.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ;VendingQR OFF - + If CoinInOK = 0 Then If CancelFlag = 0 Then SAVELOG "ButtonCancleMain > Cancle Order." @@ -2970,17 +3061,17 @@ Var cancelState = "Enable" Var CancelCounter = 0 - If FlagQROpened = 1 Then + If FlagQROpened = 1 Then Var CancelNumber = 12 EndIf - + EndIf EndIf Refresh - + @@ -3060,9 +3151,9 @@ Var( DirImage2 + "/bp_keep.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + - Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml" + Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml" @@ -3074,7 +3165,7 @@ Var( DirImage2 + "/bp_cancel2.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + CoinVending BILLREJECT Var alphaState3 = "Invisible" @@ -3106,7 +3197,7 @@ Var( DirImage2 + "/bp_cancel2.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + CoinVending BILLREJECT Var alphaState3_offline = "Invisible" @@ -3157,7 +3248,7 @@ Var( DirImage + "/QRError.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + @@ -3192,14 +3283,30 @@ 968 94 94 - LOADING_STATE + +eval( + Var should_show = 0 + If LOADING_STATE = "Enable" Then + Var should_show = 1 + EndIf + + If CancelingPopupFlag = "Enable" Then + Var should_show = 1 + EndIf + + If should_show = 1 Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + Var( DirImage + "/loading.gif" ) - - - Open "/media/bt/xml/security_alarm.xml" + + Open "/media/bt/xml/security_alarm.xml" ; @@ -3225,13 +3332,13 @@ DEBUGVAR IgnoreNetCore If IgnoreNetCore = "true" Then - If Seeker = "curr" Then - + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID Else - + EndIf - Open "ROOT/taobin_project/xml/page_thankyou.xml" + Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf diff --git a/xml/page_payment_cashOther.xml b/xml/page_payment_cashOther.xml index fca25e22..4e87e8fc 100644 --- a/xml/page_payment_cashOther.xml +++ b/xml/page_payment_cashOther.xml @@ -12,23 +12,23 @@ Var Seeker.FreeVendingCampaign = 0 Var Timeout = 0 - + Var GetPayInfoFlag = 0 ;Var Seeker.CodeChannel = 0 ;Var VendingQRCode = "ERROR" ;VendingQR ON ;Var QRCODE99 = "" - + ;CoinVending OFF VendingQR OFF - + Var ShowTextNumber = "Enable" Var ShowErrorText = "Invisible" Var Tel_Confirm_State = "Invisible" Var ErrorCause = "" - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/collectiing_en" Else Var DirImage = "ROOT/taobin_project/image/collectiing" @@ -68,37 +68,37 @@ Var WalletEnable = "Disable" EndIf - + ;Var InvisibleCCard = "Invisible" - + 1000 - - ;Open "ROOT/xml/page_board.xml" + + ;Open "ROOT/xml/page_board.xml" + - Var Timeout = Timeout + 1 If Timeout > 30 Then ;VendingQR OFF - ;Open menu_back_to_main + ;Open menu_back_to_main Var PayState1 = "PressForever" Var PayState2 = "Enable" ;Var QRChannel = 0 ;Var Seeker.CodeChannel = 0 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" Else - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" EndIf Refresh EndIf TimerReset - + @@ -116,11 +116,11 @@ If ViewBill > 0 Then CoinVending BILLREJECT EndIf - + VendingQR OFF CoinVending OFF - + If Seeker = "curr" Then MakeDrinkV1 SelectDrink SelectSugarID @@ -128,7 +128,7 @@ Var Seeker.CreditCard = 1 Var Seeker.CreditCardRef = CreditCardRef - Open "ROOT/taobin_project/xml/page_thankyou.xml" + Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf @@ -141,7 +141,7 @@ Var CreditCardRef = "" GenHashWithTimeStamp CreditCardRef - DEBUGVAR VendingCashless + DEBUGVAR VendingCashless If VendingCashless = "READY" Then CashlessPay PriceDrink CreditCardRef @@ -174,20 +174,21 @@ "ROOT/taobin_project/image/collectiing/bd_pay_with_true.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + + - Var QR_POPUP = "/img_popup3.png" Var LOADING_STATE = "Enable" - + Var QRCODE99 = "" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON - - + Var QRPopupOpenFlag = 1 + + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -198,11 +199,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "TWN:2/" @@ -213,7 +214,7 @@ ; Var ECommerceQR = ECommerceQR + ":" ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 ;EndIf - + Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -226,7 +227,7 @@ GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 3 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" @@ -241,19 +242,20 @@ "ROOT/taobin_project/image/collectiing/bd_pay_with_paotang.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var QR_POPUP = "/img_popup1.png" Var LOADING_STATE = "Enable" - + Var QRCODE99 = "" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON - - + Var QRPopupOpenFlag = 1 + + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -264,11 +266,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "KBA:2/" @@ -279,7 +281,7 @@ ; Var ECommerceQR = ECommerceQR + ":" ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 ;EndIf - + Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -292,7 +294,7 @@ GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 1 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" @@ -306,19 +308,20 @@ "ROOT/taobin_project/image/collectiing/bd_pay_with_linepay.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var QR_POPUP = "/img_popup9.png" Var LOADING_STATE = "Enable" - + Var QRCODE99 = "" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON - - + Var QRPopupOpenFlag = 1 + + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -329,11 +332,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "LPY:2/" @@ -344,7 +347,7 @@ ; Var ECommerceQR = ECommerceQR + ":" ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 ;EndIf - + Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -357,7 +360,7 @@ GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 5 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" @@ -374,19 +377,20 @@ "ROOT/taobin_project/image/collectiing/bd_pay_with_shoppy.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var QR_POPUP = "/img_popup2.png" Var LOADING_STATE = "Enable" - + Var QRCODE99 = "" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON - - + Var QRPopupOpenFlag = 1 + + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -397,11 +401,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "AIR:2/" @@ -412,7 +416,7 @@ ; Var ECommerceQR = ECommerceQR + ":" ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 ;EndIf - + Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -425,7 +429,7 @@ GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 2 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" @@ -439,19 +443,20 @@ "ROOT/taobin_project/image/collectiing/bd_pay_with_maxme.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var QR_POPUP = "/img_popup11.png" Var LOADING_STATE = "Enable" - + Var QRCODE99 = "" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON - - + Var QRPopupOpenFlag = 1 + + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -462,11 +467,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "MAX:2/" @@ -477,7 +482,7 @@ ; Var ECommerceQR = ECommerceQR + ":" ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 ;EndIf - + Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -490,7 +495,7 @@ GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 7 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" @@ -504,19 +509,20 @@ "ROOT/taobin_project/image/collectiing/bd_pay_with_wechat.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var QR_POPUP = "/img_popup13.png" Var LOADING_STATE = "Enable" - + Var QRCODE99 = "" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON - - + Var QRPopupOpenFlag = 1 + + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -527,11 +533,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "WEC:2/" @@ -542,7 +548,7 @@ ; Var ECommerceQR = ECommerceQR + ":" ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 ;EndIf - + Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -555,7 +561,7 @@ GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 8 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" @@ -570,19 +576,20 @@ "ROOT/taobin_project/image/collectiing/bn_pay_with_make.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var QR_POPUP = "/img_popup1.png" Var LOADING_STATE = "Enable" - + Var QRCODE99 = "" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON - - + Var QRPopupOpenFlag = 1 + + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -593,11 +600,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "KBA:2/" @@ -608,7 +615,7 @@ ; Var ECommerceQR = ECommerceQR + ":" ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 ;EndIf - + Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -621,9 +628,9 @@ GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 1 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + - @@ -631,25 +638,26 @@ @@ -702,20 +710,21 @@ "ROOT/taobin_project/image/collectiing/bd_pay_with_cashUnion.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + + - Var QR_POPUP = "/img_popup21.png" Var LOADING_STATE = "Enable" - + Var QRCODE99 = "" Var FlagQROpened = 1 Var alphaState = "Enable" ;CoinVending OFF VendingQR ON - - + Var QRPopupOpenFlag = 1 + + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -726,11 +735,11 @@ Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + SessionID2 Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "UNP:2/" @@ -741,7 +750,7 @@ ; Var ECommerceQR = ECommerceQR + ":" ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 ;EndIf - + Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -754,12 +763,79 @@ GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var ReqPayInfoFlag = 10 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + + @@ -785,9 +861,9 @@ "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + + - @@ -801,9 +877,9 @@ "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + + - @@ -817,13 +893,13 @@ "ROOT/taobin_project/image/collectiing/bd_pay_with_ccard1.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var QR_POPUP = "/img_popup8.png" Var alphaState = "Enable" Coin CARD Var ReqPayInfoFromCashOther = 2 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" @@ -839,15 +915,15 @@ Var( DirImage + "/bn_cancel2.png") "ROOT/sounds/codebuttom.wav" SoundVolume - + Var PayState1 = "PressForever" Var PayState2 = "Enable" ;Var QRChannel = 0 ;Var Seeker.CodeChannel = 0 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" Else - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" EndIf @@ -863,9 +939,9 @@ - - - Open "/media/bt/xml/security_alarm.xml" + + + Open "/media/bt/xml/security_alarm.xml"