THAI: Fixed QR re-initialize QRCODE
This commit is contained in:
Kenta420
parent
f20bf0f0e1
commit
286363f241
2 changed files with 68 additions and 61 deletions
|
|
@ -15,12 +15,21 @@
|
|||
DEBUGVAR cash_disable
|
||||
|
||||
;Cash for any lang
|
||||
;include="ROOT/taobin_project/xml/payment_cash.ev"
|
||||
;include="ROOT/taobin_project/xml/payment_cash.ev"
|
||||
|
||||
DEBUGVAR show_eng
|
||||
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
|
||||
|
|
@ -335,7 +344,7 @@
|
|||
Else
|
||||
Var showRemaining = RemainAmountStr + " บาท"
|
||||
EndIf
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var showRemaining = RemainAmountStr + " Bath"
|
||||
EndIf
|
||||
|
||||
|
|
@ -457,7 +466,7 @@
|
|||
Var FlagalphaState2 = 1
|
||||
Var RemainAmountStr = "ทอน " + Canout
|
||||
EndIf
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var RemainAmountStr = "ငွေပြောင်းပါ။ " + Canout
|
||||
Var RemainAmountStr = RemainAmountStr + "###size=90"
|
||||
EndIf
|
||||
|
|
@ -2513,7 +2522,7 @@
|
|||
Var FlagalphaState2 = 1
|
||||
Var RemainAmountStr = "ทอน " + Canout
|
||||
EndIf
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var RemainAmountStr = "ငွေပြောင်းပါ။ " + Canout
|
||||
Var RemainAmountStr = RemainAmountStr + "###size=90"
|
||||
EndIf
|
||||
|
|
@ -2571,7 +2580,7 @@
|
|||
Else
|
||||
Var showRemaining = "คืนเงิน"
|
||||
EndIf
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var showRemaining = "ပြန်အမ်းငွေ"
|
||||
EndIf
|
||||
;Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
|
|
@ -2605,7 +2614,7 @@
|
|||
Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink.png"
|
||||
|
||||
EndIf
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink_mmr.png"
|
||||
EndIf
|
||||
)
|
||||
|
|
@ -3130,7 +3139,7 @@ eval(
|
|||
Else
|
||||
Var return = "กำลังยกเลิก..."
|
||||
EndIf
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var return = "ပယ်ဖျက်ပါ။..."
|
||||
EndIf
|
||||
)
|
||||
|
|
@ -3577,7 +3586,7 @@ eval(
|
|||
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
|
||||
|
||||
</EventUnitTest1>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@
|
|||
|
||||
Var Timeout = 0
|
||||
|
||||
If show_eng = "true" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
If show_eng = "true" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
SetLanguage "MYANMAR"
|
||||
Else
|
||||
SetLanguage "ENG"
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
If CountryName = "Indonesia" Then
|
||||
Var img_popup11 = "/img_popup11-IDR.png"
|
||||
Var img_popup15 = "/img_popup15-IDR.png"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
;inter-image
|
||||
If CountryName = "Singapore" Then
|
||||
|
|
@ -61,10 +61,8 @@
|
|||
Var img_popup15 = "/img_popup15-AUS.png"
|
||||
EndIf
|
||||
|
||||
If
|
||||
|
||||
|
||||
|
||||
|
||||
Var CreditAmount = SumCreditAmount
|
||||
Var RemainAmountStr !assigned StringFmt( CreditAmount, DisplayFormat, PreScaleConvertShow )
|
||||
Var showRemaining = charOfBaht + RemainAmountStr
|
||||
|
|
@ -83,7 +81,7 @@
|
|||
|
||||
Var ServiceAmount2 = CreditAmount
|
||||
Var ServiceCharge = 0
|
||||
Var Donate = ""
|
||||
Var Donate = ""
|
||||
Var SuggestID = ""
|
||||
|
||||
Var Seeker.StoreCreditFlag = 0
|
||||
|
|
@ -94,9 +92,9 @@
|
|||
Var NamePriceShow = NamePriceShow + DrinkAmountStr
|
||||
|
||||
Var warning_price_state = "Enable"
|
||||
|
||||
|
||||
If CoinAmount > 0 Then
|
||||
|
||||
|
||||
Var SumAmount = CreditAmount + CoinAmount
|
||||
|
||||
|
||||
|
|
@ -110,7 +108,7 @@
|
|||
|
||||
Var RemainAmountStr !assigned StringFmt( SumAmount, DisplayFormat, PreScaleConvertShow )
|
||||
Var showRemaining = charOfBaht + RemainAmountStr
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -130,7 +128,7 @@
|
|||
Var RemainAmountStr = "Keep credit"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If LanguageShow = "THAI" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/page_payment"
|
||||
Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend"
|
||||
|
|
@ -144,7 +142,7 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
|
||||
Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr"
|
||||
If CoinAmount = 0 Then
|
||||
|
|
@ -170,14 +168,14 @@
|
|||
RefreshAll
|
||||
</EventLanguageOnChange>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
<EventTimeout>
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
If Timeout > 180 Then
|
||||
If CoinInOK = 0 Then
|
||||
If CancelFlag = 0 Then
|
||||
SAVELOG "ButtonCancleAlpha2 > Timeout Order."
|
||||
|
||||
|
||||
If ReqPayWithCash = 1 Then
|
||||
Var BmiYear = useCreditAmount
|
||||
Var GetScore = "useCredit"
|
||||
|
|
@ -187,8 +185,8 @@
|
|||
Var CancelFlag = 1
|
||||
Var CancelCounter = 0
|
||||
If CoinAmount = 0 Then
|
||||
If show_eng = "true" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
If show_eng = "true" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
SetLanguage "MYANMAR"
|
||||
Else
|
||||
SetLanguage "ENG"
|
||||
|
|
@ -197,8 +195,8 @@
|
|||
SetLanguage "THAI"
|
||||
EndIf
|
||||
Else
|
||||
If show_eng = "true" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
If show_eng = "true" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
SetLanguage "MYANMAR"
|
||||
Else
|
||||
SetLanguage "ENG"
|
||||
|
|
@ -206,7 +204,7 @@
|
|||
Else
|
||||
SetLanguage "THAI"
|
||||
EndIf
|
||||
|
||||
|
||||
CoinVending BILLSTACKALL
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -218,7 +216,7 @@
|
|||
If CancelFlag = 0 Then
|
||||
Var CreditAmount = CreditAmount + CoinAmount
|
||||
Var ServiceAmount2 = CreditAmount
|
||||
Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml"
|
||||
Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml"
|
||||
Else
|
||||
|
||||
Var payCreditFlag = 0
|
||||
|
|
@ -234,7 +232,7 @@
|
|||
Var TelephoneNumber = Seeker.TNumberTaobinCredit
|
||||
Var PayO2 = Var Seeker.CoffeePinNumber
|
||||
Var ServiceAmount2 = CoinAmount
|
||||
|
||||
|
||||
Var VendingDiscount = 0
|
||||
Var VendingCampaign = 0
|
||||
Var ServiceType = "credit"
|
||||
|
|
@ -243,20 +241,20 @@
|
|||
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
Var PayCredit = 1
|
||||
|
||||
|
||||
CoinVending OFF
|
||||
|
||||
|
||||
If Seeker = "curr" Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
EndIf
|
||||
Else
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml"
|
||||
Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
Else
|
||||
|
||||
|
|
@ -273,7 +271,7 @@
|
|||
Var CoinInCounter = CoinInCounter + 1
|
||||
If CoinInCounter = 1 Then
|
||||
Var PayOK = 1
|
||||
|
||||
|
||||
If CoinAmount > 0 Then
|
||||
Var ChangeOK = 1
|
||||
EndIf
|
||||
|
|
@ -291,15 +289,15 @@
|
|||
If ChangeTimeout > 30 Then
|
||||
Var ChangeOK = 1
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
</EventTimeout>
|
||||
</EventTimeout>
|
||||
|
||||
<EventChangeStatus>
|
||||
If ChangeStatus = "payout-end" Then
|
||||
If ChangeStatus = "payout-end" Then
|
||||
If ChangeFlag2 = 1 Then
|
||||
Var ChangeOK = 1
|
||||
EndIf
|
||||
|
|
@ -332,28 +330,28 @@
|
|||
|
||||
Else
|
||||
|
||||
|
||||
|
||||
If CoinInOK = 0 Then
|
||||
|
||||
Var Timeout = 0
|
||||
|
||||
Var RemainAmountStr !assigned StringFmt( SumAmount, DisplayFormat, PreScaleConvertShow )
|
||||
Var showRemaining = charOfBaht + RemainAmountStr
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Refresh
|
||||
</EventCoin>
|
||||
|
||||
|
||||
<EventActionOk>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Refresh
|
||||
</EventActionOk>
|
||||
|
|
@ -371,8 +369,8 @@
|
|||
<FilenamePress> show_btp </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
<EventClick>
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -416,7 +414,7 @@
|
|||
<Value>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var return = "*ပမာဏသည် စျေးနှုန်းနှင့် တူညီရမည်"
|
||||
Else
|
||||
Var return = "*Amount must equal or exceed price."
|
||||
|
|
@ -448,8 +446,8 @@
|
|||
<FilenamePress> Var( DirImage + "/bn_cancel3.png" )</FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
<EventClick>
|
||||
|
||||
If CoinInOK = 0 Then
|
||||
If CancelFlag = 0 Then
|
||||
SAVELOG "ButtonCancleAlpha2 > Cancle Order."
|
||||
|
|
@ -463,8 +461,8 @@
|
|||
Var CancelCounter = 0
|
||||
Var CancelFlag = 1
|
||||
If CoinAmount = 0 Then
|
||||
If show_eng = "true" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
If show_eng = "true" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var RemainAmountStr = "ပယ်ဖျက်ခဲ့သည်။"
|
||||
Else
|
||||
Var RemainAmountStr = "Cancelled"
|
||||
|
|
@ -473,8 +471,8 @@
|
|||
Var RemainAmountStr = "ยกเลิก"
|
||||
EndIf
|
||||
Else
|
||||
If show_eng = "true" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
If show_eng = "true" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var RemainAmountStr = "ခရက်ဒစ်စုဆောင်းပါ။"
|
||||
Else
|
||||
Var RemainAmountStr = "Keep credit"
|
||||
|
|
@ -482,17 +480,17 @@
|
|||
Else
|
||||
Var RemainAmountStr = "เก็บเครดิต"
|
||||
EndIf
|
||||
|
||||
|
||||
CoinVending BILLSTACKALL
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
Refresh
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
Refresh
|
||||
|
||||
</EventClick>
|
||||
|
|
@ -518,8 +516,8 @@
|
|||
|
||||
;include="ROOT/taobin_project/inc/video.inc"
|
||||
|
||||
<EventSecurity>
|
||||
Open "/media/bt/xml/security_alarm.xml"
|
||||
<EventSecurity>
|
||||
Open "/media/bt/xml/security_alarm.xml"
|
||||
</EventSecurity>
|
||||
|
||||
</Popup>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue