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

This commit is contained in:
wanlop run 2024-05-29 16:33:12 +07:00
commit d00a12c4a6
73 changed files with 56432 additions and 2119 deletions

View file

@ -215,9 +215,7 @@
<EventClick>
; goto lid straw
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>

View file

@ -206,9 +206,7 @@
<EventClick>
; goto lid straw
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>

View file

@ -279,9 +279,7 @@
<EventClick>
; goto lid straw
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>

View file

@ -124,18 +124,8 @@
If Seeker.IsLineMember = 0 Then
SAVELOG "Not Line Member skip to normal collect point."
If Seeker.CodeChannel = 1 Then
If Seeker.CollectPointMain = 1 Then
GETACCEXT Param1 23
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
GETACCEXT Param1 23
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
EndIf
SAVELOG "Not Line Member open not member page."
Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_not_member.xml"
EndIf
If Seeker.IsAlreadyGetReward = 1 Then

View file

@ -109,7 +109,7 @@
Var MenuPointName[3] = "มะพร้าวหาดนางรำ\n(สวย)"
Var MenuPointName[4] = "มะพร้าวหาดทรายแก้ว\n(มังกร)"
Var MenuPointName[5] = "มะพร้าวหาดแม่พิมพ์\n(ดีด)"
Var MenuPointName[6] = "มะพร้าวหาดแสงจันทร์\n(ไรอะ)"
Var MenuPointName[6] = "มะพร้าวหาดแสงจันทร์\n(ลงทัณฑ์)"
Var MenuPointName[7] = "มะพร้าวหาดพัทยา\n(พารา)"
Var MenuPointName[8] = "มะพร้าวหาดสวนสน\n(ใจไหม)"
Var MenuPointName[9] = "มะพร้าวหาดแหลมสิง\n(หไกรภพ)"

View file

@ -252,9 +252,7 @@
<EventClick>
; goto lid straw
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>

View file

@ -0,0 +1,75 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Volume> SoundVolume </Volume>
;<Background> "0xeae6e1" </Background>
<EventOpen>
Var Timeout = 0
If show_eng = "true" Then
Var RegisterLineImg = "ROOT/taobin_project/image/event/nam_hom_coconut/not_member_en.png"
Var CloseBtn = "ROOT/taobin_project/image/event/nam_hom_coconut/bn_close_en.png"
Else
Var RegisterLineImg = "ROOT/taobin_project/image/event/nam_hom_coconut/not_member_th.png"
Var CloseBtn = "ROOT/taobin_project/image/event/nam_hom_coconut/bn_close_th.png"
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
DEBUGVAR Timeout
If Timeout > 8 Then
If Seeker.CodeChannel = 1 Then
If Seeker.CollectPointMain = 1 Then
GETACCEXT Param1 23
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
GETACCEXT Param1 23
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
EndIf
EndIf
Var Timeout = Timeout + 1
TimerReset
Refresh
</EventTimeout>
;include="ROOT/taobin_project/inc/video.inc"
<Image>
<X> 0 </X>
<Y> 478 </Y>
<Filename> RegisterLineImg </Filename>
</Image>
<Button>
<X> 393 </X>
<Y> 1796 </Y>
<Filename> CloseBtn </Filename>
<FilenamePress> CloseBtn </FilenamePress>
<EventClick>
If Seeker.CodeChannel = 1 Then
If Seeker.CollectPointMain = 1 Then
GETACCEXT Param1 23
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
GETACCEXT Param1 23
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
EndIf
</EventClick>
</Button>
</Popup>

View file

@ -151,9 +151,7 @@
<EventClick>
; goto lid straw
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>

View file

@ -114,137 +114,10 @@ Var NewFlowPaymentCode = 0
Var XMLLiveInfoEnable = 0
If SystemDateMonthInt = 10 Then
If SystemDateDayInt > 15 Then
Var PepweenEnable = 1
EndIf
If SystemDateDayInt >= 13 Then
If SystemDateDayInt <= 24 Then
Var MilkChoiceVeganEnable = 1
EndIf
EndIf
EndIf
If SystemDateMonthInt = 11 Then
Var PepweenEnable = 0
Var pro15THBEnable = 1
EndIf
If SystemDateMonthInt = 12 Then
Var MyMintEnable = 1
EndIf
Var CheckMemberPageCampaign = 0
If SystemDateMonthInt = 1 Then
If SystemDateDayInt < 15 Then
Var MyMintEnable = 1
EndIf
If SystemDateDayInt >= 22 Then
If SystemDateDayInt <= 26 Then
Var RerunProEnable = 1
Else
If SystemDateDayInt >= 29 Then
If SystemDateDayInt <= 31 Then
Var RerunProEnable = 1
EndIf
EndIf
EndIf
EndIf
EndIf
If SystemDateMonthInt = 2 Then
If SystemDateDayInt >= 1 Then
If SystemDateDayInt <= 13 Then
Var ProPeachEnable = 1
EndIf
EndIf
If SystemDateDayInt >= 14 Then
Var ProBadValentineEnable = 1
EndIf
EndIf
If SystemDateMonthInt = 3 Then
If SystemDateDayInt >= 1 Then
If SystemDateDayInt <= 17 Then
Var PepsiSecondCup30Enable = 1
If SystemDateDayInt >= 4 Then
If SystemDateDayInt <= 8 Then
Var PepsiSecondCup30DiscountEnable = 1
EndIf
EndIf
If SystemDateDayInt >= 11 Then
If SystemDateDayInt <= 15 Then
Var PepsiSecondCup30DiscountEnable = 1
EndIf
EndIf
EndIf
EndIf
If SystemDateDayInt = 11 Then
Var MondayBananaPro = 1
EndIf
If SystemDateDayInt = 18 Then
Var MondayBananaPro = 1
EndIf
If SystemDateDayInt = 25 Then
Var MondayBananaPro = 1
EndIf
If SystemDateDayInt >= 13 Then
Var FreeEnergyDrink = 1
EndIf
If SystemDateDayInt >= 18 Then
Var LipitPro = 1
EndIf
EndIf
If SystemDateMonthInt = 4 Then
Var FreeEnergyDrink = 1
Var FreeFirePro = 1
If SystemDateDayInt = 1 Then
Var MondayBananaPro = 1
EndIf
If SystemDateDayInt = 8 Then
Var MondayBananaPro = 1
EndIf
If SystemDateDayInt = 15 Then
Var MondayBananaPro = 1
EndIf
If SystemDateDayInt = 22 Then
Var MondayBananaPro = 1
EndIf
If SystemDateDayInt = 29 Then
Var MondayBananaPro = 1
EndIf
If SystemDateDayInt <= 5 Then
Var LipitPro = 1
EndIf
If SystemDateDayInt >= 8 Then
Var TeaTimePro = 1
EndIf
Var CheckMemberPageCampaign = 1
EndIf
If SystemDateMonthInt = 5 Then
@ -290,7 +163,7 @@ EndIf
If SystemDateMonthInt = 6 Then
If SystemDateDayInt >= 3 Then
If SystemDateDayInt <= 21 Then
If SystemDateDayInt <= 30 Then
Var NamHomCoconutPro = 1
EndIf
EndIf
@ -310,6 +183,13 @@ If SystemDateMonthInt = 6 Then
Var WednesdayMelonPro = 1
EndIf
If SystemDateDayInt >= 17 Then
Var CheckMemberPageCampaign = 1
EndIf
EndIf
If SystemDateMonthInt >= 7 Then
Var CheckMemberPageCampaign = 1
EndIf
@ -337,6 +217,7 @@ If BoxID = 105005 Then
Var EnergyDrink1BathPro = 1
Var CoffeeDrink1BathPro = 0
Var NamHomCoconutPro = 1
Var CheckMemberPageCampaign = 1
EndIf
If BoxID = 200001 Then
@ -515,7 +396,7 @@ If NamHomCoconutPro = 1 Then
DEBUGVAR NamHomCoconutRewardOutOfStock
Var VideoMainPage = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_main_page.png"
Var VideoMainPage = "ROOT/taobin_project/video/main_page_event_pro1.mp4"
Var CurrentMainVideoTemp = 1
Var CountDownShowButton = 0
;Var MainPageEventWithTimeout = 25

File diff suppressed because it is too large Load diff

View file

@ -6,6 +6,11 @@
<Volume> SoundVolume </Volume>
<EventOpen>
If CountryName = "Australia" Then
Var catalogFile = CountryRootPath + "/xml/page_catalog.lxml"
Open catalogFile
EndIf
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"

File diff suppressed because it is too large Load diff

View file

@ -8,6 +8,10 @@
<EventOpen>
; On open
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml"
EndIf
Var Timeout = 0
If show_eng = "true" Then
@ -967,9 +971,7 @@
If MakeDrinkState = 1 Then
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -1196,9 +1198,7 @@
; goto lid straw
If MakeDrinkState = 1 Then
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf

File diff suppressed because it is too large Load diff

View file

@ -40,9 +40,7 @@
If Timeout > 30 Then
If MakeDrinkState = 1 Then
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -123,9 +121,7 @@
; goto lid straw
If MakeDrinkState = 1 Then
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Open "ROOT/taobin_project/xml/page_catalog.xml"
@ -151,9 +147,7 @@
;AddData 11 TelephoneNumber BmiYear PointCrm GetScore
If MakeDrinkState = 1 Then
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf

View file

@ -90,9 +90,7 @@
Var TelephoneNumberX = TelephoneNumber
DEBUGVAR TelephoneNumber
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
Var Param1 = TelephoneNumber + "/"
@ -118,9 +116,7 @@
Var TelephoneNumberX = TelephoneNumber
DEBUGVAR TelephoneNumber
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
Var Param1 = TelephoneNumber + "/"
@ -589,9 +585,7 @@
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
DEBUGVAR TelephoneNumber
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Var Param1 = TelephoneNumber + "/"

View file

@ -172,9 +172,7 @@
AddData 45 TelPhoneNum drink_price param2 param3
EndIf
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
Var Param1 = TelephoneNumber + "/"
@ -286,9 +284,7 @@
Var TelephoneNumberX = TelephoneNumber
DEBUGVAR TelephoneNumber
DEBUGVAR PepweenCollectPoint
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
Var Param1 = TelephoneNumber + "/"
@ -417,9 +413,6 @@
SAVELOG "collect_point1-p107."
;Open "ROOT/taobin_project/xml/page_catalog.xml"
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_collect_point_1-2.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -766,10 +759,6 @@
; goto lid straw
;Open "ROOT/taobin_project/xml/page_catalog.xml"
SAVELOG "collect_point1-p589."
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_collect_point_1-2.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>
@ -826,9 +815,7 @@
AddData 45 TelPhoneNum drink_price param2 param3
EndIf
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
If ChildrenFree = 1 Then
Var Seeker.TNumberTaobinMember = TelephoneNumber

View file

@ -192,8 +192,9 @@
;inter-xml-open
If CountryName = "Australia" Then
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf
Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml"
Open pageCollectPoint
EndIf
;inter-xml-open
If CountryName = "Singapore" Then

View file

@ -691,9 +691,7 @@
Open "ROOT/taobin_project/xml/page_display_get_free.xml"
Else
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -860,9 +858,7 @@
EndIf
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf

View file

@ -30,9 +30,7 @@
If Timeout > 5 Then
; goto lid straw
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -81,9 +79,7 @@
<EventClick>
; goto lid straw
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>

View file

@ -84,9 +84,7 @@
If Timeout > 5 Then
; goto lid straw
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
;Open "ROOT/taobin_project/xml/page_catalog.xml"
@ -174,9 +172,7 @@
<EventClick>
; goto lid straw
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"