ichaykin

diff --git a/app/addons/store_locator/controllers/frontend/store_locator.php b/app/addons/store_locator/controllers/frontend/store_locator.php
index aaa5fdebc0..a3eef7cc99 100644
--- a/app/addons/store_locator/controllers/frontend/store_locator.php
+++ b/app/addons/store_locator/controllers/frontend/store_locator.php
@@ -77,7 +77,6 @@ if ($mode == 'search') {
         'page_size' => 10,
         'page' => 1,
         'status' => ObjectStatuses::ACTIVE,
-        'without_warehouses' => true,
     ], $_REQUEST);

ichaykin

diff --git a/app/addons/product_variations/schemas/exim/products.functions.php b/app/addons/product_variations/schemas/exim/products.functions.php
index 664e7b7341..c31c049950 100644
--- a/app/addons/product_variations/schemas/exim/products.functions.php
+++ b/app/addons/product_variations/schemas/exim/products.functions.php
@@ -303,9 +303,6 @@ function fn_product_variations_exim_update_variation_groups($primary_object_ids,
                     return 0;
                 });
             }
-            if (count($products) <= 1) {
-                continue;

ichaykin

diff --git a/app/addons/stripe_connect/Tygh/Addons/StripeConnect/Payments/StripeConnect.php b/app/addons/stripe_connect/Tygh/Addons/StripeConnect/Payments/StripeConnect.php
index 9001807f26..8aa8f1f07c 100644
--- a/app/addons/stripe_connect/Tygh/Addons/StripeConnect/Payments/StripeConnect.php
+++ b/app/addons/stripe_connect/Tygh/Addons/StripeConnect/Payments/StripeConnect.php
@@ -423,27 +423,30 @@ class StripeConnect
     protected function getWithdrawalAmount(array $order_info, PayoutsManager $payouts_manager, Charge $charge = null)
     {
         $application_fee = $payouts_manager->getOrderFee($order_info['order_id']);
-
+        Logger::log(Logger::ACTION_INFO, 'transfer_withdrawal_start', ['o_id' => $order_info['order_id'], 'app_fee' => $application_fee]);

ichaykin

diff --git a/app/addons/stripe_connect/Tygh/Addons/StripeConnect/Payments/StripeConnect.php b/app/addons/stripe_connect/Tygh/Addons/StripeConnect/Payments/StripeConnect.php
index 9001807f26..49474dfad7 100644
--- a/app/addons/stripe_connect/Tygh/Addons/StripeConnect/Payments/StripeConnect.php
+++ b/app/addons/stripe_connect/Tygh/Addons/StripeConnect/Payments/StripeConnect.php
@@ -206,7 +206,7 @@ class StripeConnect
         $this->order_info = $order_info;
 
         $orders_queue = $this->getOrdersToCharge($order_info);
-
+        Logger::log(Logger::ACTION_INFO, 'start_charge', [$order_info['order_id'], $order_info['status'], $orders_queue]);

ichaykin

diff --git a/app/addons/commerceml/controllers/frontend/commerceml.php b/app/addons/commerceml/controllers/frontend/commerceml.php
index 564d2f4f25..89febb4e8d 100644
--- a/app/addons/commerceml/controllers/frontend/commerceml.php
+++ b/app/addons/commerceml/controllers/frontend/commerceml.php
@@ -36,6 +36,8 @@ if (empty($_SERVER['PHP_AUTH_USER'])) {
     exit;
 }
 
+fn_define('COMMERCEML_IMPORT', true);
+

ichaykin

diff --git a/app/addons/seo/schemas/products/page_configuration.post.php b/app/addons/seo/schemas/products/page_configuration.post.php
index 2bcd88815e..960033a4cc 100644
--- a/app/addons/seo/schemas/products/page_configuration.post.php
+++ b/app/addons/seo/schemas/products/page_configuration.post.php
@@ -19,10 +19,10 @@ defined('BOOTSTRAP') or die('Access denied');
 $schema['seo'] = [
     'position'    => 1800,
     'title'       => 'seo',
-    'is_optional' => false,
+    'is_optional' => true,

ichaykin

diff --git a/app/functions/fn.cart.php b/app/functions/fn.cart.php
index 5ff5c77ac6..76a6f42039 100644
--- a/app/functions/fn.cart.php
+++ b/app/functions/fn.cart.php
@@ -3437,16 +3437,6 @@ function fn_update_shipping($shipping_data, $shipping_id, $lang_code = DESCR_SL)
             foreach (array_keys(Languages::getAll()) as $shipping_data['lang_code']) {
                 db_query('INSERT INTO ?:shipping_descriptions ?e', $shipping_data);
             }
-
-            if ($shipping_data['rate_calculation'] === 'R') {

ichaykin

diff --git a/design/themes/responsive/templates/views/products/components/product_options.tpl b/design/themes/responsive/templates/views/products/components/product_options.tpl
index 39f0b1a836..c60994c91b 100644
--- a/design/themes/responsive/templates/views/products/components/product_options.tpl
+++ b/design/themes/responsive/templates/views/products/components/product_options.tpl
@@ -322,10 +322,10 @@
                     }
                 </div>
             {/if}
-            {/if}
 

ichaykin

diff --git a/app/addons/store_locator/schemas/permissions/vendor_multivendor.post.php b/app/addons/store_locator/schemas/permissions/vendor_multivendor.post.php
index b4a7029fa8..a43ec318d3 100644
--- a/app/addons/store_locator/schemas/permissions/vendor_multivendor.post.php
+++ b/app/addons/store_locator/schemas/permissions/vendor_multivendor.post.php
@@ -22,6 +22,9 @@ $schema['controllers']['store_locator'] = [
         'update'            => [
             'permissions' => 'manage_store_locator',
         ],
+        'm_update'            => [
+            'permissions' => 'manage_store_locator',

ichaykin

diff --git a/js/tygh/backend/heading.js b/js/tygh/backend/heading.js
index 804b3bbec0..9dea47db0c 100644
--- a/js/tygh/backend/heading.js
+++ b/js/tygh/backend/heading.js
@@ -1,35 +1,59 @@
 (function (_, $) {
-    $(document).ready(function () {
+    // Navbar submenu Horizontal position
+    $(_.doc).on('mouseenter', '.navbar-right li, .subnav .nav-pills:not(.mobile-visible) li', function () {
+        let $dropdownMenu = $(this).children('.dropdown-menu');