// Fix some bug within sharing orders between shops

2012-10-02 10:21:04 +00:00
parent 0aa2aa5a86
commit dbc87aa0b0
4 changed files with 93 additions and 24 deletions
@@ -288,10 +288,30 @@ class ParentOrderControllerCore extends FrontController
 			Product::addCustomizationPrice($summary['products'], $customizedDatas);
 		}

+		$cart_product_context = Context::getContext()->cloneContext();
 		foreach ($summary['products'] as $key => &$product)
 		{
 			$product['quantity'] = $product['cart_quantity'];// for compatibility with 1.2 themes
-			$product['price_without_specific_price'] = Product::getPriceStatic($product['id_product'], !Product::getTaxCalculationMethod(), $product['id_product_attribute'], 2, null, false, false);
+
+			if ($cart_product_context->shop->id != $product['id_shop'])
+				$cart_product_context->shop = new Shop((int)$product['id_shop']);
+			$product['price_without_specific_price'] = Product::getPriceStatic($product['id_product'], 
+																									!Product::getTaxCalculationMethod(), 
+																									$product['id_product_attribute'], 
+																									2, 
+																									null, 
+																									false, 
+																									false,
+																									1,
+																									false,
+																									null,
+																									null,
+																									null,
+																									$null,
+																									true,
+																									true,
+																									$cart_product_context);
+
 			if (Product::getTaxCalculationMethod())
 				$product['is_discounted'] = $product['price_without_specific_price'] != $product['price'];
 			else