mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git
synced 2026-08-19 04:23:55 +00:00
Edit group resources and new api for bulk puchase order
This commit is contained in:
+4
-5
@@ -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]);
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user