Skip to content

Instantly share code, notes, and snippets.

diff --git a/app/addons/commerceml/src/Importers/ProductImporter.php b/app/addons/commerceml/src/Importers/ProductImporter.php
index d027b5c88d..b288192b62 100644
--- a/app/addons/commerceml/src/Importers/ProductImporter.php
+++ b/app/addons/commerceml/src/Importers/ProductImporter.php
@@ -571,7 +571,7 @@ class ProductImporter
}
if ($lang_code) {
- $product_name = $product->name->hasTraslate($lang_code) ? $product->name->getTranslate($lang_code) : null;
+ $product_name = $product->name->hasTraslate($lang_code) ? $product->name->getTranslate($lang_code) : $product->name->default_value;
diff --git a/app/addons/commerceml/src/HookHandlers/ProductHookHandler.php b/app/addons/commerceml/src/HookHandlers/ProductHookHandler.php
index bf23cbc42f..4a662baa4a 100644
--- a/app/addons/commerceml/src/HookHandlers/ProductHookHandler.php
+++ b/app/addons/commerceml/src/HookHandlers/ProductHookHandler.php
@@ -37,29 +37,37 @@ class ProductHookHandler
*/
public static function onUpdateProductFeaturesValuePre(
$product_id,
- array $product_features,
+ array &$product_features,
diff --git a/design/backend/templates/addons/product_bundles/hooks/products/tabs_extra.post.tpl b/design/backend/templates/addons/product_bundles/hooks/products/tabs_extra.post.tpl
index 9ecabead16..2520ac4f1a 100644
--- a/design/backend/templates/addons/product_bundles/hooks/products/tabs_extra.post.tpl
+++ b/design/backend/templates/addons/product_bundles/hooks/products/tabs_extra.post.tpl
@@ -19,6 +19,7 @@
link_text=__("product_bundles.add_new_bundle")
title=__("product_bundles.add_new_bundle")
act="general"
+ icon="icon-plus"
}
diff --git a/design/themes/responsive/templates/addons/product_bundles/hooks/promotions/promotion_list.post.tpl b/design/themes/responsive/templates/addons/product_bundles/hooks/promotions/promotion_list.post.tpl
index 5291bc796b..210aaace1c 100644
--- a/design/themes/responsive/templates/addons/product_bundles/hooks/promotions/promotion_list.post.tpl
+++ b/design/themes/responsive/templates/addons/product_bundles/hooks/promotions/promotion_list.post.tpl
@@ -1,5 +1,5 @@
{if $bundles}
- <p><h1>{__("product_bundles.active_bundles")}</h1></p>
+ <h1>{__("product_bundles.active_bundles")}</h1>
{foreach $bundles as $bundle}
{include file="addons/product_bundles/components/bundle_promotion.tpl"}
diff --git a/app/addons/commerceml/src/HookHandlers/ProductHookHandler.php b/app/addons/commerceml/src/HookHandlers/ProductHookHandler.php
index 3ca8763148..bf23cbc42f 100644
--- a/app/addons/commerceml/src/HookHandlers/ProductHookHandler.php
+++ b/app/addons/commerceml/src/HookHandlers/ProductHookHandler.php
@@ -14,6 +14,8 @@
namespace Tygh\Addons\CommerceML\HookHandlers;
+use Tygh\Enum\ProductFeatures;
+
diff --git a/design/themes/responsive/templates/addons/call_requests/hooks/products/add_to_cart.post.tpl b/design/themes/responsive/templates/addons/call_requests/hooks/products/add_to_cart.post.tpl
index d75729ccf6..91771bb8c4 100644
--- a/design/themes/responsive/templates/addons/call_requests/hooks/products/add_to_cart.post.tpl
+++ b/design/themes/responsive/templates/addons/call_requests/hooks/products/add_to_cart.post.tpl
@@ -1,5 +1,5 @@
{if !$hide_form
- && $addons.call_requests.buy_now_with_one_click == "Y"
+ && $addons.call_requests.buy_now_with_one_click == "YesNo::YES"|enum
&& ($auth.user_id
|| $settings.Checkout.allow_anonymous_shopping == "allow_shopping"
diff --git a/app/addons/rus_unisender/func.php b/app/addons/rus_unisender/func.php
index 7fb206b51a..218d606796 100644
--- a/app/addons/rus_unisender/func.php
+++ b/app/addons/rus_unisender/func.php
@@ -14,6 +14,7 @@
use Tygh\Http;
use Tygh\Registry;
+use Tygh\Enum\SiteArea;
use Tygh\Enum\YesNo;
diff --git a/app/addons/stripe_connect/controllers/backend/companies.post.php b/app/addons/stripe_connect/controllers/backend/companies.post.php
index 6360d6cd79..420cf2020f 100644
--- a/app/addons/stripe_connect/controllers/backend/companies.post.php
+++ b/app/addons/stripe_connect/controllers/backend/companies.post.php
@@ -39,13 +39,8 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
fn_set_notification('E', __('error'), $disconnect_result->getFirstError());
}
- fn_update_company(
- array(