torunar

diff --git a/design/themes/responsive/css/addons/image_zoom/styles.less b/design/themes/responsive/css/addons/image_zoom/styles.less
index d1541f348a..b5136c37eb 100644
--- a/design/themes/responsive/css/addons/image_zoom/styles.less
+++ b/design/themes/responsive/css/addons/image_zoom/styles.less
@@ -5,7 +5,6 @@
 
     &__flyout {
         opacity: 0;
-        z-index: -9001;
 

torunar

diff --git a/app/addons/suppliers/controllers/backend/shippings.post.php b/app/addons/suppliers/controllers/backend/shippings.post.php
index e51c4cd139..8aa64cb7e6 100644
--- a/app/addons/suppliers/controllers/backend/shippings.post.php
+++ b/app/addons/suppliers/controllers/backend/shippings.post.php
@@ -25,6 +25,16 @@ if ($mode == 'update') {
     $shipping_data = Tygh::$app['view']->getTemplateVars('shipping');
 
     list($suppliers) = fn_get_suppliers();
+    if (fn_allowed_for('ULTIMATE') && !fn_get_runtime_company_id()) {
+        $suppliers = fn_suppliers_filter_objects_by_sharing(

torunar

diff --git a/design/backend/templates/common/daterange_picker.tpl b/design/backend/templates/common/daterange_picker.tpl
index 08835f97de..653793a472 100644
--- a/design/backend/templates/common/daterange_picker.tpl
+++ b/design/backend/templates/common/daterange_picker.tpl
@@ -13,49 +13,47 @@
 
 <script type="text/javascript" class="cm-ajax_force">
     (function (_, $) {
-        $(document).ready(function () {
-            _.tr({

torunar

diff --git a/app/addons/discussion/controllers/backend/categories.post.php b/app/addons/discussion/controllers/backend/categories.post.php
index e2b73833f0..8bf3f86b0b 100644
--- a/app/addons/discussion/controllers/backend/categories.post.php
+++ b/app/addons/discussion/controllers/backend/categories.post.php
@@ -12,6 +12,8 @@
 * "copyright.txt" FILE PROVIDED WITH THIS DISTRIBUTION PACKAGE.            *
 ****************************************************************************/
 
+use Tygh\Enum\Addons\Discussion\DiscussionObjectTypes;
+use Tygh\Enum\Addons\Discussion\DiscussionTypes;

torunar

diff --git a/app/addons/rus_sdek/Tygh/Shippings/RusSdek.php b/app/addons/rus_sdek/Tygh/Shippings/RusSdek.php
index 0683333973..70e2b97188 100644
--- a/app/addons/rus_sdek/Tygh/Shippings/RusSdek.php
+++ b/app/addons/rus_sdek/Tygh/Shippings/RusSdek.php
@@ -15,7 +15,6 @@
 namespace Tygh\Shippings;
 
 use Tygh\Http;
-use Tygh\Registry;
 

torunar

diff --git a/app/Tygh/Api/Entities/Orders.php b/app/Tygh/Api/Entities/Orders.php
index afe9354b5e..e341cb63dc 100644
--- a/app/Tygh/Api/Entities/Orders.php
+++ b/app/Tygh/Api/Entities/Orders.php
@@ -20,6 +20,15 @@ use Tygh\Registry;
 
 class Orders extends AEntity
 {
+    /** @var string[] Request parameters that will not trigger full order recalculation when updating an order */
+    protected $status_update_parameters = [

torunar

diff --git a/app/addons/lite_checkout/controllers/frontend/checkout.post.php b/app/addons/lite_checkout/controllers/frontend/checkout.post.php
index 74b4540cb7..0b3f5cb0eb 100644
--- a/app/addons/lite_checkout/controllers/frontend/checkout.post.php
+++ b/app/addons/lite_checkout/controllers/frontend/checkout.post.php
@@ -55,12 +55,16 @@ if ($mode == 'checkout') {
 
     $user_data['name'] = trim($user_data['firstname'] . ' ' . $user_data['lastname']);
 
-    if ($cart['payment_id'] === 0) {
+    if ((float) $cart['total'] == 0) {

torunar

<?php

namespace Tygh\UpgradeCenter\Connectors\SampleAddon;

use Tygh\Addons\SchemesManager;
use Tygh\Http;
use Tygh\Registry;
use Tygh\Settings;
use Tygh\Tools\Url;
use Tygh\UpgradeCenter\Connectors\BaseAddonConnector;

torunar

diff --git a/app/controllers/backend/exim.php b/app/controllers/backend/exim.php
index 42411f99af..60f42acd4a 100644
--- a/app/controllers/backend/exim.php
+++ b/app/controllers/backend/exim.php
@@ -108,11 +108,11 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 
                 // Direct download
                 if ($_REQUEST['export_options']['output'] == 'D') {
-                    $url = fn_url("exim.get_file?filename=" . rawurlencode($_REQUEST['export_options']['filename']), 'A', 'current');
+                    $url = fn_url("exim.get_file?time=" . TIME . "&filename=" . rawurlencode($_REQUEST['export_options']['filename']), 'A', 'current');

torunar

diff --git a/app/addons/rus_customer_geolocation/Tygh/Addons/RusCustomerGeolocation/RusCustomerGeolocation.php b/app/addons/rus_customer_geolocation/Tygh/Addons/RusCustomerGeolocation/RusCustomerGeolocation.php
index a0f5c200ac..7fc9050b8c 100644
--- a/app/addons/rus_customer_geolocation/Tygh/Addons/RusCustomerGeolocation/RusCustomerGeolocation.php
+++ b/app/addons/rus_customer_geolocation/Tygh/Addons/RusCustomerGeolocation/RusCustomerGeolocation.php
@@ -338,7 +338,7 @@ class RusCustomerGeolocation
      * @param array  $array
      * @param string $field
      *
-     * @return string Field value or empty string
+     * @return string|null Field value or null