Skip to content

Instantly share code, notes, and snippets.

Ekaterina Davydova edavydova

Block or report user

Report or block edavydova

Hide content and notifications from this user.

Learn more about blocking users

Contact Support about this user’s behavior.

Learn more about reporting abuse

Report abuse
View GitHub Profile
View app-functions-fn.catalog.php.diff
diff --git a/app/functions/fn.catalog.php b/app/functions/fn.catalog.php
index cbbbd3f..8633705 100644
--- a/app/functions/fn.catalog.php
+++ b/app/functions/fn.catalog.php
@@ -5403,7 +5403,7 @@ function fn_update_product_feature($feature_data, $feature_id, $lang_code = DESC
} else {
$action = 'update';
- $old_feature_data = fn_get_feature_data_with_subfeatures($feature_id, $lang_code);
+ $old_feature_data = fn_get_feature_data_with_subfeatures($feature_id, $lang_code, ['statuses' => []]);
View app-addons-wishlist-func.php.diff
diff --git a/app/addons/wishlist/func.php b/app/addons/wishlist/func.php
index f75cebd..62995fa 100644
--- a/app/addons/wishlist/func.php
+++ b/app/addons/wishlist/func.php
@@ -112,12 +112,6 @@ function fn_wishlist_get_carts(&$type_restrictions)
}
}
-function fn_wishlist_get_carts_before_select($params, $items_per_page, $fields, $join, &$condition, &$group, &$sorting, $limit)
-{
View app-addons-rus_online_cash_register-Tygh-Addons-RusOnlineCashRegister-Receipt-Item.php.diff
diff --git a/app/addons/rus_online_cash_register/Tygh/Addons/RusOnlineCashRegister/Receipt/Item.php b/app/addons/rus_online_cash_register/Tygh/Addons/RusOnlineCashRegister/Receipt/Item.php
index 3fc9eae..8444366 100644
--- a/app/addons/rus_online_cash_register/Tygh/Addons/RusOnlineCashRegister/Receipt/Item.php
+++ b/app/addons/rus_online_cash_register/Tygh/Addons/RusOnlineCashRegister/Receipt/Item.php
@@ -16,6 +16,7 @@
namespace Tygh\Addons\RusOnlineCashRegister\Receipt;
use Tygh\Addons\RusTaxes\Receipt\Item as BaseItem;
+use Tygh\Addons\RusTaxes\Receipt\Receipt as BaseReceipt;
View app-addons-rus_exim_1c-Tygh-Commerceml-RusEximCommerceml.php.diff
diff --git a/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php b/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
index d099e05..43df60f 100644
--- a/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
+++ b/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
@@ -3130,7 +3130,7 @@ class RusEximCommerceml
return $xml;
}
- public function importFileOrders($xml, $lang_code)
+ public function importFileOrders($xml)
View app-addons-rus_exim_1c-Tygh-Commerceml-RusEximCommerceml.php.diff
diff --git a/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php b/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
index 1562a02..31fdd8d 100644
--- a/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
+++ b/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
@@ -3947,7 +3947,8 @@ class RusEximCommerceml
if ($xml_offer->{$cml['product_features']}->{$cml['product_feature']}) {
foreach ($xml_offer->{$cml['product_features']}->{$cml['product_feature']} as $feature) {
- $offer_feature_value = OfferFeatureValue::create((string) $feature->{$cml['id']}, (string) $feature->{$cml['value']});
+ $feature_id = !empty($feature->{$cml['id']}) ? $feature->{$cml['id']} : $feature->{$cml['name']};
View app-Tygh-Shippings-Services-Ups.php.diff
diff --git a/app/Tygh/Shippings/Services/Ups.php b/app/Tygh/Shippings/Services/Ups.php
index 8a8b1dc..5193481 100644
--- a/app/Tygh/Shippings/Services/Ups.php
+++ b/app/Tygh/Shippings/Services/Ups.php
@@ -343,9 +343,9 @@ class Ups implements IService
}
if (!empty($this->package['location']['address'])) {
- $rating_request['Shipment']['ShipTo']['AddressLine1'] = $this->package['location']['address'];
+ $rating_request['Shipment']['ShipTo']['Address']['AddressLine1'] = $this->package['location']['address'];
View app-functions-fn.catalog.php.diff
diff --git a/app/functions/fn.catalog.php b/app/functions/fn.catalog.php
index fce933f..7e0fe0e 100644
--- a/app/functions/fn.catalog.php
+++ b/app/functions/fn.catalog.php
@@ -7411,8 +7411,13 @@ function fn_get_products_views($simple_mode = true, $active = false)
foreach ($templates as $file_name => $file_info) {
$template_description = fn_get_file_description($file_info[Themes::PATH_ABSOLUTE], 'template-description', true);
$_title = fn_basename($file_name, '.tpl');
+ $template_path = str_replace(
+ Themes::factory($file_info['theme'])->getThemePath() . '/templates/',
You can’t perform that action at this time.