incrize

diff --git a/app/controllers/backend/order_management.php b/app/controllers/backend/order_management.php
index e3f005b..e011cb7 100644
--- a/app/controllers/backend/order_management.php
+++ b/app/controllers/backend/order_management.php
@@ -155,6 +155,8 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
         // recalculate cart content after update
         list ($cart_products, $product_groups) = fn_calculate_cart_content($cart, $customer_auth);
 
+        fn_update_payment_surcharge($cart, $customer_auth);
+

incrize

diff --git a/design/themes/responsive/templates/views/checkout/components/payments/payment_methods.tpl b/design/themes/responsive/templates/views/checkout/components/payments/payment_methods.tpl
index 04145bd..4b8c7c1 100644
--- a/design/themes/responsive/templates/views/checkout/components/payments/payment_methods.tpl
+++ b/design/themes/responsive/templates/views/checkout/components/payments/payment_methods.tpl
@@ -13,12 +13,21 @@
 <script type="text/javascript">
 (function(_, $) {
     $(_.doc).on('click', '.cm-select-payment', function() {
-        var self = $(this);
+        var self = $(this),

incrize

diff --git a/design/themes/basic/templates/views/checkout/components/payments/payment_methods.tpl b/design/themes/basic/templates/views/checkout/components/payments/payment_methods.tpl
index 578aef4..7df29fa 100644
--- a/design/themes/basic/templates/views/checkout/components/payments/payment_methods.tpl
+++ b/design/themes/basic/templates/views/checkout/components/payments/payment_methods.tpl
@@ -12,12 +12,21 @@
 <script type="text/javascript">
 (function(_, $) {
     $(_.doc).on('click', '.cm-select-payment', function() {
-        var self = $(this);
+        var self = $(this),

incrize

diff --git a/app/schemas/exim/products.functions.php b/app/schemas/exim/products.functions.php
index 2b87382..aaa4907 100644
--- a/app/schemas/exim/products.functions.php
+++ b/app/schemas/exim/products.functions.php
@@ -408,6 +408,10 @@ function fn_exim_set_product_features($product_id, $data, $features_delimiter, $
             );
 
             if (empty($feature_id)) {
+                if (fn_allowed_for('MULTIVENDOR') && Registry::get('runtime.company_id')) {
+                    fn_set_notification('W', __('warning'), __('exim_vendor_cant_create_feature'));

incrize

diff --git a/app/functions/fn.multivendor.php b/app/functions/fn.multivendor.php
index 08cfc1e..968e135 100644
--- a/app/functions/fn.multivendor.php
+++ b/app/functions/fn.multivendor.php
@@ -197,9 +197,6 @@ function fn_mve_import_get_primary_object_id(&$pattern, &$_alt_keys, &$v, &$skip
 
 function fn_mve_import_check_product_data(&$v, $primary_object_id, &$options, &$processed_data, &$skip_record)
 {
-    static $company_categories     = null;
-    static $company_categories_ids = null;

incrize

diff --git a/design/themes/responsive/templates/views/checkout/components/checkout_steps.tpl b/design/themes/responsive/templates/views/checkout/components/checkout_steps.tpl
index 7358eba..2ca0a97 100644
--- a/design/themes/responsive/templates/views/checkout/components/checkout_steps.tpl
+++ b/design/themes/responsive/templates/views/checkout/components/checkout_steps.tpl
@@ -37,4 +37,21 @@
         {include file="views/checkout/components/steps/step_four.tpl" edit=true complete=$completed_steps.step_four}
     {/if}
 {/if}
-<!--checkout_steps--></div>
\ No newline at end of file

incrize

diff --git a/design/themes/basic/templates/views/checkout/components/checkout_steps.tpl b/design/themes/basic/templates/views/checkout/components/checkout_steps.tpl
index 0c98d83..cac4a35 100644
--- a/design/themes/basic/templates/views/checkout/components/checkout_steps.tpl
+++ b/design/themes/basic/templates/views/checkout/components/checkout_steps.tpl
@@ -24,6 +24,7 @@
         {include file="views/checkout/components/steps/step_four.tpl" step="four" edit=$edit complete=$completed_steps.step_four}
     <!--checkout_steps--></div>
 {else}
+    <div id="checkout_steps">
     {$smarty.capture.checkout_error_content nofilter}

incrize

diff --git a/design/themes/basic/templates/views/checkout/components/checkout_steps.tpl b/design/themes/basic/templates/views/checkout/components/checkout_steps.tpl
index 7358eba..10d4a10 100644
--- a/design/themes/basic/templates/views/checkout/components/checkout_steps.tpl
+++ b/design/themes/basic/templates/views/checkout/components/checkout_steps.tpl
@@ -37,4 +37,21 @@
         {include file="views/checkout/components/steps/step_four.tpl" edit=true complete=$completed_steps.step_four}
     {/if}
 {/if}
-<!--checkout_steps--></div>
\ No newline at end of file

incrize

diff --git a/js/tygh/checkout.js b/js/tygh/checkout.js
index 8a72ef1..807aef7 100644
--- a/js/tygh/checkout.js
+++ b/js/tygh/checkout.js
@@ -128,6 +128,20 @@
         });
     });
 
+    $.ceEvent('on', 'ce.loadershow', function() {
+        var forms = $('#checkout_steps', _.doc).find('form');

incrize

diff --git a/app/functions/fn.promotions.php b/app/functions/fn.promotions.php
index 6f06298..f1d63d6 100644
--- a/app/functions/fn.promotions.php
+++ b/app/functions/fn.promotions.php
@@ -482,7 +482,7 @@ function fn_promotion_apply_cart_rule($bonus, &$cart, &$auth, &$cart_products)
 
     } elseif ($bonus['bonus'] == 'give_coupon') {
         $cart['promotions'][$bonus['promotion_id']]['bonuses'][$bonus_id]['pending'] = true;
-        $cart['promotions'][$bonus['promotion_id']]['bonuses'][$bonus_id]['coupon_code'] = fn_generate_code('', COUPON_CODE_LENGTH);
+        $cart['promotions'][$bonus['promotion_id']]['bonuses'][$bonus_id]['coupon_code'] = fn_promotion_generate_bonus_coupon($bonus, $bonus_id, $cart);