Merge pull request #37 from thelia-modules/feat/return-label

fix: change sender adress to invoice adress

Author: julescournut

Config/module.xml

@@ -13,7 +13,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
     <authors>
         <author>
             <name>Gilles Bourgeat</name>

Request/LabelRequest.php

@@ -30,6 +30,7 @@ class LabelRequest extends AbstractLabelRequest
     public function __construct(Order $order, $pickupCode = null, $pickupType = null, $signedDelivery = false, $isReturn = false)
     {
         $orderAddress = OrderAddressQuery::create()->findOneById($order->getDeliveryOrderAddressId());
+        $orderInvoiceAddress = OrderAddressQuery::create()->findOneById($order->getInvoiceOrderAddressId());
 
         /**
          * If a pickup type was given (relay point delivery), we set the delivery code $productCode as this.
@@ -72,7 +73,12 @@ public function __construct(Order $order, $pickupCode = null, $pickupType = null
             $order->getCustomer()
         );
 
-        $senderForLetter = $isReturn ? $customerAddress : $storeAddress;
+        $customerInvoiceAddress = $this->createAddressFromOrderAddress(
+            $orderInvoiceAddress,
+            $order->getCustomer()
+        );
+
+        $senderForLetter = $isReturn ? $customerInvoiceAddress : $storeAddress;
         $addresseeForLetter = $isReturn ? $storeAddress : $customerAddress;
 
         $this->setLetter(new Letter(