pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2024-11-27 17:59:08 +07:00
commit 8eb6de95c8
4 changed files with 612 additions and 480 deletions
Download patch file Download diff file Expand all files Collapse all files

190
xml/page_payment_cash.xml
View file

@ -182,6 +182,7 @@
Var Seeker.VendingDiscount = DiscountDrink
Var CancelingPopupFlag = "Invisible"
Var SendCancelActionFlag = 0
Var CancelingPopupCountDown = 0
Var CashTextWarning = ""
@ -322,13 +323,6 @@
EndIf
If MyMintEnable = 1 Then
If FromMyMintPro = 1 Then
Var PayState2 = "Disable"
Var PayState5 = "Disable"
Var PayState6 = "Disable"
EndIf
EndIf
@ -698,13 +692,13 @@
;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.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
Var ServiceParameter = "max"
Var ServiceCharge = 0
@ -751,13 +745,13 @@
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "TWN: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.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
Var ServiceParameter = "max"
@ -805,13 +799,13 @@
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "DOL: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.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
Var ServiceParameter = "max"
Var ServiceCharge = 0
@ -858,13 +852,13 @@
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "LPY: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.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
Var ServiceParameter = "max"
Var ServiceCharge = 0
@ -911,13 +905,13 @@
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "LZP: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.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
Var ServiceParameter = "max"
Var ServiceCharge = 0
@ -965,13 +959,13 @@
Var ECommerceQR = ECommerceQR + "MAX: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.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
Var ServiceParameter = "max"
Var ServiceCharge = 0
@ -1019,13 +1013,13 @@
Var ECommerceQR = ECommerceQR + "WEC: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.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
Var ServiceParameter = "max"
Var ServiceCharge = 0
@ -1072,13 +1066,13 @@
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "ALP: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.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
Var ServiceParameter = "max"
Var ServiceCharge = 0
@ -1125,13 +1119,13 @@
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "UNP: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.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
Var ServiceParameter = "max"
@ -1179,13 +1173,13 @@
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "ACU: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.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
Var ServiceParameter = "max"
@ -2244,14 +2238,38 @@
If CancelingPopupFlag = "Enable" Then
SAVELOG "Canceled Popup"
Var CancelingPopupCountDown = CancelingPopupCountDown + 1
DEBUGVAR CancelingPopupCountDown
If CancelingPopupCountDown > 3 Then
If SendCancelActionFlag = 0 Then
SAVELOG "Send Canceled Popup"
Var SendCancelActionFlag = 1
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
If CancelingPopupCountDown > 5 Then
SAVELOG "Close Cancel Popup"
Var CancelingPopupFlag = "Invisible"
Var alphaState = "Invisible"
Var SendCancelActionFlag = 0
EndIf
EndIf
@ -3101,20 +3119,6 @@ eval(
Var CancelingPopupFlag = "Enable"
Var CancelingPopupCountDown = 0
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
Refresh
EndIf
</EventClick>

103
xml/page_payment_cashOther.xml
View file

@ -57,24 +57,71 @@
EndIf
Var WalletEnable = "Enable"
If Seeker.IntVendingCampaign > 0 Then
DEBUGVAR "Discount Disable Wallet"
Var WalletEnable = "Disable"
EndIf
Var SendDiscountCampaign = 0
;If Seeker.IntVendingCampaign > 0 Then
; SAVELOG "Have discount enable send discount campaign"
; Var SendDiscountCampaign = 1
;EndIf
If From15THBPro = 1 Then
DEBUGVAR "Discount Disable Wallet"
Var WalletEnable = "Disable"
If Seeker.IntVendingCampaign > 0 Then
SAVELOG "Have discount enable send discount campaign"
Var SendDiscountCampaign = 1
EndIf
Var TWN_CashOtherButtonState = "Disable"
Var KBA_CashOtherButtonState = "Disable"
Var LPY_CashOtherButtonState = "Disable"
Var AIR_CashOtherButtonState = "Disable"
Var MAX_CashOtherButtonState = "Disable"
Var WEC_CashOtherButtonState = "Disable"
Var ALP_CashOtherButtonState = "Disable"
Var UNP_CashOtherButtonState = "Disable"
Var ACU_CashOtherButtonState = "Disable"
If EnableCashOtherAll = "true" Then
Var TWN_CashOtherButtonState = "Enable"
Var KBA_CashOtherButtonState = "Enable"
Var LPY_CashOtherButtonState = "Enable"
Var AIR_CashOtherButtonState = "Enable"
Var MAX_CashOtherButtonState = "Enable"
Var WEC_CashOtherButtonState = "Enable"
Var ALP_CashOtherButtonState = "Enable"
Var UNP_CashOtherButtonState = "Enable"
Var ACU_CashOtherButtonState = "Enable"
EndIf
If TWN_CashOtherEnable = "true" Then
Var TWN_CashOtherButtonState = "Enable"
EndIf
If KBA_CashOtherEnable = "true" Then
Var KBA_CashOtherButtonState = "Enable"
EndIf
If LPY_CashOtherEnable = "true" Then
Var LPY_CashOtherButtonState = "Enable"
EndIf
If AIR_CashOtherEnable = "true" Then
Var AIR_CashOtherButtonState = "Enable"
EndIf
If MAX_CashOtherEnable = "true" Then
Var MAX_CashOtherButtonState = "Enable"
EndIf
If WEC_CashOtherEnable = "true" Then
Var WEC_CashOtherButtonState = "Enable"
EndIf
If ALP_CashOtherEnable = "true" Then
Var ALP_CashOtherButtonState = "Enable"
EndIf
If UNP_CashOtherEnable = "true" Then
Var UNP_CashOtherButtonState = "Enable"
EndIf
If ACU_CashOtherEnable = "true" Then
Var ACU_CashOtherButtonState = "Enable"
EndIf
;Var InvisibleCCard = "Invisible"
@ -175,7 +222,7 @@
<Button>
<X> 209 </X>
<Y> 741 </Y>
<State> WalletEnable </State>
<State> TWN_CashOtherButtonState </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_true.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_true.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_true.png" </FilenameDisable>
@ -245,7 +292,7 @@
<X> 441 </X>
<Y> 741 </Y>
<State> WalletEnable </State>
<State> KBA_CashOtherButtonState </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_paotang.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_paotang.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_paotang.png" </FilenameDisable>
@ -313,7 +360,7 @@
<Button>
<X> 675 </X>
<Y> 741 </Y>
<State> WalletEnable </State>
<State> LPY_CashOtherButtonState </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_linepay.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_linepay.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_linepay.png" </FilenameDisable>
@ -384,7 +431,7 @@
<Button>
<X> 209 </X>
<Y> 965 </Y>
<State> WalletEnable </State>
<State> AIR_CashOtherButtonState </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_shoppy.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_shoppy.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_shoppy.png" </FilenameDisable>
@ -452,7 +499,7 @@
<Button>
<X> 440 </X>
<Y> 965 </Y>
<State> WalletEnable </State>
<State> MAX_CashOtherButtonState </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_maxme.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_maxme.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_maxme.png" </FilenameDisable>
@ -520,7 +567,7 @@
<Button>
<X> 675 </X>
<Y> 965 </Y>
<State> WalletEnable </State>
<State> WEC_CashOtherButtonState </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_wechat.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_wechat.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_wechat.png" </FilenameDisable>
@ -589,10 +636,10 @@
<Button>
<X> 208 </X>
<Y> 1189 </Y>
<State> WalletEnable </State>
<State> KBA_CashOtherButtonState </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_make.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bn_pay_with_make.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bn_pay_with_make.png" </FilenameDisable>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_make.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_make.png" </FilenameDisable>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -659,7 +706,7 @@
<Button>
<X> 440 </X>
<Y> 1189 </Y>
<State> WalletEnable </State>
<State> ALP_CashOtherButtonState </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_cashAli.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_cashAli.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_cashAli.png" </FilenameDisable>
@ -727,7 +774,7 @@
<Button>
<X> 675 </X>
<Y> 1189 </Y>
<State> WalletEnable </State>
<State> UNP_CashOtherButtonState </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_cashUnion.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_cashUnion.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_cashUnion.png" </FilenameDisable>
@ -797,8 +844,8 @@
<Button>
<X> 208 </X>
<Y> 1413 </Y>
;<State> WalletEnable </State>
<State> "Invisible" </State>
<State> ACU_CashOtherButtonState </State>
;<State> "Invisible" </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_cashACU.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_cashACU.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_cashACU.png" </FilenameDisable>
@ -867,7 +914,7 @@
<Button>
<X> 208 </X>
<Y> 1413 </Y>
<State> "Enable" </State>
<State> "Invisible" </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </FilenameDisable>

33
xml/page_payment_code.xml
View file

@ -172,6 +172,39 @@
SPLIT ECommerce "/" 7 Seeker.VendingCampaignRI3
SPLIT ECommerce "/" 8 VendingCampaign1
SPLIT ECommerce "/" 9 ShouldCollectPoint
SPLIT ECommerce "/" 10 CashOtherButtonControl
DEBUGVAR CashOtherButtonControl
If CashOtherButtonControl = "" Then
Var EnableCashOtherAll = "true"
Else
If CashOtherButtonControl = "*" Then
Var EnableCashOtherAll = "true"
Else
Var EnableCashOtherAll = "false"
STRCONTAIN "TWN" CashOtherButtonControl TWN_CashOtherEnable
STRCONTAIN "KBA" CashOtherButtonControl KBA_CashOtherEnable
STRCONTAIN "LPY" CashOtherButtonControl LPY_CashOtherEnable
STRCONTAIN "AIR" CashOtherButtonControl AIR_CashOtherEnable
STRCONTAIN "MAX" CashOtherButtonControl MAX_CashOtherEnable
STRCONTAIN "WEC" CashOtherButtonControl WEC_CashOtherEnable
STRCONTAIN "ALP" CashOtherButtonControl ALP_CashOtherEnable
STRCONTAIN "UNP" CashOtherButtonControl UNP_CashOtherEnable
STRCONTAIN "ACU" CashOtherButtonControl ACU_CashOtherEnable
DEBUGVAR TWN_CashOtherEnable
DEBUGVAR KBA_CashOtherEnable
DEBUGVAR LPY_CashOtherEnable
DEBUGVAR AIR_CashOtherEnable
DEBUGVAR MAX_CashOtherEnable
DEBUGVAR WEC_CashOtherEnable
DEBUGVAR ALP_CashOtherEnable
DEBUGVAR UNP_CashOtherEnable
DEBUGVAR ACU_CashOtherEnable
EndIf
EndIf
If Seeker.VendingCode = "" Then
Var Seeker.VendingCode = "C00"

766
xml/page_topping_select7.xml
View file

File diff suppressed because it is too large Load diff