update

modules/ets_promotion/override/classes/Cart.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright ETS Software Technology Co., Ltd
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 website only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future.
+ *
+ * @author ETS Software Technology Co., Ltd
+ * @copyright  ETS Software Technology Co., Ltd
+ * @license    Valid for 1 website (or project) for each purchase of license
+ */
+ 
+class Cart extends CartCore
+{
+    public function getOrderTotal($withTaxes = true, $type = Cart::BOTH, $products = null, $id_carrier = null, $use_cache = false, bool $keepOrderPrices = false, $fee_payment = false, $only_cart = false, $custom = true)
+    {
+        $total = parent::getOrderTotal($withTaxes,$type,$products,$id_carrier,$use_cache,$keepOrderPrices);
+        if($custom && ($type==Cart::ONLY_DISCOUNTS || $type == Cart::BOTH) && Module::isEnabled('ets_promotion'))
+        {
+            $totalDiscount = Module::getInstanceByName('ets_promotion')->getDiscountTotal($withTaxes);
+            if($type==Cart::ONLY_DISCOUNTS)
+                $total = $total+$totalDiscount;
+            else
+                $total=  $total - $totalDiscount;
+        }
+        if(Module::isEnabled('ets_payment_with_fee'))
+        {
+            if($only_cart || $type!=Cart::BOTH)
+                return $total;
+            if($type== Cart::BOTH)
+            {
+                $custom_payment = Module::getInstanceByName('ets_payment_with_fee');
+                $fee = $custom_payment->getFeePayOrderTotal($products,$withTaxes);
+            }
+            else
+                $fee = 0;
+            if($fee_payment)
+                return $fee;
+            return $fee + $total;
+        }
+        return $total;
+    }
+}

modules/ets_promotion/override/classes/Cart.sync-conflict-20231027-195956-EDGUH2C.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright ETS Software Technology Co., Ltd
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 website only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future.
+ *
+ * @author ETS Software Technology Co., Ltd
+ * @copyright  ETS Software Technology Co., Ltd
+ * @license    Valid for 1 website (or project) for each purchase of license
+ */
+ 
+class Cart extends CartCore
+{
+    public function getOrderTotal($withTaxes = true, $type = Cart::BOTH, $products = null, $id_carrier = null, $use_cache = false, bool $keepOrderPrices = false, $fee_payment = false, $only_cart = false, $custom = true)
+    {
+        $total = parent::getOrderTotal($withTaxes,$type,$products,$id_carrier,$use_cache,$keepOrderPrices);
+        if($custom && ($type==Cart::ONLY_DISCOUNTS || $type == Cart::BOTH) && Module::isEnabled('ets_promotion'))
+        {
+            $totalDiscount = Module::getInstanceByName('ets_promotion')->getDiscountTotal($withTaxes);
+            if($type==Cart::ONLY_DISCOUNTS)
+                $total = $total+$totalDiscount;
+            else
+                $total=  $total - $totalDiscount;
+        }
+        if(Module::isEnabled('ets_payment_with_fee'))
+        {
+            if($only_cart || $type!=Cart::BOTH)
+                return $total;
+            if($type== Cart::BOTH)
+            {
+                $custom_payment = Module::getInstanceByName('ets_payment_with_fee');
+                $fee = $custom_payment->getFeePayOrderTotal($products,$withTaxes);
+            }
+            else
+                $fee = 0;
+            if($fee_payment)
+                return $fee;
+            return $fee + $total;
+        }
+        return $total;
+    }
+}

modules/ets_promotion/override/classes/CartRule.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright ETS Software Technology Co., Ltd
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 website only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future.
+ *
+ * @author ETS Software Technology Co., Ltd
+ * @copyright  ETS Software Technology Co., Ltd
+ * @license    Valid for 1 website (or project) for each purchase of license
+ */
+ 
+class CartRule extends CartRuleCore
+{
+    public static function haveCartRuleToday($idCustomer)
+    {
+        if(!parent::haveCartRuleToday($idCustomer))
+        {
+            return Module::getInstanceByName('ets_promotion')->haveCartRuleToday();
+        }
+        else
+            return true;
+    }
+    public static function getCustomerCartRules($id_lang, $id_customer, $active = false, $includeGeneric = true, $inStock = false, CartCore $cart = null, $free_shipping_only = false, $highlight_only = false)
+    {
+        $result = parent::getCustomerCartRules($id_lang,$id_customer,$active,$includeGeneric,$inStock,$cart,$free_shipping_only,$highlight_only);
+        Module::getInstanceByName('ets_promotion')->getCustomerCartRules($result,$id_customer,$highlight_only);
+        return $result;
+    }
+    public function delete()
+    {
+        $r = parent::delete();
+        if(!Configuration::getGlobalValue('PS_CART_RULE_FEATURE_ACTIVE'))
+        {
+            Configuration::updateGlobalValue(
+                'PS_CART_RULE_FEATURE_ACTIVE',
+                CartRule::isCurrentlyUsed('cart_rule', true) || Ets_pr_rule::isCurrentlyUsed('ets_pr_rule', true)
+            );
+        }
+        return $r;
+    }
+}

modules/ets_promotion/override/classes/CartRule.sync-conflict-20231027-200011-EDGUH2C.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright ETS Software Technology Co., Ltd
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 website only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future.
+ *
+ * @author ETS Software Technology Co., Ltd
+ * @copyright  ETS Software Technology Co., Ltd
+ * @license    Valid for 1 website (or project) for each purchase of license
+ */
+ 
+class CartRule extends CartRuleCore
+{
+    public static function haveCartRuleToday($idCustomer)
+    {
+        if(!parent::haveCartRuleToday($idCustomer))
+        {
+            return Module::getInstanceByName('ets_promotion')->haveCartRuleToday();
+        }
+        else
+            return true;
+    }
+    public static function getCustomerCartRules($id_lang, $id_customer, $active = false, $includeGeneric = true, $inStock = false, CartCore $cart = null, $free_shipping_only = false, $highlight_only = false)
+    {
+        $result = parent::getCustomerCartRules($id_lang,$id_customer,$active,$includeGeneric,$inStock,$cart,$free_shipping_only,$highlight_only);
+        Module::getInstanceByName('ets_promotion')->getCustomerCartRules($result,$id_customer,$highlight_only);
+        return $result;
+    }
+    public function delete()
+    {
+        $r = parent::delete();
+        if(!Configuration::getGlobalValue('PS_CART_RULE_FEATURE_ACTIVE'))
+        {
+            Configuration::updateGlobalValue(
+                'PS_CART_RULE_FEATURE_ACTIVE',
+                CartRule::isCurrentlyUsed('cart_rule', true) || Ets_pr_rule::isCurrentlyUsed('ets_pr_rule', true)
+            );
+        }
+        return $r;
+    }
+}

modules/ets_promotion/override/classes/index.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright ETS Software Technology Co., Ltd
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 website only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future.
+ *
+ * @author ETS Software Technology Co., Ltd
+ * @copyright  ETS Software Technology Co., Ltd
+ * @license    Valid for 1 website (or project) for each purchase of license
+ */
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;