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

Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2024-05-21 17:46:31 +07:00
commit e0cea1ae70
4 changed files with 251 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xml/page_member_topup3.xml
View file

@ -49,6 +49,10 @@
Var PayCreditChannel = "cash"
If SELLSTATUS = "SELLNOCASH" Then
Var PayState1 = "Disable"
EndIf
Var text_4 = "/text_4.png"

14
xml/page_payment.xml
View file

@ -301,7 +301,7 @@
Var Seeker.IntVendingCampaign = PriceDiff
Var Seeker.FreeVendingCampaign = 0
Var Seeker.CodeChannel = 1
Var Seeker.CodeNumber = IDNum
Var Seeker.CodeNumber = "00000000"
Var Seeker.VendingCampaignRI3 = PriceDiff
Var Seeker.CampaignPPrice = PromoPriceDrink
@ -315,7 +315,7 @@
Var Seeker.IntVendingCampaign = PriceDiff
Var Seeker.FreeVendingCampaign = 0
Var Seeker.CodeChannel = 1
Var Seeker.CodeNumber = IDNum
Var Seeker.CodeNumber = "00000000"
Var Seeker.VendingCampaignRI3 = PriceDiff
Var Seeker.CampaignPPrice = PromotionPriceDrink
EndIf
@ -326,7 +326,7 @@
Var Seeker.IntVendingCampaign = PriceDiff
Var Seeker.FreeVendingCampaign = 0
Var Seeker.CodeChannel = 1
Var Seeker.CodeNumber = IDNum
Var Seeker.CodeNumber = "00000000"
Var Seeker.VendingCampaignRI3 = PriceDiff
Var Seeker.CampaignPPrice = PromotionPriceDrink
EndIf
@ -349,7 +349,7 @@
Var Seeker.IntVendingCampaign = PriceDiff
Var Seeker.FreeVendingCampaign = 0
Var Seeker.CodeChannel = 1
Var Seeker.CodeNumber = IDNum
Var Seeker.CodeNumber = "00000000"
Var Seeker.VendingCampaignRI3 = PriceDiff
Var Seeker.CampaignPPrice = PriceDrink - PriceDiff
EndIf
@ -363,7 +363,7 @@
Var Seeker.IntVendingCampaign = PriceDiff
Var Seeker.FreeVendingCampaign = 0
Var Seeker.CodeChannel = 1
Var Seeker.CodeNumber = IDNum
Var Seeker.CodeNumber = "00000000"
Var Seeker.VendingCampaignRI3 = PriceDiff
Var Seeker.CampaignPPrice = 1
Else
@ -373,7 +373,7 @@
Var Seeker.IntVendingCampaign = PriceDiff
Var Seeker.FreeVendingCampaign = 0
Var Seeker.CodeChannel = 1
Var Seeker.CodeNumber = IDNum
Var Seeker.CodeNumber = "00000000"
Var Seeker.VendingCampaignRI3 = PriceDiff
Var Seeker.CampaignPPrice = 1
EndIf
@ -388,7 +388,7 @@
Var Seeker.IntVendingCampaign = PriceDiff
Var Seeker.FreeVendingCampaign = 0
Var Seeker.CodeChannel = 1
Var Seeker.CodeNumber = IDNum
Var Seeker.CodeNumber = "00000000"
Var Seeker.VendingCampaignRI3 = PriceDiff
Var Seeker.CampaignPPrice = 1
EndIf

256
xml/page_payment_cash-SGP.xml
View file

@ -14,6 +14,9 @@
SAVELOG "page_payment_cach-SGP.xml"
Var PreScaleCanculate = 100
DEBUGVAR VendingCashless
CashlessReq FAIL
Var CashlessPayFlag = 0
Var RemainAmountStrENG = ""
@ -263,6 +266,8 @@
Var PaidPaymentFromNextStage = 1
EndIf
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
@ -465,6 +470,7 @@
EndIf
Var UserChoosePayment = ""
DEBUGVAR SettingDisableTaobinCredit
@ -477,6 +483,7 @@
DEBUGVAR ECommerceQR
SPLIT ECommerceQR "/" 5 VendingQRTypeResult
DEBUGVAR UserChoosePayment
If ActionOKCase = 0 Then
If VendingREFID = "" Then
@ -524,6 +531,8 @@
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
Var BrewingTextThai = "เตรียมแก้ว"
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
@ -712,6 +721,8 @@
Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
@ -720,6 +731,8 @@
<EventActionError>
DEBUGVAR UserChoosePayment
If ActionOKCase = 0 Then
If ReqPayInfoFlag = 1 Then
Var QRErrorFlag = 1
@ -776,20 +789,58 @@
Var CreditCardRef = ""
GenHashWithTimeStamp CreditCardRef
DEBUGVAR VendingCashless
DEBUGVAR UserChoosePayment
DEBUGVAR CoinInFlag
If CoinInFlag = 0 Then
If VendingCashless = "READY" Then
Var QRCODE99 = ""
Var Timeout = 0
Var QRErrorState = "Invisible"
Var QR_POPUP = "/img_popup8-2.png"
Var VendingCashless = "-"
Var LOADING_STATE = "Enable"
Var alphaState = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
If CancelFlag = 0 Then
If CoinInFlag = 0 Then
DEBUGVAR UserChoosePayment
DEBUGVAR VendingCashless
If UserChoosePayment = "CreditCashless" Then
If VendingCashless = "READY" Then
Var QRCODE99 = ""
Var Timeout = 0
Var QRErrorState = "Invisible"
Var QR_POPUP = "/img_popup8-2.png"
Var VendingCashless = "-"
Var LOADING_STATE = "Enable"
Var alphaState = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
EndIf
EndIf
If UserChoosePayment = "" Then
If VendingCashless = "READY" Then
Var QRCODE99 = ""
Var Timeout = 0
Var QRErrorState = "Invisible"
Var QR_POPUP = "/img_popup8-2.png"
Var VendingCashless = "-"
Var LOADING_STATE = "Enable"
Var alphaState = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
Var UserChoosePayment = "CreditCashless"
EndIf
EndIf
EndIf
Else
If CancelFlag = 1 Then
DEBUGVAR CancelFlag
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
@ -802,8 +853,14 @@
<Timeout> 1000 </Timeout>
<EventTimeout>
DEBUGVAR VendingCashless
If ReadyForBrew = "false" Then
SAVELOG "Back to main1"
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
@ -897,9 +954,12 @@
;Var Timeout = 0
EndIf
If Seeker = "curr" Then
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
Open "ROOT/taobin_project/xml/page_catalog.xml"
Else
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
EndIf
EndIf
@ -907,6 +967,8 @@
If TestLoopMakeDrink = 1 Then
MakeDrinkV1 SelectDrink SelectSugarID
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
@ -953,6 +1015,8 @@
EndIf
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
Open "ROOT/taobin_project/xml/page_thankyou.xml"
Else
@ -967,6 +1031,20 @@
Var CancelFlag = 1
Var cancelState = "Enable"
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
@ -988,9 +1066,12 @@
If Seeker.IntVendingCampaign = 0 Then
VendingQR OFF
If Seeker = "curr" Then
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
Open "ROOT/taobin_project/xml/page_catalog.xml"
Else
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
EndIf
EndIf
@ -1060,9 +1141,12 @@
If Seeker = "curr" Then
If Seeker.IntVendingCampaign = 0 Then
If Seeker = "curr" Then
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
Open "ROOT/taobin_project/xml/page_catalog.xml"
Else
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
EndIf
EndIf
@ -1413,10 +1497,27 @@
Var CancelNumber = 12
EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
EndIf
EndIf
@ -1472,6 +1573,8 @@
If CancelFlag = 0 Then
Var TelephoneNumber = ""
Var Tel_Confirm_State = "Disable"
Var UserChoosePayment = "Code"
Open "ROOT/taobin_project/xml/page_payment_code.xml"
EndIf
EndIf
@ -1494,6 +1597,9 @@
If alphaState = "Invisible" Then
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
Var UserChoosePayment = "CreditCashless"
Var QR_POPUP = "/img_popup8.png"
Var alphaState = "Enable"
Coin CARD
@ -1525,6 +1631,8 @@ EndIf
If CancelFlag = 0 Then
Var TelephoneNumber = ""
Var Tel_Confirm_State = "Disable"
Var UserChoosePayment = "Credit"
Open "ROOT/taobin_project/xml/page_payment_credit.xml"
EndIf
EndIf
@ -1555,6 +1663,8 @@ EndIf
If alphaState = "Invisible" Then
Var UserChoosePayment = "Coin"
If EnoughChange = "yes" Then
Var alphaState2 = "Enable"
@ -1612,6 +1722,18 @@ EndIf
Var CancelNumber = 12
EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
@ -1707,6 +1829,19 @@ EndIf
CashlessReq OFF
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
@ -1799,6 +1934,23 @@ EndIf
If FlagQROpened = 1 Then
Var CancelNumber = 12
EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
EndIf
@ -1851,6 +2003,23 @@ EndIf
If FlagQROpened = 1 Then
Var CancelNumber = 12
EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
EndIf
@ -1873,7 +2042,7 @@ EndIf
SAVELOG "alphaState2 click"
DEBUGVAR CancelFlag
If CoinInOK = 0 Then
If CancelFlag = 0 Then
SAVELOG "ButtonCancleAlpha2 > Cancle Order."
@ -1888,8 +2057,30 @@ EndIf
If FlagQROpened = 1 Then
Var CancelNumber = 12
EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
EndIf
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
Var alphaState2 = "Invisible"
Refresh
@ -1991,10 +2182,26 @@ EndIf
Var CancelNumber = 12
EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
EndIf
EndIf
@ -2060,11 +2267,26 @@ EndIf
Var CancelNumber = 12
EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
EndIf
EndIf

2
xml/page_payment_cash.xml
View file

@ -2548,7 +2548,7 @@
If Seeker.IntVendingCredit > 0 Then
If Seeker.IntVendingCampaign > 0 Then
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + "|"
EndIf
Var ECommerceQR = ECommerceQR + "CRD"
Var ECommerceQR = ECommerceQR + ":"