This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/addons/reward_points/func.php b/app/addons/reward_points/func.php | |
index e00a84c..eef0536 100644 | |
--- a/app/addons/reward_points/func.php | |
+++ b/app/addons/reward_points/func.php | |
@@ -682,15 +682,15 @@ function fn_gather_reward_points_data(&$product, &$auth, $get_point_info = true) | |
} | |
if (isset($reward_points['amount'])) { | |
+ $reward_points['coefficient'] = 1; | |
if ((defined('ORDER_MANAGEMENT') || Registry::get('runtime.controller') == 'checkout') && isset($product['subtotal']) && isset($product['original_price'])) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/addons/email_marketing/func.php b/app/addons/email_marketing/func.php | |
index e3ebe99..dae9cab 100644 | |
--- a/app/addons/email_marketing/func.php | |
+++ b/app/addons/email_marketing/func.php | |
@@ -353,3 +353,16 @@ function fn_em_get_company_condition() | |
return $condition; | |
} | |
+ | |
+/** |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/controllers/backend/products.php b/app/controllers/backend/products.php | |
index 628050a..d778ba4 100644 | |
--- a/app/controllers/backend/products.php | |
+++ b/app/controllers/backend/products.php | |
@@ -573,27 +573,20 @@ if ($mode == 'add') { | |
$taxes = fn_get_taxes(); | |
arsort($product_data['category_ids']); | |
- if (fn_allowed_for('MULTIVENDOR')) { | |
+ if (fn_allowed_for('MULTIVENDOR') && defined('AJAX_REQUEST')) { |