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

Merge remote-tracking branch 'origin/masterpiece' into hkg_multi

Browse source
This commit is contained in:
Ittipat Lusuk 2025-02-17 09:12:50 +07:00
commit ab2c6e6976
1068 changed files with 345745 additions and 284584 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inter/hkg/xml/menu_catalog_new.lxml
View file

@ -146,7 +146,7 @@
; under line
<Image>
<X> 0 </X>
<Y> 358 </Y>
<Y> 380 </Y>
<Filename> "ROOT/taobin_project/image/page3/bg1.png" </Filename>
</Image>

12
inter/hkg/xml/page_brewing3.lxml
View file

@ -497,7 +497,7 @@
Var XPercent = 0
EndIf
CashlessReq SUCCESS
CashlessReq SUCCESS ""
</EventOpen>
<EventLanguageOnChange>
@ -1042,8 +1042,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -1052,8 +1052,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -1116,7 +1116,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
;CashlessReq FAIL
;CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

10
inter/hkg/xml/page_brewing3Conti.xml
View file

@ -709,8 +709,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2
@ -721,8 +721,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2
@ -798,7 +798,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
CashlessReq FAIL
CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

2754
inter/hkg/xml/page_catalog_group_appfast.lxml
View file

File diff suppressed because it is too large Load diff

43210
inter/hkg/xml/page_catalog_group_coffee.lxml
View file

File diff suppressed because it is too large Load diff

7654
inter/hkg/xml/page_catalog_group_forkid.lxml
View file

File diff suppressed because it is too large Load diff

14294
inter/hkg/xml/page_catalog_group_health.lxml
View file

File diff suppressed because it is too large Load diff

15850
inter/hkg/xml/page_catalog_group_milk.lxml
View file

File diff suppressed because it is too large Load diff

29786
inter/hkg/xml/page_catalog_group_other.lxml
View file

File diff suppressed because it is too large Load diff

23000
inter/hkg/xml/page_catalog_group_recommend.lxml
View file

File diff suppressed because it is too large Load diff

22996
inter/hkg/xml/page_catalog_group_recommend_multi_pro.lxml
View file

File diff suppressed because it is too large Load diff

25206
inter/hkg/xml/page_catalog_group_tea.lxml
View file

File diff suppressed because it is too large Load diff

9234
inter/hkg/xml/page_catalog_group_whey.lxml
View file

File diff suppressed because it is too large Load diff

14
inter/hkg/xml/page_member_topup.lxml
View file

@ -69,9 +69,9 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
Else
CashlessReq OFF
CashlessReq OFF ""
EndIf
Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml"
@ -90,7 +90,7 @@
<EventActionOk>
If VendingCashless = "OK" Then
CashlessReq SUCCESS
CashlessReq SUCCESS ""
Var ToppupSuccessPage = CountryRootPath + "xml/page_member_topupSuccess.lxml"
Open ToppupSuccessPage
@ -108,7 +108,7 @@
Var LOADING_STATE = "Invisible"
EndIf
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
@ -277,7 +277,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml"
@ -332,11 +332,11 @@
Var QRErrorState = "Invisible"
Var alphaState = "Invisible"
CashlessReq OFF
CashlessReq OFF ""
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
DEBUGVAR LOADING_STATE

4
inter/hkg/xml/page_topping_select6.lxml
View file

@ -167,6 +167,10 @@
DEBUGVAR SaveSelectDrinkRoadShow
DEBUGVAR ShowPrice
DEBUGVAR RoadShow
If ShowPrice = "Invisible" Then
Var PriceDrinkTmpShow = "Free"
EndIf