HKG: Added payment with code method
This commit is contained in:
Kenta420
parent
8d55f97c9d
commit
572008172a
5 changed files with 62 additions and 195 deletions
|
|
@ -1098,7 +1098,7 @@
|
|||
Var show_eng = "true"
|
||||
Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
|
||||
|
||||
Var ShowNetworkProblemText = "Network error. Payment Cash only."
|
||||
Var ShowNetworkProblemText = "Network error."
|
||||
|
||||
Var CountryRootPath = "ROOT/taobin_project/inter/hkg/"
|
||||
Var CountryShortName = "hkg"
|
||||
|
|
@ -1228,7 +1228,7 @@
|
|||
If CountryName = "Thailand" Then
|
||||
|
||||
Var MyanmarLangEnable = "true"
|
||||
|
||||
|
||||
If BoxID = 123456 Then
|
||||
Var CatalogLayoutV3 = 1
|
||||
Else
|
||||
|
|
@ -1255,7 +1255,7 @@
|
|||
Var WebAppShow = "Invisible"
|
||||
Var ENABLE_UAE_DUBAI = "Invisible"
|
||||
|
||||
Var LanguageShow = "THAI"
|
||||
Var LanguageShow = "THAI"
|
||||
EnableLanguage "ENG"
|
||||
EnableLanguage "THAI"
|
||||
|
||||
|
|
|
|||
|
|
@ -106,6 +106,7 @@
|
|||
|
||||
Var CreditCardButtonState = "Disable"
|
||||
Var QRCodeButtonState = "Disable"
|
||||
Var CodeButtonState = "Disable"
|
||||
|
||||
Var PayAmount = PriceDrink
|
||||
Var RemainAmount = PayAmount - Seeker.IntVendingCampaign
|
||||
|
|
@ -165,51 +166,26 @@
|
|||
If RoadShow = "true" Then
|
||||
Var CreditCardButtonState = "Invisible"
|
||||
Var QRCodeButtonState = "Invisible"
|
||||
Var CodeButtonState = "Invisible"
|
||||
Var showRemaining = "Free"
|
||||
|
||||
Else
|
||||
;Var PayState1 = "Enable"
|
||||
|
||||
;If cash_disable = "1" Then
|
||||
; Var PayState1 = "Press"
|
||||
;EndIf
|
||||
|
||||
Var CreditCardButtonState = "Enable"
|
||||
Var QRCodeButtonState = "Enable"
|
||||
|
||||
;If Seeker.IntVendingCampaign = 0 Then
|
||||
; Var CreditCardButtonState = "Enable"
|
||||
; Var QRCodeButtonState = "Enable"
|
||||
;Else
|
||||
; SAVELOG "Cash only IntVendingCampaign"
|
||||
; Var PayState2 = "Disable"
|
||||
; Var PayState4 = "Disable"
|
||||
; Var PayState5 = "Enable"
|
||||
; Var PayState6 = "Disable"
|
||||
;EndIf
|
||||
If Seeker.IntVendingCampaign = 0 Then
|
||||
Var CodeButtonState = "Enable"
|
||||
Else
|
||||
SAVELOG "CreditCard and QRCode only IntVendingCampaign"
|
||||
Var CodeButtonState = "Disable"
|
||||
EndIf
|
||||
|
||||
;Var PayState3 = "Enable"
|
||||
|
||||
|
||||
DEBUGVAR CoinAmount
|
||||
If CoinAmount > 0 Then
|
||||
SAVELOG "Cash only CoinAmount"
|
||||
Var CreditCardButtonState = "Disable"
|
||||
Var QRCodeButtonState = "Disable"
|
||||
Var CoinInFlag = 1
|
||||
If Seeker.IntVendingCredit > 0 Then
|
||||
SAVELOG "CreditCard and QRCode only IntVendingCredit"
|
||||
Var CodeButtonState = "Disable"
|
||||
EndIf
|
||||
|
||||
;If Seeker.IntVendingCredit > 0 Then
|
||||
; SAVELOG "Cash only IntVendingCredit"
|
||||
; Var PayState2 = "Disable"
|
||||
; Var PayState4 = "Disable"
|
||||
; Var PayState5 = "Disable"
|
||||
; Var PayState6 = "Disable"
|
||||
;EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
Var showRemaining = charOfBaht + RemainAmountStr
|
||||
|
||||
If show_eng = "true" Then
|
||||
|
|
@ -398,20 +374,23 @@
|
|||
EndIf
|
||||
|
||||
If SELLONLINE = 0 Then
|
||||
SAVELOG "Cash only NetworkStatus down"
|
||||
If IgnoreNetCore = "true" Then
|
||||
|
||||
Var PayState2 = "Disable"
|
||||
Var PayState3 = "Disable"
|
||||
Var PayState4 = "Disable"
|
||||
Var PayState5 = "Disable"
|
||||
Var PayState6 = "Disable"
|
||||
Else
|
||||
SAVELOG "Offline in page_payment_cash-HKG"
|
||||
;include="ROOT/taobin_project/inc/return_condition.ev"
|
||||
EndIf
|
||||
|
||||
Var PayOfflineMode = 1
|
||||
|
||||
Var ShowNetworkProblem = "Enable"
|
||||
Var ShowButtonClick2 = "Invisible"
|
||||
Var PayState2 = "Disable"
|
||||
Var PayState3 = "Disable"
|
||||
Var PayState4 = "Disable"
|
||||
Var PayState5 = "Disable"
|
||||
Var PayState6 = "Disable"
|
||||
|
||||
Var PayOfflineMode = 1
|
||||
|
||||
Var ShowNetworkProblem = "Enable"
|
||||
Var ShowButtonClick2 = "Invisible"
|
||||
Else
|
||||
Var PayOfflineMode = 0
|
||||
|
||||
|
|
@ -421,10 +400,6 @@
|
|||
|
||||
DEBUGVAR NOCashFlag
|
||||
|
||||
If NOCashFlag = 1 Then
|
||||
Var PayState1 = "Disable"
|
||||
EndIf
|
||||
|
||||
;cancel order
|
||||
If SELLSTATUS = "DEACTIVE" Then
|
||||
Var SELLONLINE = 1
|
||||
|
|
@ -441,7 +416,7 @@
|
|||
;If DisableUsingCode = "true" Then
|
||||
If DisableUsingCode = "-" Then
|
||||
SAVELOG "Diable code because using topping."
|
||||
Var PayState2 = "Disable"
|
||||
Var CodeButtonState = "Disable"
|
||||
Var pay_with_code_image = DirImage + "/bd_pay_with_code.png"
|
||||
Else
|
||||
|
||||
|
|
@ -477,30 +452,11 @@
|
|||
|
||||
;Open "ROOT/taobin_project/xml/page_page_camera.xml"
|
||||
|
||||
If RoadShow = "true" Then
|
||||
Var PayState1 = "Invisible"
|
||||
Var PayState2 = "Invisible"
|
||||
Var PayState3 = "Invisible"
|
||||
Var PayState4 = "Invisible"
|
||||
Var PayState5 = "Invisible"
|
||||
Var PayState6 = "Invisible"
|
||||
|
||||
EndIf
|
||||
|
||||
;Disable taobin credit
|
||||
|
||||
Var TopRowY = 1297
|
||||
Var BotRowY = 1499
|
||||
|
||||
Var PayState4 = "Invisible"
|
||||
|
||||
If SettingDisableTaobinCode = "true" Then
|
||||
Var PayState2 = "Invisible"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
DEBUGVAR SettingDisableTaobinCredit
|
||||
Var CancelContinue = 0
|
||||
</EventOpen>
|
||||
|
||||
|
|
@ -882,23 +838,19 @@
|
|||
|
||||
|
||||
If Timeout >= 120 Then
|
||||
Var alphaState = "Invisible"
|
||||
Var alphaState = "Invisible"
|
||||
|
||||
|
||||
If RoadShow = "true" Then
|
||||
Else
|
||||
If PayState3 = "Enable" Then
|
||||
Var PayState3 = "Disable"
|
||||
If RoadShow = "true" Then
|
||||
|
||||
Else
|
||||
Var CreditCardButtonState = "Disable"
|
||||
Var QRCodeButtonState = "Disable"
|
||||
EndIf
|
||||
If PayState5 = "Enable" Then
|
||||
Var PayState5 = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var LOADING_STATE = "Invisible"
|
||||
Var AlphaPopupLoadingState = "Invisible"
|
||||
Var QRErrorState = "Invisible"
|
||||
|
||||
Var LOADING_STATE = "Invisible"
|
||||
Var AlphaPopupLoadingState = "Invisible"
|
||||
Var QRErrorState = "Invisible"
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -976,9 +928,6 @@
|
|||
|
||||
|
||||
If CoinInOK = 1 Then
|
||||
|
||||
Var PayState5 = "Disable"
|
||||
|
||||
Var CoinInCounter = CoinInCounter + 1
|
||||
If CoinInCounter = 1 Then
|
||||
|
||||
|
|
@ -989,10 +938,6 @@
|
|||
Var PayOK = 1
|
||||
|
||||
EndIf
|
||||
|
||||
Else
|
||||
Var PayState5 = "Enable"
|
||||
|
||||
EndIf
|
||||
|
||||
Var stringLog = "Timeout " + Timeout
|
||||
|
|
@ -1664,35 +1609,8 @@
|
|||
<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
|
||||
</Image>
|
||||
|
||||
;<Button>
|
||||
;<X> 664 </X>
|
||||
;<Y> 1276</Y>
|
||||
;<State> PayState2</State>
|
||||
;<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
|
||||
;<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
|
||||
;<FilenameDisable> pay_with_code_image </FilenameDisable>
|
||||
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
;<Volume> SoundVolume </Volume>
|
||||
;<EventClick>
|
||||
;
|
||||
; If alphaState = "Invisible" Then
|
||||
;
|
||||
; If CoinInFlag = 0 Then
|
||||
; 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
|
||||
;
|
||||
; EndIf
|
||||
;</EventClick>
|
||||
;</Button>
|
||||
|
||||
<Button>
|
||||
<X> 223 </X>
|
||||
<X> 73 </X>
|
||||
<Y> TopRowY </Y>
|
||||
<State> CreditCardButtonState </State>
|
||||
<Filename> Var( CountryRootPath + "/image/page_payment/bn_credit_card.png") </Filename>
|
||||
|
|
@ -1746,7 +1664,7 @@ EndIf
|
|||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 566 </X>
|
||||
<X> 394 </X>
|
||||
<Y> TopRowY </Y>
|
||||
<State> QRCodeButtonState </State>
|
||||
<Filename> Var( CountryRootPath + "/image/page_payment/bn_qr_code.png") </Filename>
|
||||
|
|
@ -1788,38 +1706,32 @@ EndIf
|
|||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 715 </X>
|
||||
<Y> TopRowY </Y>
|
||||
<State> CodeButtonState </State>
|
||||
<Filename> Var( CountryRootPath + "/image/page_payment/bn_code.png") </Filename>
|
||||
<FilenamePress> Var( CountryRootPath + "/image/page_payment/bn_code.png") </FilenamePress>
|
||||
<FilenameDisable> Var( CountryRootPath + "/image/page_payment/bn_code.png") </FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
If alphaState = "Invisible" Then
|
||||
|
||||
;<Button>
|
||||
;<X> 439 </X>
|
||||
;<Y> 1276 </Y>
|
||||
;<State> PayState4</State>
|
||||
;<Filename> Var( DirImage + "/bn_pay_with_credit.png") </Filename>
|
||||
;<FilenamePress> Var( DirImage + "/bp_pay_with_credit.png") </FilenamePress>
|
||||
;<FilenameDisable> pay_with_credit_image </FilenameDisable>
|
||||
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
;<Volume> SoundVolume </Volume>
|
||||
;<EventClick>
|
||||
;
|
||||
;
|
||||
; If alphaState = "Invisible" Then
|
||||
;
|
||||
; If CoinInFlag = 0 Then
|
||||
; 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
|
||||
;
|
||||
; EndIf
|
||||
;
|
||||
;
|
||||
;</EventClick>
|
||||
;</Button>
|
||||
If CoinInFlag = 0 Then
|
||||
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
|
||||
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 360 </X>
|
||||
|
|
@ -2494,27 +2406,6 @@ eval(
|
|||
<Filename> "ROOT/taobin_project/image/page_payment/alpha_popup.png" </Filename>
|
||||
</Image>
|
||||
|
||||
;<Text>
|
||||
;<X> 267 </X>
|
||||
;<Y> 1065 </Y>
|
||||
;<Width> 516 </Width>
|
||||
;<Height> 75 </Height>
|
||||
;<Size> 48 </Size>
|
||||
;<Font> RobotoBold </Font>
|
||||
;<Color> eval(
|
||||
;If AlphaLoadingState = "Enable" Then
|
||||
;Var return = 0xFFFFFF
|
||||
;Else
|
||||
;Var return = 0x5A5A5A
|
||||
;EndIf
|
||||
;)
|
||||
;</Color>
|
||||
;<Align> Center </Align>
|
||||
;<State> LOADING_STATE </State>
|
||||
;<Value> "Just Moment, Please" </Value>
|
||||
;<Filename> Var( DirImage + "/loadingText.png" )</Filename>
|
||||
;</Text>
|
||||
|
||||
<Image>
|
||||
<X> LOADING_STATE_X </X>
|
||||
<Y> 1065 </Y>
|
||||
|
|
@ -2567,28 +2458,4 @@ eval(
|
|||
</Text>
|
||||
|
||||
|
||||
<EventUnitTest1>
|
||||
|
||||
Var SELLONLINE = 1
|
||||
Var EnoughChange = "nay"
|
||||
Var PayState1 = "Enable"
|
||||
|
||||
</EventUnitTest1>
|
||||
|
||||
<EventUnitTest2>
|
||||
|
||||
Var SELLONLINE = 1
|
||||
Var EnoughChange = "yes"
|
||||
Var PayState1 = "Enable"
|
||||
|
||||
</EventUnitTest2>
|
||||
|
||||
<EventUnitTest3>
|
||||
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
|
||||
</EventUnitTest3>
|
||||
|
||||
|
||||
</Popup>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue