// Release branch merged

classes/order/Order.php

@@ -1510,11 +1510,12 @@ class OrderCore extends ObjectModel
 
 	/**
 	 * @return array return all shipping method for the current order
+	 * state_name sql var is now deprecated - use order_state_name for the state name and carrier_name for the carrier_name
 	 */
 	public function getShipping()
 	{
 		return Db::getInstance()->executeS('
-			SELECT DISTINCT oc.`id_order_invoice`, oc.`weight`, oc.`shipping_cost_tax_excl`, oc.`shipping_cost_tax_incl`, c.`url`, oc.`id_carrier`, c.`name` as `state_name`, oc.`date_add`, "Delivery" as `type`, "true" as `can_edit`, oc.`tracking_number`, oc.`id_order_carrier`
+			SELECT DISTINCT oc.`id_order_invoice`, oc.`weight`, oc.`shipping_cost_tax_excl`, oc.`shipping_cost_tax_incl`, c.`url`, oc.`id_carrier`, c.`name` as `carrier_name`, oc.`date_add`, "Delivery" as `type`, "true" as `can_edit`, oc.`tracking_number`, oc.`id_order_carrier`, osl.`name` as order_state_name, c.`name` as state_name
 			FROM `'._DB_PREFIX_.'orders` o
 			LEFT JOIN `'._DB_PREFIX_.'order_history` oh
 				ON (o.`id_order` = oh.`id_order`)
@@ -1524,7 +1525,8 @@ class OrderCore extends ObjectModel
 				ON (oc.`id_carrier` = c.`id_carrier`)
 			LEFT JOIN `'._DB_PREFIX_.'order_state_lang` osl
 				ON (oh.`id_order_state` = osl.`id_order_state` AND osl.`id_lang` = '.(int)Context::getContext()->language->id.')
-			WHERE oc.`id_order` = '.(int)$this->id);
+			WHERE o.`id_order` = '.(int)$this->id.'
+			GROUP BY c.id_carrier');
 	}
 
 

classes/order/OrderDetail.php

@@ -249,7 +249,17 @@ class OrderDetailCore extends ObjectModel
 			$context = Context::getContext();
 		$this->context = $context->cloneContext();
 	}
-	
+
+	public function delete()
+	{
+		if(!$res = parent::delete())
+			return false;
+
+		Db::getInstance()->delete('order_detail_tax', 'id_order_detail='.(int)$this->id);
+
+		return $res;
+	}
+
 	protected function setContext($id_shop)
 	{
 		if ($this->context->shop->id != $id_shop)