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

...

Browse source
This commit is contained in:
pichet 2023-04-17 17:17:58 +07:00
parent a6f588b7cb
commit 89f332db61
17 changed files with 233 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/collectiing/bd_pay_with_wechat.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
image/collectiing/bn_pay_with_wechat.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
image/collectiing/bp_pay_with_wechat.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
image/collectiing/img_popup17.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

BIN
image/collectiing_en/bd_pay_with_wechat.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
image/collectiing_en/bn_pay_with_wechat.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
image/collectiing_en/bp_pay_with_wechat.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
image/collectiing_en/img_popup17.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

BIN
image/page_payment/img_popup13.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
image/page_payment_en/page_payment/img_popup13.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

14
xml/page_collect_point_1-3.xml
View file

@ -89,6 +89,11 @@
Var TelephoneNumberX = TelephoneNumber Var TelephoneNumberX = TelephoneNumber
DEBUGVAR TelephoneNumber DEBUGVAR TelephoneNumber
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
Var Param1 = TelephoneNumber + "/" Var Param1 = TelephoneNumber + "/"
Var Param1 = Param1 + ParamCP Var Param1 = Param1 + ParamCP
@ -112,6 +117,11 @@
SAVELOG "collect_point1-p71." SAVELOG "collect_point1-p71."
Var TelephoneNumberX = TelephoneNumber Var TelephoneNumberX = TelephoneNumber
DEBUGVAR TelephoneNumber DEBUGVAR TelephoneNumber
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
Var Param1 = TelephoneNumber + "/" Var Param1 = TelephoneNumber + "/"
Var Param1 = Param1 + ParamCP Var Param1 = Param1 + ParamCP
@ -582,6 +592,10 @@
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
DEBUGVAR TelephoneNumber DEBUGVAR TelephoneNumber
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Var Param1 = TelephoneNumber + "/" Var Param1 = TelephoneNumber + "/"
Var Param1 = Param1 + ParamCP Var Param1 = Param1 + ParamCP

16
xml/page_collect_point_1.xml
View file

@ -89,6 +89,11 @@
Var TelephoneNumberX = TelephoneNumber Var TelephoneNumberX = TelephoneNumber
DEBUGVAR TelephoneNumber DEBUGVAR TelephoneNumber
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
Var Param1 = TelephoneNumber + "/" Var Param1 = TelephoneNumber + "/"
Var Param1 = Param1 + ParamCP Var Param1 = Param1 + ParamCP
@ -112,6 +117,10 @@
SAVELOG "collect_point1-p71." SAVELOG "collect_point1-p71."
Var TelephoneNumberX = TelephoneNumber Var TelephoneNumberX = TelephoneNumber
DEBUGVAR TelephoneNumber DEBUGVAR TelephoneNumber
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
Var Param1 = TelephoneNumber + "/" Var Param1 = TelephoneNumber + "/"
Var Param1 = Param1 + ParamCP Var Param1 = Param1 + ParamCP
@ -584,6 +593,10 @@
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
DEBUGVAR TelephoneNumber DEBUGVAR TelephoneNumber
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Var Param1 = TelephoneNumber + "/" Var Param1 = TelephoneNumber + "/"
Var Param1 = Param1 + ParamCP Var Param1 = Param1 + ParamCP
@ -591,6 +604,9 @@
GETACCEXT Param1 23 GETACCEXT Param1 23
;Open "ROOT/taobin_project/xml/page_catalog.xml" ;Open "ROOT/taobin_project/xml/page_catalog.xml"
Open "ROOT/taobin_project/xml/page_collect_point_2.xml" Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
Else Else

4
xml/page_display_Promo1Get1Free.xml
View file

@ -24,11 +24,11 @@
Var promoTxt = "" + PromotionIDCurrentOrder Var promoTxt = "" + PromotionIDCurrentOrder
Var promoTxt = promoTxt + "/1" Var promoTxt = promoTxt + "/1"
;AddData 27 Seeker.TNumberTaobinMember promoTxt "" ""
Var Cid = 27 Var Cid = 27
Var PointCrm = "" Var PointCrm = ""
Var GetScore = "1" Var GetScore = "1"
AddData Cid Seeker.TNumberTaobinMember promoTxt PointCrm GetScore AddData Cid TelephoneNumber promoTxt PointCrm GetScore
If PromotionIDCurrentOrder = 2 Then If PromotionIDCurrentOrder = 2 Then

4
xml/page_drinkfail2-2.xml
View file

@ -31,7 +31,7 @@
DEBUGVAR TelephoneNumberProblem
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
@ -43,6 +43,8 @@
If Timeout > 9 Then If Timeout > 9 Then
DEBUGVAR TelephoneNumberProblem
StrLen TelephoneNumberProblem TelNumLen StrLen TelephoneNumberProblem TelNumLen
If TelNumLen >= 10 Then If TelNumLen >= 10 Then

13
xml/page_drinkfail4.xml
View file

@ -27,7 +27,7 @@
DEBUGVAR TelephoneNumberProblem
</EventOpen> </EventOpen>
@ -44,6 +44,9 @@
If GetFreeFlag = 1 Then If GetFreeFlag = 1 Then
If Timeout > 240 Then If Timeout > 240 Then
DEBUGVAR TelephoneNumberProblem
StrLen TelephoneNumberProblem TelNumLen StrLen TelephoneNumberProblem TelNumLen
If TelNumLen >= 10 Then If TelNumLen >= 10 Then
@ -77,6 +80,9 @@
Else Else
If MachineStage = "show-menu" Then If MachineStage = "show-menu" Then
DEBUGVAR TelephoneNumberProblem
StrLen TelephoneNumberProblem TelNumLen StrLen TelephoneNumberProblem TelNumLen
If TelNumLen >= 10 Then If TelNumLen >= 10 Then
@ -100,6 +106,9 @@
Else Else
If Timeout > 5 Then If Timeout > 5 Then
DEBUGVAR TelephoneNumberProblem
StrLen TelephoneNumberProblem TelNumLen StrLen TelephoneNumberProblem TelNumLen
If TelNumLen >= 10 Then If TelNumLen >= 10 Then
@ -241,6 +250,8 @@
Machine RemoveCup Machine RemoveCup
DEBUGVAR TelephoneNumberProblem
StrLen TelephoneNumberProblem TelNumLen StrLen TelephoneNumberProblem TelNumLen
If TelNumLen >= 10 Then If TelNumLen >= 10 Then

79
xml/page_payment_cash.xml
View file

@ -774,7 +774,7 @@
If web_payment = "MAXME" Then If web_payment = "MAXME" Then
Var QR_POPUP = "/img_popup10.png" Var QR_POPUP = "/img_popup11.png"
Var LOADING_STATE = "Enable" Var LOADING_STATE = "Enable"
Var FlagQROpened = 1 Var FlagQROpened = 1
@ -815,6 +815,50 @@
Var ReqPayInfoFlag = 7 Var ReqPayInfoFlag = 7
EndIf EndIf
If web_payment = "WECHAT" Then
Var QR_POPUP = "/img_popup12.png"
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 + "WEC: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 = 8
EndIf
EndIf EndIf
@ -895,6 +939,10 @@
If ReqPayInfoFlag2 = 7 Then If ReqPayInfoFlag2 = 7 Then
Var Seeker.CampaignPayChanel = "maxme" Var Seeker.CampaignPayChanel = "maxme"
EndIf EndIf
If ReqPayInfoFlag2 = 8 Then
Var Seeker.CampaignPayChanel = "wechat"
EndIf
@ -1132,6 +1180,35 @@
EndIf EndIf
EndIf EndIf
If ReqPayInfoFlag = 8 Then
If VendingQRTypeResult = "WEC: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 = 8
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
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
EndIf
EndIf
EndIf
Else Else
Var PayInfoCFlag = 1 Var PayInfoCFlag = 1
EndIf EndIf

119
xml/page_payment_cashOther.xml
View file

@ -154,14 +154,14 @@
<Image> <Image>
<X> 158 </X> <X> 158 </X>
<Y> 712 </Y> <Y> 567 </Y>
<Filename> Var( DirImage + "/img_popup17.png") </Filename> <Filename> Var( DirImage + "/img_popup17.png") </Filename>
</Image> </Image>
<Button> <Button>
<X> 209 </X> <X> 209 </X>
<Y> 888 </Y> <Y> 741 </Y>
<State> WalletEnable </State> <State> WalletEnable </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_true.png" </Filename> <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_true.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_true.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_true.png" </FilenamePress>
@ -228,7 +228,7 @@
<Button> <Button>
<X> 441 </X> <X> 441 </X>
<Y> 888 </Y> <Y> 741 </Y>
<State> WalletEnable </State> <State> WalletEnable </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_shoppy.png" </Filename> <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_shoppy.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_shoppy.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_shoppy.png" </FilenamePress>
@ -293,8 +293,8 @@
<Button> <Button>
<X> 673 </X> <X> 208 </X>
<Y> 888 </Y> <Y> 1189 </Y>
<State> WalletEnable </State> <State> WalletEnable </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_dolfin.png" </Filename> <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_dolfin.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_dolfin.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_dolfin.png" </FilenamePress>
@ -359,7 +359,7 @@
<Button> <Button>
<X> 209 </X> <X> 209 </X>
<Y> 1112 </Y> <Y> 965 </Y>
<State> WalletEnable </State> <State> WalletEnable </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_linepay.png" </Filename> <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_linepay.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_linepay.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_linepay.png" </FilenamePress>
@ -455,8 +455,8 @@
</Button> </Button>
<Button> <Button>
<X> 441 </X> <X> 440 </X>
<Y> 1112 </Y> <Y> 965 </Y>
<State> WalletEnable </State> <State> WalletEnable </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_lazpay.png" </Filename> <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_lazpay.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_lazpay.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_lazpay.png" </FilenamePress>
@ -520,8 +520,8 @@
</Button> </Button>
<Button> <Button>
<X> 673 </X> <X> 675 </X>
<Y> 1112 </Y> <Y> 965 </Y>
<State> WalletEnable </State> <State> WalletEnable </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_maxme.png" </Filename> <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_maxme.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_maxme.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_maxme.png" </FilenamePress>
@ -584,6 +584,103 @@
</EventClick> </EventClick>
</Button> </Button>
<Button>
<X> 675 </X>
<Y> 741 </Y>
<State> WalletEnable </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>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var QR_POPUP = "/img_popup13.png"
Var LOADING_STATE = "Enable"
Var QRCODE99 = ""
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 + "WEC:2/"
;If 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
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 = 8
Var ReqPayInfoFromCashOther = 1
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
</EventClick>
</Button>
<Button>
<X> 440 </X>
<Y> 1189 </Y>
<State> "Enable" </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>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
</EventClick>
</Button>
<Button>
<X> 675 </X>
<Y> 1189 </Y>
<State> "Enable" </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>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
</EventClick>
</Button>
<Button> <Button>
@ -626,7 +723,7 @@
<Button> <Button>
<X> 397 </X> <X> 397 </X>
<Y> 1365 </Y> <Y> 1440 </Y>
<Filename> Var( DirImage + "/bn_cancel2.png") </Filename> <Filename> Var( DirImage + "/bn_cancel2.png") </Filename>
<FilenamePress> Var( DirImage + "/bn_cancel2.png") </FilenamePress> <FilenamePress> Var( DirImage + "/bn_cancel2.png") </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound> <Sound> "ROOT/sounds/codebuttom.wav" </Sound>