Skip to content

Instantly share code, notes, and snippets.

View design-backend-templates-views-tabs-manage.tpl.diff
diff --git a/design/backend/templates/views/tabs/manage.tpl b/design/backend/templates/views/tabs/manage.tpl
index 53fff0a276..c7e01829f3 100644
--- a/design/backend/templates/views/tabs/manage.tpl
+++ b/design/backend/templates/views/tabs/manage.tpl
@@ -24,14 +24,12 @@
{if $dynamic_object}
{$dynamic_object_href="&dynamic_object[object_type]=`$dynamic_object.object_type`&dynamic_object[object_id]=`$dynamic_object.object_id`&selected_location=`$location.location_id`&hide_status=1"}
{$r_url="products.update?product_id=`$dynamic_object.object_id`&selected_section=product_tabs"|urlencode}
- {$additional_class=""}
- {$_href_update=""}
View app-functions-fn.cart.php.diff
diff --git a/app/functions/fn.cart.php b/app/functions/fn.cart.php
index f937d1194d..4d3f8c1d7e 100644
--- a/app/functions/fn.cart.php
+++ b/app/functions/fn.cart.php
@@ -5717,6 +5717,12 @@ function fn_check_amount_in_stock($product_id, $amount, $product_options, $cart_
if (!defined('ORDER_MANAGEMENT')) {
$amount = $min_qty;
+ } elseif (
+ !empty($product['qty_step']) && isset($product_not_in_cart) && $product_not_in_cart
View app-functions-fn.products.php.diff
diff --git a/app/functions/fn.products.php b/app/functions/fn.products.php
index 8f6f692ddf..571518b9bc 100644
--- a/app/functions/fn.products.php
+++ b/app/functions/fn.products.php
@@ -358,6 +358,10 @@ function fn_get_product_data(//phpcs:ignore Squiz.Commenting.FunctionComment.Typ
$product_data['product_features'] = fn_get_product_features_list($product_data, ProductFeaturesDisplayOn::ALL);
}
+ if ($product_data['company_id']) {
+ $product_data['company_name'] = fn_get_company_name($product_data['company_id']);
View app-addons-reward_points-func.php.diff
diff --git a/app/addons/reward_points/func.php b/app/addons/reward_points/func.php
index 7d719462bb..2475daebd5 100644
--- a/app/addons/reward_points/func.php
+++ b/app/addons/reward_points/func.php
@@ -136,7 +136,7 @@ function fn_reward_points_calculate_cart_taxes_pre(&$cart, &$cart_products, &$sh
}
// calculating price in points
- if (defined('ORDER_MANAGEMENT') && isset($cart['points_info']['in_use']['cost'])) {
+ if (isset($cart['points_info']['in_use']['cost'])) {
View app-addons-reward_points-func.php.diff
diff --git a/app/addons/reward_points/func.php b/app/addons/reward_points/func.php
index a74b2e26e9..2475daebd5 100644
--- a/app/addons/reward_points/func.php
+++ b/app/addons/reward_points/func.php
@@ -111,29 +111,6 @@ function fn_reward_points_ult_delete_company(&$company_id)
db_query("DELETE FROM ?:reward_points WHERE company_id = ?i", $company_id);
}
-/**
- * The "extract_cart" hook handler.
View app-addons-reward_points-func.php.diff
diff --git a/app/addons/reward_points/func.php b/app/addons/reward_points/func.php
index a74b2e26e9..2475daebd5 100644
--- a/app/addons/reward_points/func.php
+++ b/app/addons/reward_points/func.php
@@ -111,29 +111,6 @@ function fn_reward_points_ult_delete_company(&$company_id)
db_query("DELETE FROM ?:reward_points WHERE company_id = ?i", $company_id);
}
-/**
- * The "extract_cart" hook handler.
View design-backend-templates-addons-reward_points-hooks-orders-totals_content.post.tpl.diff
diff --git a/design/backend/templates/addons/reward_points/hooks/orders/totals_content.post.tpl b/design/backend/templates/addons/reward_points/hooks/orders/totals_content.post.tpl
index 80b2ef92be..989221461e 100644
--- a/design/backend/templates/addons/reward_points/hooks/orders/totals_content.post.tpl
+++ b/design/backend/templates/addons/reward_points/hooks/orders/totals_content.post.tpl
@@ -7,7 +7,7 @@
{if $order_info.points_info.in_use}
<tr>
- <td>{__("points_in_use")}&nbsp;({__("points_lowercase", [$order_info.points_info.in_use.points])}):</td>
- <td>{include file="common/price.tpl" value=$order_info.points_info.in_use.cost}</td>
View design-backend-templates-addons-reward_points-hooks-orders-totals_content.post.tpl.diff
diff --git a/design/backend/templates/addons/reward_points/hooks/orders/totals_content.post.tpl b/design/backend/templates/addons/reward_points/hooks/orders/totals_content.post.tpl
index 80b2ef92be..989221461e 100644
--- a/design/backend/templates/addons/reward_points/hooks/orders/totals_content.post.tpl
+++ b/design/backend/templates/addons/reward_points/hooks/orders/totals_content.post.tpl
@@ -7,7 +7,7 @@
{if $order_info.points_info.in_use}
<tr>
- <td>{__("points_in_use")}&nbsp;({__("points_lowercase", [$order_info.points_info.in_use.points])}):</td>
- <td>{include file="common/price.tpl" value=$order_info.points_info.in_use.cost}</td>