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

merge from masterpiece

Browse source
This commit is contained in:
Pakin 2025-04-04 14:34:43 +07:00
parent 845c5f1637
commit 736af0e6dc
65 changed files with 481100 additions and 1087 deletions
Download patch file Download diff file Expand all files Collapse all files

6
inter/sgp/animation01/play_list.tsv
View file

@ -885,3 +885,9 @@ PEPSI Max BANANA 52-05-02-0077 1 14 56 23 13 24 120 14:00 23
PEPSI Max YUZU 52-05-02-0076 1 14 53 23 13 24 120 4:00 23 PEPSI Max YUZU 52-05-02-0076 1 14 53 23 13 24 120 4:00 23
PEPSI MINT 52-05-02-0068 1 14 59 12 23 24 120 15:00 23 PEPSI MINT 52-05-02-0068 1 14 59 12 23 24 120 15:00 23
Almost Dirty 52-21-02-0071 1 2 3 4 5 6 7 24 66 6:06 32 Almost Dirty 52-21-02-0071 1 2 3 4 5 6 7 24 66 6:06 32
ICED SANTA GINGER 12-03-02-0081 1 7 22 23 24 49 10:01 23
ICED SANTA GINGER 12-23-02-0081 1 7 22 23 24 49 10:01 23
CHOCO SNOWFLAKE SMOOTHIE 12-03-03-0088 1 15 7 22 40 41 24 49 10:01 23
REINDEER PEPPERMINT SMOOTHIE 12-03-03-0089 1 59 7 19 41 24 49 10:01 23
ICED CHRISTMAS CAFE LATTE 12-01-02-0084 1 6 7 12 22 23 24 49 10:01 23
ICED CHRISTMAS CAFE LATTE 12-21-02-0084 1 6 7 12 22 23 24 49 10:01 23

Can't render this file because it has a wrong number of fields in line 40.

5
inter/sgp/xml/event/tricker.ev
View file

@ -8,6 +8,7 @@
Var SeasonPassMode = 0 Var SeasonPassMode = 0
Var New_PaymentInter = 0
If SystemDateMonthInt = 7 Then If SystemDateMonthInt = 7 Then
If SystemDateDayInt > 28 Then If SystemDateDayInt > 28 Then
@ -37,3 +38,7 @@ If SeasonPassMode = 1 Then
Var SeasonPassFile = CountryRootPath + "xml/event/season_pass/season_pass.ev" Var SeasonPassFile = CountryRootPath + "xml/event/season_pass/season_pass.ev"
TRY SeasonPassFile TRY SeasonPassFile
EndIf EndIf
DEBUGVAR New_PaymentInter

6
inter/sgp/xml/page_brewing3_blue.lxml
View file

@ -6,6 +6,12 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOpen> <EventOpen>
If New_PaymentInter = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_NewBrewing3_blue.lxml"
EndIf
Var SendNotiPaySuccess = 2 Var SendNotiPaySuccess = 2
Var GetMoreStrawCount = 2 Var GetMoreStrawCount = 2

1377
inter/sgp/xml/page_catalog_group_milk.lxml
View file

File diff suppressed because it is too large Load diff

1377
inter/sgp/xml/page_catalog_group_recommend.lxml
View file

File diff suppressed because it is too large Load diff

5500
inter/sgp/xml/page_catalog_group_recommend_multi_pro.lxml
View file

File diff suppressed because it is too large Load diff

2115
inter/tha/xml/multi/page_catalog_group_appfast.lxml Normal file
View file

File diff suppressed because it is too large Load diff

20651
inter/tha/xml/multi/page_catalog_group_cocktail.lxml Normal file
View file

File diff suppressed because it is too large Load diff

41564
inter/tha/xml/multi/page_catalog_group_coffee.lxml Normal file
View file

File diff suppressed because it is too large Load diff

1306
inter/tha/xml/multi/page_catalog_group_deep_fryer.lxml Normal file
View file

File diff suppressed because it is too large Load diff

7639
inter/tha/xml/multi/page_catalog_group_forkid.lxml Normal file
View file

File diff suppressed because it is too large Load diff

13890
inter/tha/xml/multi/page_catalog_group_health.lxml Normal file
View file

File diff suppressed because it is too large Load diff

20164
inter/tha/xml/multi/page_catalog_group_milk.lxml Normal file
View file

File diff suppressed because it is too large Load diff

5551
inter/tha/xml/multi/page_catalog_group_oreo.lxml Normal file
View file

File diff suppressed because it is too large Load diff

36879
inter/tha/xml/multi/page_catalog_group_other.lxml Normal file
View file

File diff suppressed because it is too large Load diff

25672
inter/tha/xml/multi/page_catalog_group_other_other.lxml Normal file
View file

File diff suppressed because it is too large Load diff

14344
inter/tha/xml/multi/page_catalog_group_pepsi_7up.lxml Normal file
View file

File diff suppressed because it is too large Load diff

4003
inter/tha/xml/multi/page_catalog_group_pepsi_pro.lxml Normal file
View file

File diff suppressed because it is too large Load diff

5551
inter/tha/xml/multi/page_catalog_group_pro_12_day_12_menu.lxml Normal file
View file

File diff suppressed because it is too large Load diff

3587
inter/tha/xml/multi/page_catalog_group_pro_15THB.lxml Normal file
View file

File diff suppressed because it is too large Load diff

17161
inter/tha/xml/multi/page_catalog_group_pro_7up_lucky_draw_x2.lxml Normal file
View file

File diff suppressed because it is too large Load diff

4391
inter/tha/xml/multi/page_catalog_group_pro_bad_valentine.lxml Normal file
View file

File diff suppressed because it is too large Load diff

10197
inter/tha/xml/multi/page_catalog_group_pro_banana_mint_lucky_draw_x3.lxml Normal file
View file

File diff suppressed because it is too large Load diff

12520
inter/tha/xml/multi/page_catalog_group_pro_buble_tea.lxml Normal file
View file

File diff suppressed because it is too large Load diff

8311
inter/tha/xml/multi/page_catalog_group_pro_cocoa_77.lxml Normal file
View file

File diff suppressed because it is too large Load diff

2455
inter/tha/xml/multi/page_catalog_group_pro_coconut_milk.lxml Normal file
View file

File diff suppressed because it is too large Load diff

1299
inter/tha/xml/multi/page_catalog_group_pro_freefile.lxml Normal file
View file

File diff suppressed because it is too large Load diff

6723
inter/tha/xml/multi/page_catalog_group_pro_halloween.lxml Normal file
View file

File diff suppressed because it is too large Load diff

1681
inter/tha/xml/multi/page_catalog_group_pro_happy_trios.lxml Normal file
View file

File diff suppressed because it is too large Load diff

4395
inter/tha/xml/multi/page_catalog_group_pro_jemila.lxml Normal file
View file

File diff suppressed because it is too large Load diff

4004
inter/tha/xml/multi/page_catalog_group_pro_lipit.lxml Normal file
View file

File diff suppressed because it is too large Load diff

2452
inter/tha/xml/multi/page_catalog_group_pro_melon.lxml Normal file
View file

File diff suppressed because it is too large Load diff

9065
inter/tha/xml/multi/page_catalog_group_pro_mom_cocoa.lxml Normal file
View file

File diff suppressed because it is too large Load diff

1295
inter/tha/xml/multi/page_catalog_group_pro_monday_banana.lxml Normal file
View file

File diff suppressed because it is too large Load diff

5969
inter/tha/xml/multi/page_catalog_group_pro_mymint.lxml Normal file
View file

File diff suppressed because it is too large Load diff

11746
inter/tha/xml/multi/page_catalog_group_pro_nam_hom_coconut.lxml Normal file
View file

File diff suppressed because it is too large Load diff

7873
inter/tha/xml/multi/page_catalog_group_pro_oreo_11.lxml Normal file
View file

File diff suppressed because it is too large Load diff

1298
inter/tha/xml/multi/page_catalog_group_pro_ovaltine_school.lxml Normal file
View file

File diff suppressed because it is too large Load diff

5165
inter/tha/xml/multi/page_catalog_group_pro_passion_mint.lxml Normal file
View file

File diff suppressed because it is too large Load diff

5574
inter/tha/xml/multi/page_catalog_group_pro_peach.lxml Normal file
View file

File diff suppressed because it is too large Load diff

5551
inter/tha/xml/multi/page_catalog_group_pro_pepsi_second_cup_30.lxml Normal file
View file

File diff suppressed because it is too large Load diff

1294
inter/tha/xml/multi/page_catalog_group_pro_red_string_of_fate.lxml Normal file
View file

File diff suppressed because it is too large Load diff

4778
inter/tha/xml/multi/page_catalog_group_pro_rerun.lxml Normal file
View file

File diff suppressed because it is too large Load diff

4777
inter/tha/xml/multi/page_catalog_group_pro_robinson_beauty.lxml Normal file
View file

File diff suppressed because it is too large Load diff

3249
inter/tha/xml/multi/page_catalog_group_pro_strawberry_series.lxml Normal file
View file

File diff suppressed because it is too large Load diff

11436
inter/tha/xml/multi/page_catalog_group_pro_tea_time.lxml Normal file
View file

File diff suppressed because it is too large Load diff

1306
inter/tha/xml/multi/page_catalog_group_pro_thick_tea_by_brewer.lxml Normal file
View file

File diff suppressed because it is too large Load diff

5566
inter/tha/xml/multi/page_catalog_group_pro_wednesday_melon.lxml Normal file
View file

File diff suppressed because it is too large Load diff

6325
inter/tha/xml/multi/page_catalog_group_pro_weekday_discount.lxml Normal file
View file

File diff suppressed because it is too large Load diff

6325
inter/tha/xml/multi/page_catalog_group_pro_weekday_discount_event_on.lxml Normal file
View file

File diff suppressed because it is too large Load diff

24709
inter/tha/xml/multi/page_catalog_group_recommend.lxml Normal file
View file

File diff suppressed because it is too large Load diff

24580
inter/tha/xml/multi/page_catalog_group_recommend_multi_pro.lxml Normal file
View file

File diff suppressed because it is too large Load diff

7485
inter/tha/xml/multi/page_catalog_group_soft_serve.lxml Normal file
View file

File diff suppressed because it is too large Load diff

2842
inter/tha/xml/multi/page_catalog_group_songkran.lxml Normal file
View file

File diff suppressed because it is too large Load diff

26008
inter/tha/xml/multi/page_catalog_group_tea.lxml Normal file
View file

File diff suppressed because it is too large Load diff

6526
inter/tha/xml/multi/page_catalog_group_whey.lxml Normal file
View file

File diff suppressed because it is too large Load diff

2391
inter/tha/xml/multi/page_catalog_momday.lxml Normal file
View file

File diff suppressed because it is too large Load diff

6
inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml
View file

@ -118,6 +118,12 @@
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml" Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Var Brew3ConInter = CountryRootPath + "/xml/page_brewing3Conti.xml" Var Brew3ConInter = CountryRootPath + "/xml/page_brewing3Conti.xml"
If New_PaymentInter = 1 Then
Var Brew3Inter = CountryRootPath + "/xml/page_NewBrewing3_blue.lxml"
Var Brew3ConInter = CountryRootPath + "/xml/page_NewBrewing3Conti_blue.xml"
EndIf
If Seeker = "next" Then If Seeker = "next" Then
;CoinBack ;CoinBack
Open Brew3ConInter Open Brew3ConInter

42
inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml
View file

@ -266,6 +266,10 @@
CoinVending OFF CoinVending OFF
If Seeker = "curr" Then If Seeker = "curr" Then
If New_PaymentInter = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 SelectDrink SelectSugarID MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = "" Var TxRef1 = ""
CreateTxRef1 TxRef1 CreateTxRef1 TxRef1
@ -283,6 +287,31 @@
EndIf EndIf
If Seeker.FreeVendingCampaign = 1 Then
Var RemainAmountStr = "Free###size=150"
CoinVending OFF
If Seeker = "curr" Then
If New_PaymentInter = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
If CoinInOK = 0 Then If CoinInOK = 0 Then
@ -535,6 +564,10 @@
If Seeker = "curr" Then If Seeker = "curr" Then
If New_PaymentInter = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 SelectDrink SelectSugarID MakeDrinkV1 SelectDrink SelectSugarID
;Var TxRef1 = "" ;Var TxRef1 = ""
;CreateTxRef1 TxRef1 ;CreateTxRef1 TxRef1
@ -735,7 +768,10 @@
Refresh Refresh
If Seeker = "curr" Then If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID If New_PaymentInter = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 SelectDrink SelectSugarID
EndIf EndIf
Var Seeker.CreditCard = 1 Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef Var Seeker.CreditCardRef = CreditCardRef
@ -1184,6 +1220,10 @@
If Seeker = "curr" Then If Seeker = "curr" Then
If New_PaymentInter = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 SelectDrink SelectSugarID MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = "" Var TxRef1 = ""
CreateTxRef1 TxRef1 CreateTxRef1 TxRef1

2
xml/page_board.xml
View file

@ -1020,6 +1020,8 @@
;Var EnablePepsiFullscreen = 1 ;Var EnablePepsiFullscreen = 1
Var New_PaymentInter = 0
EndIf EndIf
;inter-page-board ;inter-page-board

6
xml/page_get_yourchange.xml
View file

@ -173,6 +173,12 @@
Open "ROOT/taobin_project/xml/page_brewing3.xml" Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf EndIf
Else Else
If New_PaymentInter = 1 Then
; TODO: change script
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml" Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Var Brew3ConInter = CountryRootPath + "/xml/page_brewing3Conti.xml" Var Brew3ConInter = CountryRootPath + "/xml/page_brewing3Conti.xml"

15
xml/page_lid_straw.xml
View file

@ -267,6 +267,16 @@
Open "ROOT/taobin_project/xml/page_brewing3.xml" Open "ROOT/taobin_project/xml/page_brewing3.xml"
Else Else
If New_PaymentInter = 1 Then
If UsePepsiTheme = 1 Then
If CountryName = "Singapore" Then
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/whatthecup/sgp/xml/process/payment.ev"
EndIf
EndIf
EndIf
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml" Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter Open Brew3Inter
EndIf EndIf
@ -281,6 +291,11 @@
Else Else
If UsePepsiTheme = 1 Then If UsePepsiTheme = 1 Then
If CountryName = "Singapore" Then If CountryName = "Singapore" Then
If New_PaymentInter = 1 Then
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/whatthecup/sgp/xml/process/payment.ev"
EndIf
Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml" Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml"
EndIf EndIf
If CountryName = "UnitedArabEmirates Dubai" Then If CountryName = "UnitedArabEmirates Dubai" Then

32
xml/page_payment.xml
View file

@ -307,6 +307,12 @@
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf EndIf
If New_PaymentInter = 1 Then
Var Seeker.ORDER_ID = ""
GenHashWithTimeStamp Seeker.ORDER_ID
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
Open "ROOT/taobin_project/xml/page_payment_cash.xml" Open "ROOT/taobin_project/xml/page_payment_cash.xml"
@ -356,6 +362,32 @@
EndIf EndIf
If New_PaymentInter = 1 Then
Var Seeker.ORDER_ID = ""
GenHashWithTimeStamp Seeker.ORDER_ID
DEBUGVAR Seeker.NameDrinkTH
DEBUGVAR Seeker.NameDrinkEN
Var param1 = Seeker.ORDER_ID
Var param2 = Seeker.NameDrinkEN
Var param3 = DiscountCampaignCode
STRCONTAIN "size" Seeker.NameDrinkEN SizeFromSheet
If SizeFromSheet = "true" Then
SPLIT Seeker.NameDrinkEN "###" 1 PureName
Var param2 = PureName
EndIf
If ConnectWithPOSMachine = 1 Then
Var WaitPOSStatus = 1
Var TimeWaitPOSStatus = 0
Var POS_SELL_STATUS = "-"
GetPOSStatus param1 param2 param3
EndIf
EndIf
</EventOpen> </EventOpen>
<Timeout> 900 </Timeout> <Timeout> 900 </Timeout>

7
xml/test_video_loop.xml
View file

@ -47,6 +47,13 @@
Var HeadVideoFilename = HeadVideoFilename + ".mp4" Var HeadVideoFilename = HeadVideoFilename + ".mp4"
If CountryName = "Singapore" Then
If UsePepsiTheme = 1 Then
Var HeadVideoFilename = DefaultLargeBanner + ".mp4"
EndIf
EndIf
DEBUGVAR VideoAdvIndex DEBUGVAR VideoAdvIndex
DEBUGVAR HeadVideoFilename DEBUGVAR HeadVideoFilename