[*] BO : Fix #PSCFV-8504 carrier on invoice and delivery slip

classes/pdf/HTMLTemplateDeliverySlip.php

@@ -60,13 +60,16 @@ class HTMLTemplateDeliverySlipCore extends HTMLTemplate
 			$invoice_address = new Address((int)$this->order->id_address_invoice);
 			$formatted_invoice_address = AddressFormat::generateAddress($invoice_address, array(), '<br />', ' ');
 		}
-
+		
+		$carrier = new Carrier($this->order->id_carrier);
+		$carrier->name = ($carrier->name == '0' ? Configuration::get('PS_SHOP_NAME') : $carrier->name);
 		$this->smarty->assign(array(
 			'order' => $this->order,
 			'order_details' => $this->order_invoice->getProducts(),
 			'delivery_address' => $formatted_delivery_address,
 			'invoice_address' => $formatted_invoice_address,
-			'order_invoice' => $this->order_invoice
+			'order_invoice' => $this->order_invoice,
+			'carrier' => $carrier
 		));
 
 		return $this->smarty->fetch($this->getTemplate('delivery-slip'));

classes/pdf/HTMLTemplateInvoice.php

@@ -89,7 +89,8 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
 			$tax_exempt = Configuration::get('VATNUMBER_MANAGEMENT')
 								&& !empty($address->vat_number)
 								&& $address->id_country != Configuration::get('VATNUMBER_COUNTRY');
-
+			$carrier = new Carrier($this->order->id_carrier);
+			
 			$this->smarty->assign(array(
 				'tax_exempt' => $tax_exempt,
 				'use_one_after_another_method' => $this->order_invoice->useOneAfterAnotherTaxComputationMethod(),
@@ -98,7 +99,8 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
 				'ecotax_tax_breakdown' => $this->order_invoice->getEcoTaxTaxesBreakdown(),
 				'wrapping_tax_breakdown' => $this->order_invoice->getWrappingTaxesBreakdown(),
 				'order' => $this->order,
-				'order_invoice' => $this->order_invoice
+				'order_invoice' => $this->order_invoice,
+				'carrier' => $carrier
 			));
 
 			return $this->smarty->fetch($this->getTemplate('invoice.tax-tab'));

pdf/delivery-slip.tpl

@@ -71,7 +71,7 @@
 <!-- PRODUCTS TAB -->
 <table style="width: 100%">
 	<tr>
-		<td style="width: 20%; padding-right: 7px; text-align: right; vertical-align: top">
+		<td style="width: 22%; padding-right: 7px; text-align: right; vertical-align: top">
 			<!-- CUSTOMER INFORMATIONS -->
 			<b>{l s='Order Number:' pdf='true'}</b><br />
 			{$order->getUniqReference()}<br />
@@ -93,9 +93,14 @@
 			{/foreach}
 			</table>
 			<br />
+			{if isset($carrier)}
+			<b>{l s='Carrier:' pdf='true'}</b><br />
+			{$carrier->name}<br />
+			<br />
+			{/if}			
 			<!-- / CUSTOMER INFORMATIONS -->
 		</td>
-		<td style="width: 80%; text-align: right">
+		<td style="width: 78%; text-align: right">
 			<table style="width: 100%">
 				<tr style="line-height:6px;">
 					<td style="text-align: left; background-color: #4D4D4D; color: #FFF; padding-left: 10px; font-weight: bold; width: 60%">{l s='ITEMS TO BE DELIVERED' pdf='true'}</td>

pdf/invoice.tpl

@@ -92,6 +92,11 @@
 			{/foreach}
 			</table>
 			<br />
+			{if isset($carrier)}
+			<b>{l s='Carrier:' pdf='true'}</b><br />
+			{$carrier->name}<br />
+			<br />
+			{/if}				
 			<!-- / CUSTOMER INFORMATION -->
 		</td>
 		<td style="width: 85%; text-align: right">