uzaharova

diff --git a/app/functions/fn.exim.php b/app/functions/fn.exim.php
index aa0a500..5454f57 100644
--- a/app/functions/fn.exim.php
+++ b/app/functions/fn.exim.php
@@ -1889,3 +1889,11 @@ function fn_exim_apply_company($pattern, &$alt_keys, &$object, &$skip_get_primar
         }
     }
 }
+
+function fn_exim_key_lable($value)

uzaharova

diff --git a/app/functions/fn.exim.php b/app/functions/fn.exim.php
index aa0a500..2ecd26d 100644
--- a/app/functions/fn.exim.php
+++ b/app/functions/fn.exim.php
@@ -1889,3 +1889,22 @@ function fn_exim_apply_company($pattern, &$alt_keys, &$object, &$skip_get_primar
         }
     }
 }
+
+function fn_exim_get_language_value($value, $lang_code = CART_LANGUAGE)

uzaharova

diff --git a/_tools/migration/migrations/20171017131431_addons_rus_cities_change_setting.php b/_tools/migration/migrations/20171017131431_addons_rus_cities_change_setting.php
index 28d547b..3b2eb9d 100644
--- a/_tools/migration/migrations/20171017131431_addons_rus_cities_change_setting.php
+++ b/_tools/migration/migrations/20171017131431_addons_rus_cities_change_setting.php
@@ -16,53 +16,52 @@ class AddonsRusCitiesChangeSetting extends AbstractMigration
         $this->deleteSectionSetting($pr, 'rus_edost');
         $this->deleteSectionSetting($pr, 'rus_sdek');
 
+        if (!$this->hasTable($pr . 'rus_cities')) {
+            return;

uzaharova

diff --git a/_tools/migration/migrations/20171017131431_addons_rus_cities_change_setting.php b/_tools/migration/migrations/20171017131431_addons_rus_cities_change_setting.php
index 28d547b..3b2eb9d 100644
--- a/_tools/migration/migrations/20171017131431_addons_rus_cities_change_setting.php
+++ b/_tools/migration/migrations/20171017131431_addons_rus_cities_change_setting.php
@@ -16,53 +16,52 @@ class AddonsRusCitiesChangeSetting extends AbstractMigration
         $this->deleteSectionSetting($pr, 'rus_edost');
         $this->deleteSectionSetting($pr, 'rus_sdek');
 
+        if (!$this->hasTable($pr . 'rus_cities')) {
+            return;

uzaharova

diff --git a/_docs/developer_changes/patch.md b/_docs/developer_changes/patch.md
index f297485..32eb1ce 100644
--- a/_docs/developer_changes/patch.md
+++ b/_docs/developer_changes/patch.md
@@ -3,7 +3,7 @@
 ### New function
 * `fn_get_user_auth_token($user_id, $ttl = 604800)` -  Gets user auth token.
 * `\Tygh\Tools\Url::buildUrn($dispatch, array $query_params = array())` - Builds uniform resource name with query string.
-* `fn_get_console_protocol` - Gets the type of protocol.
+* `fn_get_console_protocol` - Gets the communication protocol to use for URLs when accessing a store in the console mode.

uzaharova

diff --git a/app/Tygh/Backend/Storage/File.php b/app/Tygh/Backend/Storage/File.php
index 19f2cd7..b3030c3 100644
--- a/app/Tygh/Backend/Storage/File.php
+++ b/app/Tygh/Backend/Storage/File.php
@@ -149,7 +149,9 @@ class File extends ABackend
             } else {
                 $prefix = Registry::get('config.current_location');
 
-                if (defined('CONSOLE') && AREA == 'C' && Registry::get('settings.Security.secure_storefront') == 'full') {
+                if (defined('CONSOLE') && ((AREA == 'C' && Registry::get('settings.Security.secure_storefront') == 'full')

uzaharova

diff --git a/app/addons/product_variations/func.php b/app/addons/product_variations/func.php
index e7e10ad..30ac729 100644
--- a/app/addons/product_variations/func.php
+++ b/app/addons/product_variations/func.php
@@ -1226,7 +1226,7 @@ function fn_product_variations_commerceml_get_product_variations(&$variation_dat
  */
 function fn_product_variations_commerceml_generate_product_variations(&$product_vatiation, $description_data, $options_ids, $tracking, $languages)
 {
-    $product_variation_id = db_query('REPLACE INTO ?:products ?e', $product_vatiation);
+    $product_variation_id = db_replace_into('products', $product_vatiation);

uzaharova

<?php
/***************************************************************************
 *                                                                          *
 *   (c) 2004 Vladimir V. Kalynyak, Alexey V. Vinokurov, Ilya M. Shalnev    *
 *                                                                          *
 * This  is  commercial  software,  only  users  who have purchased a valid *
 * license  and  accept  to the terms of the  License Agreement can install *
 * and use this program.                                                    *
 *                                                                          *
 ****************************************************************************

uzaharova

diff --git a/app/addons/product_variations/func.php b/app/addons/product_variations/func.php
index 6fd8cc0..6ef8996 100644
--- a/app/addons/product_variations/func.php
+++ b/app/addons/product_variations/func.php
@@ -1179,4 +1179,23 @@ function fn_product_variations_get_product_data_pre(&$product_id)
 
         Registry::set('runtime.selected_options.' . $product_id, $selected_options);
     }
+}
+

uzaharova

diff --git a/app/addons/product_variations/func.php b/app/addons/product_variations/func.php
index a6d476b..9c35e59 100644
--- a/app/addons/product_variations/func.php
+++ b/app/addons/product_variations/func.php
@@ -1066,6 +1066,7 @@ function fn_product_variations_after_options_calculation($mode, $data)
             }
         }
 
+        $view->assign('no_capture', false);
         $view->assign('tabs', $tabs);