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

AUS & THAI: aus => new page collect point can redeem discount & thai => new page check member with campaign

Browse source
This commit is contained in:
Kenta420 2024-06-04 10:24:20 +07:00
parent 5970ded75b
commit 53831f3d5a
23 changed files with 985 additions and 507 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
inter/aus/image/collect_point/redeem/close_btn.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
inter/aus/image/collect_point/redeem/close_btn_pressed.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
inter/aus/image/collect_point/redeem/fail_header_bg.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
inter/aus/image/collect_point/redeem/header_bg.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
inter/aus/image/collect_point/redeem/redeem_get_free_content.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 63 KiB

Before After
Before After

BIN
inter/aus/image/collect_point/redeem/redemption_bg.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
inter/aus/image/collect_point/show_point/member-profile-bg.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Before After
Before After

BIN
inter/aus/image/collect_point/show_point/shell_discount_1dollar_active_new.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5 KiB

BIN
inter/aus/image/collect_point/show_point/shell_discount_2dollar_active_new.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
inter/aus/image/collect_point/show_point/shell_new.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
inter/aus/image/collect_point/show_point/taoLevel1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
inter/aus/image/collect_point/show_point/taoLevel2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
inter/aus/image/collect_point/show_point/taoLevel3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
inter/aus/image/collect_point/show_point/taoLevel4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 31 KiB

2
inter/aus/xml/event/tricker.ev
View file

@ -6,6 +6,8 @@
; Reset flag away.
Var NewCollectPointFlag = 0
Var WinterWarmersCatalogFlag = 1

34
inter/aus/xml/page_brewing3.lxml
View file

@ -1111,6 +1111,24 @@
If AddData = 1 Then
Var Cid = 26
If NewCollectPointFlag = 1 Then
Var redeemSeeker = "curr-redeem"
If redeemSeeker.redeem2Dollar = 1 Then
; TODO: Var Cid =
EndIf
If redeemSeeker.redeem1Dollar = 1 Then
; TODO: Var Cid =
EndIf
; reset
Var redeemSeeker.phoneNumber = ""
Var redeemSeeker.redeem2Dollar = 0
Var redeemSeeker.redeem1Dollar = 0
EndIf
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf
@ -1215,6 +1233,22 @@
If AddData = 1 Then
Var Cid = 26
If NewCollectPointFlag = 1 Then
Var redeemSeeker = "curr-redeem"
If redeemSeeker.redeem2Dollar = 1 Then
; TODO: Var Cid =
EndIf
If redeemSeeker.redeem1Dollar = 1 Then
; TODO: Var Cid =
EndIf
; reset
Var redeemSeeker.phoneNumber = ""
Var redeemSeeker.redeem2Dollar = 0
Var redeemSeeker.redeem1Dollar = 0
EndIf
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf

1129
inter/aus/xml/page_collect_point_3.lxml
View file

File diff suppressed because it is too large Load diff

290
inter/aus/xml/page_collect_point_redeem.lxml Normal file
View file

@ -0,0 +1,290 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0x303030" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
Var Timeout = 0
Var TargetTimeout = 10
If show_eng = "true" Then
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
Else
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
EndIf
Var DirImage = "ROOT/taobin_project/inter/aus/image/collect_point/redeem"
Var congratsState = "Enable"
Var sendCodeState = "Invisible"
Var footerButtonSectionState = "Enable"
Var headerBackground = "/header_bg.png"
Var content_X = 178
Var content_Y = 899
If RedeemType = "1_dollar" Then
Var headerImage = DirImage + "/redeem_1dollar_header.png"
Var contentImage = DirImage + "/redeem_1dollar_content.png"
EndIf
If RedeemType = "2_dollar" Then
Var headerImage = DirImage + "/redeem_2dollar_header.png"
Var contentImage = DirImage + "/redeem_2dollar_content.png"
EndIf
If RedeemType = "get_free" Then
Var headerImage = DirImage + "/redeem_get_free_header.png"
Var contentImage = DirImage + "/redeem_get_free_content.png"
Var footerButtonSectionState = "Invisible"
Var content_Y = 984
Var TargetTimeout = 5
EndIf
Var SELLONLINE = 0
If SELLSTATUS = "SELLONLINE" Then
Var SELLONLINE = 1
EndIf
If SELLSTATUS = "SELLNOCASH" Then
Var SELLONLINE = 1
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var CountDownBrewing = BREW_CNT
Var ShowCountDownBrewing = CountDownBrewing
;Var Timeout = Timeout + 1
If Timeout > TargetTimeout Then
If sendCodeState = "Enable" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
If RedeemType = "get_free" Then
Var congratsState = "Invisible"
Var sendCodeState = "Enable"
Var Timeout = 0
Var TargetTimeout = 5
If SELLONLINE = 1 Then
Var headerBackground = "/success_header_bg.png"
Var headerImage = "/redeem_success_header.png"
Var contentImage = "/redeem_success_content.png"
Var content_X = 308
Var content_Y = 1065
Else
Var headerBackground = "/fail_header_bg.png"
Var headerImage = "/redeem_fail_header.png"
Var contentImage = "/redeem_fail_content.png"
Var content_X = 243
Var content_Y = 1118
EndIf
Refresh
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
EndIf
TimerReset
Refresh
</EventTimeout>
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
<EventMachine>
If MachineStage = "drink-success" Then
Var MachineState_Result = 1
EndIf
If MachineStage = "drink-failed" Then
Var MachineState_Result = 2
EndIf
</EventMachine>
;include="ROOT/taobin_project/inc/video.inc"
<Image>
<X> 118 </X>
<Y> 642 </Y>
<Filename> Var( DirImage + headerBackground) </Filename>
</Image>
<Image>
<X> 118 </X>
<Y> 859 </Y>
<Filename> Var( DirImage + "/redemption_bg.png") </Filename>
</Image>
<Image>
<X> 158 </X>
<Y> 682 </Y>
<Filename> Var( DirImage + headerImage ) </Filename>
</Image>
<Image>
<X> content_X </X>
<Y> content_Y </Y>
<Filename> Var( DirImage + contentImage ) </Filename>
</Image>
<Button>
<X> 212 </X>
<Y> 1752 </Y>
<State>
eval(
If congratsState = "Enable" Then
If footerButtonSectionState = "Enable" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
Else
Var return = "Invisible"
EndIf
)
</State>
<Filename> Var( DirImage + "/keep_collecting_btn.png" )</Filename>
<FilenamePress> Var( DirImage + "/keep_collecting_btn_pressed.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; Go to lid straw
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>
</Button>
<Button>
<X> 548 </X>
<Y> 1752 </Y>
<State>
eval(
If congratsState = "Enable" Then
If footerButtonSectionState = "Enable" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
Else
Var return = "Invisible"
EndIf
)
</State>
<Filename> Var( DirImage + "/redeem_now_btn.png" )</Filename>
<FilenamePress> Var( DirImage + "/redeem_now_btn_pressed.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var redeemSeeker = "curr-redeem"
Var redeemSeeker.phoneNumber = Seeker.TNumberTaobinMember
If RedeemType = "1_dollar" Then
Var redeemSeeker.redeem1Dollar = 1
EndIf
If RedeemType = "2_dollar" Then
Var redeemSeeker.redeem2Dollar = 1
EndIf
Var congratsState = "Invisible"
Var sendCodeState = "Enable"
Var Timeout = 0
Var TargetTimeout = 5
If SELLONLINE = 1 Then
Var headerBackground = "/success_header_bg.png"
Var headerImage = "/redeem_success_header.png"
Var contentImage = "/redeem_success_content.png"
Var content_X = 308
Var content_Y = 1065
Else
Var headerBackground = "/fail_header_bg.png"
Var headerImage = "/redeem_fail_header.png"
Var contentImage = "/redeem_fail_content.png"
Var content_X = 243
Var content_Y = 1118
EndIf
Refresh
</EventClick>
</Button>
<Button>
<X> 379 </X>
<Y> 1752 </Y>
<State> sendCodeState </State>
<Filename> Var( DirImage + "/close_btn.png" )</Filename>
<FilenamePress> Var( DirImage + "/close_btn_pressed.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; goto lid straw
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>
</Button>
;
<Image>
<X> 751 </X>
<Y> 413 </Y>
<Filename> IMG_CNT </Filename>
</Image>
;
<Text>
<X> XPosiShowCountDownBrew </X>
<Y> 470 </Y>
<Align> End </Align>
<Width> 153 </Width>
<Size> 88 </Size>
<Font> RobotoBold </Font>
<Color> 0x513C2F </Color>
<Value> ShowCountDownBrewing </Value>
</Text>
<EventUnitTest1>
Var RedeemType = "1_dollar"
Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
</EventUnitTest1>
<EventUnitTest2>
Var RedeemType = "2_dollar"
Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
</EventUnitTest2>
<EventUnitTest3>
Var RedeemType = "get_free"
Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
</EventUnitTest3>
</Popup>

5
xml/page_check_member.xml
View file

@ -130,6 +130,11 @@
INT CoffeePointRank
Var CoffeePointRankTmp = CoffeePointRank
If CheckMemberPageCampaign = 1 Then
Var luckeyDrawTicket = Ext1h
INT luckeyDrawTicket
EndIf
GETACCEXT TelephoneNumber 15

9
xml/page_check_member1.xml
View file

@ -85,12 +85,17 @@
Var TNumberTaobinMemberXXX = TelephoneNumber
Var CoffeePointRank = Ext1b
INT CoffeePointRank
Var CoffeePointRankTmp = CoffeePointRank
If CheckMemberPageCampaign = 1 Then
Var luckeyDrawTicket = Ext1h
INT luckeyDrawTicket
EndIf
Var Ext1a = ""
Var Ext1b = ""
Var Ext1c = ""

5
xml/page_check_member2_campaign.xml
View file

@ -689,8 +689,7 @@
INT TaobinCredit
Var TaobinCreditStr !assigned StringFmt( TaobinCredit, DisplayFormat, PreScaleConvertShow )
Var LuckeyDrawTicketFormat = "%03.0f"
Var luckyDrawTicket = 16
Var LuckyDrawTicketFormat = "%03.0f"
If SystemDateMonthInt = 6 Then
If SystemDateDayInt >= 17 Then
@ -1052,7 +1051,7 @@
<Size> 64 </Size>
<Color> 0x3F2C20 </Color>
<Align> center-vertical-horizontal </Align>
<Value> StringFmt( luckyDrawTicket , LuckeyDrawTicketFormat, PreScaleConvertShow) </Value>
<Value> StringFmt( luckyDrawTicket , LuckyDrawTicketFormat, PreScaleConvertShow) </Value>
</Text>

10
xml/page_collect_point_2.xml
View file

@ -192,10 +192,14 @@
;inter-xml-open
If CountryName = "Australia" Then
;Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml"
;Open pageCollectPoint
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
If NewCollectPointFlag = 1 Then
Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml"
Open pageCollectPoint
Else
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf
EndIf
;inter-xml-open

4
xml/page_thankyou.xml
View file

@ -270,7 +270,9 @@
If CountDownThankyou = 0 Then
If IgnoreNetCore = "true" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
;Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Var testPageCollectPointAUS = CountryRootPath + "/xml/page_collect_point_3.lxml"
Open testPageCollectPointAUS
EndIf
If TestLoopMakeDrink = 1 Then