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

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

Browse source
This commit is contained in:
wanlop run 2024-09-04 16:49:09 +07:00
commit 443bc6c943
5 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
xml/event/collect_promotion_point_condition.ev Normal file
View file

@ -0,0 +1,11 @@
If RobinsonBeautyPro = 1 Then
If Seeker.VendingCode = "MKF" Then
Var Seeker.CollectPointPromotion = 1
EndIf
EndIf
If JemilaPro = 1 Then
If Seeker.VendingCode = "MKF" Then
Var Seeker.CollectPointPromotion = 1
EndIf
EndIf

4
xml/page_NewBrewing3.xml
View file

@ -819,6 +819,8 @@
Var SuggestID = ""
Var SessionID2 = ""
Var VendingDiscount = 0
Var VendingCampaign = 0
Var PayDetail = ""
Var PayDetail2 = ""
Var VendingOrderID = Seeker.ORDER_ID
@ -855,6 +857,8 @@
Var SuggestID = ""
Var SessionID2 = ""
Var VendingDiscount = 0
Var VendingCampaign = 0
Var PayDetail = ""
Var PayDetail2 = ""
Var VendingOrderID = Seeker.ORDER_ID

4
xml/page_NewBrewing3Conti.xml
View file

@ -370,6 +370,8 @@
Var SuggestID = ""
Var SessionID2 = ""
Var VendingDiscount = 0
Var VendingCampaign = 0
Var PayDetail = ""
Var PayDetail2 = ""
Var VendingOrderID = Seeker.ORDER_ID
@ -406,6 +408,8 @@
Var SuggestID = ""
Var SessionID2 = ""
Var VendingDiscount = 0
Var VendingCampaign = 0
Var PayDetail = ""
Var PayDetail2 = ""
Var VendingOrderID = Seeker.ORDER_ID

4
xml/page_NewCannotConti.xml
View file

@ -359,6 +359,8 @@
Var SuggestID = ""
Var SessionID2 = ""
Var VendingDiscount = 0
Var VendingCampaign = 0
Var PayDetail = ""
Var PayDetail2 = ""
Var VendingOrderID = Seeker.ORDER_ID
@ -393,6 +395,8 @@
Var SuggestID = ""
Var SessionID2 = ""
Var VendingDiscount = 0
Var VendingCampaign = 0
Var PayDetail = ""
Var PayDetail2 = ""
Var VendingOrderID = Seeker.ORDER_ID

2
xml/page_payment_code.xml
View file

@ -237,6 +237,8 @@
EndIf
EndIf
TRY "ROOT/taobin_project/xml/event/collect_promotion_point_condition.ev"
;Open "ROOT/taobin_project/xml/page_payment_cash.xml"
Var Seeker.VendingCampaign = PayAmount