From 9b5e667a4025c385efe968091cc3a105efbfe53b Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 18 Oct 2021 12:27:23 +0800 Subject: [PATCH 1/4] fix company employee bug --- app/Http/Resources/CompanyResource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php index 0c988ac1..a35c7082 100644 --- a/app/Http/Resources/CompanyResource.php +++ b/app/Http/Resources/CompanyResource.php @@ -35,7 +35,7 @@ class CompanyResource extends JsonResource 'status' => (int) $this->status, 'contact' => new ContactResource ($this->when($this->has('contacts'), $this->contacts->first())), 'address' => new AddressResource($this->when($this->has('addresses'), $this->addresses->where('billing', true)->first())), - 'employee' => new UserResource(Auth::user()->type === RoleTypes::USER ? $this->employees()->where('email', '=', Auth::user()->email)->first() : $this->employees()->where('users.status', '=', ApprovalStatus::APPROVED)->orderBy('id', 'DESC')->first()), + 'employee' => new UserResource(Auth::user()->type === RoleTypes::USER ? $this->employees()->where('email', '=', Auth::user()->email)->first() : $this->employees()->orderBy('id', 'DESC')->first()), 'identification' => new DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->first()), 'bookings' => $this->whenLoaded('bookings', $this->bookings()->orderBy('id', 'DESC')->get(), []), 'total_payments' => (float) $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount'), From 1c8ea59858e9000790fca814c0e5aeee0d5b3b5c Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 18 Oct 2021 12:39:27 +0800 Subject: [PATCH 2/4] change invoice and purchase order document date to booking date --- resources/views/pages/pdfs/invoice.blade.php | 2 +- resources/views/pages/pdfs/purchase_order.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php index 611d4362..355c2328 100644 --- a/resources/views/pages/pdfs/invoice.blade.php +++ b/resources/views/pages/pdfs/invoice.blade.php @@ -33,7 +33,7 @@
Ref# {{ $invoice_transaction->payment_reference ?? '-' }}
-
Date: {{ $po_order_transaction->created_at }}
+
Date: {{ $po_order_transaction->booking->created_at }}
 
diff --git a/resources/views/pages/pdfs/purchase_order.blade.php b/resources/views/pages/pdfs/purchase_order.blade.php index c2c17481..eb123975 100644 --- a/resources/views/pages/pdfs/purchase_order.blade.php +++ b/resources/views/pages/pdfs/purchase_order.blade.php @@ -14,7 +14,7 @@ PO#: {{ $po_order_transaction->bill_no }}
Ref#: {{ $po_order_transaction->payment_reference ?? '-' }}
- Date: {{ $po_order_transaction->created_at }} + Date: {{ $po_order_transaction->booking->created_at }} From c4195fd4e88c44bb23544b252c9f1df61094d4be Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 18 Oct 2021 12:46:16 +0800 Subject: [PATCH 3/4] change invoice and purchase order document date to booking date --- resources/views/pages/pdfs/invoice.blade.php | 2 +- resources/views/pages/pdfs/purchase_order.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php index 355c2328..611d4362 100644 --- a/resources/views/pages/pdfs/invoice.blade.php +++ b/resources/views/pages/pdfs/invoice.blade.php @@ -33,7 +33,7 @@
Ref# {{ $invoice_transaction->payment_reference ?? '-' }}
-
Date: {{ $po_order_transaction->booking->created_at }}
+
Date: {{ $po_order_transaction->created_at }}
 
diff --git a/resources/views/pages/pdfs/purchase_order.blade.php b/resources/views/pages/pdfs/purchase_order.blade.php index eb123975..c2c17481 100644 --- a/resources/views/pages/pdfs/purchase_order.blade.php +++ b/resources/views/pages/pdfs/purchase_order.blade.php @@ -14,7 +14,7 @@ PO#: {{ $po_order_transaction->bill_no }}
Ref#: {{ $po_order_transaction->payment_reference ?? '-' }}
- Date: {{ $po_order_transaction->booking->created_at }} + Date: {{ $po_order_transaction->created_at }} From 426e53d595c0d7fc8a58c6678e7b5b46c0543fd9 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 18 Oct 2021 14:14:47 +0800 Subject: [PATCH 4/4] change invoice and purchase order document date to booking date --- resources/views/pages/pdfs/invoice.blade.php | 2 +- resources/views/pages/pdfs/purchase_order.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php index 611d4362..355c2328 100644 --- a/resources/views/pages/pdfs/invoice.blade.php +++ b/resources/views/pages/pdfs/invoice.blade.php @@ -33,7 +33,7 @@
Ref# {{ $invoice_transaction->payment_reference ?? '-' }}
-
Date: {{ $po_order_transaction->created_at }}
+
Date: {{ $po_order_transaction->booking->created_at }}
 
diff --git a/resources/views/pages/pdfs/purchase_order.blade.php b/resources/views/pages/pdfs/purchase_order.blade.php index c2c17481..eb123975 100644 --- a/resources/views/pages/pdfs/purchase_order.blade.php +++ b/resources/views/pages/pdfs/purchase_order.blade.php @@ -14,7 +14,7 @@ PO#: {{ $po_order_transaction->bill_no }}
Ref#: {{ $po_order_transaction->payment_reference ?? '-' }}
- Date: {{ $po_order_transaction->created_at }} + Date: {{ $po_order_transaction->booking->created_at }}