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

before merge

Browse source
This commit is contained in:
wanlop run 2025-06-20 10:51:14 +07:00
commit 5d9721e4ac
188 changed files with 52004 additions and 17393 deletions
Download patch file Download diff file Expand all files Collapse all files

19263
xml/event/double_promotion_americano_and_taiwanese_tea.xml Normal file
View file

File diff suppressed because it is too large Load diff

28
xml/event/multi_promotion_config_americano_taiwanese_tea.json Normal file
View file

@ -0,0 +1,28 @@
[
{
"name": "americano",
"template": "/event/promotion_template.inc",
"config": {
"normal_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png",
"normal_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png",
"press_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png",
"press_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png",
"disable_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png",
"disable_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png",
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_americano.xml"
}
},
{
"name": "taiwanese_tea",
"template": "/event/promotion_template.inc",
"config": {
"normal_eng": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
"normal_thai": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
"press_eng": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
"press_thai": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
"disable_eng": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
"disable_thai": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_taiwanese_tea.xml"
}
}
]

2
xml/event/out_put_file3.txt
View file

@ -1 +1 @@
/event/promotion_happy_trios.xml
/event/promotion_americano.xml

19172
xml/event/promotion_americano.xml Normal file
View file

File diff suppressed because it is too large Load diff

2
xml/event/promotion_onclick3.inc
View file

@ -1 +1 @@
Open "ROOT/taobin_project/xml/page_catalog_group_pro_happy_trios.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_pro_americano.xml"

2
xml/event/promotion_taiwanese_tea.xml
View file

@ -45,7 +45,6 @@
<FrameScroll>
<Max> 12 </Max>
<X> 10 </X>
@ -19168,7 +19167,6 @@ Limenade Soda" </Value>
</Button>
;include="ROOT/taobin_project/inc/button_remove_cup.inc"
</Popup>

40
xml/event/promotion_template3.inc
View file

@ -1,47 +1,15 @@
<Button>
<X> 42 </X>
<Y> 518 </Y>
<State> BigButtonEnable </State>
<Filename>
eval(
If show_eng = "true" Then
Var return = ###normal_eng
Else
Var return = ###normal_thai
EndIf
)
</Filename>
<FilenamePress>
eval(
If show_eng = "true" Then
Var return = ###normal_eng
Else
Var return = ###normal_thai
EndIf
)
</FilenamePress>
<FilenameDisable>
eval(
If show_eng = "true" Then
Var return = ###normal_eng
Else
Var return = ###normal_thai
EndIf
)
</FilenameDisable>
<Filename> ###normal_thai </Filename>
<FilenamePress> ###press_thai </FilenamePress>
<FilenameDisable> ###disable_thai </FilenameDisable>
<EventOnClick>
###EventOnClick
</EventOnClick>
</Button>
<EventUnitTest1>
Var BigButtonEnable = "Enable"
Refresh
</EventUnitTest1>
<EventUnitTest2>
Var BigButtonEnable = "Invisible"
Refresh
</EventUnitTest2>

11
xml/event/script_common_for_open_promotion_xml.ev
View file

@ -8,6 +8,7 @@ DEBUGVAR SchoolOvaltinePro
DEBUGVAR AppleFarmFestivalPro
DEBUGVAR HappyTriosPro
DEBUGVAR TaiwaneseTeaPro
DEBUGVAR AmericanoPro
Var PromotionState1 = "Invisible"
Var PromotionState2 = "Invisible"
@ -65,6 +66,16 @@ Else
EndIf
EndIf
If AmericanoPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_americano.xml"
Var PromotionState1 = "Enable"
If TaiwaneseTeaPro = 1 Then
Var PromotionState2 = "Enable"
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_americano_and_taiwanese_tea.xml"
EndIf
EndIf
EndIf
DEBUGVAR OpenFromMulti

12
xml/event/tricker.ev
View file

@ -92,9 +92,12 @@ Var HappyTriosPro = 0
; School Ovaltine, 15 - 30 June
Var SchoolOvaltinePro = 0
; Taiwanese Tea, 16 - 30 June
; Taiwanese Tea, 16 - 31 July
Var TaiwaneseTeaPro = 0
; Americano, 1 - 31 July
Var AmericanoPro = 0
Var NewCollectPoint = 1
Var PaymentCodeShouldCollectPromotionPoint = 0
@ -173,6 +176,13 @@ If SystemDateMonthInt = 6 Then
EndIf
EndIf
If SystemDateMonthInt = 7 Then
Var AmericanoPro = 1
Var TaiwaneseTeaPro = 1
EndIf
Var JemilaToppingFlag = 1
If SystemDateDayOfWeek = "Wednesday" Then

6
xml/function2.inc
View file

@ -1,5 +1,4 @@
Var fun = "function2"
DEBUGVAR fun
Var img_cold_no_flag = 0
Var img_smth_no_flag = 0
@ -840,4 +839,5 @@ Var fun = "function2"
Var Timeout = 0
RefreshAll
RefreshAll

37
xml/page_board.xml
View file

@ -1342,7 +1342,7 @@
EndIf
If CountryName = "Australia" Then
TRY "ROOT/taobin_project/inter/tha/configure.ev"
TRY "ROOT/taobin_project/inter/aus/configure.ev"
EndIf
DEBUGVAR EnableMultiInstanceFromBoxID
@ -1559,6 +1559,8 @@
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
EndIf
Else
Var EnableMultiInstance = "false"
EndIf
DEBUGVAR InternationalEnable
@ -2353,6 +2355,31 @@ PRICE "Reset" "-"
If startTaobinML = "true" Then
DEBUGVAR NeedTrickTaobinML
If NeedTrickTaobinML = "true" Then
If TrickTaobinMLDEACTIVE = "true" Then
TrickTaoBinML "TRICKERDEACTIVE"
Var NeedTrickTaobinML = "false"
DEBUGVAR NeedTrickTaobinML
Var TrickTaobinMLDEACTIVE = "false"
DEBUGVAR TrickTaobinMLDEACTIVE
Else
TrickTaoBinML "TRICKER"
Var NeedTrickTaobinML = "false"
DEBUGVAR NeedTrickTaobinML
EndIf
EndIf
Else
Var CountDownOpenTaobinML = CountDownOpenTaobinML + 1
@ -2365,15 +2392,7 @@ PRICE "Reset" "-"
EndIf
DEBUGVAR NeedTrickTaobinML
If NeedTrickTaobinML = "true" Then
TrickTaoBinML "TRICKER"
Var NeedTrickTaobinML = "false"
DEBUGVAR NeedTrickTaobinML
EndIf
EndIf
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"

2
xml/page_payment_cash-GBR.xml
View file

@ -811,7 +811,7 @@
; Member not found
If ErrorCause = "failed_fromoper_1001" Then
Var QRErrorText = "Number not found"
Var QRErrorText = "Member not found"
EndIf
; Not enough balance

30
xml/page_payment_cashMore.xml
View file

@ -235,7 +235,7 @@
Var Seeker.FreeVendingCampaign = 1
CoinVending OFF
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
@ -415,8 +415,21 @@
Else
Var PayState5 = "Disable"
EndIf
If CART_COUNT >= 1 Then
Var cart1_pic = "ROOT/taobin_project/image/page_drink/" + carttaobin1_pic
Var cart1_name = carttaobin1_name
Var cart1_price = "" + CART1_PRICE
Var cart1_en = "Enable"
Var PriceDrinkMulti = CART1_PRICE
Var cardBottomY = 760
Var lineBottomY = 750
Var subtotalBottomY = 810
EndIf
</EventOpen>
@ -452,7 +465,7 @@
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
Var BrewingTextThai = "เตรียมแก้ว"
Cart "MakeID" CART_INDEX
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
@ -622,7 +635,7 @@
If TestLoopMakeDrink = 1 Then
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
@ -656,7 +669,7 @@
Var PayReference = ""
GenHashWithTimeStamp PayReference
Cart "MakeID" CART_INDEX
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
@ -984,10 +997,9 @@
Var PriceDrinkMulti = 0
If CART_COUNT >= 1 Then
Var cart1_pic = "ROOT/taobin_project/image/page_drink/" + CART1_PICTURE
Var cart1_name = CART1_NAME_THAI
Var cart1_pic = "ROOT/taobin_project/image/page_drink/" + carttaobin1_pic
Var cart1_name = carttaobin1_name
Var cart1_price = "" + CART1_PRICE
Var cart1_en = "Enable"
@ -1239,7 +1251,7 @@
Var MachineStage = "make-drink"
Var BrewingTextThai = "เตรียมแก้ว"
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
EndIf
@ -2344,7 +2356,7 @@
; make drink
MakeDrinkV1 SelectDrink Seeker.ExtendData
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Var UnitTestType = "1"
Var UnitTestType = "2"

130
xml/page_topping_select8.xml
View file

@ -10614,6 +10614,136 @@
</ListView1>
</Block>
<Block>
<State> ShotCoffeePremium </State>
<Width> 1080 </Width>
<Height> "auto" </Height>
<MarginTop> 20 </MarginTop>
<ListView1>
<Width> 986 </Width>
<Height> "auto" </Height>
<Align> "vertical"</Align>
<State> ShotCoffeePremium </State>
<Row1>
<Width> 986 </Width>
<Height> 72 </Height>
<State> ShotCoffeePremium </State>
<Image>
<Filename> Var( DirImageInter + "/bg_top_custom_special.png" ) </Filename>
</Image>
<Text>
<X> 40 </X>
<Y> 10 </Y>
<Width> 1000 </Width>
<Height> 70 </Height>
<Language>
<ID> 000064 </ID>
</Language>
</Text>
</Row1>
<Row1>
<Width> 986 </Width>
<Height> "auto" </Height>
<State> ShotCoffeePremium </State>
<Image>
<X> 0 </X>
<Y> 0 </Y>
<Filename> Var( DirImageInter + "/bg_special_topping.png") </Filename>
</Image>
<Text>
<X> 120 </X>
<Y> 0 </Y>
<Width> 700 </Width>
<Height> 72 </Height>
<Language>
<ID> 000102 </ID>
</Language>
</Text>
<Button>
<X> 40 </X>
<Y> 5 </Y>
<State> ShotCoffeePremium </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/bn_add_shot2.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_add_shot2.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
SAVELOG "premium shot press"
If ShotCoffeePremium = "Press" Then
Var ShotCoffeePremium = "Enable"
Else
Var ShotCoffeePremium = "Press"
EndIf
Function 2
Refresh
</EventClick>
</Button>
;
<Button>
<X> 896 </X>
<Y> 14 </Y>
<State> ShotCoffeePremium </State>
<Mode> "No" </Mode>
<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
SAVELOG "premium shot press"
If ShotCoffeePremium = "Press" Then
Var ShotCoffeePremium = "Enable"
Else
Var ShotCoffeePremium = "Press"
EndIf
Function 2
Refresh
</EventClick>
</Button>
<Text>
<X> 833 </X>
<Y> 26 </Y>
<Font> KanitRegularTTF </Font>
<State> ShotCoffeePremium </State>
<Size> 16 </Size>
<Color> 0x84776F </Color>
<Value> text_price_topping </Value>
</Text>
</Row1>
<Row1>
<State> "Enable" </State>
<Width> 986 </Width>
<Height> 27 </Height>
<Y> -5 </Y>
<Image>
<State> ShotCoffeePremium </State>
<Filename> "ROOT/taobin_project/image/topping2/bg_bottom.png" </Filename>
</Image>
</Row1>
</ListView1>
</Block>