// Improve Specific prices

controllers/admin/AdminProductsController.php

@@ -810,7 +810,7 @@ class AdminProductsController extends AdminController
 				{
 					$specificPrice = new SpecificPrice();
 					$specificPrice->id_product = $id_product;
-					$specificPrice->id_product_attribute = (int)Tools::getValue('id_product_attribute');
+					$specificPrice->id_product_attribute = (int)Tools::getValue('sp_id_product_attribute');
 					$specificPrice->id_shop = (int)$id_shop;
 					$specificPrice->id_currency = (int)($id_currency);
 					$specificPrice->id_country = (int)($id_country);

controllers/front/HistoryController.php

@@ -53,7 +53,7 @@ class HistoryControllerCore extends FrontController
 		if ($orders = Order::getCustomerOrders($this->context->customer->id))
 			foreach ($orders as &$order)
 			{
-				$myOrder = new Order((int)($order['id_order']));
+				$myOrder = new Order((int)$order['id_order']);
 				if (Validate::isLoadedObject($myOrder))
 					$order['virtual'] = $myOrder->isVirtual(false);
 			}

controllers/front/IdentityController.php

@@ -46,7 +46,20 @@ class IdentityControllerCore extends FrontController
 	{
 		if (count($_POST))
 		{
-			$exclusion = array('secure_key', 'old_passwd', 'passwd', 'active', 'date_add', 'date_upd', 'last_passwd_gen', 'newsletter_date_add', 'id_default_group');
+			$exclusion = array('secure_key', 
+									'old_passwd', 
+									'passwd', 
+									'active', 
+									'date_add', 
+									'date_upd', 
+									'last_passwd_gen', 
+									'newsletter_date_add', 
+									'id_default_group', 
+									'id_shop', 
+									'id_group_shop', 
+									'ip_registration_newsletter',
+									'note',
+									'is_guest');
 			$fields = $this->customer->getFields();
 			foreach ($fields as $key => $value)
 				if (!in_array($key, $exclusion))

controllers/front/OrderDetailController.php

@@ -74,7 +74,7 @@ class OrderDetailControllerCore extends FrontController
 						$ct->id_contact = 0;
 						$ct->id_customer = (int)$order->id_customer;
 						$ct->id_shop = (int)$this->context->shop->getId(true);
-						if ($id_product = (int)Tools::getValue('id_product'))
+						if ($id_product = (int)Tools::getValue('id_product') && $order->orderContainProduct((int)$id_product))
 							$ct->id_product = $id_product;
 						$ct->id_order = (int)$order->id;
 						$ct->id_lang = (int)$this->context->language->id;

controllers/front/ProductController.php

@@ -228,10 +228,19 @@ class ProductControllerCore extends FrontController
 		$id_currency = (int)$this->context->cookie->id_currency;
 		$id_product = (int)$this->product->id;
 		$id_shop = $this->context->shop->getID(true);
-		$quantity_discounts = SpecificPrice::getQuantityDiscounts($id_product, $id_shop, $id_currency, $id_country, $id_group);
-
+		
+		$quantity_discounts = SpecificPrice::getQuantityDiscounts($id_product, $id_shop, $id_currency, $id_country, $id_group, null, true);
+		foreach($quantity_discounts as &$quantity_discount)
+			if ($quantity_discount['id_product_attribute'])
+			{
+				$combination = new Combination((int)$quantity_discount['id_product_attribute']);
+				$attributes = $combination->getAttributesName((int)$this->context->language->id);
+				foreach ($attributes as $attribute)
+					$quantity_discount['attributes'] = $attribute['name'].' - ';
+				$quantity_discount['attributes'] = rtrim($quantity_discount['attributes'], ' - ');
+			}
+		
 		$product_price = $this->product->getPrice(Product::$_taxCalculationMethod == PS_TAX_INC, false);
-
 		$address = new Address($this->context->cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')});
 		$this->context->smarty->assign(array(
 			'quantity_discounts' => $this->formatQuantityDiscounts($quantity_discounts, $product_price, (float)$tax),
@@ -292,6 +301,7 @@ class ProductControllerCore extends FrontController
 		if (is_array($attributes_groups) && $attributes_groups)
 		{
 			$combination_images = $this->product->getCombinationImages($this->context->language->id);
+			
 			foreach ($attributes_groups as $k => $row)
 			{
 				// Color management