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

AUS: Disable fatzebra & update EMA

Browse source
This commit is contained in:
Kenta420 2024-11-28 15:45:44 +07:00
parent b2498d34f6
commit b4f9c003a9
18 changed files with 1197 additions and 629 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page_payment_en/page_payment/img_popup_ema.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

BIN
image/page_payment_en/page_payment/img_popup_ema_error.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
image/page_payment_en/page_payment/img_popup_ema_success.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

0
inter/aus/image/payment_cash/bd_eam_enter_code.png → inter/aus/image/payment_cash/bd_ema_enter_code.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Before After
Before After

BIN
inter/aus/image/payment_cash/bd_try_again.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
inter/aus/image/payment_cash/bn_try_again.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
inter/aus/image/payment_cash/bp_try_again.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
inter/aus/image/payment_cash/edit_border.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
inter/aus/image/payment_cash/ema_member_icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
inter/aus/image/payment_cash/enter_ema_number_text.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.8 KiB

2
inter/aus/xml/page_catalog_group_other.lxml
View file

@ -897,7 +897,7 @@
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
Var DescLang[0][5] = "" Var DescLang[0][5] = ""
Var NameLang[1][0] = "FLYING TURTLE\nENERGY DRINK SODA" Var NameLang[1][0] = "FLYING TURTLE ENERGY DRINK SODA"
Var NameLang[1][1] = "เต่าทรงพลังโซดา" Var NameLang[1][1] = "เต่าทรงพลังโซดา"
Var NameLang[1][2] = "" Var NameLang[1][2] = ""
Var NameLang[1][3] = "" Var NameLang[1][3] = ""

2
inter/aus/xml/page_catalog_group_recommend.lxml
View file

@ -11580,7 +11580,7 @@
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
Var DescLang[0][5] = "" Var DescLang[0][5] = ""
Var NameLang[1][0] = "FLYING TURTLE\nENERGY DRINK SODA" Var NameLang[1][0] = "FLYING TURTLE ENERGY DRINK SODA"
Var NameLang[1][1] = "เต่าทรงพลังโซดา" Var NameLang[1][1] = "เต่าทรงพลังโซดา"
Var NameLang[1][2] = "" Var NameLang[1][2] = ""
Var NameLang[1][3] = "" Var NameLang[1][3] = ""

2
inter/aus/xml/page_catalog_group_recommend_multi_pro.lxml
View file

@ -11557,7 +11557,7 @@
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
Var DescLang[0][5] = "" Var DescLang[0][5] = ""
Var NameLang[1][0] = "FLYING TURTLE\nENERGY DRINK SODA" Var NameLang[1][0] = "FLYING TURTLE ENERGY DRINK SODA"
Var NameLang[1][1] = "เต่าทรงพลังโซดา" Var NameLang[1][1] = "เต่าทรงพลังโซดา"
Var NameLang[1][2] = "" Var NameLang[1][2] = ""
Var NameLang[1][3] = "" Var NameLang[1][3] = ""

6
inter/aus/xml/page_collect_point_1.lxml
View file

@ -635,6 +635,12 @@
<Filename> Var( DirImage + "/text_edit.png") </Filename> <Filename> Var( DirImage + "/text_edit.png") </Filename>
</Image> </Image>
<Image>
<X> 236 </X>
<Y> 699 </Y>
<Filename> Var( DirImage + "/text_2.png") </Filename>
</Image>
;include="ROOT/taobin_project/inc/video.inc" ;include="ROOT/taobin_project/inc/video.inc"

1
inter/aus/xml/page_member_topup.lxml
View file

@ -261,6 +261,7 @@
<Button> <Button>
<X> 287 </X> <X> 287 </X>
<Y> 778 </Y> <Y> 778 </Y>
<State> "Disable" </State>
<Filename> Var( DirImage2 + "/bn_fatzebra.png" ) </Filename> <Filename> Var( DirImage2 + "/bn_fatzebra.png" ) </Filename>
<FilenamePress> Var( DirImage2 + "/bp_fatzebra.png" ) </FilenamePress> <FilenamePress> Var( DirImage2 + "/bp_fatzebra.png" ) </FilenamePress>
<FilenameDisable> Var( DirImage2 + "/bd_fatzebra.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "/bd_fatzebra.png" ) </FilenameDisable>

336
inter/aus/xml/page_payment_with_ema.lxml Normal file
View file

@ -0,0 +1,336 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Sound> PlaySoundCodeLang </Sound>
<Volume> SoundVolume </Volume>
<Refresh> "Partial" </Refresh>
<EventOpen>
Var Timeout = 0
Var EMAMemberID = ""
Var Tel_Confirm_State = "Invisible"
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var Timeout = Timeout + 1
If Timeout > 30 Then
SAVELOG "page_payment_with_ema > timeout"
Var EMAMemberID = ""
Open "ROOT/taobin_project/xml/page_payment_cash-AUS.xml"
EndIf
</EventTimeout>
<Image>
<X> 0 </X>
<Y> 380 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
</Image>
<Image>
<X> 158 </X>
<Y> 665 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/img_popup1.png" </Filename>
</Image>
<Image>
<X> 302 </X>
<Y> 710 </Y>
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/enter_ema_number_text.png" </Filename>
</Image>
<Image>
<X> 217 </X>
<Y> 830 </Y>
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/edit_border.png" </Filename>
</Image>
<Image>
<X> 273 </X>
<Y> 837 </Y>
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/ema_member_icon.png" </Filename>
</Image>
<Text>
<X> 255 </X>
<Y> 856 </Y>
<Refresh> "Enable" </Refresh>
<Width> 570 </Width>
<Font> KanitRegularTTF </Font>
<Size> 48 </Font>
<Color> 0x000000 </Color>
<Align> center-vertical-horizontal </Align>
<Value> EMAMemberID </Value>
</Text>
<Button>
<X> 333 </X>
<Y> 1004 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_1.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_1.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "1"
Trim EMAMemberID 8
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
If IDNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
</EventClick>
</Button>
<Button>
<X> 477 </X>
<Y> 1004 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_2.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_2.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "2"
Trim EMAMemberID 8
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
If IDNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
</EventClick>
</Button>
<Button>
<X> 620 </X>
<Y> 1004 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_3.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_3.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "3"
Trim EMAMemberID 8
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
If IDNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
</EventClick>
</Button>
<Button>
<X> 333 </X>
<Y> 1148 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_4.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_4.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "4"
Trim EMAMemberID 8
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
If IDNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
</EventClick>
</Button>
<Button>
<X> 477 </X>
<Y> 1148 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_5.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_5.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "5"
Trim EMAMemberID 8
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
If IDNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
</EventClick>
</Button>
<Button>
<X> 620 </X>
<Y> 1148 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_6.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_6.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "6"
Trim EMAMemberID 8
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
If IDNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
</EventClick>
</Button>
<Button>
<X> 333 </X>
<Y> 1292 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_7.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_7.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "7"
Trim EMAMemberID 8
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
If IDNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
</EventClick>
</Button>
<Button>
<X> 477 </X>
<Y> 1292 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_8.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_8.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "8"
Trim EMAMemberID 8
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
If IDNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
</EventClick>
</Button>
<Button>
<X> 620 </X>
<Y> 1292 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_9.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_9.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "9"
Trim EMAMemberID 8
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
If IDNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
</EventClick>
</Button>
<Button>
<X> 477 </X>
<Y> 1436 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_0.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_0.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "0"
Trim EMAMemberID 8
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
If IDNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
</EventClick>
</Button>
<Button>
<X> 620 </X>
<Y> 1436 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_back-1.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_back-1.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Trim EMAMemberID -1
Var Tel_Confirm_State = "Invisible"
TimerReset
Refresh
</EventClick>
</Button>
<Button>
<X> 218 </X>
<Y> 1623 </Y>
<Filename> "ROOT/taobin_project/image/collectiing_en/bn_back.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing_en/bn_back.png" </FilenamePress>
<EventClick>
Var EMAMemberID = ""
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
</EventClick>
</Button>
<Button>
<X> 577 </X>
<Y> 1623 </Y>
<Refresh> "Enable" </Refresh>
<State> Tel_Confirm_State </State>
<Filename> "ROOT/taobin_project/image/collectiing_en/bn_confirm.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing_en/bp_confirm.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing_en/bp_confirm.png" </FilenameDisable>
<EventClick>
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
</EventClick>
</Button>
</Popup>

21
inter/aus/xml/page_topping_select6.lxml
View file

@ -410,6 +410,17 @@
Var SugarZeroCalCheck = "Enable" Var SugarZeroCalCheck = "Enable"
EndIf EndIf
Strlen showname show_name_len
If show_eng = "true" Then
If show_name_len > 24 Then
Var showname = showname + "###size=54"
EndIf
Else
If show_name_len > 0 Then
Var showname = showname + "###size=68"
EndIf
EndIf
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
@ -6841,6 +6852,16 @@
DEBUGVAR showname DEBUGVAR showname
DEBUGVAR showdesc DEBUGVAR showdesc
Strlen showname show_name_len
If show_eng = "true" Then
If show_name_len > 24 Then
Var showname = showname + "###size=54"
EndIf
Else
If show_name_len > 0 Then
Var showname = showname + "###size=68"
EndIf
EndIf
Var Timeout = 0 Var Timeout = 0

428
xml/page_payment_cash-AUS.xml
View file

@ -84,12 +84,17 @@
; Below original ; Below original
; On open ; On open
Var popup_cancel_button_y = 1345
Var PopupCancelButtonState = "Invisible"
Var cancelState = "Invisible" Var cancelState = "Invisible"
Var CameraState = "Invisible" Var CameraState = "Invisible"
Var EMAEnterNumberButtonState = "Invisible"
Var EMAPopupSuccessState = "Invisible"
Var EMAPopupErrorState = "Invisible"
Var alphaState = "Invisible" Var alphaState = "Invisible"
Var alphaState2 = "Invisible" Var alphaState2 = "Invisible"
@ -427,6 +432,87 @@
Var PayState5 = "Invisible" Var PayState5 = "Invisible"
Var PayState6 = "Invisible" Var PayState6 = "Invisible"
EndIf EndIf
If EMAMemberID = "" Then
Else
Var CameraState = "Invisible"
Var alphaState = "Enable"
Var PopupCancelButtonState = "Enable"
Var EMAEnterNumberButtonState = "Disable"
Var popup_cancel_button_y = 1390
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
Var QR_POPUP = "/img_popup_ema.png"
Var QRCODE99 = ""
Var LOADING_STATE = "Enable"
VendingQR ON
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + Seeker.ExtendData
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumberQR = "0899999999"
Var ServiceType = "coffee"
Var ECommerceQR = ""
Var ECommerceQR = ECommerceQR + PriceDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + DiscountDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SessionID2
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SelectDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "AUB:2:"
Var ECommerceQR = ECommerceQR + EMAMemberID
Var ECommerceQR = ECommerceQR + "/"
If Seeker.IntVendingCampaign > 0 Then
Var ECommerceQR = ECommerceQR + Seeker.VendingCode
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + Seeker.CodeNumber
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3
EndIf
If Seeker.IntVendingCredit > 0 Then
If Seeker.IntVendingCampaign > 0 Then
Var ECommerceQR = ECommerceQR + "|"
EndIf
Var ECommerceQR = ECommerceQR + "CRD"
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + PointCrm
EndIf
Var ServiceParameter = "max"
Var ServiceCharge = 0
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
Var GetScore = ""
Var OperatorName = ""
Var SessionID = ""
Var PayDetail2 = Seeker.PayDetail2
GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var ReqPayInfoFlag = 6
Refresh
EndIf
EndIf
EndIf
</EventOpen> </EventOpen>
<EventActionOk> <EventActionOk>
@ -451,7 +537,9 @@
VendingQR OFF VendingQR OFF
CoinVending OFF CoinVending OFF
If ReqPayInfoFlag2 = 0 Then
Var Seeker.CampaignPayChanel = "unknown"
EndIf
If ReqPayInfoFlag2 = 1 Then If ReqPayInfoFlag2 = 1 Then
DEBUGVAR VendingBank DEBUGVAR VendingBank
Var Seeker.CampaignPayChanel = "malaymbb" Var Seeker.CampaignPayChanel = "malaymbb"
@ -468,6 +556,9 @@
If ReqPayInfoFlag2 = 5 Then If ReqPayInfoFlag2 = 5 Then
Var Seeker.CampaignPayChanel = "linepay" Var Seeker.CampaignPayChanel = "linepay"
EndIf EndIf
If ReqPayInfoFlag2 = 6 Then
Var Seeker.CampaignPayChanel = "aubpay"
EndIf
@ -671,27 +762,37 @@
EndIf EndIf
EndIf EndIf
;If ReqPayInfoFlag = 6 Then If ReqPayInfoFlag = 6 Then
; If VendingQRTypeResult = "FZB:2" Then
; Var CashTextWarning = ""
; Var QRErrorState = "Invisible"
; Var QRCODE99Shoppy = SessionID
; Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a
; SAVELOG Ext1a
; SAVELOG QRCODE99Shoppy
; Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21
; Var ReqPayInfoFlag = 0
; Var ReqPayInfoFlag2 = 5
; SAVELOG QRCODE99Shoppy
; SAVELOG Ext21
; Var employeeName = "Jhon" SPLIT ECommerceQR "/" 6 MemberData
; Var
; ;Var QRCODE99 = QRCODE99Shoppy If VendingQRTypeResult = "AUB" Then
; Var LOADING_STATE = "Invisible" Var CashTextWarning = ""
; EndIf Var QRErrorState = "Invisible"
;EndIf Var ReqPayInfoFlag = 0
Var ReqPayInfoFlag2 = 6
SAVELOG QRCODE99Shoppy
SAVELOG Ext21
SPLIT MemberData ":" 1 _EMAMemberName
SPLIT MemberData ":" 2 EMAMemberSurname
SPLIT MemberData ":" 3 _EMAMemberBalance
Var EMAMemberName !assigned SprintFmt("[%s]", _EMAMemberName)
Var EMAMemberBalance !assigned SprintFmt("Remain Balance: $%s", _EMAMemberBalance)
DEBUGVAR EMAMemberName
DEBUGVAR EMAMemberSurname
DEBUGVAR EMAMemberBalance
Var QR_POPUP = "/img_popup_ema_success.png"
Var EMAPopupSuccessState = "Enable"
Var EMAEnterNumberButtonState = "Invisible"
Var PopupCancelButtonState = "Invisible"
Var EMAEnterNumberButtonState = "Invisible"
EndIf
EndIf
Else Else
Var PayInfoCFlag = 1 Var PayInfoCFlag = 1
@ -762,12 +863,22 @@
Var LOADING_STATE = "Invisible" Var LOADING_STATE = "Invisible"
EndIf EndIf
EndIf EndIf
If ReqPayInfoFlag = 5 Then
Var QRErrorFlag = 1
If alphaState = "Enable" Then
Var QRErrorImg = "/QRError.png"
Var QRErrorState = "Enable"
Var LOADING_STATE = "Invisible"
EndIf
EndIf
If ReqPayInfoFlag = 6 Then If ReqPayInfoFlag = 6 Then
Var QRErrorFlag = 1 Var QRErrorFlag = 1
If alphaState = "Enable" Then If alphaState = "Enable" Then
Var QRErrorImg = "/QRError.png" Var QR_POPUP = "/img_popup_ema_error.png"
Var QRErrorState = "Enable" Var EMAPopupErrorState = "Enable"
Var EMAEnterNumberButtonState = "Invisible"
Var LOADING_STATE = "Invisible" Var LOADING_STATE = "Invisible"
Var popup_cancel_button_y = 1225
EndIf EndIf
EndIf EndIf
Else Else
@ -806,6 +917,7 @@
Var VendingCashless = "-" Var VendingCashless = "-"
Var LOADING_STATE = "Enable" Var LOADING_STATE = "Enable"
Var alphaState = "Enable" Var alphaState = "Enable"
Var PopupCancelButtonState = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1 Var CashlessPayFlag = 1
@ -851,26 +963,25 @@
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
If Timeout >= 120 Then If Timeout >= 120 Then
Var alphaState = "Invisible" Var alphaState = "Invisible"
Var PopupCancelButtonState = "Invisible"
Var CameraState = "Invisible"
Var EMAEnterNumberButtonState = "Invisible"
Var EMAPopupErrorState = "Invisible"
If CameraState = "Enable" Then If RoadShow = "true" Then
Var CameraState = "Invisible" Else
EndIf Var PayState3 = "Disable"
Var PayState5 = "Disable"
Var PayState6 = "Disable"
If RoadShow = "true" Then EndIf
Else
Var PayState3 = "Disable"
Var PayState5 = "Disable"
Var PayState6 = "Disable"
EndIf
Var LOADING_STATE = "Invisible" Var LOADING_STATE = "Invisible"
Var QRErrorState = "Invisible" Var QRErrorState = "Invisible"
Var CreditCardErrorState = "Invisible" Var CreditCardErrorState = "Invisible"
EndIf EndIf
If Timeout > 210 Then If Timeout > 210 Then
@ -1228,6 +1339,7 @@
If CoinInFlag = 0 Then If CoinInFlag = 0 Then
;VendingQR OFF ;VendingQR OFF
Var alphaState = "Invisible" Var alphaState = "Invisible"
Var PopupCancelButtonState = "Invisible"
EndIf EndIf
@ -1292,10 +1404,6 @@
If CoinInOK = 0 Then If CoinInOK = 0 Then
Var RemainAmount = PayAmount - CoinAmount Var RemainAmount = PayAmount - CoinAmount
Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign
Var RemainAmount = RemainAmount - Seeker.IntVendingCredit Var RemainAmount = RemainAmount - Seeker.IntVendingCredit
@ -1388,82 +1496,90 @@
DEBUGVAR scanresult DEBUGVAR scanresult
DEBUGVAR scanmsg DEBUGVAR scanmsg
;If scanresult = "true" Then
; Var employeeCode = scanmsg
; Open "ROOT/taobin_project/inter/aus/xml/page_payment_employee_ping
;Else
;EndIf
If scanresult = "true" Then If scanresult = "true" Then
If Timeout < 120 Then
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
Var QR_POPUP = "/img_popup_AUS_QR.png"
Var QRCODE99 = ""
Var LOADING_STATE = "Enable" StrLen scanmsg textLen
If textLen = 8 Then
VendingQR ON Var EMAMemberID = scanmsg
Var SessionID2 = SelectSlot + ":" If Timeout < 120 Then
Var SessionID2 = SessionID2 + Seeker.ExtendData If CoinInFlag = 0 Then
If CancelFlag = 0 Then
Var QR_POPUP = "/img_popup_ema.png"
Var QRCODE99 = ""
Var CreditAmount1 = "" Var LOADING_STATE = "Enable"
Var ServiceAmountFlow = "" Var EMAEnterNumberButtonState = "Disable"
Var TelephoneNumberQR = "0899999999"
Var ServiceType = "coffee"
Var ECommerceQR = ""
Var ECommerceQR = ECommerceQR + PriceDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + DiscountDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SessionID2
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SelectDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "FZB:2/"
If Seeker.IntVendingCampaign > 0 Then VendingQR ON
Var ECommerceQR = ECommerceQR + Seeker.VendingCode
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + Seeker.CodeNumber
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3
EndIf
If Seeker.IntVendingCredit > 0 Then Var SessionID2 = SelectSlot + ":"
If Seeker.IntVendingCampaign > 0 Then Var SessionID2 = SessionID2 + Seeker.ExtendData
Var ECommerceQR = ECommerceQR + "|"
EndIf Var CreditAmount1 = ""
Var ECommerceQR = ECommerceQR + "CRD" Var ServiceAmountFlow = ""
Var ECommerceQR = ECommerceQR + ":" Var TelephoneNumberQR = "0899999999"
Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit Var ServiceType = "coffee"
Var ECommerceQR = ECommerceQR + ":" Var ECommerceQR = ""
Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit Var ECommerceQR = ECommerceQR + PriceDrink
Var ECommerceQR = ECommerceQR + ":" Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + PointCrm Var ECommerceQR = ECommerceQR + DiscountDrink
EndIf Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SessionID2
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SelectDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "AUB:2:"
Var ECommerceQR = ECommerceQR + EMAMemberID
Var ECommerceQR = ECommerceQR + "/"
If Seeker.IntVendingCampaign > 0 Then
Var ECommerceQR = ECommerceQR + Seeker.VendingCode
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + Seeker.CodeNumber
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3
EndIf
If Seeker.IntVendingCredit > 0 Then
If Seeker.IntVendingCampaign > 0 Then
Var ECommerceQR = ECommerceQR + "|"
EndIf
Var ECommerceQR = ECommerceQR + "CRD"
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + PointCrm
EndIf
Var ServiceParameter = "max" Var ServiceParameter = "max"
Var ServiceCharge = 0 Var ServiceCharge = 0
Var AccountType = "new" Var AccountType = "new"
Var testservice = "kbank" Var testservice = "kbank"
Var tc = "" Var tc = ""
Var GetScore = "" Var GetScore = ""
Var OperatorName = "" Var OperatorName = ""
Var SessionID = "" Var SessionID = ""
Var PayDetail2 = Seeker.PayDetail2 Var PayDetail2 = Seeker.PayDetail2
GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var ReqPayInfoFlag = 6 Var ReqPayInfoFlag = 6
Refresh Refresh
EndIf
EndIf EndIf
EndIf EndIf
Else
Var QR_POPUP = "/img_popup_ema_error.png"
Var EMAPopupErrorState = "Enable"
Var alphaState = "Enable"
Var LOADING_STATE = "Invisible"
Var EMAEnterNumberButtonState = "Invisible"
Var popup_cancel_button_y = 1225
EndIf EndIf
Else
Var scanmsg = "Please try agin"
EndIf EndIf
Var CameraState = "Invisible" Var CameraState = "Invisible"
@ -1565,6 +1681,7 @@ If alphaState = "Invisible" Then
If CancelFlag = 0 Then If CancelFlag = 0 Then
Var QR_POPUP = "/img_popup8-AUS.png" Var QR_POPUP = "/img_popup8-AUS.png"
Var alphaState = "Enable" Var alphaState = "Enable"
Var PopupCancelButtonState = "Enable"
Coin CARD Coin CARD
EndIf EndIf
EndIf EndIf
@ -1636,9 +1753,10 @@ EndIf
</Button> </Button>
<Button> <Button>
<X> 328 </X> <X> 552 </X>
<Y> 1499 </Y> <Y> 1499 </Y>
<State> PayState3</State> ;<State> PayState3</State>
<State> "Invisible" </State>
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_qrcode.png" </Filename> <Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_qrcode.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_pay_qrcode.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_pay_qrcode.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/payment_cash/bd_pay_qrcode.png" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/inter/aus/image/payment_cash/bd_pay_qrcode.png" </FilenameDisable>
@ -1658,6 +1776,7 @@ EndIf
Var FlagQROpened = 1 Var FlagQROpened = 1
Var alphaState = "Enable" Var alphaState = "Enable"
Var PopupCancelButtonState = "Enable"
VendingQR ON VendingQR ON
@ -1726,7 +1845,7 @@ EndIf
<Button> <Button>
<X> 552 </X> <X> 552 </X>
<Y> 1499 </Y> <Y> 1499 </Y>
<State> "Invisible" </State> <State> "Enable" </State>
<Filename> Var( DirImage + "/bn_pay_with_comingSoon.png") </Filename> <Filename> Var( DirImage + "/bn_pay_with_comingSoon.png") </Filename>
<FilenamePress> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenamePress> <FilenamePress> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenamePress>
<FilenameDisable> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenameDisable> <FilenameDisable> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenameDisable>
@ -1738,7 +1857,7 @@ EndIf
</Button> </Button>
<Button> <Button>
<X> 552 </X> <X> 328 </X>
<Y> 1499 </Y> <Y> 1499 </Y>
<State> PayState6 </State> <State> PayState6 </State>
;<State> "Invisible" </State> ;<State> "Invisible" </State>
@ -1759,12 +1878,18 @@ EndIf
Var FlagQROpened = 1 Var FlagQROpened = 1
Var alphaState = "Enable" Var alphaState = "Enable"
Var PopupCancelButtonState = "Enable"
Var EMAPopupErrorState = "Invisible"
Var scanresult = "" Var scanresult = ""
Var scanmsg = "" Var scanmsg = ""
Var EMAMemberID = ""
INITSCANQR INITSCANQR
Var CameraState = "Enable" Var CameraState = "Enable"
Var EMAEnterNumberButtonState = "Enable"
Var popup_cancel_button_y = 1390
Refresh Refresh
EndIf EndIf
@ -1878,19 +2003,92 @@ EndIf
</Image> </Image>
<CameraX> <CameraX>
<X> 50 </X> <X> 120 </X>
<Y> 900 </Y> <Y> 900 </Y>
<Name>"usbfront"</Name> <Name>"usbfront"</Name>
<Width> 1000 </Width> <Width> 850 </Width>
<Height> 1000 </Height> <Height> 800 </Height>
<State> CameraState </State> <State> CameraState </State>
</CameraX> </CameraX>
<Button>
<X> 398 </X>
<Y> 1275 </Y>
<State> EMAEnterNumberButtonState </State>
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_ema_enter_code.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_ema_enter_code.png" </FilenamePress>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bd_ema_enter_code.png" </FilenamePress>
<EventClick>
Open "ROOT/taobin_project/inter/aus/xml/page_payment_with_ema.lxml"
</EventClick>
</Button>
<Text>
<X> 249 </X>
<Y> 1186 </Y>
<State> EMAPopupSuccessState </State>
<Width> 583 </Width>
<Font> KanitLightTTF </Font>
<Size> 40 </Size>
<Color> 0x513C2F </Color>
<Align> center-vertical-horizontal </Align>
<Value> EMAMemberName </Value>
</Text>
<Text>
<X> 249 </X>
<Y> 1233 </Y>
<State> EMAPopupSuccessState </State>
<Width> 583 </Width>
<Font> KanitLightTTF </Font>
<Size> 40 </Size>
<Color> 0x513C2F </Color>
<Align> center-vertical-horizontal </Align>
<Value> EMAMemberBalance </Value>
</Text>
<Button>
<X> 402 </X>
<Y> 1080 </Y>
<State> EMAPopupErrorState </State>
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_try_again.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_try_again.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/payment_cash/bd_try_again.png" </FilenameDisable>
<EventClick>
If Timeout < 120 Then
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
Var QR_POPUP = "/img_popup_ema.png"
Var QRCODE99 = ""
Var FlagQROpened = 1
Var alphaState = "Enable"
Var PopupCancelButtonState = "Enable"
Var EMAPopupErrorState = "Invisible"
Var scanresult = ""
Var scanmsg = ""
Var EMAMemberID = ""
INITSCANQR
Var CameraState = "Enable"
Var EMAEnterNumberButtonState = "Enable"
Var popup_cancel_button_y = 1390
Refresh
EndIf
EndIf
EndIf
</EventClick>
</Button>
<Button> <Button>
<X> 438 </X> <X> 438 </X>
<Y> 1345 </Y> <Y> popup_cancel_button_y </Y>
<State> alphaState </State> <State> PopupCancelButtonState </State>
<Filename> Var( DirImage + "/bn_cancel.png" )</Filename> <Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress> <FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -1901,8 +2099,14 @@ EndIf
Var QRErrorState = "Invisible" Var QRErrorState = "Invisible"
Var CreditCardErrorState = "Invisible" Var CreditCardErrorState = "Invisible"
Var alphaState = "Invisible" Var alphaState = "Invisible"
Var PopupCancelButtonState = "Invisible"
Var CameraState = "Invisible" Var CameraState = "Invisible"
Var EMAEnterNumberButtonState = "Invisible"
Var EMAPopupErrorState = "Invisible"
Var QRCODE99 = "" Var QRCODE99 = ""
Var EMAMemberID = ""
Var popup_cancel_button_y = 1345
If CashlessPayFlag = 1 Then If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0 Var CashlessPayFlag = 0