From 63b212a66ce0a071e2cb24b64798dab535741e71 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 1 Sep 2023 05:13:21 +0800
Subject: [PATCH] export arrived parcel improvements

---
 .../Modules/Exports/Services/ExportsArrivedParcel.php  |  6 ++++--
 app/Models/CompanyModule.php                           | 10 ++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php
index 51d7dc08..4e395cae 100644
--- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php
+++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php
@@ -36,6 +36,8 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping,
             'Description',
             'Quantity',
             'Received Date',
+            'Recorded On',
+            'Days to Record',
             'Remarks'
         ];
     }
@@ -66,9 +68,9 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping,
 
     public function map($packingList): array
     {
+
         $order = $packingList->owner;
-        $connection = $order->companyModule->first()->inviters->first();
-        $marking = $connection ? $connection->pivot->invitee_reference : '';
+        $marking = $order->companyModule->first()->getMarking();
         $warehouse = $order->orderRoles->firstWhere('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->appointee;
         $cbm = $packingList->packages->sum(function ($package) {
             return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
diff --git a/app/Models/CompanyModule.php b/app/Models/CompanyModule.php
index c6253288..33b898f1 100644
--- a/app/Models/CompanyModule.php
+++ b/app/Models/CompanyModule.php
@@ -29,7 +29,7 @@ use App\Classes\General\Interfaces\Remarkable;
  * Class CompanyModule
  * @package App\Models
  *
- * @property \App\Models\Company company_id 
+ * @property \App\Models\Company company_id
  * @property integer type
  * @property integer status
  */
@@ -111,6 +111,12 @@ class CompanyModule extends AbstractModel implements Addressable, Documentable,
         return $this->hasMany(CompanyConnection::class, 'invitee_id');
     }
 
+    public function getMarking()
+    {
+        $connection = $this->inviters->first();
+        return $connection ? $connection->pivot->invitee_reference : '';
+    }
+
     /**
      * @return HasMany
      */
@@ -193,7 +199,7 @@ class CompanyModule extends AbstractModel implements Addressable, Documentable,
     {
         return $this->hasManyDeep(Transaction::class, [Order::class], ['company_module_id',  'owner_id'], ['id', 'id']);
     }
-    
+
     /**
      * @return MorphMany
      */