Skip to content

Instantly share code, notes, and snippets.

@uzaharova
Last active October 9, 2017 11:52
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save uzaharova/178b71b6cee20e767eceabf667aa50bd to your computer and use it in GitHub Desktop.
Save uzaharova/178b71b6cee20e767eceabf667aa50bd to your computer and use it in GitHub Desktop.
diff --git a/app/functions/fn.order_management.php b/app/functions/fn.order_management.php
index 07a0ee6..9f7b309 100644
--- a/app/functions/fn.order_management.php
+++ b/app/functions/fn.order_management.php
@@ -85,7 +85,7 @@ function fn_get_data_of_changed_product(&$params, $auth, $mode)
$_cart = Tygh::$app['session']['cart'];
- $product_data = fn_get_product_options_data($cart_products, $_cart);
+ $product_data = fn_get_product_options_data($cart_products, $_cart, $params);
fn_set_hook('calculate_options', $cart_products, $_cart, $auth);
@@ -129,7 +129,7 @@ function fn_get_data_of_changed_product(&$params, $auth, $mode)
}
}
- fn_change_product_data_in_cart($cart_products, $_cart);
+ fn_change_product_data_in_cart($cart_products, $_cart, $params);
Registry::set('navigation', array());
Tygh::$app['view']->assign('cart_products', $cart_products);
@@ -194,11 +194,11 @@ function fn_get_additional_product_data(&$product_data, $auth)
// Get specific settings
$specific_settings = array(
- 'get_icon' => isset($params['additional_info']['get_icon']) ? $params['additional_info']['get_icon'] : false,
- 'get_detailed' => isset($params['additional_info']['get_detailed']) ? $params['additional_info']['get_detailed'] : false,
- 'get_options' => isset($params['additional_info']['get_options']) ? $params['additional_info']['get_options'] : true,
- 'get_discounts' => isset($params['additional_info']['get_discounts']) ? $params['additional_info']['get_discounts'] : true,
- 'get_features' => isset($params['additional_info']['get_features']) ? $params['additional_info']['get_features'] : false,
+ 'get_icon' => isset($product_data['additional_info']['get_icon']) ? $product_data['additional_info']['get_icon'] : false,
+ 'get_detailed' => isset($product_data['additional_info']['get_detailed']) ? $product_data['additional_info']['get_detailed'] : false,
+ 'get_options' => isset($product_data['additional_info']['get_options']) ? $product_data['additional_info']['get_options'] : true,
+ 'get_discounts' => isset($product_data['additional_info']['get_discounts']) ? $product_data['additional_info']['get_discounts'] : true,
+ 'get_features' => isset($product_data['additional_info']['get_features']) ? $product_data['additional_info']['get_features'] : false,
);
fn_set_hook('get_additional_information', $product, $product_data);
@@ -209,8 +209,8 @@ function fn_get_additional_product_data(&$product_data, $auth)
$product['amount'] = $product['inventory_amount'];
}
- if (!empty($params['extra_id'])) {
- $product['product_id'] = $params['extra_id'];
+ if (!empty($product_data['extra_id'])) {
+ $product['product_id'] = $product_data['extra_id'];
}
Tygh::$app['view']->assign('product', $product);
@@ -253,11 +253,12 @@ function fn_update_product_image_in_template($params)
* The function is used only in controllers.
*
* @param array $cart_products The data of the product.
- * @param array $cart Array of cart content.
+ * @param array $cart Array of cart content.
+ * @param array $params An array of parameters.
*
* @return array|null The array with the product data.
*/
-function fn_get_product_options_data($cart_products, &$cart)
+function fn_get_product_options_data($cart_products, &$cart, $params)
{
foreach ($cart_products as $cart_id => $item) {
if (isset($cart['products'][$cart_id])) {
@@ -306,12 +307,13 @@ function fn_get_product_options_data($cart_products, &$cart)
* Changes the product data in the $cart array.
* The function is used only in controllers.
*
- * @param array $cart_products The data of the product.
- * @param $cart Array of cart content.
+ * @param array $cart_products The data of the product.
+ * @param array $cart Array of cart content.
+ * @param array $params An array of parameters.
*
* @return void
*/
-function fn_change_product_data_in_cart(&$cart_products, &$cart)
+function fn_change_product_data_in_cart(&$cart_products, &$cart, $params)
{
if (!empty($cart_products)) {
foreach ($cart_products as $k => $product) {
@vorvulev
Copy link

vorvulev commented Oct 9, 2017

Nice! Thank you :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment