uzaharova

diff --git a/app/addons/discussion/schemas/block_manager/templates.post.php b/app/addons/discussion/schemas/block_manager/templates.post.php
new file mode 100644
index 0000000..2525afc
--- /dev/null
+++ b/app/addons/discussion/schemas/block_manager/templates.post.php
@@ -0,0 +1,20 @@
+<?php
+/***************************************************************************
+ *                                                                          *
+ *   (c) 2004 Vladimir V. Kalynyak, Alexey V. Vinokurov, Ilya M. Shalnev    *

uzaharova

diff --git a/app/addons/google_export/func.php b/app/addons/google_export/func.php
index 3f9c0dd..0f0c506 100644
--- a/app/addons/google_export/func.php
+++ b/app/addons/google_export/func.php
@@ -599,6 +599,8 @@ function fn_export_get_options_product_google_export($data, &$result, &$export_f
                 $product_id = $data[$k_result][$lang_code]['product_id'];
             }
 
+            $product = $data[$k_result][$lang_code];
+

uzaharova

diff --git a/design/themes/responsive/templates/addons/wishlist/hooks/products/product_detail_view_url.override.tpl b/design/themes/responsive/templates/addons/wishlist/hooks/products/product_detail_view_url.override.tpl
index cac5761..afd825b 100644
--- a/design/themes/responsive/templates/addons/wishlist/hooks/products/product_detail_view_url.override.tpl
+++ b/design/themes/responsive/templates/addons/wishlist/hooks/products/product_detail_view_url.override.tpl
@@ -1 +1,4 @@
-{"products.view?product_id=`$product.product_id`"}{if $product.combination}{"&combination=`$product.combination`"}{/if}
\ No newline at end of file
+{$product_detail_view_url = "products.view?product_id=`$product.product_id`&tt=111" scope=parent}
+{if $product.combination}
+    {$product_detail_view_url = "products.view?product_id=`$product.product_id`&combination=`$product.combination`" scope=parent}

uzaharova

diff --git a/app/addons/buy_together/func.php b/app/addons/buy_together/func.php
index ca54c59..35f813c 100644
--- a/app/addons/buy_together/func.php
+++ b/app/addons/buy_together/func.php
@@ -1010,6 +1010,7 @@ function fn_buy_together_calculate_cart_items(&$cart, &$cart_products, &$auth)
                                 $discounted_price = $discounted_price < 0 ? 0 : $discounted_price;
 
                                 $cart_products[$k]['price'] = $cart_products[$k]['base_price'] = $discounted_price;
+                                $cart['subtotal'] -= $chain['products'][$v['extra']['chain']['hash']]['discount'] * $cart_products[$k]['amount'];
                             }

uzaharova

diff --git a/js/lib/js-webshim/shims/dom-extend.js b/js/lib/js-webshim/shims/dom-extend.js
new file mode 100644
index 0000000..fc2b98f
--- /dev/null
+++ b/js/lib/js-webshim/shims/dom-extend.js
@@ -0,0 +1,1236 @@
+
+//this might was already extended by ES5 shim feature
+(function($){
+    "use strict";

uzaharova

diff --git a/_tools/migration/scripts/4.7.1/post_script.php b/_tools/migration/scripts/4.7.1/post_script.php
index b3827bc..0b63358 100644
--- a/_tools/migration/scripts/4.7.1/post_script.php
+++ b/_tools/migration/scripts/4.7.1/post_script.php
@@ -37,6 +37,7 @@ if (PRODUCT_BUILD == 'RU') {
 
     if (empty($cities_addon_status) && !empty($addon_status)) {
         fn_install_addon('rus_cities', false, false);
+        fn_load_addon('rus_cities');
     }

uzaharova

diff --git a/_tools/migration/scripts/4.7.1/post_script.php b/_tools/migration/scripts/4.7.1/post_script.php
index b3827bc..417255c 100644
--- a/_tools/migration/scripts/4.7.1/post_script.php
+++ b/_tools/migration/scripts/4.7.1/post_script.php
@@ -39,6 +39,92 @@ if (PRODUCT_BUILD == 'RU') {
         fn_install_addon('rus_cities', false, false);
     }
 
+    if (!function_exists('fn_rus_cities_read_cities_by_chunk')) {
+        function fn_rus_cities_read_cities_by_chunk($path, $size, $function_callback)

uzaharova

diff --git a/_docs/developer_changes/patch.md b/_docs/developer_changes/patch.md
index 97cdb01..bc2c961 100644
--- a/_docs/developer_changes/patch.md
+++ b/_docs/developer_changes/patch.md
@@ -2,7 +2,7 @@
 
 ### New function
 * `fn_is_lang_var_exists($value)` - Checks availability of translation for the variable.
-* `fn_exim_get_field_lable($value)` - Gets the translation for the variable.
+* `fn_exim_get_field_label($value)` - Gets the translation for the variable.

uzaharova

diff --git a/_docs/developer_changes/patch.md b/_docs/developer_changes/patch.md
index 5898f69..55e19d5 100644
--- a/_docs/developer_changes/patch.md
+++ b/_docs/developer_changes/patch.md
@@ -8,6 +8,11 @@
 ### New function
 
 * `Settings::getEditableSettingsEditionTypes($use_access_level = true)` - Provides editable settings' edition types.
+* `fn_get_data_of_changed_product($params, $auth, $mode)` - Prepares the array of data of the product that is being changed in cart or in the order, and returns the template of the product with the product data. The function is used only in controllers.
+* `fn_get_additional_product_data($product_data, $auth)` - Gets the data about the product's stock and options based on the passed data of the product that is being changed in cart or in the order. The function is used only in controllers.

uzaharova

diff --git a/app/addons/yml_export/Tygh/Ym/Yml2.php b/app/addons/yml_export/Tygh/Ym/Yml2.php
index 4680ef7..62c58f3 100644
--- a/app/addons/yml_export/Tygh/Ym/Yml2.php
+++ b/app/addons/yml_export/Tygh/Ym/Yml2.php
@@ -258,6 +258,9 @@ class Yml2 implements IYml2
 
         if (!$continue) {
             $this->head($file);
+        } else {
+            $yml2_params = $this->generateYml2Data();