This commit is contained in:
miggaze 2023-08-22 13:25:24 +07:00
parent 57b67e47f7
commit bb9b7ed864
7 changed files with 139 additions and 145 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

Before After
Before After

View file

@ -175,6 +175,8 @@
Var PayState1 = "Press"
EndIf
Var PayState3 = "Enable"
If Seeker.IntVendingCampaign = 0 Then
Var PayState2 = "Enable"
Var PayState4 = "Enable"
@ -186,8 +188,9 @@
Var PayState4 = "Disable"
Var PayState5 = "Enable"
Var PayState6 = "Disable"
Var PayState3 = "Disable"
EndIf
Var PayState3 = "Enable"
DEBUGVAR CoinAmount
@ -207,6 +210,7 @@
Var PayState4 = "Disable"
Var PayState5 = "Disable"
Var PayState6 = "Disable"
Var PayState3 = "Disable"
EndIf
@ -450,6 +454,8 @@
;Open "ROOT/taobin_project/xml/page_page_camera.xml"
;Var PayState4 = "Invisible"
</EventOpen>
<EventActionOk>
@ -480,20 +486,9 @@
Var Seeker.CampaignPayChanel = "malaymbb"
EndIf
If ReqPayInfoFlag2 = 2 Then
Var Seeker.CampaignPayChanel = "shopee"
Var Seeker.CampaignPayChanel = "alipay"
EndIf
If ReqPayInfoFlag2 = 3 Then
Var Seeker.CampaignPayChanel = "true"
EndIf
If ReqPayInfoFlag2 = 4 Then
Var Seeker.CampaignPayChanel = "dolfin"
EndIf
If ReqPayInfoFlag2 = 5 Then
Var Seeker.CampaignPayChanel = "linepay"
EndIf
If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID
@ -536,36 +531,10 @@
EndIf
If VendingQRTypeResult = "IND:2" Then
Var CashTextWarning = ""
Var QRErrorState = "Invisible"
Var QRCODE99KBANK = SessionID
Var QRCODE99KBANK = QRCODE99KBANK + Ext1a
SAVELOG Ext1a
SAVELOG QRCODE99KBANK
Var QRCODE99KBANK = QRCODE99KBANK + Ext21
Var QRCODETMP = QRCODE99KBANK
Var ReqPayInfoFlag = 0
Var ReqPayInfoFlag2 = 1
SAVELOG QRCODE99KBANK
SAVELOG Ext21
Var QRCODE99 = QRCODE99KBANK
Var LOADING_STATE = "Invisible"
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
EndIf
EndIf
EndIf
If ReqPayInfoFlag = 2 Then
If VendingQRTypeResult = "AIR:2" Then
If VendingQRTypeResult = "ALI:2" Then
Var CashTextWarning = ""
Var QRErrorState = "Invisible"
Var QRCODE99Shoppy = SessionID
@ -590,84 +559,6 @@
EndIf
EndIf
If ReqPayInfoFlag = 3 Then
If VendingQRTypeResult = "TWN:2" Then
Var CashTextWarning = ""
Var QRErrorState = "Invisible"
Var QRCODE99Shoppy = SessionID
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a
SAVELOG Ext1a
SAVELOG QRCODE99Shoppy
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21
Var ReqPayInfoFlag = 0
Var ReqPayInfoFlag2 = 3
SAVELOG QRCODE99Shoppy
SAVELOG Ext21
Var QRCODE99 = QRCODE99Shoppy
Var LOADING_STATE = "Invisible"
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
EndIf
EndIf
EndIf
If ReqPayInfoFlag = 4 Then
If VendingQRTypeResult = "DOL:2" Then
Var CashTextWarning = ""
Var QRErrorState = "Invisible"
Var QRCODE99Shoppy = SessionID
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a
SAVELOG Ext1a
SAVELOG QRCODE99Shoppy
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21
Var ReqPayInfoFlag = 0
Var ReqPayInfoFlag2 = 4
SAVELOG QRCODE99Shoppy
SAVELOG Ext21
Var QRCODE99 = QRCODE99Shoppy
Var LOADING_STATE = "Invisible"
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
EndIf
EndIf
EndIf
If ReqPayInfoFlag = 5 Then
If VendingQRTypeResult = "LPY:2" Then
Var CashTextWarning = ""
Var QRErrorState = "Invisible"
Var QRCODE99Shoppy = SessionID
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a
SAVELOG Ext1a
SAVELOG QRCODE99Shoppy
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21
Var ReqPayInfoFlag = 0
Var ReqPayInfoFlag2 = 5
SAVELOG QRCODE99Shoppy
SAVELOG Ext21
Var QRCODE99 = QRCODE99Shoppy
Var LOADING_STATE = "Invisible"
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
EndIf
EndIf
EndIf
Else
Var PayInfoCFlag = 1
EndIf
@ -1460,8 +1351,8 @@
</Button>
<Button>
<X> 216 </X>
<Y> 1499</Y>
<X> 324 </X>
<Y> 1488</Y>
<State> PayState2</State>
<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
@ -1486,8 +1377,8 @@
<Button>
<X> 439 </X>
<Y> 1276 </Y>
<X> 199 </X>
<Y> 1266 </Y>
<State> PayState3</State>
<Filename> Var( DirImage + "/bn_qrcode.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_qrcode.png") </FilenamePress>
@ -1536,23 +1427,23 @@
Var ECommerceQR = ECommerceQR + "MBB:2/"
If Seeker.IntVendingCampaign > 0 Then
Var ECommerceQR = ECommerceQR + Seeker.VendingCode
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + Seeker.CodeNumber
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3
EndIf
If Seeker.IntVendingCredit > 0 Then
Var ECommerceQR = ECommerceQR + "CRD"
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + PointCrm
EndIf
;If Seeker.IntVendingCampaign > 0 Then
; Var ECommerceQR = ECommerceQR + Seeker.VendingCode
; Var ECommerceQR = ECommerceQR + ":"
; Var ECommerceQR = ECommerceQR + Seeker.CodeNumber
; Var ECommerceQR = ECommerceQR + ":"
; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3
;EndIf
;
;If Seeker.IntVendingCredit > 0 Then
; Var ECommerceQR = ECommerceQR + "CRD"
; Var ECommerceQR = ECommerceQR + ":"
; Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit
; Var ECommerceQR = ECommerceQR + ":"
; Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit
; Var ECommerceQR = ECommerceQR + ":"
; Var ECommerceQR = ECommerceQR + PointCrm
;EndIf
Var ServiceParameter = "max"
@ -1596,8 +1487,101 @@
</Button>
<Button>
<X> 439 </X>
<Y> 1499 </Y>
<X> 434 </X>
<Y> 1266 </Y>
<State> PayState3</State>
<Filename> Var( DirImage + "/bn_alipay.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_alipay.png") </FilenamePress>
<FilenameDisable> Var( DirImage + "/bd_alipay.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If Timeout < 120 Then
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
If alphaState = "Invisible" Then
Var QR_POPUP = "/img_popup12.png"
Var QRCODE99 = ""
Var LOADING_STATE = "Enable"
Var FlagQROpened = 1
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + Seeker.ExtendData
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumberQR = "0899999999"
Var ServiceType = "coffee"
Var ECommerceQR = ""
Var ECommerceQR = ECommerceQR + PriceDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + DiscountDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SessionID2
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SelectDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "ALI:2/"
Var ServiceParameter = "max"
Var ServiceCharge = 0
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
Var GetScore = ""
Var OperatorName = ""
Var SessionID = ""
GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var ReqPayInfoFlag = 2
Refresh
;If CoinAmount > 0 Then
; Change CoinAmount
; Var ChangeOK = 0
; Var CancelFlag = 1x
; Var CancelCounter = 0
; Var NoGotoMenupage = "true"
;
;EndIf
EndIf
EndIf
EndIf
EndIf
; If CoinInFlag = 0 Then
; Var BG_Menu_Page4 = "ROOT/image/BG_PromptPay_Page4.bmp"
; Var PayState1 = "Enable"
; Var PayState2 = "PressForever"
; Var QRChannel = 1
; Open "ROOT/taobin_project/xml/page_payment_qr.xml"
;
; EndIf
</EventClick>
</Button>
<Button>
<X> 554 </X>
<Y> 1488 </Y>
<State> PayState5 </State>
<Filename> Var( DirImage + "/bn_pay_with_ccard.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_ccard.png") </FilenamePress>
@ -1624,8 +1608,8 @@ EndIf
<Button>
<X> 664 </X>
<Y> 1276 </Y>
<X> 669 </X>
<Y> 1266 </Y>
<State> PayState4</State>
<Filename> Var( DirImage + "/bn_pay_with_credit.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_credit.png") </FilenamePress>
@ -1655,7 +1639,7 @@ EndIf
<Button>
<X> 664 </X>
<Y> 1499 </Y>
<State> "Enable"</State>
<State> "Invisible" </State>
<Filename> Var( DirImage + "/bn_pay_with_comingSoon.png") </Filename>
<FilenamePress> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenamePress>
<FilenameDisable> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenameDisable>
@ -1762,6 +1746,14 @@ EndIf
<Image>
<X> 249 </X>
<Y> 748 </Y>
<State> alphaState </State>
<Filename> Var( DirImage + QR_POPUP )</Filename>
</Image>
<Image>
<X> 267 </X>
<Y> 1065 </Y>
@ -1772,6 +1764,8 @@ EndIf
<Button>
<X> 438 </X>