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

SGP: enable get_yourchange & fix order

Browse source
This commit is contained in:
Pakin 2024-07-19 13:51:36 +07:00
parent 4a86eccf60
commit 5e109800c0
14 changed files with 1704 additions and 1607 deletions
Download patch file Download diff file Expand all files Collapse all files

62
xml/page_get_yourchange.xml
View file

@ -9,13 +9,26 @@
; On open
Var Timeout = 0
Var LangButtonEnable = "Enable"
If CountryName = "Singapore" Then
Var LangButtonEnable = "Invisible"
EndIf
DEBUGVAR LangButtonEnable
If show_eng = "true" Then
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
If CountryName = "Singapore" Then
Var show_btp = ""
Var show_btn = ""
EndIf
Var DirImage = "ROOT/taobin_project/image/page_thankyou_en"
@ -23,6 +36,12 @@
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
If CountryName = "Singapore" Then
Var show_btp = ""
Var show_btn = ""
EndIf
Var DirImage = "ROOT/taobin_project/image/page_thankyou"
@ -83,16 +102,42 @@
UpdateTxRef2 TxRef1 ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail PayDetail2
EndIf
If New_Payment = 1 Then
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf
If InternationalEnable = 1 Then
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Var Brew3ConInter = CountryRootPath + "/xml/page_brewing3Conti.xml"
If Seeker = "next" Then
If Seeker = "next" Then
;CoinBack
Open Brew3ConInter
Else
Open Brew3Inter
EndIf
Else
If New_Payment = 1 Then
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf
If Seeker = "next" Then
;CoinBack
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
EndIf
;If New_Payment = 1 Then
; TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
;EndIf
;If Seeker = "next" Then
;CoinBack
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
; Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
;Else
; Open "ROOT/taobin_project/xml/page_brewing3.xml"
;EndIf
EndIf
@ -118,6 +163,7 @@
<Button>
<X> 990 </X>
<Y> 416 </Y>
<State> LangButtonEnable </State>
<Filename> show_btn </Filename>
<FilenamePress> show_btp </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

2
xml/page_lid_straw.xml
View file

@ -144,7 +144,7 @@
DEBUGVAR ChangeFlag2
If ChangeFlag2 = 0 Then
If Seeker.PayWithQR = 0 Then

8
xml/page_payment_cash-SGP.xml
View file

@ -964,6 +964,7 @@
EndIf
If Seeker = "curr" Then
DEBUGVAR UserChoosePayment
DEBUGVAR CancelContinue
Var UserChoosePayment = ""
If CancelContinue = 2 Then
@ -1112,16 +1113,23 @@
EndIf
Var CancelCounter = CancelCounter + 1
DEBUGVAR CancelCounter
DEBUGVAR Seeker.StoreCreditFlag
DEBUGVAR CancelNumber
If CancelCounter = CancelNumber Then
;Change CoinAmount
DEBUGVAR CoinAmount
If CoinAmount > 0 Then
DEBUGVAR Seeker.StoreCreditFlag
If Seeker.StoreCreditFlag = 1 Then
Var ChangeOK = 1
Else
DEBUGVAR CoinAmount
Change CoinAmount
EndIf
Else
DEBUGVAR CancelContinue
If ActionOKCase = 0 Then
Var ActionOKCase = 1
Var PayInfoCFlag = 1

18
xml/page_thankyou.xml
View file

@ -375,6 +375,8 @@
EndIf
EndIf
DEBUGVAR ChangeFlag2
If CountryName = "Singapore" Then
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "xml/page_member_prompt.lxml"
@ -466,7 +468,21 @@
EndIf
Else
If GotoStoreCredit0 = 1 Then
Open "ROOT/taobin_project/xml/page_payment_storeCredit0.xml"
If CountryName = "Singapore" Then
; force-change-cash
Change StoreCreditAmount
Var ChangeFlag2 = 1
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
Open MemberPrompt
Else
Open "ROOT/taobin_project/xml/page_payment_storeCredit0.xml"
EndIf
Else
If Seeker.FreeVendingCampaign = 1 Then