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

fix qr fail and page_payment_credit3 topcash

Browse source
This commit is contained in:
wanlop run 2024-12-17 16:38:11 +07:00
commit 34d1dbec2d
2 changed files with 67 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

25
xml/page_payment_cash.xml
View file

@ -15,12 +15,21 @@
DEBUGVAR cash_disable DEBUGVAR cash_disable
;Cash for any lang ;Cash for any lang
;include="ROOT/taobin_project/xml/payment_cash.ev" ;include="ROOT/taobin_project/xml/payment_cash.ev"
DEBUGVAR show_eng DEBUGVAR show_eng
DEBUGVAR LanguageShow DEBUGVAR LanguageShow
; re-initial QR
Var QRCODE1 = "A000000677010112"
Var QRCODE2 = "010755600066301"
Var QRCODE3 = "VDGN"
Var QRCODE4 = BoxID
Var QRCODE5 = SelectSlot
Var QRCODE6 = SelectDrink
Var QRCODE7 = PriceDrink
Var QRCODE8 = ""
;If AdultFlag = 1 Then ;If AdultFlag = 1 Then
@ -335,7 +344,7 @@
Else Else
Var showRemaining = RemainAmountStr + " บาท" Var showRemaining = RemainAmountStr + " บาท"
EndIf EndIf
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var showRemaining = RemainAmountStr + " Bath" Var showRemaining = RemainAmountStr + " Bath"
EndIf EndIf
@ -457,7 +466,7 @@
Var FlagalphaState2 = 1 Var FlagalphaState2 = 1
Var RemainAmountStr = "ทอน " + Canout Var RemainAmountStr = "ทอน " + Canout
EndIf EndIf
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var RemainAmountStr = "ငွေပြောင်းပါ။ " + Canout Var RemainAmountStr = "ငွေပြောင်းပါ။ " + Canout
Var RemainAmountStr = RemainAmountStr + "###size=90" Var RemainAmountStr = RemainAmountStr + "###size=90"
EndIf EndIf
@ -2513,7 +2522,7 @@
Var FlagalphaState2 = 1 Var FlagalphaState2 = 1
Var RemainAmountStr = "ทอน " + Canout Var RemainAmountStr = "ทอน " + Canout
EndIf EndIf
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var RemainAmountStr = "ငွေပြောင်းပါ။ " + Canout Var RemainAmountStr = "ငွေပြောင်းပါ။ " + Canout
Var RemainAmountStr = RemainAmountStr + "###size=90" Var RemainAmountStr = RemainAmountStr + "###size=90"
EndIf EndIf
@ -2571,7 +2580,7 @@
Else Else
Var showRemaining = "คืนเงิน" Var showRemaining = "คืนเงิน"
EndIf EndIf
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var showRemaining = "ပြန်အမ်းငွေ" Var showRemaining = "ပြန်အမ်းငွေ"
EndIf EndIf
;Open "ROOT/taobin_project/xml/page_catalog.xml" ;Open "ROOT/taobin_project/xml/page_catalog.xml"
@ -2605,7 +2614,7 @@
Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink.png" Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink.png"
EndIf EndIf
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink_mmr.png" Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink_mmr.png"
EndIf EndIf
) )
@ -3130,7 +3139,7 @@ eval(
Else Else
Var return = "กำลังยกเลิก..." Var return = "กำลังยกเลิก..."
EndIf EndIf
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var return = "ပယ်ဖျက်ပါ။..." Var return = "ပယ်ဖျက်ပါ။..."
EndIf EndIf
) )
@ -3577,7 +3586,7 @@ eval(
MakeDrinkV1 SelectDrink SelectSugarID MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml" Open "ROOT/taobin_project/xml/page_thankyou.xml"
</EventUnitTest1> </EventUnitTest1>

102
xml/page_payment_credit3-TopupCash.xml
View file

@ -11,8 +11,8 @@
Var Timeout = 0 Var Timeout = 0
If show_eng = "true" Then If show_eng = "true" Then
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
SetLanguage "MYANMAR" SetLanguage "MYANMAR"
Else Else
SetLanguage "ENG" SetLanguage "ENG"
@ -41,7 +41,7 @@
If CountryName = "Indonesia" Then If CountryName = "Indonesia" Then
Var img_popup11 = "/img_popup11-IDR.png" Var img_popup11 = "/img_popup11-IDR.png"
Var img_popup15 = "/img_popup15-IDR.png" Var img_popup15 = "/img_popup15-IDR.png"
EndIf EndIf
;inter-image ;inter-image
If CountryName = "Singapore" Then If CountryName = "Singapore" Then
@ -61,8 +61,6 @@
Var img_popup15 = "/img_popup15-AUS.png" Var img_popup15 = "/img_popup15-AUS.png"
EndIf EndIf
Var CreditAmount = SumCreditAmount Var CreditAmount = SumCreditAmount
Var RemainAmountStr !assigned StringFmt( CreditAmount, DisplayFormat, PreScaleConvertShow ) Var RemainAmountStr !assigned StringFmt( CreditAmount, DisplayFormat, PreScaleConvertShow )
Var showRemaining = charOfBaht + RemainAmountStr Var showRemaining = charOfBaht + RemainAmountStr
@ -81,7 +79,7 @@
Var ServiceAmount2 = CreditAmount Var ServiceAmount2 = CreditAmount
Var ServiceCharge = 0 Var ServiceCharge = 0
Var Donate = "" Var Donate = ""
Var SuggestID = "" Var SuggestID = ""
Var Seeker.StoreCreditFlag = 0 Var Seeker.StoreCreditFlag = 0
@ -92,9 +90,9 @@
Var NamePriceShow = NamePriceShow + DrinkAmountStr Var NamePriceShow = NamePriceShow + DrinkAmountStr
Var warning_price_state = "Enable" Var warning_price_state = "Enable"
If CoinAmount > 0 Then If CoinAmount > 0 Then
Var SumAmount = CreditAmount + CoinAmount Var SumAmount = CreditAmount + CoinAmount
@ -108,7 +106,7 @@
Var RemainAmountStr !assigned StringFmt( SumAmount, DisplayFormat, PreScaleConvertShow ) Var RemainAmountStr !assigned StringFmt( SumAmount, DisplayFormat, PreScaleConvertShow )
Var showRemaining = charOfBaht + RemainAmountStr Var showRemaining = charOfBaht + RemainAmountStr
EndIf EndIf
@ -128,7 +126,7 @@
Var RemainAmountStr = "Keep credit" Var RemainAmountStr = "Keep credit"
EndIf EndIf
EndIf EndIf
If LanguageShow = "THAI" Then If LanguageShow = "THAI" Then
Var DirImage = "ROOT/taobin_project/image/page_payment" Var DirImage = "ROOT/taobin_project/image/page_payment"
Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend"
@ -142,7 +140,7 @@
EndIf EndIf
EndIf EndIf
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment" Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr"
If CoinAmount = 0 Then If CoinAmount = 0 Then
@ -168,14 +166,14 @@
RefreshAll RefreshAll
</EventLanguageOnChange> </EventLanguageOnChange>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
If Timeout > 180 Then If Timeout > 180 Then
If CoinInOK = 0 Then If CoinInOK = 0 Then
If CancelFlag = 0 Then If CancelFlag = 0 Then
SAVELOG "ButtonCancleAlpha2 > Timeout Order." SAVELOG "ButtonCancleAlpha2 > Timeout Order."
If ReqPayWithCash = 1 Then If ReqPayWithCash = 1 Then
Var BmiYear = useCreditAmount Var BmiYear = useCreditAmount
Var GetScore = "useCredit" Var GetScore = "useCredit"
@ -185,8 +183,8 @@
Var CancelFlag = 1 Var CancelFlag = 1
Var CancelCounter = 0 Var CancelCounter = 0
If CoinAmount = 0 Then If CoinAmount = 0 Then
If show_eng = "true" Then If show_eng = "true" Then
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
SetLanguage "MYANMAR" SetLanguage "MYANMAR"
Else Else
SetLanguage "ENG" SetLanguage "ENG"
@ -195,8 +193,8 @@
SetLanguage "THAI" SetLanguage "THAI"
EndIf EndIf
Else Else
If show_eng = "true" Then If show_eng = "true" Then
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
SetLanguage "MYANMAR" SetLanguage "MYANMAR"
Else Else
SetLanguage "ENG" SetLanguage "ENG"
@ -204,7 +202,7 @@
Else Else
SetLanguage "THAI" SetLanguage "THAI"
EndIf EndIf
CoinVending BILLSTACKALL CoinVending BILLSTACKALL
EndIf EndIf
EndIf EndIf
@ -216,7 +214,7 @@
If CancelFlag = 0 Then If CancelFlag = 0 Then
Var CreditAmount = CreditAmount + CoinAmount Var CreditAmount = CreditAmount + CoinAmount
Var ServiceAmount2 = CreditAmount Var ServiceAmount2 = CreditAmount
Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml" Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml"
Else Else
Var payCreditFlag = 0 Var payCreditFlag = 0
@ -232,7 +230,7 @@
Var TelephoneNumber = Seeker.TNumberTaobinCredit Var TelephoneNumber = Seeker.TNumberTaobinCredit
Var PayO2 = Var Seeker.CoffeePinNumber Var PayO2 = Var Seeker.CoffeePinNumber
Var ServiceAmount2 = CoinAmount Var ServiceAmount2 = CoinAmount
Var VendingDiscount = 0 Var VendingDiscount = 0
Var VendingCampaign = 0 Var VendingCampaign = 0
Var ServiceType = "credit" Var ServiceType = "credit"
@ -241,20 +239,20 @@
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Var PayCredit = 1 Var PayCredit = 1
CoinVending OFF CoinVending OFF
If Seeker = "curr" Then If Seeker = "curr" Then
Open "ROOT/taobin_project/xml/page_catalog.xml" Open "ROOT/taobin_project/xml/page_catalog.xml"
Else Else
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
EndIf EndIf
Else Else
Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml" Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml"
EndIf EndIf
EndIf EndIf
Else Else
@ -271,7 +269,7 @@
Var CoinInCounter = CoinInCounter + 1 Var CoinInCounter = CoinInCounter + 1
If CoinInCounter = 1 Then If CoinInCounter = 1 Then
Var PayOK = 1 Var PayOK = 1
If CoinAmount > 0 Then If CoinAmount > 0 Then
Var ChangeOK = 1 Var ChangeOK = 1
EndIf EndIf
@ -289,15 +287,15 @@
If ChangeTimeout > 30 Then If ChangeTimeout > 30 Then
Var ChangeOK = 1 Var ChangeOK = 1
EndIf EndIf
EndIf EndIf
TimerReset TimerReset
Refresh Refresh
</EventTimeout> </EventTimeout>
<EventChangeStatus> <EventChangeStatus>
If ChangeStatus = "payout-end" Then If ChangeStatus = "payout-end" Then
If ChangeFlag2 = 1 Then If ChangeFlag2 = 1 Then
Var ChangeOK = 1 Var ChangeOK = 1
EndIf EndIf
@ -330,28 +328,28 @@
Else Else
If CoinInOK = 0 Then If CoinInOK = 0 Then
Var Timeout = 0 Var Timeout = 0
Var RemainAmountStr !assigned StringFmt( SumAmount, DisplayFormat, PreScaleConvertShow ) Var RemainAmountStr !assigned StringFmt( SumAmount, DisplayFormat, PreScaleConvertShow )
Var showRemaining = charOfBaht + RemainAmountStr Var showRemaining = charOfBaht + RemainAmountStr
EndIf EndIf
EndIf EndIf
Refresh Refresh
</EventCoin> </EventCoin>
<EventActionOk> <EventActionOk>
Refresh Refresh
</EventActionOk> </EventActionOk>
@ -369,8 +367,8 @@
<FilenamePress> show_btp </FilenamePress> <FilenamePress> show_btp </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
</EventClick> </EventClick>
</Button> </Button>
@ -414,7 +412,7 @@
<Value> <Value>
eval( eval(
If show_eng = "true" Then If show_eng = "true" Then
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var return = "*ပမာဏသည် စျေးနှုန်းနှင့် တူညီရမည်" Var return = "*ပမာဏသည် စျေးနှုန်းနှင့် တူညီရမည်"
Else Else
Var return = "*Amount must equal or exceed price." Var return = "*Amount must equal or exceed price."
@ -446,8 +444,8 @@
<FilenamePress> Var( DirImage + "/bn_cancel3.png" )</FilenamePress> <FilenamePress> Var( DirImage + "/bn_cancel3.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
If CoinInOK = 0 Then If CoinInOK = 0 Then
If CancelFlag = 0 Then If CancelFlag = 0 Then
SAVELOG "ButtonCancleAlpha2 > Cancle Order." SAVELOG "ButtonCancleAlpha2 > Cancle Order."
@ -461,8 +459,8 @@
Var CancelCounter = 0 Var CancelCounter = 0
Var CancelFlag = 1 Var CancelFlag = 1
If CoinAmount = 0 Then If CoinAmount = 0 Then
If show_eng = "true" Then If show_eng = "true" Then
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var RemainAmountStr = "ပယ်ဖျက်ခဲ့သည်။" Var RemainAmountStr = "ပယ်ဖျက်ခဲ့သည်။"
Else Else
Var RemainAmountStr = "Cancelled" Var RemainAmountStr = "Cancelled"
@ -471,8 +469,8 @@
Var RemainAmountStr = "ยกเลิก" Var RemainAmountStr = "ยกเลิก"
EndIf EndIf
Else Else
If show_eng = "true" Then If show_eng = "true" Then
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var RemainAmountStr = "ခရက်ဒစ်စုဆောင်းပါ။" Var RemainAmountStr = "ခရက်ဒစ်စုဆောင်းပါ။"
Else Else
Var RemainAmountStr = "Keep credit" Var RemainAmountStr = "Keep credit"
@ -480,17 +478,17 @@
Else Else
Var RemainAmountStr = "เก็บเครดิต" Var RemainAmountStr = "เก็บเครดิต"
EndIf EndIf
CoinVending BILLSTACKALL CoinVending BILLSTACKALL
EndIf EndIf
Refresh Refresh
EndIf EndIf
EndIf EndIf
Refresh Refresh
</EventClick> </EventClick>
@ -516,8 +514,8 @@
;include="ROOT/taobin_project/inc/video.inc" ;include="ROOT/taobin_project/inc/video.inc"
<EventSecurity> <EventSecurity>
Open "/media/bt/xml/security_alarm.xml" Open "/media/bt/xml/security_alarm.xml"
</EventSecurity> </EventSecurity>
</Popup> </Popup>