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

update

Browse source
This commit is contained in:
wanlop run 2025-04-10 15:56:44 +07:00
parent 8509bceede
commit cd78d3bb90
15 changed files with 140 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

80
xml/event/script_common_for_open_promotion_xml.ev
View file

@ -31,64 +31,46 @@ Else
Var FileRecommendToOpen = "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If taobin_nopro = "true" Then
SAVELOG "============================= no promotion ======================="
If CatalogLayoutV3 = 1 Then
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/v3/event/script_open_promotion_v3.ev"
Else
If CoconutMilkPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_coconut_milk.xml"
Var PromotionState2 = "Enable"
If MatchaEveryDayPro = 1 Then
Var PromotionState1 = "Enable"
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_matcha_every_day_and_coconut_milk.xml"
EndIf
Else
DEBUGVAR OpenFromPageBoard
DEBUGVAR FileRecommendToOpen
If OpenFromPageBoard = 1 Then
DEBUGVAR BigButtonEnable
OpenInst 2 FileRecommendToOpen
TopView "show"
Open "ROOT/taobin_project/xml/page_main_blank.xml"
Else
Open FileRecommendToOpen
If MatchaEveryDayPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_matcha_every_day.xml"
EndIf
EndIf
EndIf
If CoconutMilkPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_coconut_milk.xml"
Var PromotionState2 = "Enable"
If MatchaEveryDayPro = 1 Then
If KingdomThaiTeaPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_kingdom_thai_tea.xml"
Var PromotionState1 = "Enable"
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_matcha_every_day_and_coconut_milk.xml"
EndIf
Else
If MatchaEveryDayPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_matcha_every_day.xml"
EndIf
EndIf
If KingdomThaiTeaPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_kingdom_thai_tea.xml"
Var PromotionState1 = "Enable"
If PepsiXTaobinPro = 1 Then
Var PromotionState2 = "Enable"
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_kingdom_thai_tea_and_pepsi_x_taobin.xml"
EndIf
If PepsiXTaobinPro = 1 Then
Var PromotionState2 = "Enable"
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_kingdom_thai_tea_and_pepsi_x_taobin.xml"
If MatchaEveryDayPro = 1 Then
Var PromotionState2 = "Enable"
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_kingdom_thai_tea_and_matcha_every_day.xml"
EndIf
Else
If PepsiXTaobinPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_pepsi_x_taobin.xml"
EndIf
If MatchaEveryDayPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_matcha_every_day.xml"
EndIf
EndIf
If MatchaEveryDayPro = 1 Then
Var PromotionState2 = "Enable"
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_kingdom_thai_tea_and_matcha_every_day.xml"
EndIf
Else
If PepsiXTaobinPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_pepsi_x_taobin.xml"
EndIf
If MatchaEveryDayPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_matcha_every_day.xml"
EndIf
EndIf
If CatalogLayoutV3 = 1 Then

6
xml/page_board.xml
View file

@ -179,6 +179,7 @@
EndIf
If BoxID = 105005 Then
Var XMLProfile = "Plus5AndInclude20Percent-taobin_notopup-taobin_nopro-taobin_notopping"
Var XMLProfile = "DiscountFromBO-MachineShedule"
EndIf
DEBUGVAR XMLProfile
@ -574,6 +575,11 @@
EndIf
EndIf
STRCONTAIN "default_english" XMLProfile default_english
If default_english = "true" Then
Var show_eng = "true"
EndIf
Var InternationalEnable = 0
Var InternationalEnableStr = "false"

4
xml/page_catalog_group_recommend.xml
View file

@ -3090,7 +3090,7 @@ Volcano" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-02-01-0103.Button,12-02-02-0103.Button,12-02-03-0103.Button,DateTimeStart="2025/04/20T00:00:00",Var=NewMatchaPremiumX3,Disable=Invisible,$Sum120201010312020201031202030103) </State>
<State> Flag( 12-02-01-0103.Button,12-02-02-0103.Button,12-02-03-0103.Button,Var=NewMatchaPremiumX3,Disable=Invisible,$Sum120201010312020201031202030103) </State>
<Button>
<State> $Sum120201010312020201031202030103 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Matcha_Latte_Premium.png" </Filename>
@ -3345,7 +3345,7 @@ Volcano" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-02-01-0104.Button,12-02-02-0104.Button,12-02-03-0104.Button,DateTimeStart="2025/04/20T00:00:00",Var=NewMatchaPremiumX3,Disable=Invisible,$Sum120201010412020201041202030104) </State>
<State> Flag( 12-02-01-0104.Button,12-02-02-0104.Button,12-02-03-0104.Button,Var=NewMatchaPremiumX3,Disable=Invisible,$Sum120201010412020201041202030104) </State>
<Button>
<State> $Sum120201010412020201041202030104 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Matcha_Latte_X3.png" </Filename>

26
xml/page_catalog_group_tea.xml
View file

@ -1071,7 +1071,7 @@
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-02-01-0103.Button,12-02-02-0103.Button,12-02-03-0103.Button,DateTimeStart="2025/04/20T00:00:00",Var=NewMatchaPremiumX3,$Sum120201010312020201031202030103) </State>
<State> Flag( 12-02-01-0103.Button,12-02-02-0103.Button,12-02-03-0103.Button,Var=NewMatchaPremiumX3,$Sum120201010312020201031202030103) </State>
<Button>
<State> $Sum120201010312020201031202030103 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Matcha_Latte_Premium.png" </Filename>
@ -1326,7 +1326,7 @@
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-02-01-0104.Button,12-02-02-0104.Button,12-02-03-0104.Button,DateTimeStart="2025/04/20T00:00:00",Var=NewMatchaPremiumX3,$Sum120201010412020201041202030104) </State>
<State> Flag( 12-02-01-0104.Button,12-02-02-0104.Button,12-02-03-0104.Button,Var=NewMatchaPremiumX3,$Sum120201010412020201041202030104) </State>
<Button>
<State> $Sum120201010412020201041202030104 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Matcha_Latte_X3.png" </Filename>
@ -2953,7 +2953,8 @@ Sugar And Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Western Cocoa Thai Milk Tea" </Value>
<Value> "Western Cocoa
Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>
@ -3208,7 +3209,8 @@ Sugar And Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Northern Strawberry Thai Milk Tea" </Value>
<Value> "Northern Strawberry
Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>
@ -3368,7 +3370,7 @@ Sugar And Ice" </Value>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Southern Coconut Thai Milk Tea"
Var NameDrink = "Southern Coconu Thai Milk Tea"
Var NameDrinkTH = "ชาไทยมะพร้าวศรีวิชัย"
Var DrinkDescriptionTH = "ชาไทย ชาไต้หวัน นม โกโก้ มะพร้าว"
Var DrinkDescription = "Thai Tea Oolong Tea Milk Sugar Cocoa Coconut"
@ -3463,7 +3465,8 @@ Sugar And Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Southern Coconut Thai Milk Tea" </Value>
<Value> "Southern Coconu
Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>
@ -3624,7 +3627,7 @@ Sugar And Ice" </Value>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Northeastern Lychee Thai Milk Tea"
Var NameDrinkTH = "ชาไทยลิ้นจี่ศรีโคตรบูรณ์"
Var NameDrinkTH = "ชาไทยลิ้นจี่ ศรีโคตรบูรณ์"
Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล ลิ้นจี่"
Var DrinkDescription = "Thai Tea Milk Sugar Lychee"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_thai_milk_tea_Lychee.png"
@ -3697,7 +3700,8 @@ Sugar And Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "ชาไทยลิ้นจี่ศรีโคตรบูรณ์" </Value>
<Value> "ชาไทยลิ้นจี่
ศรีโคตรบูรณ์" </Value>
</Text>
<Text>
<X> 16 </X>
@ -3718,7 +3722,8 @@ Sugar And Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Northeastern Lychee Thai Milk Tea" </Value>
<Value> "Northeastern Lychee
Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>
@ -3973,7 +3978,8 @@ Sugar And Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Eastern Ume Thai Milk Tea" </Value>
<Value> "Eastern Ume
Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>

25
xml/page_payment.xml
View file

@ -325,6 +325,31 @@
Var Seeker.CodeChannel = 1
Var Seeker.CodeNumber = IDNum
If New_Payment = 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"
EndIf
If ModeFreeEnable = 2 Then
Var RemainAmountStr = "Free###size=150"
Var RoadShowMarketCode = ""
Var Seeker.VendingCode = RoadShowMarketCode
DEBUGVAR RoadShowMarketCode
Var Seeker.IntVendingCampaign = PriceDrink
Var Seeker.FreeVendingCampaign = 1
Var Seeker.CodeChannel = 1
Var Seeker.CodeNumber = IDNum
SAVELOG "ModeFreeEnable ModeFreeEnable ModeFreeEnable ModeFreeEnable ModeFreeEnable"
If New_Payment = 1 Then
Var Seeker.ORDER_ID = ""

14
xml/page_payment_cash.xml
View file

@ -140,7 +140,7 @@
; On open
SAVELOG "payment case 1"
Var cancelState = "Invisible"
@ -173,6 +173,7 @@
Var ChangeOK = 0
Var CoinInOK = 0
SAVELOG "payment case 2"
Var RemainAmountKeep = 0
Var showRemaining = charOfBaht + RemainAmountStr
@ -192,6 +193,8 @@
Var Seeker.VendingDiscount = DiscountDrink
SAVELOG "payment case 3"
Var CancelingPopupFlag = "Invisible"
Var SendCancelActionFlag = 0
Var CancelingPopupCountDown = 0
@ -204,8 +207,8 @@
Var QRErrorFlag = 0
SAVELOG SelectDrink
SAVELOG "payment case 4"
Var QRCODE99 = ""
SAVELOG QRChannel
@ -232,6 +235,7 @@
Var ExtendData = Seeker.ExtendData
SAVELOG "payment case 5"
DEBUGVAR QRCODE99KBANK
@ -434,7 +438,9 @@
If Seeker.FreeVendingCampaign = 1 Then
Var RemainAmountStr = "Free###size=150"
DEBUGVAR Seeker
SAVELOG " FreeVendingCampaign = 1 FreeVendingCampaign = 1 FreeVendingCampaign = 1 FreeVendingCampaign = 1 "
CoinVending OFF
If Seeker = "curr" Then