ichaykin

diff --git a/app/controllers/frontend/theme_editor.php b/app/controllers/frontend/theme_editor.php
index a5b583c..27d5b2e 100644
--- a/app/controllers/frontend/theme_editor.php
+++ b/app/controllers/frontend/theme_editor.php
@@ -212,6 +212,10 @@ if ($mode == 'view') {
         $_REQUEST['style_id'] = $_REQUEST['preset_id'];
     }
 
+    if (!empty($_REQUEST['name'])) {
+        $_REQUEST['name'] = trim($_REQUEST['name']);

ichaykin

diff --git a/app/addons/product_variations/src/HookHandlers/ProductsHookHandler.php b/app/addons/product_variations/src/HookHandlers/ProductsHookHandler.php
index cb0f470..41ae2f6 100644
--- a/app/addons/product_variations/src/HookHandlers/ProductsHookHandler.php
+++ b/app/addons/product_variations/src/HookHandlers/ProductsHookHandler.php
@@ -24,6 +24,7 @@ use Tygh\Addons\ProductVariations\ServiceProvider;
 use Tygh\Application;
 use Tygh\Enum\NotificationSeverity;
 use Tygh\Enum\ProductFeatures;
+use Tygh\Enum\YesNo;
 use Tygh\Registry;

ichaykin

diff --git a/app/addons/product_variations/src/HookHandlers/ProductsHookHandler.php b/app/addons/product_variations/src/HookHandlers/ProductsHookHandler.php
index bd8f1aa..41ae2f6 100644
--- a/app/addons/product_variations/src/HookHandlers/ProductsHookHandler.php
+++ b/app/addons/product_variations/src/HookHandlers/ProductsHookHandler.php
@@ -24,6 +24,7 @@ use Tygh\Addons\ProductVariations\ServiceProvider;
 use Tygh\Application;
 use Tygh\Enum\NotificationSeverity;
 use Tygh\Enum\ProductFeatures;
+use Tygh\Enum\YesNo;
 use Tygh\Registry;

ichaykin

diff --git a/design/backend/templates/views/addons/components/addons_list.tpl b/design/backend/templates/views/addons/components/addons_list.tpl
index 8098b54..e01228a 100644
--- a/design/backend/templates/views/addons/components/addons_list.tpl
+++ b/design/backend/templates/views/addons/components/addons_list.tpl
@@ -50,13 +50,13 @@
         {assign var="addon_classes" value="filter_status_`$a.status`"}
 
         {if ($a.is_core_addon)}
-            {$addon_classes = "`$addon_classes` filter_source_built_in filter_supplier_`$a.supplier`"}
+            {$addon_classes = "`$addon_classes` filter_source_built_in"}

ichaykin

diff --git a/js/tygh/live_editor_mode.js b/js/tygh/live_editor_mode.js
index 8ed9666..abcc609 100644
--- a/js/tygh/live_editor_mode.js
+++ b/js/tygh/live_editor_mode.js
@@ -264,7 +264,6 @@
                     str_len = value.length ? value.length : 1;
                 
                 if (elm.is('input')) {
-                    value = $.formatPrice(value.replace(new RegExp(',', 'g'), ''));
                     elm.attr('size', str_len);

ichaykin

diff --git a/js/tygh/file_uploader.js b/js/tygh/file_uploader.js
index b14be17..d9947e5 100644
--- a/js/tygh/file_uploader.js
+++ b/js/tygh/file_uploader.js
@@ -36,7 +36,9 @@
             value: function () {
                 for (var i = 0; i < this.length; i++) {
                     if (this[i].image_type === 'M') {
-                        return this[i]; } }
+                        return this[i];

ichaykin

diff --git a/app/addons/google_sitemap/func.php b/app/addons/google_sitemap/func.php
index cc54b10..769b10e 100644
--- a/app/addons/google_sitemap/func.php
+++ b/app/addons/google_sitemap/func.php
@@ -74,8 +74,9 @@ function fn_google_sitemap_generate_link($type, $id, $languages, $extra = [], $s
              * @param string[]   $languages     List of languages to generate the sitemap for
              * @param array      $extra         Additional link parameters
              * @param int        $storefront_id Storefront idenfitier to generate the sitemap for
+             * @param string     $link          Entry link
              */

ichaykin

diff --git a/app/addons/rus_ruble/config.php b/app/addons/rus_ruble/config.php
index dae65e2..3c22b08 100644
--- a/app/addons/rus_ruble/config.php
+++ b/app/addons/rus_ruble/config.php
@@ -15,7 +15,7 @@
 if (!defined('BOOTSTRAP')) { die('Access denied'); }
 
 fn_define('CRON_IMPORT_KEY_LENGTH', 16);
-fn_define('SYMBOL_RUBL', '<span class="ty-rub">Р</span>');
+fn_define('SYMBOL_RUBL', '₽');

ichaykin

diff --git a/app/addons/rus_pecom/Tygh/Shippings/Services/Pecom.php b/app/addons/rus_pecom/Tygh/Shippings/Services/Pecom.php
index 1f5822b..ab43079 100644
--- a/app/addons/rus_pecom/Tygh/Shippings/Services/Pecom.php
+++ b/app/addons/rus_pecom/Tygh/Shippings/Services/Pecom.php
@@ -265,7 +265,7 @@ class Pecom implements IService
             $data['strah'] = $this->_shipping_info['package_info']['C'];
         }
 
-        $url = 'https://calc.pecom.ru/bitrix/components/pecom/calc/ajax.php';
+        $url = 'http://calc.pecom.ru/bitrix/components/pecom/calc/ajax.php';

ichaykin

diff --git a/app/functions/fn.companies.php b/app/functions/fn.companies.php
index 7d461e2..462d826 100644
--- a/app/functions/fn.companies.php
+++ b/app/functions/fn.companies.php
@@ -1349,7 +1349,7 @@ function fn_change_company_status($company_id, $status_to, $reason = '', &$statu
     if ($notify && !empty($company_data['email'])) {
         $e_username = $e_account = $e_password = '';
         if ($status_from == 'N' && ($status_to == 'A' || $status_to == 'P')) {
-            list($e_username, $e_account) = [$username, $account];
+            list($e_username, $e_account) = [$user_data['email'], $account];