From 803bddceba7d05727b734569073f2161b6c9da1b Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Wed, 4 Sep 2024 13:39:41 +0700 Subject: [PATCH 1/2] THAI: update special condition for collect promotion point --- xml/event/collect_promotion_point_condition.ev | 11 +++++++++++ xml/page_payment_code.xml | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 xml/event/collect_promotion_point_condition.ev diff --git a/xml/event/collect_promotion_point_condition.ev b/xml/event/collect_promotion_point_condition.ev new file mode 100644 index 00000000..56d2b239 --- /dev/null +++ b/xml/event/collect_promotion_point_condition.ev @@ -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 \ No newline at end of file diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index a399e200..e7f97b60 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -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 From 4b8b194e8f0b2d51b8477d0715fe250924fc6f94 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Wed, 4 Sep 2024 14:58:47 +0700 Subject: [PATCH 2/2] THAI: Fix bug coffee-refund --- xml/page_NewBrewing3.xml | 4 ++++ xml/page_NewBrewing3Conti.xml | 4 ++++ xml/page_NewCannotConti.xml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index a77b1586..207f9e52 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -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 diff --git a/xml/page_NewBrewing3Conti.xml b/xml/page_NewBrewing3Conti.xml index 3100a5fd..7754db2c 100644 --- a/xml/page_NewBrewing3Conti.xml +++ b/xml/page_NewBrewing3Conti.xml @@ -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 diff --git a/xml/page_NewCannotConti.xml b/xml/page_NewCannotConti.xml index c95f2162..647ee1d4 100644 --- a/xml/page_NewCannotConti.xml +++ b/xml/page_NewCannotConti.xml @@ -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