From ff023a380af2cd9d8473ca2957e2483cffcd34fd Mon Sep 17 00:00:00 2001
From: ahmedsophyudden <saufiyuddin@gmail.com>
Date: Wed, 25 May 2022 21:28:01 +0800
Subject: [PATCH] Edit group resources and new api for bulk puchase order

---
 .../CreateBulkPurchaseOrderTransactionLogic.php          | 9 ++++-----
 app/Http/Resources/GroupResource.php                     | 9 +++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateBulkPurchaseOrderTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateBulkPurchaseOrderTransactionLogic.php
index 51e2b973..733f2288 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/CreateBulkPurchaseOrderTransactionLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateBulkPurchaseOrderTransactionLogic.php
@@ -39,19 +39,19 @@ class CreateBulkPurchaseOrderTransactionLogic extends AbstractControllerLogic
     private $fetchesCompany;
 
     /** @var CreateInvoiceDocumentProcessor */
-    private $createInvoiceDocumentProcessor;
+    private $invoiceDocumentProcessor;
 
     /**
      * CreateBulkPurchaseOrderTransactionLogic constructor.
      * @param ListsGroups $listsGroups
      * @param FetchesCompany $fetchesCompany
-     * @param CreateInvoiceDocumentProcessor $createInvoiceDocumentProcessor
+     * @param CreateInvoiceDocumentProcessor $invoiceDocumentProcessor
      */
-    public function __construct(ListsGroups $listsGroups, FetchesCompany $fetchesCompany, CreateInvoiceDocumentProcessor $createInvoiceDocumentProcessor)
+    public function __construct(ListsGroups $listsGroups, FetchesCompany $fetchesCompany, CreateInvoiceDocumentProcessor $invoiceDocumentProcessor)
     {
         $this->listsGroups = $listsGroups;
         $this->fetchesCompany = $fetchesCompany;
-        $this->createInvoiceDocumentProcessor = $createInvoiceDocumentProcessor;
+        $this->invoiceDocumentProcessor = $invoiceDocumentProcessor;
     }
 
     /**
@@ -79,7 +79,6 @@ class CreateBulkPurchaseOrderTransactionLogic extends AbstractControllerLogic
                     ->where('type', TransactionType::PURCHASE_ORDER)
                     ->complete()
                     ->first();
-                    dd($purchaseOrder);
 
                 foreach($completed_transactions as $transaction){
                     $supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]);
diff --git a/app/Http/Resources/GroupResource.php b/app/Http/Resources/GroupResource.php
index 9f07675d..baed798f 100644
--- a/app/Http/Resources/GroupResource.php
+++ b/app/Http/Resources/GroupResource.php
@@ -5,6 +5,7 @@ namespace App\Http\Resources;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class GroupResource extends JsonResource
@@ -18,10 +19,14 @@ class GroupResource extends JsonResource
     public function toArray($request)
     {
         $transactions = $this->transactions()->get();
-        $complete_transactions = [];
+        $complete_transactions = new Collection([]);
         foreach($transactions as $transaction){
-            $complete_transactions[] = $transaction->owner()->owner()->transactions()->where('type', TransactionType::PURCHASE_ORDER)->where('status', '=', ApprovalStatus::APPROVED)->get();
+            $booking = $transaction->owner()->first()->owner()->first();
+            $purchaseOrders = $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->where('status', '=', ApprovalStatus::APPROVED)->get();
+
+            $complete_transactions = $complete_transactions->merge($purchaseOrders);
         }
+        
         return [
             'id' => $this->id,
             'original_amount' => (float) $this->original_amount,