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

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

Browse source
This commit is contained in:
Pakin 2024-05-21 17:13:37 +07:00
commit df2e4915bc
16 changed files with 538 additions and 563 deletions
Download patch file Download diff file Expand all files Collapse all files

1020
xml/event/promotion_energy_drink_1_bath.xml
View file

File diff suppressed because it is too large Load diff

2
xml/page_board.xml
View file

@ -698,6 +698,8 @@
;inter-page-board
If CountryName = "Australia" Then
Var SettingVideoBrewingUseCommon = 1
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/video/script_video.ev"

5
xml/page_catalog2.xml
View file

@ -109,8 +109,9 @@
EndIf
If SELLSTATUS = "DEACTIVE" Then
;include="ROOT/taobin_project/inc/return_condition_when_deative.ev"
SAVELOG "DEACTIVE in catalog2.xml"
;include="ROOT/taobin_project/inc/return_condition.ev"
EndIf

2
xml/page_get_yourchange.xml
View file

@ -80,7 +80,7 @@
DEBUGVAR PayDetail
DEBUGVAR PayDetail2
UpdateTxRef2 TxRef1 ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail, PayDetail2
UpdateTxRef2 TxRef1 ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail PayDetail2
EndIf

2
xml/page_payment.xml
View file

@ -458,6 +458,8 @@
Var CoundDownStillOnPage = 240
__CMD "CLEAR_TIME_BLINK_DISPLAY" 0 "-" "-"
</EventOpen>
<Timeout> 900 </Timeout>
<EventTimeout>

3
xml/page_payment_cash.xml
View file

@ -2547,6 +2547,9 @@
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

9
xml/page_topping_select7.xml
View file

@ -509,6 +509,15 @@
DEBUGVAR MenuReady
DEBUGVAR CupRemain
If SELLSTATUS = "DEACTIVE" Then
SAVELOG "DEACTIVE in page_topping_select7.xml"
;include="ROOT/taobin_project/inc/return_condition.ev"
EndIf
If SelectDrinkType = 1 Then