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

Merge branch 'masterpiece' of ssh://kong:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
nattapon tachawong 2025-06-06 11:10:22 +07:00
commit 0ab45a7053
10 changed files with 1157 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
inter/gbr/image/payment_cash/bd_pay_with_Staff_Pass.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
inter/gbr/image/payment_cash/bd_staff_pass_number.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
inter/gbr/image/payment_cash/bn_pay_with_Staff_Pass.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
inter/gbr/image/payment_cash/bn_staff_pass_number.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
inter/gbr/image/payment_cash/bp_pay_with_Staff_Pass.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.8 KiB

BIN
inter/gbr/image/payment_cash/bp_staff_pass_number.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
inter/gbr/image/payment_cash/enter_ema_number_text.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

Before After
Before After

1096
inter/gbr/xml/page_catalog_group_coffee.lxml
View file

File diff suppressed because it is too large Load diff

92
inter/gbr/xml/page_payment_with_ema.lxml → inter/gbr/xml/page_payment_with_ukb.lxml
View file

@ -9,7 +9,7 @@
<EventOpen> <EventOpen>
Var Timeout = 0 Var Timeout = 0
Var EMAMemberID = "" Var UKBMemberID = ""
Var Tel_Confirm_State = "Invisible" Var Tel_Confirm_State = "Invisible"
</EventOpen> </EventOpen>
@ -20,7 +20,7 @@
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
If Timeout > 30 Then If Timeout > 30 Then
SAVELOG "page_payment_with_ema > timeout" SAVELOG "page_payment_with_ema > timeout"
Var EMAMemberID = "" Var UKBMemberID = ""
Open "ROOT/taobin_project/xml/page_payment_cash-GBR.xml" Open "ROOT/taobin_project/xml/page_payment_cash-GBR.xml"
EndIf EndIf
</EventTimeout> </EventTimeout>
@ -39,7 +39,7 @@
<Image> <Image>
<X> 302 </X> <X> 286 </X>
<Y> 710 </Y> <Y> 710 </Y>
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/enter_ema_number_text.png" </Filename> <Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/enter_ema_number_text.png" </Filename>
</Image> </Image>
@ -66,7 +66,7 @@
<Size> 48 </Font> <Size> 48 </Font>
<Color> 0x000000 </Color> <Color> 0x000000 </Color>
<Align> center-vertical-horizontal </Align> <Align> center-vertical-horizontal </Align>
<Value> EMAMemberID </Value> <Value> UKBMemberID </Value>
</Text> </Text>
@ -79,14 +79,14 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var EMAMemberID = EMAMemberID + "1" Var UKBMemberID = UKBMemberID + "1"
Trim EMAMemberID MAX_EMA_CODE Trim UKBMemberID MAX_UKB_CODE
TimerReset TimerReset
Refresh Refresh
StrLen EMAMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_EMA_CODE Then If IDNumLen >= MAX_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -101,14 +101,14 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var EMAMemberID = EMAMemberID + "2" Var UKBMemberID = UKBMemberID + "2"
Trim EMAMemberID MAX_EMA_CODE Trim UKBMemberID MAX_UKB_CODE
TimerReset TimerReset
Refresh Refresh
StrLen EMAMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_EMA_CODE Then If IDNumLen >= MAX_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -123,14 +123,14 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var EMAMemberID = EMAMemberID + "3" Var UKBMemberID = UKBMemberID + "3"
Trim EMAMemberID MAX_EMA_CODE Trim UKBMemberID MAX_UKB_CODE
TimerReset TimerReset
Refresh Refresh
StrLen EMAMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_EMA_CODE Then If IDNumLen >= MAX_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -145,14 +145,14 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var EMAMemberID = EMAMemberID + "4" Var UKBMemberID = UKBMemberID + "4"
Trim EMAMemberID MAX_EMA_CODE Trim UKBMemberID MAX_UKB_CODE
TimerReset TimerReset
Refresh Refresh
StrLen EMAMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_EMA_CODE Then If IDNumLen >= MAX_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -167,14 +167,14 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var EMAMemberID = EMAMemberID + "5" Var UKBMemberID = UKBMemberID + "5"
Trim EMAMemberID MAX_EMA_CODE Trim UKBMemberID MAX_UKB_CODE
TimerReset TimerReset
Refresh Refresh
StrLen EMAMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_EMA_CODE Then If IDNumLen >= MAX_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -189,14 +189,14 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var EMAMemberID = EMAMemberID + "6" Var UKBMemberID = UKBMemberID + "6"
Trim EMAMemberID MAX_EMA_CODE Trim UKBMemberID MAX_UKB_CODE
TimerReset TimerReset
Refresh Refresh
StrLen EMAMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_EMA_CODE Then If IDNumLen >= MAX_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -211,14 +211,14 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var EMAMemberID = EMAMemberID + "7" Var UKBMemberID = UKBMemberID + "7"
Trim EMAMemberID MAX_EMA_CODE Trim UKBMemberID MAX_UKB_CODE
TimerReset TimerReset
Refresh Refresh
StrLen EMAMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_EMA_CODE Then If IDNumLen >= MAX_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -233,14 +233,14 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var EMAMemberID = EMAMemberID + "8" Var UKBMemberID = UKBMemberID + "8"
Trim EMAMemberID MAX_EMA_CODE Trim UKBMemberID MAX_UKB_CODE
TimerReset TimerReset
Refresh Refresh
StrLen EMAMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_EMA_CODE Then If IDNumLen >= MAX_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -255,14 +255,14 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var EMAMemberID = EMAMemberID + "9" Var UKBMemberID = UKBMemberID + "9"
Trim EMAMemberID MAX_EMA_CODE Trim UKBMemberID MAX_UKB_CODE
TimerReset TimerReset
Refresh Refresh
StrLen EMAMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_EMA_CODE Then If IDNumLen >= MAX_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -277,14 +277,14 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var EMAMemberID = EMAMemberID + "0" Var UKBMemberID = UKBMemberID + "0"
Trim EMAMemberID MAX_EMA_CODE Trim UKBMemberID MAX_UKB_CODE
TimerReset TimerReset
Refresh Refresh
StrLen EMAMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_EMA_CODE Then If IDNumLen >= MAX_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -300,7 +300,7 @@
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Trim EMAMemberID -1 Trim UKBMemberID -1
Var Tel_Confirm_State = "Invisible" Var Tel_Confirm_State = "Invisible"
TimerReset TimerReset
@ -315,7 +315,7 @@
<Filename> "ROOT/taobin_project/image/collectiing_en/bn_back.png" </Filename> <Filename> "ROOT/taobin_project/image/collectiing_en/bn_back.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing_en/bn_back.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/collectiing_en/bn_back.png" </FilenamePress>
<EventClick> <EventClick>
Var EMAMemberID = "" Var UKBMemberID = ""
Open "ROOT/taobin_project/xml/page_payment_cash.xml" Open "ROOT/taobin_project/xml/page_payment_cash.xml"
</EventClick> </EventClick>
</Button> </Button>

30
xml/page_payment_cash-GBR.xml
View file

@ -16,7 +16,7 @@
;EndIf ;EndIf
Var ErrorCause = "" Var ErrorCause = ""
Var MAX_EMA_CODE = 5 Var MAX_UKB_CODE = 5
Var PreScaleCanculate = 100 Var PreScaleCanculate = 100
@ -409,7 +409,7 @@
EndIf EndIf
If EMAMemberID = "" Then If UKBMemberID = "" Then
Else Else
Var CameraState = "Invisible" Var CameraState = "Invisible"
@ -445,7 +445,7 @@
Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + SelectDrink
Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "UKB:2:" Var ECommerceQR = ECommerceQR + "UKB:2:"
Var ECommerceQR = ECommerceQR + EMAMemberID Var ECommerceQR = ECommerceQR + UKBMemberID
Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "/"
If Seeker.IntVendingCampaign > 0 Then If Seeker.IntVendingCampaign > 0 Then
@ -1455,7 +1455,7 @@
If textLen = MAX_EMA_CODE Then If textLen = MAX_EMA_CODE Then
Var EMAMemberID = scanmsg Var UKBMemberID = scanmsg
If Timeout < 120 Then If Timeout < 120 Then
If CoinInFlag = 0 Then If CoinInFlag = 0 Then
@ -1486,7 +1486,7 @@
Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + SelectDrink
Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "UKB:2:" Var ECommerceQR = ECommerceQR + "UKB:2:"
Var ECommerceQR = ECommerceQR + EMAMemberID Var ECommerceQR = ECommerceQR + UKBMemberID
Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "/"
If Seeker.IntVendingCampaign > 0 Then If Seeker.IntVendingCampaign > 0 Then
@ -1829,9 +1829,9 @@ EndIf
<X> 328 </X> <X> 328 </X>
<Y> 1399 </Y> <Y> 1399 </Y>
<State> PayWithUKBState </State> <State> PayWithUKBState </State>
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_pay_with_ema.png" </Filename> <Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_pay_with_Staff_Pass.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_pay_with_ema.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_pay_with_Staff_Pass.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_pay_with_ema.png" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_pay_with_Staff_Pass.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
@ -1851,7 +1851,7 @@ EndIf
Var scanresult = "" Var scanresult = ""
Var scanmsg = "" Var scanmsg = ""
Var EMAMemberID = "" Var UKBMemberID = ""
If IsCardlessEnable = 1 Then If IsCardlessEnable = 1 Then
CashlessReq OFF "" CashlessReq OFF ""
@ -1989,11 +1989,11 @@ EndIf
<X> 398 </X> <X> 398 </X>
<Y> 1275 </Y> <Y> 1275 </Y>
<State> EMAEnterNumberButtonState </State> <State> EMAEnterNumberButtonState </State>
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_ema_enter_code.png" </Filename> <Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_staff_pass_number.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_ema_enter_code.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_staff_pass_number.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_ema_enter_code.png" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_staff_pass_number.png" </FilenameDisable>
<EventClick> <EventClick>
Open "ROOT/taobin_project/inter/gbr/xml/page_payment_with_ema.lxml" Open "ROOT/taobin_project/inter/gbr/xml/page_payment_with_ukb.lxml"
</EventClick> </EventClick>
</Button> </Button>
@ -2055,7 +2055,7 @@ EndIf
Var scanresult = "" Var scanresult = ""
Var scanmsg = "" Var scanmsg = ""
Var EMAMemberID = "" Var UKBMemberID = ""
INITSCANQR INITSCANQR
Var CameraState = "Enable" Var CameraState = "Enable"
@ -2091,7 +2091,7 @@ EndIf
Var EMAEnterNumberButtonState = "Invisible" Var EMAEnterNumberButtonState = "Invisible"
Var EMAPopupErrorState = "Invisible" Var EMAPopupErrorState = "Invisible"
Var QRCODE99 = "" Var QRCODE99 = ""
Var EMAMemberID = "" Var UKBMemberID = ""
Var popup_cancel_button_y = 1345 Var popup_cancel_button_y = 1345