ichaykin

diff --git a/design/backend/templates/views/orders/details.tpl b/design/backend/templates/views/orders/details.tpl
index 8c42ae3a09..9aa8c42096 100644
--- a/design/backend/templates/views/orders/details.tpl
+++ b/design/backend/templates/views/orders/details.tpl
@@ -383,19 +383,19 @@
                                 {$shipment_id = 0}
                                 {$carrier = ""}
                                 {hook name="orders:new_shipment"}
-                                <div class="control-group">
-                                    <label class="control-label" for="tracking_number">{__("tracking_number")}</label>

ichaykin

diff --git a/app/Tygh/Backend/Database/Pdo.php b/app/Tygh/Backend/Database/Pdo.php
index eeafd47f21..dc3356d534 100644
--- a/app/Tygh/Backend/Database/Pdo.php
+++ b/app/Tygh/Backend/Database/Pdo.php
@@ -53,7 +53,10 @@ class Pdo implements IBackend
                 $user,
                 $passwd,
                 // phpcs:ignore
-                [\PDO::ATTR_ERRMODE => \PDO::ERRMODE_SILENT]
+                [

ichaykin

diff --git a/app/addons/wishlist/func.php b/app/addons/wishlist/func.php
index d5fe8a6970..1d6dae267b 100644
--- a/app/addons/wishlist/func.php
+++ b/app/addons/wishlist/func.php
@@ -488,3 +488,20 @@ function fn_wishlist_delete_product_pre($product_id, $status)
     }
     db_query("DELETE FROM ?:user_session_products WHERE type = 'W' AND product_id = ?i", $product_id);
 }
+
+/**

ichaykin

diff --git a/app/addons/commerceml/src/Importers/ProductImporter.php b/app/addons/commerceml/src/Importers/ProductImporter.php
index d4d8214119..f2bda956eb 100644
--- a/app/addons/commerceml/src/Importers/ProductImporter.php
+++ b/app/addons/commerceml/src/Importers/ProductImporter.php
@@ -934,7 +934,9 @@ class ProductImporter
             $feature_id = (int) $product_feature_value->feature_id->local_id;
 
             $selected_feature_values = $product_feature_value->selected_values->getAll();
-            $is_multiple_values = fn_get_product_feature_type_by_feature_id($feature_id) === ProductFeatures::MULTIPLE_CHECKBOX;
+            $feature_type = fn_get_product_feature_type_by_feature_id($feature_id);

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,