Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
1565acb063
84 changed files with 3594 additions and 2069 deletions
|
|
@ -127,10 +127,10 @@ Var New_Payment = 0
|
|||
|
||||
Var XMLLiveInfoEnable = 0
|
||||
|
||||
Var CheckMemberPageCampaign = 0
|
||||
Var LuckyDrawCampaign = 0
|
||||
|
||||
If SystemDateMonthInt = 1 Then
|
||||
Var CheckMemberPageCampaign = 1
|
||||
Var LuckyDrawCampaign = 1
|
||||
EndIf
|
||||
|
||||
If SystemDateMonthInt = 5 Then
|
||||
|
|
@ -195,7 +195,7 @@ If SystemDateMonthInt = 6 Then
|
|||
EndIf
|
||||
|
||||
If SystemDateDayInt >= 17 Then
|
||||
Var CheckMemberPageCampaign = 1
|
||||
Var LuckyDrawCampaign = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -223,7 +223,7 @@ If SystemDateMonthInt = 7 Then
|
|||
EndIf
|
||||
|
||||
If SystemDateMonthInt >= 7 Then
|
||||
Var CheckMemberPageCampaign = 1
|
||||
Var LuckyDrawCampaign = 1
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,8 @@
|
|||
EndIf
|
||||
|
||||
|
||||
|
||||
Var luckyDrawTicket = 0
|
||||
Var luckyDrawAlredyGotReward = 0
|
||||
|
||||
|
||||
Var StepX = 2
|
||||
|
|
@ -130,9 +131,10 @@
|
|||
INT CoffeePointRank
|
||||
Var CoffeePointRankTmp = CoffeePointRank
|
||||
|
||||
If CheckMemberPageCampaign = 1 Then
|
||||
Var luckeyDrawTicket = Ext1h
|
||||
INT luckeyDrawTicket
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Var luckyDrawTicket = Ext1h
|
||||
INT luckyDrawTicket
|
||||
Var luckyDrawAlredyGotReward = Ext1i
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@
|
|||
|
||||
Var Xtext = 246
|
||||
|
||||
Var luckyDrawTicket = 0
|
||||
Var luckyDrawAlredyGotReward = 0
|
||||
|
||||
If show_eng = "true" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/collectiing_en"
|
||||
|
|
@ -90,9 +92,10 @@
|
|||
Var CoffeePointRankTmp = CoffeePointRank
|
||||
|
||||
|
||||
If CheckMemberPageCampaign = 1 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Var luckyDrawTicket = Ext1h
|
||||
INT luckyDrawTicket
|
||||
Var luckyDrawAlredyGotReward = Ext1i
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<EventOpen>
|
||||
; On open
|
||||
|
||||
If CheckMemberPageCampaign = 1 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml"
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
|
|
@ -755,6 +755,15 @@
|
|||
DEBUGVAR SystemDate
|
||||
DEBUGVAR targetDate
|
||||
DEBUGVAR dayDiff
|
||||
|
||||
|
||||
Var ShowLuckyDrawTicketState = "Enable"
|
||||
Var ShowLuckyDrawAlreadyGotRewardState = "Invisible"
|
||||
If luckyDrawAlredyGotReward = 1 Then
|
||||
Var ShowLuckyDrawTicketState = "Invisible"
|
||||
Var ShowLuckyDrawAlreadyGotRewardState = "Enable"
|
||||
EndIf
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
|
@ -1028,18 +1037,21 @@
|
|||
|
||||
|
||||
<Image>
|
||||
<X> 142 </X>
|
||||
<X> 142 </X
|
||||
<Y> 1036 </Y>
|
||||
<State> ShowLuckyDrawTicketState </State>
|
||||
<Filename> Var( DirImageCampaign + "/luckydraw_detail_container.png" ) </Filename>
|
||||
</Image>
|
||||
|
||||
<Image>
|
||||
<X> prize_x </X>
|
||||
<Y> 1046 </Y>
|
||||
<State> ShowLuckyDrawTicketState </State>
|
||||
<Filename> Var( "ROOT/taobin_project/image/display_point_campaign" + prizeImg ) </Filename>
|
||||
</Image>
|
||||
|
||||
<Text>
|
||||
<State> ShowLuckyDrawTicketState </State>
|
||||
<X> dayDiff_X </X>
|
||||
<Y> dayDiff_Y </Y>
|
||||
<Width> 40 </Width>
|
||||
|
|
@ -1051,6 +1063,7 @@
|
|||
</Text>
|
||||
|
||||
<Text>
|
||||
<State> ShowLuckyDrawTicketState </State>
|
||||
<X> 620 </X>
|
||||
<Y> 1076 </Y>
|
||||
<Width> 164 </Width>
|
||||
|
|
@ -1062,6 +1075,26 @@
|
|||
<Value> StringFmt( luckyDrawTicket , LuckyDrawTicketFormat, PreScaleConvertShow) </Value>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<State> ShowLuckyDrawAlreadyGotRewardState </State>
|
||||
<X> 334 </X>
|
||||
<Y> 1057 </Y>
|
||||
<Font> KanitSemiBoldTTF </Font>
|
||||
<Width> 390 </Width>
|
||||
<Size> 24 </Size>
|
||||
<Color> 0x84776F </Color>
|
||||
<Align> center-vertical-horizontal </Align>
|
||||
<Value>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "You already got Lucky Draw reward."
|
||||
Else
|
||||
Var return = "คุณได้รับรางวัล Lucky Draw ไปแล้ว"
|
||||
EndIf
|
||||
)
|
||||
</Value>
|
||||
</Text>
|
||||
|
||||
|
||||
<Text>
|
||||
<X> 142 </X>
|
||||
|
|
|
|||
|
|
@ -777,7 +777,7 @@
|
|||
;Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
SAVELOG "collect_point1-p589."
|
||||
|
||||
If CheckMemberPageCampaign = 1 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
|
|
|
|||
|
|
@ -43,6 +43,8 @@
|
|||
Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
Var GetLuckyDraw = 0
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
|
|
@ -111,143 +113,171 @@
|
|||
|
||||
Else
|
||||
|
||||
If Ext1a = "ok" Then
|
||||
|
||||
Var TaobinName = Ext1d
|
||||
Var TaobinCoupons = Ext1g
|
||||
Var TaobinExpire = Ext1f
|
||||
Var TaobinLevel = Ext1e
|
||||
Var TaobinPDPA = Ext1h
|
||||
|
||||
Var TaobinPromoX = Ext1j
|
||||
|
||||
DEBUGVAR TaobinPDPA
|
||||
|
||||
Var PointTaobinTmp = Ext1i
|
||||
|
||||
DEBUGVAR PointTaobinTmp
|
||||
INT PointTaobinTmp
|
||||
|
||||
INT TaobinPDPA
|
||||
|
||||
If TaobinName = "-" Then
|
||||
Var Seeker.IsLineMember = 0
|
||||
Else
|
||||
Var Seeker.IsLineMember = 1
|
||||
EndIf
|
||||
|
||||
|
||||
Var TelephoneNumber = TelephoneNumberX
|
||||
Var TNumberTaobinMemberXXX = TelephoneNumber
|
||||
|
||||
;Var PointTaobinTmp = 4
|
||||
|
||||
Var PointTaobin = PointTaobinTmp
|
||||
Var pTaobin = PointTaobin
|
||||
|
||||
DEBUGVAR TaobinLevel
|
||||
|
||||
If TaobinLevel = "1" Then
|
||||
Var pTaobin = PayAmount / 20
|
||||
Else
|
||||
Var pTaobin = PayAmount / 15
|
||||
EndIf
|
||||
|
||||
If pTaobin > 0 Then
|
||||
Var pTaobinX = PointTaobin / pTaobin
|
||||
If pTaobinX >= 2 Then
|
||||
Var Point2X = 1
|
||||
If GetLuckyDraw = 1 Then
|
||||
If Ext1a = "ok" Then
|
||||
DEBUGVAR Ext1h
|
||||
DEBUGVAR Ext1i
|
||||
Var luckyDrawTicket = Ext1h
|
||||
INT luckyDrawTicket
|
||||
Var luckyDrawAlredyGotReward = Ext1i
|
||||
If luckyDrawAlredyGotReward = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
|
||||
EndIf
|
||||
Else
|
||||
|
||||
Var Seeker.TaobinErrorNetwork = 1
|
||||
|
||||
Var Seeker.PointTaobinStr = ParamCP
|
||||
Var TelephoneNumber = TelephoneNumberX
|
||||
Var Seeker.TNumberTaobinMember = TelephoneNumber
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
Var Seeker.PointTaobinStr = ParamCP
|
||||
Var Seeker.TNumberTaobinMember = TelephoneNumberX
|
||||
|
||||
|
||||
Var CoffeePointRank = Ext1b
|
||||
INT CoffeePointRank
|
||||
|
||||
Var CoffeePoint1 = Ext1c
|
||||
INT CoffeePoint1
|
||||
EndIf
|
||||
|
||||
Var CoffeePoint = PointTaobin + CoffeePoint1
|
||||
Var CoffeePointOld = CoffeePoint1
|
||||
|
||||
If TaobinLevel = 1 Then
|
||||
Var CoffeePointRank = CoffeePointRank + 0
|
||||
Else
|
||||
Var CoffeePointRank = CoffeePointRank + PointTaobin
|
||||
EndIf
|
||||
If GetLuckyDraw = 0 Then
|
||||
If Ext1a = "ok" Then
|
||||
|
||||
Var CoffeePointRankTmp = CoffeePointRank
|
||||
Var TaobinName = Ext1d
|
||||
Var TaobinCoupons = Ext1g
|
||||
Var TaobinExpire = Ext1f
|
||||
Var TaobinLevel = Ext1e
|
||||
Var TaobinPDPA = Ext1h
|
||||
|
||||
Var TaobinPromoX = Ext1j
|
||||
|
||||
DEBUGVAR Seeker.PointTaobinStr
|
||||
DEBUGVAR Seeker.TNumberTaobinMember
|
||||
If TaobinPDPA = 0 Then
|
||||
DEBUGVAR TaobinPDPA
|
||||
|
||||
;inter-xml-open
|
||||
If CountryName = "Malaysia" Then
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
|
||||
Var PointTaobinTmp = Ext1i
|
||||
|
||||
DEBUGVAR PointTaobinTmp
|
||||
INT PointTaobinTmp
|
||||
|
||||
INT TaobinPDPA
|
||||
|
||||
If TaobinName = "-" Then
|
||||
Var Seeker.IsLineMember = 0
|
||||
Else
|
||||
Var Seeker.IsLineMember = 1
|
||||
EndIf
|
||||
|
||||
|
||||
Var TelephoneNumber = TelephoneNumberX
|
||||
Var TNumberTaobinMemberXXX = TelephoneNumber
|
||||
|
||||
;Var PointTaobinTmp = 4
|
||||
|
||||
Var PointTaobin = PointTaobinTmp
|
||||
Var pTaobin = PointTaobin
|
||||
|
||||
DEBUGVAR TaobinLevel
|
||||
|
||||
If TaobinLevel = "1" Then
|
||||
Var pTaobin = PayAmount / 20
|
||||
Else
|
||||
Var pTaobin = PayAmount / 15
|
||||
EndIf
|
||||
|
||||
;inter-xml-open
|
||||
If CountryName = "Indonesia" Then
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
|
||||
If pTaobin > 0 Then
|
||||
Var pTaobinX = PointTaobin / pTaobin
|
||||
If pTaobinX >= 2 Then
|
||||
Var Point2X = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var Seeker.PointTaobinStr = ParamCP
|
||||
Var Seeker.TNumberTaobinMember = TelephoneNumberX
|
||||
|
||||
|
||||
Var CoffeePointRank = Ext1b
|
||||
INT CoffeePointRank
|
||||
|
||||
Var CoffeePoint1 = Ext1c
|
||||
INT CoffeePoint1
|
||||
|
||||
Var CoffeePoint = PointTaobin + CoffeePoint1
|
||||
Var CoffeePointOld = CoffeePoint1
|
||||
|
||||
If TaobinLevel = 1 Then
|
||||
Var CoffeePointRank = CoffeePointRank + 0
|
||||
Else
|
||||
Var CoffeePointRank = CoffeePointRank + PointTaobin
|
||||
EndIf
|
||||
|
||||
;inter-xml-open
|
||||
If CountryName = "Australia" Then
|
||||
Var CoffeePointRankTmp = CoffeePointRank
|
||||
|
||||
If NewCollectPointFlag = 1 Then
|
||||
Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml"
|
||||
Open pageCollectPoint
|
||||
Else
|
||||
|
||||
DEBUGVAR Seeker.PointTaobinStr
|
||||
DEBUGVAR Seeker.TNumberTaobinMember
|
||||
If TaobinPDPA = 0 Then
|
||||
|
||||
;inter-xml-open
|
||||
If CountryName = "Malaysia" Then
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
|
||||
EndIf
|
||||
|
||||
;inter-xml-open
|
||||
If CountryName = "Indonesia" Then
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
|
||||
EndIf
|
||||
|
||||
;inter-xml-open
|
||||
If CountryName = "Australia" Then
|
||||
|
||||
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
|
||||
If CountryName = "Singapore" Then
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
|
||||
EndIf
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_show_consent.xml"
|
||||
EndIf
|
||||
|
||||
If PayAmount >= 20 Then
|
||||
|
||||
If TaobinPromoX = "p2.no_otp" Then
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml"
|
||||
EndIf
|
||||
|
||||
If TaobinPromoX = "p2.unused" Then
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
;inter-xml-open
|
||||
If CountryName = "Singapore" Then
|
||||
If NewCollectPoint = 1 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Var GetLuckyDraw = 1
|
||||
GETACCEXT TelephoneNumber 14
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
|
||||
EndIf
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
|
||||
EndIf
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_show_consent.xml"
|
||||
EndIf
|
||||
|
||||
If PayAmount >= 20 Then
|
||||
|
||||
If TaobinPromoX = "p2.no_otp" Then
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml"
|
||||
EndIf
|
||||
|
||||
If TaobinPromoX = "p2.unused" Then
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
If NewCollectPoint = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
|
||||
|
||||
Var Seeker.TaobinErrorNetwork = 1
|
||||
|
||||
Var Seeker.PointTaobinStr = ParamCP
|
||||
Var TelephoneNumber = TelephoneNumberX
|
||||
Var Seeker.TNumberTaobinMember = TelephoneNumber
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
Else
|
||||
|
||||
Var Seeker.TaobinErrorNetwork = 1
|
||||
|
||||
Var Seeker.PointTaobinStr = ParamCP
|
||||
Var TelephoneNumber = TelephoneNumberX
|
||||
Var Seeker.TNumberTaobinMember = TelephoneNumber
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
|
|||
|
|
@ -683,7 +683,7 @@
|
|||
Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
|
||||
Else
|
||||
If Seeker.IsLineMember = 0 Then
|
||||
If CheckMemberPageCampaign = 1 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
|
|
@ -694,7 +694,7 @@
|
|||
EndIf
|
||||
Else
|
||||
If Seeker.IsLineMember = 0 Then
|
||||
If CheckMemberPageCampaign = 1 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
|
|
@ -843,7 +843,7 @@
|
|||
Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
|
||||
Else
|
||||
If Seeker.IsLineMember = 0 Then
|
||||
If CheckMemberPageCampaign = 1 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
|
|
@ -854,7 +854,7 @@
|
|||
EndIf
|
||||
Else
|
||||
If Seeker.IsLineMember = 0 Then
|
||||
If CheckMemberPageCampaign = 1 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
|
|
@ -1232,7 +1232,7 @@
|
|||
</EventUnitTest2>
|
||||
|
||||
<EventUnitTest4>
|
||||
If CheckMemberPageCampaign = 1 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
|
|
|
|||
1395
xml/page_collect_point_3_28_lucky_draw_campaign.xml
Normal file
1395
xml/page_collect_point_3_28_lucky_draw_campaign.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -30,19 +30,19 @@
|
|||
|
||||
Var Timeout = Timeout + 1
|
||||
|
||||
If FromCheckMemberPoint = 1 Then
|
||||
If Timeout > 10 Then
|
||||
If Timeout > 10 Then
|
||||
If FromCheckMemberPoint = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_check_member2.xml"
|
||||
EndIf
|
||||
Else
|
||||
If Seeker.IsLineMember = 0 Then
|
||||
If CheckMemberPageCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
||||
Else
|
||||
If Seeker.IsLineMember = 0 Then
|
||||
If LuckyDrawCampaign = 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
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -157,7 +157,7 @@
|
|||
If FromCheckMemberPoint = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_check_member2.xml"
|
||||
Else
|
||||
If CheckMemberPageCampaign = 1 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
|
|
@ -181,7 +181,7 @@
|
|||
Open "ROOT/taobin_project/xml/page_check_member2.xml"
|
||||
Else
|
||||
If Seeker.IsLineMember = 0 Then
|
||||
If CheckMemberPageCampaign = 1 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
Open "ROOT/taobin_project/xml/page_check_member2.xml"
|
||||
Else
|
||||
If Seeker.IsLineMember = 0 Then
|
||||
If CheckMemberPageCampaign = 1 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
|
|
@ -157,7 +157,7 @@
|
|||
Open "ROOT/taobin_project/xml/page_check_member2.xml"
|
||||
Else
|
||||
If Seeker.IsLineMember = 0 Then
|
||||
If CheckMemberPageCampaign = 1 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
|
|
|
|||
|
|
@ -145,6 +145,8 @@
|
|||
Var Seeker.CreditCard = 0
|
||||
Var Seeker.CreditCardRef = ""
|
||||
|
||||
Var Seeker.UseCreditPayFullDrinkPrice = 0
|
||||
|
||||
Var Seeker.IntVendingCredit = 0
|
||||
|
||||
Var Seeker.StoreCreditFlag = 0
|
||||
|
|
|
|||
|
|
@ -90,6 +90,8 @@
|
|||
Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/"
|
||||
Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm
|
||||
|
||||
Var Seeker.CreditEnoughRefID = PointCrm
|
||||
|
||||
CoinVending OFF
|
||||
|
||||
Var Seeker.TNumberTaobinCredit = TelephoneNumber
|
||||
|
|
@ -98,6 +100,7 @@
|
|||
Var Seeker.StoreCreditFlag = 1
|
||||
Var SumCreditAmount = SumCreditAmount - PayAmountSubDiscount
|
||||
Var VendingCreditRemain = "" + SumCreditAmount
|
||||
Var Seeker.UseCreditPayFullDrinkPrice = 1
|
||||
|
||||
If CART_COUNT >= 1 Then
|
||||
|
||||
|
|
|
|||
|
|
@ -78,8 +78,6 @@
|
|||
Var ChangeTimeout = 0
|
||||
Var CancelCounter = 0
|
||||
|
||||
CoinVending XBILL
|
||||
|
||||
|
||||
Var ServiceAmount2 = CreditAmount
|
||||
Var ServiceCharge = 0
|
||||
|
|
@ -95,6 +93,24 @@
|
|||
|
||||
Var warning_price_state = "Enable"
|
||||
|
||||
If CoinAmount > 0 Then
|
||||
|
||||
Var SumAmount = CreditAmount + CoinAmount
|
||||
|
||||
|
||||
If SumAmount >= PayAmountSubDiscount Then
|
||||
Var confirmButtonState = "Enable"
|
||||
Var alphaState2 = "Invisible"
|
||||
Var warning_price_state = "Invisible"
|
||||
Else
|
||||
Var warning_price_state = "Enable"
|
||||
EndIf
|
||||
|
||||
Var RemainAmountStr !assigned StringFmt( SumAmount, DisplayFormat, PreScaleConvertShow )
|
||||
Var showRemaining = charOfBaht + RemainAmountStr
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
|
|
@ -112,7 +128,6 @@
|
|||
AddData 24 TelephoneNumber BmiYear PointCrm GetScore
|
||||
EndIf
|
||||
|
||||
CoinVending OFF
|
||||
Var CancelFlag = 1
|
||||
Var CancelCounter = 0
|
||||
If CoinAmount = 0 Then
|
||||
|
|
@ -154,6 +169,7 @@
|
|||
|
||||
Var TelephoneNumber = Seeker.TNumberTaobinCredit
|
||||
Var PayO2 = Var Seeker.CoffeePinNumber
|
||||
Var ServiceAmount2 = CoinAmount
|
||||
|
||||
Var VendingDiscount = 0
|
||||
Var VendingCampaign = 0
|
||||
|
|
@ -163,6 +179,8 @@
|
|||
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
Var PayCredit = 1
|
||||
|
||||
CoinVending OFF
|
||||
|
||||
If Seeker = "curr" Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
|
|
@ -212,14 +230,6 @@
|
|||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
</EventTimeout>
|
||||
|
|
@ -381,7 +391,6 @@
|
|||
AddData 24 TelephoneNumber BmiYear PointCrm GetScore
|
||||
EndIf
|
||||
|
||||
CoinVending OFF
|
||||
Var CancelCounter = 0
|
||||
Var CancelFlag = 1
|
||||
If CoinAmount = 0 Then
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
EndIf
|
||||
|
||||
Var consentImg = "/img_popup2.png"
|
||||
If CheckMemberPageCampaign = 1 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Var consentImg = "/img_popup3.png"
|
||||
EndIf
|
||||
|
||||
|
|
@ -59,7 +59,11 @@
|
|||
;GETACCEXT TelephoneNumber 14
|
||||
; goto lid straw
|
||||
If NewCollectPoint = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
|
||||
EndIf
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
|
||||
EndIf
|
||||
|
|
@ -130,7 +134,11 @@
|
|||
If UnitTestType = "1" Then
|
||||
Var CoffeePoint = 10
|
||||
If NewCollectPoint = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
|
||||
EndIf
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
|
||||
EndIf
|
||||
|
|
@ -142,7 +150,11 @@
|
|||
;GETACCEXT TelephoneNumber 14
|
||||
; goto lid straw
|
||||
If NewCollectPoint = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
|
||||
EndIf
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
|
||||
EndIf
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@
|
|||
Var GotoStoreCredit0 = 0
|
||||
Var StoreCreditAmount = 0
|
||||
|
||||
Var DetectCoinAmount = 0
|
||||
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
|
||||
Var MachineState_Result = 0
|
||||
|
|
@ -215,24 +217,33 @@
|
|||
EndIf
|
||||
|
||||
Else
|
||||
DEBUGVAR Seeker.UseCreditPayFullDrinkPrice
|
||||
|
||||
If Seeker.IntVendingCampaign < PayAmount Then
|
||||
Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign
|
||||
Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit
|
||||
If Seeker.UseCreditPayFullDrinkPrice = 1 Then
|
||||
If CoinAmount > 0 Then
|
||||
Var StoreCreditAmount = CoinAmount
|
||||
Var DetectCoinAmount = 1
|
||||
EndIf
|
||||
Else
|
||||
If Seeker.IntVendingCampaign < PayAmount Then
|
||||
Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign
|
||||
Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit
|
||||
|
||||
If SumCoinAmount >= PayAmount Then
|
||||
Var Canout = SumCoinAmount - PayAmount
|
||||
If Canout > 0 Then
|
||||
|
||||
;Change Canout
|
||||
;Var ChangeFlag2 = 1
|
||||
Var GotoStoreCredit0 = 1
|
||||
Var StoreCreditAmount = Canout
|
||||
|
||||
If SumCoinAmount >= PayAmount Then
|
||||
Var Canout = SumCoinAmount - PayAmount
|
||||
If Canout > 0 Then
|
||||
|
||||
;Change Canout
|
||||
;Var ChangeFlag2 = 1
|
||||
Var GotoStoreCredit0 = 1
|
||||
Var StoreCreditAmount = Canout
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -409,16 +420,32 @@
|
|||
|
||||
DEBUGVAR Seeker.CurrCreditAmount
|
||||
DEBUGVAR Seeker.CreditNotEnoughRefID
|
||||
DEBUGVAR Seeker.CreditEnoughRefID
|
||||
|
||||
If Seeker.CreditNotEnoughRefID = "" Then
|
||||
Var CurrAmount = Seeker.CurrCreditAmount
|
||||
If CoinAmount > 0 Then
|
||||
Var CurrAmount = CurrAmount + CoinAmount
|
||||
EndIf
|
||||
Var CurrTelePhoneNum = Seeker.CurrCreditTelNum
|
||||
Var CurrPinNum = Seeker.CurrCreditPinNum
|
||||
Var RefID = ""
|
||||
AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID
|
||||
|
||||
If DetectCoinAmount = 1 Then
|
||||
Var ServiceAmountSupCampain = Seeker.ServiceAmount2 - Seeker.IntVendingCampaign
|
||||
|
||||
If CurrAmount >= ServiceAmountSupCampain Then
|
||||
|
||||
Var creditToTopup = CurrAmount - ServiceAmountSupCampain
|
||||
Var RefID = "0/" + Seeker.CreditEnoughRefID
|
||||
Var Seeker.CreditReferenceTmp = RefID
|
||||
|
||||
AddData 41 CurrTelePhoneNum creditToTopup CurrPinNum RefID
|
||||
Else
|
||||
Var RefID = ""
|
||||
AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID
|
||||
EndIf
|
||||
Else
|
||||
Var RefID = ""
|
||||
AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID
|
||||
EndIf
|
||||
|
||||
Else
|
||||
|
||||
Var ServiceAmountSupCampain = Seeker.ServiceAmount2 - Seeker.IntVendingCampaign
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue