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 th_inter

Browse source
This commit is contained in:
Ittipat Lusuk 2025-03-25 10:40:52 +07:00
commit 1e8450e91f
24 changed files with 478 additions and 707 deletions
Download patch file Download diff file Expand all files Collapse all files

20
xml/event/promotion_kingdom_thai_tea.xml
View file

@ -337,8 +337,8 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Kati Shake"
Var NameDrinkTH = "กะทิเชค"
Var NameDrink = "Coconut Milk Ice Cream"
Var NameDrinkTH = "เต่าบินไอติมถัง กะทิ"
Var DrinkDescriptionTH = "มะพร้าว, คาราเมล, นม, น้ำตาล และ น้ำแข็ง"
Var DrinkDescription = "Coconut, Caramel, Milk, Sugar And Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Coconut_Milk_Smoothie.png"
@ -411,7 +411,8 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "กะทิเชค" </Value>
<Value> "เต่าบินไอติมถัง
กะทิ" </Value>
</Text>
<Text>
<X> 16 </X>
@ -433,7 +434,8 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Kati Shake" </Value>
<Value> "Coconut Milk
Ice Cream" </Value>
</Text>
<Text>
<X> 16 </X>
@ -590,8 +592,8 @@ And Ice" </Value>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Kati Shake Matcha"
Var NameDrinkTH = "กะทิเชคมัทฉะญี่ปุ่น"
Var NameDrink = "Coconut Milk Matcha Ice Cream"
Var NameDrinkTH = "เต่าบินไอติมถัง มัทฉะญี่ปุ่น"
Var DrinkDescriptionTH = "มะพร้าว, คาราเมล, มัทฉะ, นม, น้ำตาล และ น้ำแข็ง"
Var DrinkDescription = "Coconut, Caramel, Matcha, Milk, Sugar And Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Coconut_Milk_Matcha_Smoothie.png"
@ -664,7 +666,8 @@ And Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "กะทิเชคมัทฉะญี่ปุ่น" </Value>
<Value> "เต่าบินไอติมถัง
มัทฉะญี่ปุ่น" </Value>
</Text>
<Text>
<X> 16 </X>
@ -686,7 +689,8 @@ And Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Kati Shake Matcha" </Value>
<Value> "Coconut Milk
Matcha Ice Cream" </Value>
</Text>
<Text>
<X> 16 </X>

16
xml/event/tricker.ev
View file

@ -86,6 +86,8 @@ Var XMLLiveInfoEnable = 0
Var LuckyDrawCampaign = 0
Var AdvertisePepsiAtTheSun = 0
If SystemDateMonthInt = 1 Then
Var LuckyDrawCampaign = 1
@ -131,11 +133,24 @@ If SystemDateMonthInt = 3 Then
Var CoconutMilkPro = 1
EndIf
If SystemDateMonthInt = 4 Then
If SystemDateDayInt < 7 Then
Var AdvertisePepsiAtTheSun = 1
EndIf
EndIf
If SystemDateMonthInt = 3 Then
If SystemDateDayInt = 31 Then
Var AdvertisePepsiAtTheSun = 1
EndIf
EndIf
If SystemDateMonthInt = 4 Then
Var KingdomThaiTeaPro = 1
EndIf
Var JemilaToppingFlag = 1
If SystemDateDayOfWeek = "Wednesday" Then
Var JemilaToppingFreeFlag = 1
@ -180,6 +195,7 @@ EndIf
Var ToppingNewUINewSystem = 1
If BoxID = 123456 Then
Var ToppingNewUINewSystem = 1
Var AdvertisePepsiAtTheSun = 1
EndIf
; override again

3
xml/page_board.xml
View file

@ -1228,7 +1228,8 @@
If CountryName = "Thailand" Then
Var MyanmarLangEnable = "true"
Var CatalogLayoutV3 = 0
Var CatalogLayoutV3 = 1
; test payment
Var New_Payment = 1

8
xml/page_catalog_group_milk.xml
View file

@ -1059,9 +1059,9 @@ Volcano" </Value>
<State> Flag( 12-03-03-0087.Button,DateTimeStart="2025/04/01T00:00:00",$Sum1203030087) </State>
<Button>
<State> $Sum1203030087 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_bn_Yuzu_Milk_Oreo_Volcano.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_bn_Yuzu_Milk_Oreo_Volcano.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_bn_Yuzu_Milk_Oreo_Volcano.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Yuzu_Milk_Oreo_Volcano.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_Yuzu_Milk_Oreo_Volcano.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Yuzu_Milk_Oreo_Volcano.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-03-03-0087, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -1070,7 +1070,7 @@ Volcano" </Value>
Var NameDrinkTH = "ยูสุโอริโอ้โวคาโน่"
Var DrinkDescriptionTH = "ยูซุ นม โอริโอ้"
Var DrinkDescription = "Yuzu Milk Oreo"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_bn_Yuzu_Milk_Oreo_Volcano.png"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Yuzu_Milk_Oreo_Volcano.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $-.Price

19
xml/page_topping_select5.xml
View file

@ -95,6 +95,25 @@
Open "ROOT/taobin_project/xml/page_topping_select8.xml"
EndIf
Var ProductSodaCat = "12-05-02-0014,12-05-02-0015,12-05-02-0008,12-05-03-0008,12-05-02-0009,12-05-03-0009,12-05-02-0003,12-05-03-0003,12-05-02-0002,12-05-03-0002,12-05-02-0033,12-05-03-0033,12-05-02-0032,12-05-03-0032,12-05-02-0041,12-05-03-0041,12-05-02-0023,12-05-03-0023,12-05-02-0040,12-05-03-0040,12-05-02-0010,12-05-03-0010,12-05-02-0001,12-05-03-0001,12-05-02-0024,12-05-03-0024,12-05-02-0025,12-05-03-0025,12-05-02-0026,12-05-03-0026,12-05-02-0090,12-05-02-0104,12-05-03-0104,12-05-02-0094,12-05-03-0094,12-05-02-0104,12-05-02-0093,12-05-02-0106,12-05-02-0114,12-05-03-0114,12-05-02-0136,12-05-03-0136,12-05-02-0137,12-05-03-0137,12-05-02-0138,12-05-03-0138,12-05-02-0139,12-05-03-0139,12-05-02-0140,12-05-03-0140,12-05-02-0141,12-05-03-0141,12-05-02-0142,12-05-03-0142,12-05-02-0143,12-05-03-0143"
STRCONTAIN PD_CODE1 ProductSodaCat IsCatalogSoda
DEBUGVAR IsCatalogSoda
If IsCatalogSoda = "true" Then
Open "ROOT/taobin_project/xml/page_topping_select8.xml"
EndIf
STRCONTAIN PD_CODE2 ProductSodaCat IsCatalogSoda
DEBUGVAR IsCatalogSoda
If IsCatalogSoda = "true" Then
Open "ROOT/taobin_project/xml/page_topping_select8.xml"
EndIf
STRCONTAIN PD_CODE3 ProductSodaCat IsCatalogSoda
DEBUGVAR IsCatalogSoda
If IsCatalogSoda = "true" Then
Open "ROOT/taobin_project/xml/page_topping_select8.xml"
EndIf
EndIf