This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/functions/fn.categories.php b/app/functions/fn.categories.php | |
index c3fb61f159..06284fb602 100644 | |
--- a/app/functions/fn.categories.php | |
+++ b/app/functions/fn.categories.php | |
@@ -624,7 +624,7 @@ function fn_get_categories_list_with_parents(array $category_ids, $lang_code = C | |
$parent_ids = explode('/', $category['id_path']); | |
array_pop($parent_ids); | |
- $category['parents'] = fn_sort_by_ids( | |
+ $category['parents'] = fn_get_items_by_ids( |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/addons/vendor_plans/func.php b/app/addons/vendor_plans/func.php | |
index 4654a06f0d..f7b38b4065 100644 | |
--- a/app/addons/vendor_plans/func.php | |
+++ b/app/addons/vendor_plans/func.php | |
@@ -240,17 +240,16 @@ function fn_vendor_plans_update_company(&$company_data, &$company_id, &$lang_cod | |
) { | |
$company = Company::model()->find($company_id); | |
$current_plan = VendorPlan::model()->find($company_data['current_plan']); | |
+ | |
/** @var \Tygh\Notifications\EventDispatcher $event_dispatcher */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/addons/vendor_plans/Tygh/Models/Company.php b/app/addons/vendor_plans/Tygh/Models/Company.php | |
index a3071d60e1..be0aad407b 100644 | |
--- a/app/addons/vendor_plans/Tygh/Models/Company.php | |
+++ b/app/addons/vendor_plans/Tygh/Models/Company.php | |
@@ -509,4 +509,10 @@ class Company extends AModel | |
return isset($this->current_attributes['email']) ? $this->current_attributes['email'] : ''; | |
} | |
+ | |
+ /** @inheritdoc */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/Tygh/Notifications/Transports/Internal/InternalMessageSchema.php b/app/Tygh/Notifications/Transports/Internal/InternalMessageSchema.php | |
index 899611ad58..1db3676221 100644 | |
--- a/app/Tygh/Notifications/Transports/Internal/InternalMessageSchema.php | |
+++ b/app/Tygh/Notifications/Transports/Internal/InternalMessageSchema.php | |
@@ -84,6 +84,7 @@ class InternalMessageSchema extends BaseMessageSchema | |
public function init(Data $data) | |
{ | |
$self = parent::init($data); | |
+ $data = new Data($self->data); | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/js/addons/help_center/func.js b/js/addons/help_center/func.js | |
index 308dac3..390f4b3 100644 | |
--- a/js/addons/help_center/func.js | |
+++ b/js/addons/help_center/func.js | |
@@ -1,7 +1,8 @@ | |
(function(_, $){ | |
$.ceEvent('on', 'ce.commoninit', function (context) { | |
if ($(context).is(document)) { | |
- fnInitHelpCenter(); | |
+ setTimeout(fnInitHelpCenter, 2000); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/controllers/backend/init.php b/app/controllers/backend/init.php | |
index f00a4eb..f468e3b 100644 | |
--- a/app/controllers/backend/init.php | |
+++ b/app/controllers/backend/init.php | |
@@ -276,6 +276,7 @@ Tygh::$app['view']->assign('store_mode', $store_mode); | |
Tygh::$app['view']->assign('product_state_suffix', $product_state_suffix); | |
Tygh::$app['view']->assign('store_mode_number_of_storefronts', count(fn_get_all_companies_ids())); | |
Tygh::$app['view']->assign('store_mode_allowed_number_of_storefronts', fn_get_storage_data('allowed_number_of_stores')); | |
+Tygh::$app['view']->assign('hash_of_available_countries', fn_get_hash_of_available_countries()); | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/design/themes/responsive/templates/views/checkout/components/profile_fields/s_country.tpl b/design/themes/responsive/templates/views/checkout/components/profile_fields/s_country.tpl | |
index 7bdf8cb..bc64ff3 100644 | |
--- a/design/themes/responsive/templates/views/checkout/components/profile_fields/s_country.tpl | |
+++ b/design/themes/responsive/templates/views/checkout/components/profile_fields/s_country.tpl | |
@@ -3,6 +3,7 @@ | |
<select data-ca-lite-checkout-field="user_data.s_country" | |
class="cm-country cm-location-shipping litecheckout__input litecheckout__input--selectable litecheckout__input--selectable--select" | |
data-ca-lite-checkout-element="country" | |
+ data-ca-lite-checkout-last-value="{$user_data.s_country}" | |
required |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/addons/master_products/func.php b/app/addons/master_products/func.php | |
index 1593311..144289a 100644 | |
--- a/app/addons/master_products/func.php | |
+++ b/app/addons/master_products/func.php | |
@@ -137,7 +137,7 @@ function fn_master_products_get_products( | |
} | |
$condition .= db_quote(' AND products.master_product_id = ?i', $master_product_id); | |
- } elseif (empty($params['runtime_company_id']) && empty($params['pid'])) { | |
+ } elseif (empty($params['runtime_company_id']) && empty($params['pid']) && empty($params['only_for_counting'])) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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'; |