Merge branch 'masterpiece' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into th_mmr
This commit is contained in:
commit
c6d1a1c6d7
1299 changed files with 47601 additions and 22302 deletions
|
|
@ -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
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
|
||||
Var ServiceAmount2 = CreditAmount
|
||||
Var ServiceCharge = 0
|
||||
Var Donate = ""
|
||||
Var Donate = ""
|
||||
Var SuggestID = ""
|
||||
|
||||
Var Seeker.StoreCreditFlag = 0
|
||||
|
|
@ -92,9 +92,9 @@
|
|||
Var NamePriceShow = NamePriceShow + DrinkAmountStr
|
||||
|
||||
Var warning_price_state = "Enable"
|
||||
|
||||
|
||||
If CoinAmount > 0 Then
|
||||
|
||||
|
||||
Var SumAmount = CreditAmount + CoinAmount
|
||||
|
||||
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
|
||||
Var RemainAmountStr !assigned StringFmt( SumAmount, DisplayFormat, PreScaleConvertShow )
|
||||
Var showRemaining = charOfBaht + RemainAmountStr
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -122,34 +122,22 @@
|
|||
Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
|
||||
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
|
||||
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
|
||||
If CoinAmount = 0 Then
|
||||
Var RemainAmountStr = "Cancelled"
|
||||
Else
|
||||
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"
|
||||
Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
|
||||
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
|
||||
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
|
||||
If CoinAmount = 0 Then
|
||||
Var RemainAmountStr = "ยกเลิก"
|
||||
Else
|
||||
Var RemainAmountStr = "เก็บเครดิต"
|
||||
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
|
||||
Var RemainAmountStr = "ပယ်ဖျက်ခဲ့သည်။"
|
||||
Else
|
||||
Var RemainAmountStr = "ခရက်ဒစ်စုဆောင်းပါ။"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
SAVELOG "EventLanguageOnChange menu -list"
|
||||
|
||||
|
|
@ -168,14 +156,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"
|
||||
|
|
@ -185,8 +173,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"
|
||||
|
|
@ -195,8 +183,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"
|
||||
|
|
@ -204,7 +192,7 @@
|
|||
Else
|
||||
SetLanguage "THAI"
|
||||
EndIf
|
||||
|
||||
|
||||
CoinVending BILLSTACKALL
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -216,7 +204,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
|
||||
|
|
@ -232,7 +220,7 @@
|
|||
Var TelephoneNumber = Seeker.TNumberTaobinCredit
|
||||
Var PayO2 = Var Seeker.CoffeePinNumber
|
||||
Var ServiceAmount2 = CoinAmount
|
||||
|
||||
|
||||
Var VendingDiscount = 0
|
||||
Var VendingCampaign = 0
|
||||
Var ServiceType = "credit"
|
||||
|
|
@ -241,20 +229,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
|
||||
|
||||
|
|
@ -271,7 +259,7 @@
|
|||
Var CoinInCounter = CoinInCounter + 1
|
||||
If CoinInCounter = 1 Then
|
||||
Var PayOK = 1
|
||||
|
||||
|
||||
If CoinAmount > 0 Then
|
||||
Var ChangeOK = 1
|
||||
EndIf
|
||||
|
|
@ -289,15 +277,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
|
||||
|
|
@ -330,28 +318,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>
|
||||
|
|
@ -369,8 +357,8 @@
|
|||
<FilenamePress> show_btp </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
<EventClick>
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -414,7 +402,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."
|
||||
|
|
@ -446,8 +434,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."
|
||||
|
|
@ -461,8 +449,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"
|
||||
|
|
@ -471,8 +459,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"
|
||||
|
|
@ -480,17 +468,17 @@
|
|||
Else
|
||||
Var RemainAmountStr = "เก็บเครดิต"
|
||||
EndIf
|
||||
|
||||
|
||||
CoinVending BILLSTACKALL
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
Refresh
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
Refresh
|
||||
|
||||
</EventClick>
|
||||
|
|
@ -516,8 +504,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