Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
wanlop run 2024-07-15 14:45:02 +07:00
commit 5efa8bd3c7
32 changed files with 303 additions and 143 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

View file

@ -547,7 +547,7 @@
<Volume> SoundVolume </Volume>
<EventClick>
; eng
Open "ROOT/taobin_project/xml/page_check_member.xml"
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
</EventClick>
</Button>

View file

@ -0,0 +1,127 @@
<Popup>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
Var Timeout = 0
Var OpenTopupCredit = 0
Var OpenCheckCoupon = 0
; Default language (Thai).
Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
Var text = "เลือกบริการที่คุณต้องการ"
Var Extension = ".png"
; language (Eng).
If show_eng = "true" Then
Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
Var text = "Manage your Tao Bin account"
Var Extension = "_en.png"
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var Timeout = Timeout + 1
If Timeout > 30 Then
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
TimerReset
</EventTimeout>
;include="ROOT/taobin_project/inc/video.inc"
; back
<Button>
<X> 19 </X>
<Y> 381 </Y>
<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_catalog.xml"
</EventClick>
</Button>
<Button>
<X> 990 </X>
<Y> 381 </Y>
<Filename> show_btn </Filename>
<FilenamePress> show_btn </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; eng
If show_eng = "true" Then
Var show_eng = "false"
Else
Var show_eng = "true"
EndIf
Open CurrentXMLFileName2
</EventClick>
</Button>
<Text>
<X> 199 </X>
<Y> 560 </Y>
<Width> 680 </Width>
<Height> 80 </Height>
<Font> KanitRegularTTF </Font>
<Size> 51 </Size>
<Color> 0x513C2F </Color>
<Align> center-vertical-horizontal </Align>
<Value> text </Value>
</Text>
<Button>
<X> 286 </X>
<Y> 824 </Y>
<Filename> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bn_topup_credit" + Extension ) </Filename>
<FilenamePress> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_topup_credit" + Extension ) </FilenamePress>
<FilenameDisable> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_topup_credit" + Extension ) </FilenameDisable>
<EventClick>
Var OpenTopupCredit = 1
Open "ROOT/taobin_project/xml/page_check_member.xml"
</EventClick>
</Button>
<Button>
<X> 286 </X>
<Y> 976 </Y>
<Filename> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bn_check_coupon" + Extension ) </Filename>
<FilenamePress> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_check_coupon" + Extension ) </FilenamePress>
<FilenameDisable> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_check_coupon" + Extension ) </FilenameDisable>
<EventClick>
Var OpenCheckCoupon = 1
Open "ROOT/taobin_project/xml/page_check_member.xml"
</EventClick>
</Button>
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
</Popup>

View file

@ -1714,7 +1714,7 @@
OpenInst 2 ChackMemberPage
EndIf
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_member.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_before_check_member.xml"
EndIf
TopView "show"

View file

@ -477,7 +477,7 @@
<Volume> SoundVolume </Volume>
<EventClick>
; eng
Open "ROOT/taobin_project/xml/page_check_member.xml"
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
</EventClick>
</Button>

View file

@ -552,7 +552,7 @@
<Volume> SoundVolume </Volume>
<EventClick>
; eng
Open "ROOT/taobin_project/xml/page_check_member.xml"
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
</EventClick>
</Button>

View file

@ -573,7 +573,7 @@
<Volume> SoundVolume </Volume>
<EventClick>
; eng
Open "ROOT/taobin_project/xml/page_check_member.xml"
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
</EventClick>
</Button>

View file

@ -437,7 +437,7 @@
<Volume> SoundVolume </Volume>
<EventClick>
; eng
Open "ROOT/taobin_project/xml/page_check_member.xml"
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
</EventClick>
</Button>

View file

@ -454,7 +454,7 @@
<Volume> SoundVolume </Volume>
<EventClick>
; eng
Open "ROOT/taobin_project/xml/page_check_member.xml"
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
</EventClick>
</Button>

View file

@ -551,7 +551,7 @@
Open "ROOT/taobin_project/xml/page_catalog.xml"
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
</EventClick>

View file

@ -150,6 +150,11 @@
If Ext1a = "ok" Then
Var TaobinCredit = Ext1b
If OpenTopupCredit = 1 Then
Open "ROOT/taobin_project/xml/page_member_topup3.xml"
EndIf
GETACCEXT TelephoneNumber 14
Var StepX = 1
Var Ext1a = ""

View file

@ -58,7 +58,7 @@
Var Timeout = Timeout + 1
If Timeout > 30 Then
Open "ROOT/taobin_project/xml/page_check_member.xml"
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
EndIf
TimerReset
@ -692,7 +692,7 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_check_member.xml"
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
</EventClick>
</Button>

View file

@ -59,7 +59,7 @@
Var Timeout = Timeout + 1
If Timeout > 40 Then
Open "ROOT/taobin_project/xml/page_check_member.xml"
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
EndIf
TimerReset
@ -131,6 +131,10 @@
If Ext1a = "ok" Then
If OpenTopupCredit = 1 Then
Open "ROOT/taobin_project/xml/page_member_topup3.xml"
EndIf
Var TaobinName = ""
Var TaobinCoupons = ""
Var TaobinExpire = ""
@ -848,7 +852,7 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_check_member.xml"
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
</EventClick>
</Button>

View file

@ -682,39 +682,17 @@
If GetDrink5Bath = 1 Then
Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
Else
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
If CheckMemberPageCampaign = 1 Then
; Go to comapaign ad and go back.
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
If CheckMemberPageCampaign = 1 Then
; Go to comapaign ad and go back.
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -858,39 +836,17 @@
If GetDrink5Bath = 1 Then
Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
Else
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -1264,7 +1220,11 @@
</EventUnitTest2>
<EventUnitTest4>
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
</EventUnitTest4>

View file

@ -36,20 +36,8 @@
EndIf
Else
If Timeout > 5 Then
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -167,18 +155,8 @@
If FromCheckMemberPoint = 1 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
Else
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -200,18 +178,8 @@
If FromCheckMemberPoint = 1 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
Else
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf

View file

@ -52,20 +52,8 @@
If FromCheckMemberPoint = 1 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
Else
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -164,18 +152,8 @@
If FromCheckMemberPoint = 1 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
Else
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf

View file

@ -78,6 +78,11 @@
Var Timeout = Timeout + 1
If Timeout > 30 Then
If OpenTopupCredit = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
EndIf
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
@ -207,11 +212,12 @@
<EventClick>
If OpenTopupCredit = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
EndIf
Open "ROOT/taobin_project/xml/page_check_member2.xml"
</EventClick>
</Button>

View file

@ -270,7 +270,11 @@
If CountDownThankyou = 0 Then
If IgnoreNetCore = "true" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
If TestLoopMakeDrink = 1 Then
@ -285,7 +289,11 @@
If RoadShow = "true" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Var Seeker.OrderChanel = Seeker.OrderChanel + ":"
@ -360,7 +368,11 @@
EndIf
If CART_INDEX >= 2 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
If CountryName = "Singapore" Then
@ -431,10 +443,18 @@
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
If CART_INDEX >= 2 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
If CountryName = "Singapore" Then
; ask-if-member-yet
@ -472,10 +492,18 @@
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
If CART_INDEX >= 2 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
If CountryName = "Singapore" Then
; ask-if-member-yet

View file

@ -214,7 +214,7 @@
<Volume> SoundVolume </Volume>
<EventClick>
; eng
Open "ROOT/termtem_project/xml/page_check_member.xml"
Open "ROOT/termtem_project/xml/page_before_check_member.xml"
</EventClick>
</Button>

View file

@ -0,0 +1,84 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xffffff" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
Var Timeout = 0
Var ImgDir = "ROOT/taobin_project/image/event/lucky_draw_ads/"
Var Extension = ".png"
Var Text_X = 207
Var Text_Y = 1470
If show_eng = "true" Then
Var Extension = "_en.png"
Var Text_X = 233
Var Text_Y = 1468
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var Timeout = Timeout + 1
If Timeout > 10 Then
; Go back to lid straw page
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
TimerReset
</EventTimeout>
;include="ROOT/taobin_project/inc/video.inc"
; Background
<Image>
<X> 0 </X>
<Y> 380 </Y>
<Filename> "ROOT/taobin_project/image/display_point/alpha.png" </Filename>
</Image>
; Popup bg
<Image>
<X> 157 </X>
<Y> 480 </Y>
<Filename> Var( ImgDir + "popup_bg.png" ) </Filename>
</Image>
<Image>
<X> Text_X </X>
<Y> Text_Y </Y>
<Filename>
eval(
Var return = ImgDir + "text"
Var return = return + Extension
)
</Filename>
</Image>
<Button>
<X> 397 </X>
<Y> 1699 </Y>
<Filename> Var(ImgDir + "bn_next.png") </Filename>
<FilenamePress> Var(ImgDir + "bp_next.png") </FilenamePress>
<FilenameDisable> Var(ImgDir + "bp_next.png") </FilenameDisable>
<EventClick>
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>
</Button>
<EventUnitTest4>
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
</EventUnitTest4>
</Popup>