uzaharova

diff --git a/_docs/core/addons/README.md b/_docs/core/addons/README.md
new file mode 100644
index 0000000..c4cf837
--- /dev/null
+++ b/_docs/core/addons/README.md
@@ -0,0 +1,39 @@
+Аддоны в CS-Cart
+================
+
+Процессы

uzaharova

diff --git a/app/addons/rus_cities/controllers/frontend/city.php b/app/addons/rus_cities/controllers/frontend/city.php
index 426a567..cc321fd 100644
--- a/app/addons/rus_cities/controllers/frontend/city.php
+++ b/app/addons/rus_cities/controllers/frontend/city.php
@@ -20,9 +20,9 @@ if (!defined('BOOTSTRAP')) { die('Access denied'); }
 if ($mode == 'autocomplete_city') {
     $params = $_REQUEST;
 
-    $status_country = db_get_field("SELECT status FROM ?:countries WHERE code = 'RU'");
+    $d_country = db_get_fields("SELECT code FROM ?:countries WHERE status = 'A'");

uzaharova

diff --git a/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php b/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
index 22fddae..68421a7 100644
--- a/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
+++ b/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
@@ -869,10 +869,9 @@ class RusEximCommerceml
                     }
                     $variant_data['variant'] = $variant;
 
-                    list($d_variants, $params_variant) = fn_get_product_feature_variants(array('feature_id' => array($variant_data['feature_id']), 'search_query' => $variant), 0, $import_params['lang_code']);
-                    if (!empty($d_variants)) {

uzaharova

diff --git a/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php b/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
index 41575c5..84064e6 100644
--- a/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
+++ b/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
@@ -1001,10 +1001,7 @@ class RusEximCommerceml
                 . " FROM ?:images AS images"
                 . " LEFT JOIN ?:images_links AS images_links ON images.image_id = images_links.detailed_id"
                 . " WHERE images_links.object_id = ?i $condition", $product_id);
-                
-            foreach ($images as $image) {

uzaharova

diff --git a/design/themes/responsive/templates/addons/gift_certificates/views/gift_certificates/update.tpl b/design/themes/responsive/templates/addons/gift_certificates/views/gift_certificates/update.tpl
index 0843642..d29e501 100644
--- a/design/themes/responsive/templates/addons/gift_certificates/views/gift_certificates/update.tpl
+++ b/design/themes/responsive/templates/addons/gift_certificates/views/gift_certificates/update.tpl
@@ -25,11 +25,25 @@
 
                 return false;
             }
-        }); 
-        

uzaharova

diff --git a/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php b/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
index 722d1fc..d87bca3 100644
--- a/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
+++ b/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
@@ -108,7 +108,7 @@ class RusEximCommerceml
 
         fn_echo("success\n");
 
-        if ($service_exchange != 'exim_1c') {
+        if (!empty($service_exchange) && $service_exchange != 'exim_cml') {

uzaharova

diff --git a/app/functions/fn.catalog.php b/app/functions/fn.catalog.php
index 7e0fe0e..b9c8f31 100644
--- a/app/functions/fn.catalog.php
+++ b/app/functions/fn.catalog.php
@@ -10108,7 +10108,13 @@ function fn_generate_feature_conditions($items, $selected_items, $join, $conditi
             }
             $condition .= ' AND (' . implode(' OR ', $combined_conditions) . ')';
         } else {
-            $condition .= ' AND (' . implode(' AND ', $conditions) . ')';
+            if (!empty($params['variant_filter']) && sizeof($variant_features) == 1) {

uzaharova

diff --git a/app/functions/fn.users.php b/app/functions/fn.users.php
index 553b474..aa8f80d 100644
--- a/app/functions/fn.users.php
+++ b/app/functions/fn.users.php
@@ -2931,6 +2931,12 @@ function fn_recover_password_generate_key($user_email, $notify = true)
 
     if ($user_email) {
         $condition = '';
+        
+        $current_protocol = 'http';

uzaharova

diff --git a/app/functions/fn.users.php b/app/functions/fn.users.php
index aa8f80d..7b6378b 100644
--- a/app/functions/fn.users.php
+++ b/app/functions/fn.users.php
@@ -2931,12 +2931,6 @@ function fn_recover_password_generate_key($user_email, $notify = true)
 
     if ($user_email) {
         $condition = '';
-        
-        $current_protocol = 'http';

uzaharova

diff --git a/app/functions/fn.users.php b/app/functions/fn.users.php
index 4f9d3cb..a463b3b 100644
--- a/app/functions/fn.users.php
+++ b/app/functions/fn.users.php
@@ -3003,12 +3003,6 @@ function fn_recover_password_generate_key($user_email, $notify = true)
     if ($user_email) {
         $condition = '';
 
-        $current_protocol = 'http';
-        $current_location = Registry::get('config.current_location');