From 6a546ea80f03c46776bbd0ef42768b0b616b7884 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Tue, 26 Apr 2022 19:45:30 +0800 Subject: [PATCH 01/52] export booking transaction --- .../Services/ExportsBookingTransactions.php | 74 +++++++++++++++++ .../ExportCustomersToExcelController.php | 7 ++ .../ExportBookingTransactionFormComponent.vue | 79 +++++++++++++++++++ .../views/pages/currency_orders.blade.php | 1 + routes/web.php | 1 + 5 files changed, 162 insertions(+) create mode 100644 app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php create mode 100644 resources/assets/vue/components/bookings/forms/ExportBookingTransactionFormComponent.vue diff --git a/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php b/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php new file mode 100644 index 00000000..7da82a31 --- /dev/null +++ b/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php @@ -0,0 +1,74 @@ +request = $request; + } + + public function headings(): array + { + return [ + 'Ref No', + 'Creted Date', + 'Amount', + 'Rate' + ]; + } + + /** + * @return \Illuminate\Support\Collection|mixed + */ + public function query() + { + $supplierIds = array_map(function($value){ + return ['id' => $value]; + }, json_decode($this->request->input('supplierIds'))); + + $dateFrom =Carbon::parse($this->request->input('startDate'))->format('Y-m-d'); + $dateTo =Carbon::parse($this->request->input('endDate'))->format('Y-m-d'); + + return Transaction::where('type', 3)->whereIn('issuer', $supplierIds)->whereBetween('created_at', [$dateFrom, $dateTo]); + } + + /** + * @param $transaction + * @return array + */ + public function map($transaction): array + { + if ($transaction->owner->owner == null){ + $refNo = $transaction->owner->marking; + } else { + $refNo = $transaction->owner->owner->marking; + } + + $createdAt = $transaction->created_at->format('d-m-Y'); + $amount = $transaction->amount; + $rate = $transaction->currency_rate; + + return [ + $refNo, + $createdAt, + $amount, + $rate, + ]; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php index 39ea3dc5..8563f78a 100644 --- a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php +++ b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Exports; use App\Classes\Modules\Exports\Services\ExportsCustomers; use App\Classes\Modules\Exports\Services\ExportsTransactions; +use App\Classes\Modules\Exports\Services\ExportsBookingTransactions; use App\Classes\Modules\Exports\Services\ExportsNullDebtors; use App\Classes\Modules\Exports\Services\ExportsPaymentTransactions; @@ -54,4 +55,10 @@ class ExportCustomersToExcelController ob_end_clean(); return $response; } + + public function bookingTransactions(ExportsBookingTransactions $exportsBookingTransactions, Request $request){ + $response = $exportsBookingTransactions->download('bookingTransactions.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']); + ob_end_clean(); + return $response; + } } \ No newline at end of file diff --git a/resources/assets/vue/components/bookings/forms/ExportBookingTransactionFormComponent.vue b/resources/assets/vue/components/bookings/forms/ExportBookingTransactionFormComponent.vue new file mode 100644 index 00000000..24ad2317 --- /dev/null +++ b/resources/assets/vue/components/bookings/forms/ExportBookingTransactionFormComponent.vue @@ -0,0 +1,79 @@ + + + diff --git a/resources/views/pages/currency_orders.blade.php b/resources/views/pages/currency_orders.blade.php index 269591e1..daf804cf 100644 --- a/resources/views/pages/currency_orders.blade.php +++ b/resources/views/pages/currency_orders.blade.php @@ -2,6 +2,7 @@ @section('inner_content')
+
diff --git a/routes/web.php b/routes/web.php index 99e07dd3..91e3657b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -151,6 +151,7 @@ Route::get('/export/transactions/f614e339d7058904a831aad742e24d55', 'Exports\Exp Route::get('/export/null-debtor/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@nullDebtor'); Route::get('/export/payment-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@paymentTransactions'); Route::get('/export/wallet-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@walletTransactions'); +Route::get('/export/booking-transactions', 'Exports\ExportCustomersToExcelController@bookingTransactions')->name('export.transactions.booking'); Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsProducts $exportsProducts) { $bookings = Booking::where(function($query){ From ef77463c06f01340ff3e3178bfae8e401c18961b Mon Sep 17 00:00:00 2001 From: edmondlang Date: Tue, 26 Apr 2022 21:52:38 +0800 Subject: [PATCH 02/52] export booking transaction ui --- .../ExportBookingTransactionFormComponent.vue | 41 +++++++++---- .../SelectIndividualSupplierFormComponent.vue | 43 ++++++++++++++ .../forms/SelectSupplierFormComponent.vue | 59 +++++++++++++++++++ 3 files changed, 131 insertions(+), 12 deletions(-) create mode 100644 resources/assets/vue/components/bookings/forms/SelectIndividualSupplierFormComponent.vue create mode 100644 resources/assets/vue/components/bookings/forms/SelectSupplierFormComponent.vue diff --git a/resources/assets/vue/components/bookings/forms/ExportBookingTransactionFormComponent.vue b/resources/assets/vue/components/bookings/forms/ExportBookingTransactionFormComponent.vue index 24ad2317..889ea3e7 100644 --- a/resources/assets/vue/components/bookings/forms/ExportBookingTransactionFormComponent.vue +++ b/resources/assets/vue/components/bookings/forms/ExportBookingTransactionFormComponent.vue @@ -3,12 +3,19 @@
-
+
- - - - +
+
+ + + + +
+
+ + +
@@ -44,7 +51,8 @@ export default { startDate: '', endDate: '', supplier: null, - supplierIds: [] + supplierIds: [], + supplierNames: [] }, } }, @@ -56,7 +64,10 @@ export default { endDate: { required }, - supplier: { + supplierIds: { + required + }, + supplierNames: { required }, } @@ -65,14 +76,20 @@ export default { submitSearch(){ if(!this.validate()){ return; } - var supplierIds = []; - supplierIds.push(parseInt(this.parameters.supplier)); - supplierIds = JSON.stringify(supplierIds); - - console.log(supplierIds); + var supplierIds = JSON.stringify(this.parameters.supplierIds); window.open(route('export.transactions.booking')+'?startDate='+this.parameters.startDate+'&endDate='+this.parameters.endDate+'&supplierIds='+supplierIds, '_blank'); }, + updateList(supplierList){ + let supplierIds = []; + let supplierNames = []; + supplierList.forEach(function(supplier) { + supplierIds.push(supplier.id); + supplierNames.push(supplier.name); + }); + this.parameters.supplierIds = supplierIds; + this.parameters.supplierNames = supplierNames; + }, }, mixins: [componentHandler] }; diff --git a/resources/assets/vue/components/bookings/forms/SelectIndividualSupplierFormComponent.vue b/resources/assets/vue/components/bookings/forms/SelectIndividualSupplierFormComponent.vue new file mode 100644 index 00000000..56b86b86 --- /dev/null +++ b/resources/assets/vue/components/bookings/forms/SelectIndividualSupplierFormComponent.vue @@ -0,0 +1,43 @@ + + + diff --git a/resources/assets/vue/components/bookings/forms/SelectSupplierFormComponent.vue b/resources/assets/vue/components/bookings/forms/SelectSupplierFormComponent.vue new file mode 100644 index 00000000..2895d76e --- /dev/null +++ b/resources/assets/vue/components/bookings/forms/SelectSupplierFormComponent.vue @@ -0,0 +1,59 @@ + + + From 83f030f0f662146c13bc345cb8af943b3a6c0966 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 27 Apr 2022 12:58:10 +0800 Subject: [PATCH 03/52] update raya announcement --- .../companies/sections/CustomerDashboardSectionComponent.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue index 9d11ecd0..bcfafad5 100644 --- a/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue @@ -3,6 +3,11 @@
+
+
+ +
+
From 058d9949656111d528120e330a34a139c1df2a12 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 27 Apr 2022 13:25:43 +0800 Subject: [PATCH 04/52] update xpo --- .../Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php index 73751cfb..5e65c6a4 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php @@ -65,7 +65,7 @@ class AutoPurchaseOrderFillLogic extends AbstractControllerLogic public function logic(Request $request) : JsonResponse { $bookings = Booking::where(function($query){ - return $query->whereMonth('created_at', 11)->orWhereMonth('created_at', 12); + return $query->whereMonth('created_at', 01)->orWhereMonth('created_at', 02); })->whereDoesntHave('transactions', function($q){ $q->where('type', TransactionType::PURCHASE_ORDER); $q->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED]); From a704408677f140dbb13850fc82971fd81a7d6d3a Mon Sep 17 00:00:00 2001 From: edmondlang Date: Thu, 28 Apr 2022 01:08:56 +0800 Subject: [PATCH 05/52] copy sign up to a new page --- .../views/pages/accounts/login.blade.php | 2 +- .../views/pages/accounts/sign_up.blade.php | 43 +++++++++++++++++++ routes/web.php | 4 ++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 resources/views/pages/accounts/sign_up.blade.php diff --git a/resources/views/pages/accounts/login.blade.php b/resources/views/pages/accounts/login.blade.php index 88296371..a6ab237c 100644 --- a/resources/views/pages/accounts/login.blade.php +++ b/resources/views/pages/accounts/login.blade.php @@ -64,7 +64,7 @@
- + Create Account
diff --git a/resources/views/pages/accounts/sign_up.blade.php b/resources/views/pages/accounts/sign_up.blade.php new file mode 100644 index 00000000..05b4d9a9 --- /dev/null +++ b/resources/views/pages/accounts/sign_up.blade.php @@ -0,0 +1,43 @@ +@extends('layouts.base_login') + +@section('inner_content') + +
+
+
+
+
+
+
+
+
+
+
+
We Are Glad
+
You've Decided To join Us
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+
+ +@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 99e07dd3..0f4000ba 100644 --- a/routes/web.php +++ b/routes/web.php @@ -30,6 +30,10 @@ Route::get('', function () { return view('pages.accounts.login'); })->name('login'); +Route::get('/sign_up', function () { + return view('pages.accounts.sign_up'); +})->name('sign_up'); + Route::get('/account/email/verification/{token}', function ($token) { return view('pages.accounts.email_verified', ['token' => $token]); })->name('account.email.verification'); From b626ae5b05f0a50abde23174d6675a5acb1788f5 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 28 Apr 2022 11:09:16 +0800 Subject: [PATCH 06/52] update transaction export --- .../Modules/Exports/Services/ExportsTransactions.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index f9bbecaf..5d9f06aa 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -58,12 +58,17 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping 6 => 'EXPIRED' ]; + $booking = $transaction->type === 1 ? $transaction->owner : $transaction->owner->owner; + + return [ + $booking ? $booking->company->reference : '', + $booking ? $booking->marking : '', $transaction->bill_no, $transaction->owner_id, $transaction->owner_type, $transactionTypes[$transaction->type], - $transaction->issuer, + $transaction->issuerCompany->name, $transaction->reciver, $transaction->currency_id === 1 ? 'MYR' : 'RMB', $transaction->amount, From b2e9a70852068e10198dddb121ab05e024bb7f39 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 28 Apr 2022 11:12:49 +0800 Subject: [PATCH 07/52] update transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 5d9f06aa..3155caa4 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -5,6 +5,7 @@ namespace App\Classes\Modules\Exports\Services; use App\Classes\ValueObjects\Constants\BusinessType; use App\Classes\ValueObjects\Constants\CompanyType; use App\Classes\ValueObjects\Constants\TransactionType; +use App\Models\Booking; use App\Models\Company; use App\Models\Transaction; use Maatwebsite\Excel\Concerns\Exportable; @@ -62,8 +63,8 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping return [ - $booking ? $booking->company->reference : '', - $booking ? $booking->marking : '', + ($booking instanceof Booking) ? $booking->company->reference : '', + ($booking instanceof Booking) ? $booking->marking : '', $transaction->bill_no, $transaction->owner_id, $transaction->owner_type, From 4dbfcb36230a918658097738621ef157f3ac7aa2 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 28 Apr 2022 11:13:32 +0800 Subject: [PATCH 08/52] update transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 3155caa4..7fac8611 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -61,7 +61,6 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping $booking = $transaction->type === 1 ? $transaction->owner : $transaction->owner->owner; - return [ ($booking instanceof Booking) ? $booking->company->reference : '', ($booking instanceof Booking) ? $booking->marking : '', From 81b03e40b1a4a8691279803c7d52f1d9f984743c Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 28 Apr 2022 11:19:22 +0800 Subject: [PATCH 09/52] update transaction export --- .../Exports/Services/ExportsTransactions.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 7fac8611..02232268 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -8,6 +8,7 @@ use App\Classes\ValueObjects\Constants\TransactionType; use App\Models\Booking; use App\Models\Company; use App\Models\Transaction; +use App\Models\Wallet; use Maatwebsite\Excel\Concerns\Exportable; use Maatwebsite\Excel\Concerns\FromQuery; use Maatwebsite\Excel\Concerns\WithHeadingRow; @@ -59,11 +60,20 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping 6 => 'EXPIRED' ]; - $booking = $transaction->type === 1 ? $transaction->owner : $transaction->owner->owner; + $booking = null; + + if($transaction->owner_type === Booking::class){ + $booking = $transaction->owner; + } + + if($transaction->owner_type === Transaction::class){ + $booking = $transaction->owner->owner; + } + return [ - ($booking instanceof Booking) ? $booking->company->reference : '', - ($booking instanceof Booking) ? $booking->marking : '', + $booking ? $booking->company->reference : '', + $booking ? $booking->marking : '', $transaction->bill_no, $transaction->owner_id, $transaction->owner_type, From faee26fea1486da64d17fc479f2b7ad43a50561b Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 28 Apr 2022 11:20:40 +0800 Subject: [PATCH 10/52] update transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 02232268..08679c12 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -72,7 +72,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping return [ - $booking ? $booking->company->reference : '', + $booking ? $booking->company->reference : $transaction->owner->owner->reference, $booking ? $booking->marking : '', $transaction->bill_no, $transaction->owner_id, From 53d2d7383ef39f8dc485afb2288089a7c2401b30 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 28 Apr 2022 11:23:12 +0800 Subject: [PATCH 11/52] update transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 08679c12..02232268 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -72,7 +72,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping return [ - $booking ? $booking->company->reference : $transaction->owner->owner->reference, + $booking ? $booking->company->reference : '', $booking ? $booking->marking : '', $transaction->bill_no, $transaction->owner_id, From faabd2fe3de90a3396573b0cb8c05b12be90ad53 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 28 Apr 2022 11:26:51 +0800 Subject: [PATCH 12/52] update transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 02232268..432094ef 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -67,7 +67,11 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping } if($transaction->owner_type === Transaction::class){ + $booking = $transaction->owner->owner; + if($booking instanceof Transaction){ + $booking = $booking->owner; + } } From 6db687ac99d6302e385cf436730b8ebe57be0231 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 28 Apr 2022 11:30:35 +0800 Subject: [PATCH 13/52] update transaction export --- .../Modules/Exports/Services/ExportsTransactions.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 432094ef..c4bc2220 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -66,12 +66,8 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping $booking = $transaction->owner; } - if($transaction->owner_type === Transaction::class){ - + if($transaction->type === TransactionType::BILL){ $booking = $transaction->owner->owner; - if($booking instanceof Transaction){ - $booking = $booking->owner; - } } From 2796fafd5b2e04599c83de00506ee099ff7c22ab Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 28 Apr 2022 11:36:58 +0800 Subject: [PATCH 14/52] update transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index c4bc2220..f6b85b52 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -25,7 +25,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping */ public function query() { - return Transaction::query(); + return Transaction::where('type', TransactionType::BILL); } /** From 35bab66df51c8e06928421944454c0b4de34920e Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 28 Apr 2022 11:38:30 +0800 Subject: [PATCH 15/52] update transaction export --- .../Modules/Exports/Services/ExportsTransactions.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index f6b85b52..910fb79b 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -60,17 +60,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping 6 => 'EXPIRED' ]; - $booking = null; - - if($transaction->owner_type === Booking::class){ - $booking = $transaction->owner; - } - - if($transaction->type === TransactionType::BILL){ - $booking = $transaction->owner->owner; - } - - + $booking = $transaction->owner->owner; return [ $booking ? $booking->company->reference : '', $booking ? $booking->marking : '', From 980378a088ca86868c809018174a818c0af4a8c9 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 28 Apr 2022 13:20:54 +0800 Subject: [PATCH 16/52] update signup page --- routes/web.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/web.php b/routes/web.php index 0f4000ba..db16a917 100644 --- a/routes/web.php +++ b/routes/web.php @@ -30,7 +30,7 @@ Route::get('', function () { return view('pages.accounts.login'); })->name('login'); -Route::get('/sign_up', function () { +Route::get('/signup', function () { return view('pages.accounts.sign_up'); })->name('sign_up'); From d21daa1a67d523db653f2a92ca0914cde09cba3c Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 28 Apr 2022 13:25:21 +0800 Subject: [PATCH 17/52] update signup page --- .../forms/RegistrationFormComponent.vue | 20 ++++++++++--------- resources/assets/vue/general/mixins/guards.js | 2 +- .../views/pages/accounts/login.blade.php | 2 +- routes/web.php | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue b/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue index e436960a..429d0b9a 100644 --- a/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue +++ b/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue @@ -121,16 +121,18 @@
-
- + +
diff --git a/resources/assets/vue/general/mixins/guards.js b/resources/assets/vue/general/mixins/guards.js index 3b39baad..3e5aaea5 100644 --- a/resources/assets/vue/general/mixins/guards.js +++ b/resources/assets/vue/general/mixins/guards.js @@ -5,7 +5,7 @@ export default { (this.$store.getters.isAuthenticated && !this.isProtectedRoute()&& !this.isWithTokenRoute()) ? window.location.href = this.route('dashboard') : ''; }, isProtectedRoute(){ - const unprotectedRoutes = [this.route('login'), this.route('account.email.verification')]; + const unprotectedRoutes = [this.route('login'), this.route('signup'), this.route('account.email.verification')]; return !unprotectedRoutes.includes(window.location.href); }, isWithTokenRoute(){ diff --git a/resources/views/pages/accounts/login.blade.php b/resources/views/pages/accounts/login.blade.php index a6ab237c..990eb4cc 100644 --- a/resources/views/pages/accounts/login.blade.php +++ b/resources/views/pages/accounts/login.blade.php @@ -64,7 +64,7 @@
- Create Account + Create Account
diff --git a/routes/web.php b/routes/web.php index db16a917..dafe7a1f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -32,7 +32,7 @@ Route::get('', function () { Route::get('/signup', function () { return view('pages.accounts.sign_up'); -})->name('sign_up'); +})->name('signup'); Route::get('/account/email/verification/{token}', function ($token) { return view('pages.accounts.email_verified', ['token' => $token]); From 7756726ea8ddf45144b7fc47eee083f639f6b231 Mon Sep 17 00:00:00 2001 From: glovetleong Date: Fri, 29 Apr 2022 09:09:58 +0800 Subject: [PATCH 18/52] no file error --- .../ControllersLogic/DownloadBookingDocumentLogic.php | 4 +++- .../Bookings/DownloadBookingDocumentController.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/Bookings/ControllersLogic/DownloadBookingDocumentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/DownloadBookingDocumentLogic.php index de4b59f1..ff9427fe 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/DownloadBookingDocumentLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/DownloadBookingDocumentLogic.php @@ -45,7 +45,9 @@ class DownloadBookingDocumentLogic })->get(); - if (!count($bookings)) throw new MalformedRequestException('No available file to download'); + if (!count($bookings)) { + return response()->json(['no file to download']); + } foreach ($bookings as $booking) { diff --git a/app/Http/Controllers/Bookings/DownloadBookingDocumentController.php b/app/Http/Controllers/Bookings/DownloadBookingDocumentController.php index d2a7d85c..95427363 100644 --- a/app/Http/Controllers/Bookings/DownloadBookingDocumentController.php +++ b/app/Http/Controllers/Bookings/DownloadBookingDocumentController.php @@ -15,7 +15,7 @@ class DownloadBookingDocumentController * @throws \App\Classes\Exceptions\MalformedRequestException */ public function download(Request $request, DownloadBookingDocumentLogic $logic) { - $logic->execute($request); + return $logic->execute($request); } } \ No newline at end of file From 6e1d31159ba88ff2b1bdac198f1013f9ed86772e Mon Sep 17 00:00:00 2001 From: edmondlang Date: Sun, 1 May 2022 12:21:31 +0800 Subject: [PATCH 19/52] update export booking transaction add in supplier name --- .../Exports/Services/ExportsBookingTransactions.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php b/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php index 7da82a31..aed106ea 100644 --- a/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php @@ -2,6 +2,7 @@ namespace App\Classes\Modules\Exports\Services; +use App\Models\Company; use App\Models\Transaction; use Maatwebsite\Excel\Concerns\Exportable; use Maatwebsite\Excel\Concerns\FromQuery; @@ -29,7 +30,8 @@ class ExportsBookingTransactions implements FromQuery, WithHeadings, WithHeading 'Ref No', 'Creted Date', 'Amount', - 'Rate' + 'Rate', + 'Supplier' ]; } @@ -54,11 +56,8 @@ class ExportsBookingTransactions implements FromQuery, WithHeadings, WithHeading */ public function map($transaction): array { - if ($transaction->owner->owner == null){ - $refNo = $transaction->owner->marking; - } else { - $refNo = $transaction->owner->owner->marking; - } + $supplierName = Company::where('id', $transaction->issuer)->get()->first()->name; + $refNo = $transaction->owner->owner == null ? $transaction->owner->marking : $transaction->owner->owner->marking; $createdAt = $transaction->created_at->format('d-m-Y'); $amount = $transaction->amount; @@ -69,6 +68,7 @@ class ExportsBookingTransactions implements FromQuery, WithHeadings, WithHeading $createdAt, $amount, $rate, + $supplierName ]; } } \ No newline at end of file From 960b46daeaa8ae63b108852f9c3479bf9e90517c Mon Sep 17 00:00:00 2001 From: edmondlang Date: Sun, 1 May 2022 16:49:57 +0800 Subject: [PATCH 20/52] export booking analytic --- .../ExportsAnalyticBookingTransactions.php | 109 ++++++++++++++++++ .../ExportAnalyticToExcelController.php | 30 +++++ routes/web.php | 1 + 3 files changed, 140 insertions(+) create mode 100644 app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php create mode 100644 app/Http/Controllers/Exports/ExportAnalyticToExcelController.php diff --git a/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php b/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php new file mode 100644 index 00000000..9861b78f --- /dev/null +++ b/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php @@ -0,0 +1,109 @@ +request = $request; + } + + public function headings(): array + { + return [ + 'TransID', + 'Company ID', + 'Type Of User', + 'Group Control / Experiment', + 'Payment Date', + 'Completed Purchase OrderDate', + 'DayTo Closed', + 'IsCompleted Purchase Order (1 or 0)', + 'Final Payment', + 'Discount Amount', + 'PaymentType', + 'RowUpdateDate' + ]; + } + + /** + * @return \Illuminate\Support\Collection|mixed + */ + public function query() + { + return Booking::query(); + } + + /** + * @param $booking + * @return array + */ + public function map($booking): array + { + $companyType = []; + $companyType[companyType::COMPANY_BUSINESS] = 'COMPANY_BUSINESS'; + $companyType[companyType::PERSONAL_BUSINESS] = 'PERSONAL_BUSINESS'; + + $payments = $booking->transactions()->where('type', 1)->whereIn('status', [2, 3]); + + $firstPayment = $payments->first(); + + $CompletedPurchaseOrders = $booking->transactions()->where('type', 7)->whereIn('status', [1, 2]); + + $FirstCompletedPurchaseOrder = $CompletedPurchaseOrders->first(); + + $lastPayment = $booking->transactions()->where('type', 1)->whereIn('status', [2, 3])->orderBy('id', 'desc')->first(); + + $paymentMethod = ''; + foreach ($payments->get() as $payment) { + + if ( $paymentMethod == '' ) { + $paymentMethod = $payment->payment_method; + } else { + if ( $payment->payment_method != $paymentMethod ) { + $paymentMethod = 0; // set it to Hybrid + } + } + } + + $paymentmethondArray = PaymentMethodType::PAYMENT_METHODS_ID; + $paymentmethondArray[0] = 'Hybrid'; + + $paymentMethod == '' ? '' : $paymentMethod = $paymentmethondArray[$paymentMethod]; + + return [ + $booking->id, + $booking->company_id, + $companyType[$booking->company->type], + '', + $firstPayment == null ? '' : $firstPayment->created_at, + $FirstCompletedPurchaseOrder == null ? '' : $FirstCompletedPurchaseOrder->created_at, + '', + $CompletedPurchaseOrders->count() > 0 ? '1' : '0', + $lastPayment == null ? '' : $lastPayment->amount, + '', + $paymentMethod, + '', + ]; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Exports/ExportAnalyticToExcelController.php b/app/Http/Controllers/Exports/ExportAnalyticToExcelController.php new file mode 100644 index 00000000..135e570d --- /dev/null +++ b/app/Http/Controllers/Exports/ExportAnalyticToExcelController.php @@ -0,0 +1,30 @@ +headers->set('Authorization', 'Bearer '.$token); + } + + public function bookingData(ExportsAnalyticBookingTransactions $exportsAnalyticBookingTransactions, Request $request){ + $response = $exportsAnalyticBookingTransactions->download('bookingData.csv', Excel::CSV, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']); + ob_end_clean(); + return $response; + } +} \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index dafe7a1f..5628c585 100644 --- a/routes/web.php +++ b/routes/web.php @@ -96,6 +96,7 @@ Route::get('/online_payment/redirect', 'Billplz\CallbackBillplzController@callba Route::get('/export/customers/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export'); Route::get('/export/transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@transactions'); +Route::get('/export/analytic/booking', 'Exports\ExportAnalyticToExcelController@bookingData'); Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsProducts $exportsProducts) { return $exportsProducts->download('products.csv', Excel::CSV, ['Content-Type' => 'text/csv']); From 0004d53901d2dfd17d2d4f586b101ba3c7b238f3 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Sun, 1 May 2022 23:11:38 +0800 Subject: [PATCH 21/52] update code on export analytic booking data for Hybrid paymentMethod --- .../ExportsAnalyticBookingTransactions.php | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php b/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php index 9861b78f..791c0de3 100644 --- a/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php @@ -65,6 +65,18 @@ class ExportsAnalyticBookingTransactions implements FromQuery, WithHeadings, Wit $companyType[companyType::PERSONAL_BUSINESS] = 'PERSONAL_BUSINESS'; $payments = $booking->transactions()->where('type', 1)->whereIn('status', [2, 3]); + + $paymentmethondArray = PaymentMethodType::PAYMENT_METHODS_ID; + $paymentmethondArray[0] = 'Hybrid'; + $paymentMethod = ''; + foreach ($payments->get() as $payment) { + if ( $paymentMethod == '' ) { + $paymentMethod = $payment->payment_method; + } else if ( $payment->payment_method != $paymentMethod ) { + $paymentMethod = 0; // set it to Hybrid + } + } + $paymentMethod === '' ? '' : $paymentMethod = $paymentmethondArray[$paymentMethod]; $firstPayment = $payments->first(); @@ -74,23 +86,6 @@ class ExportsAnalyticBookingTransactions implements FromQuery, WithHeadings, Wit $lastPayment = $booking->transactions()->where('type', 1)->whereIn('status', [2, 3])->orderBy('id', 'desc')->first(); - $paymentMethod = ''; - foreach ($payments->get() as $payment) { - - if ( $paymentMethod == '' ) { - $paymentMethod = $payment->payment_method; - } else { - if ( $payment->payment_method != $paymentMethod ) { - $paymentMethod = 0; // set it to Hybrid - } - } - } - - $paymentmethondArray = PaymentMethodType::PAYMENT_METHODS_ID; - $paymentmethondArray[0] = 'Hybrid'; - - $paymentMethod == '' ? '' : $paymentMethod = $paymentmethondArray[$paymentMethod]; - return [ $booking->id, $booking->company_id, From 7e791a64b4f5fb462a1991d728949ebdabefe322 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Sun, 1 May 2022 23:14:27 +0800 Subject: [PATCH 22/52] update code on export booking analytic data for Hybrid payment method --- .../ExportsAnalyticBookingTransactions.php | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php b/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php index 9861b78f..791c0de3 100644 --- a/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php @@ -65,6 +65,18 @@ class ExportsAnalyticBookingTransactions implements FromQuery, WithHeadings, Wit $companyType[companyType::PERSONAL_BUSINESS] = 'PERSONAL_BUSINESS'; $payments = $booking->transactions()->where('type', 1)->whereIn('status', [2, 3]); + + $paymentmethondArray = PaymentMethodType::PAYMENT_METHODS_ID; + $paymentmethondArray[0] = 'Hybrid'; + $paymentMethod = ''; + foreach ($payments->get() as $payment) { + if ( $paymentMethod == '' ) { + $paymentMethod = $payment->payment_method; + } else if ( $payment->payment_method != $paymentMethod ) { + $paymentMethod = 0; // set it to Hybrid + } + } + $paymentMethod === '' ? '' : $paymentMethod = $paymentmethondArray[$paymentMethod]; $firstPayment = $payments->first(); @@ -74,23 +86,6 @@ class ExportsAnalyticBookingTransactions implements FromQuery, WithHeadings, Wit $lastPayment = $booking->transactions()->where('type', 1)->whereIn('status', [2, 3])->orderBy('id', 'desc')->first(); - $paymentMethod = ''; - foreach ($payments->get() as $payment) { - - if ( $paymentMethod == '' ) { - $paymentMethod = $payment->payment_method; - } else { - if ( $payment->payment_method != $paymentMethod ) { - $paymentMethod = 0; // set it to Hybrid - } - } - } - - $paymentmethondArray = PaymentMethodType::PAYMENT_METHODS_ID; - $paymentmethondArray[0] = 'Hybrid'; - - $paymentMethod == '' ? '' : $paymentMethod = $paymentmethondArray[$paymentMethod]; - return [ $booking->id, $booking->company_id, From 78c2fd6c2dc384c714cd8fe46d6b95f5623035b1 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 3 May 2022 13:17:35 +0800 Subject: [PATCH 23/52] debug export booking analytics --- .../Exports/Services/ExportsAnalyticBookingTransactions.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php b/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php index 791c0de3..d7b95220 100644 --- a/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php @@ -86,6 +86,7 @@ class ExportsAnalyticBookingTransactions implements FromQuery, WithHeadings, Wit $lastPayment = $booking->transactions()->where('type', 1)->whereIn('status', [2, 3])->orderBy('id', 'desc')->first(); + dump($booking); return [ $booking->id, $booking->company_id, From 060ae247f0fbf79fc923666591a52b9191c875f1 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 3 May 2022 13:20:29 +0800 Subject: [PATCH 24/52] debug export booking analytics --- .../Exports/Services/ExportsAnalyticBookingTransactions.php | 1 - app/Models/Booking.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php b/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php index d7b95220..791c0de3 100644 --- a/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php @@ -86,7 +86,6 @@ class ExportsAnalyticBookingTransactions implements FromQuery, WithHeadings, Wit $lastPayment = $booking->transactions()->where('type', 1)->whereIn('status', [2, 3])->orderBy('id', 'desc')->first(); - dump($booking); return [ $booking->id, $booking->company_id, diff --git a/app/Models/Booking.php b/app/Models/Booking.php index 69b8a745..2dfd945a 100644 --- a/app/Models/Booking.php +++ b/app/Models/Booking.php @@ -38,7 +38,7 @@ class Booking extends AbstractModel implements Documentable, Transactionable */ public function company(): BelongsTo { - return $this->BelongsTo(Company::class, 'company_id'); + return $this->BelongsTo(Company::class, 'company_id')->withTrashed(); } /** From 860e1314ea8624607fc7d91b7edda67b6a91ce04 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 3 May 2022 13:27:35 +0800 Subject: [PATCH 25/52] debug export booking analytics --- .../Modules/Accounts/ControllersLogic/CreateCustomerLogic.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php index 3fe7b382..2c732126 100644 --- a/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php +++ b/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php @@ -14,6 +14,7 @@ use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject; use App\Classes\Modules\Contacts\Processors\CreateContactProcessor; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\BusinessType; +use App\Classes\ValueObjects\Constants\CompanyType; use App\Classes\ValueObjects\Constants\RoleTypes; use App\Models\Company; use App\Models\User; @@ -91,7 +92,7 @@ class CreateCustomerLogic extends AbstractControllerLogic $user = $this->createUserProcessor->execute($request, RoleTypes::USER, App::environment(['local']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION); /** @var Company $company */ - $company = $this->createCompanyProcessor->execute($request, BusinessType::IMPORTER, $request->input('type'), ApprovalStatus::PENDING_SUBMISSION); + $company = $this->createCompanyProcessor->execute($request, BusinessType::IMPORTER, $request->input('type') === CompanyType::COMPANY_BUSINESS ? CompanyType::COMPANY_BUSINESS : CompanyType::PERSONAL_BUSINESS, ApprovalStatus::PENDING_SUBMISSION); $this->createContactProcessor->execute($request, $company); From 06dd1efa247202e279f35784fb189d4b696918ce Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 6 May 2022 13:49:37 +0800 Subject: [PATCH 26/52] remove raya announcement --- .../companies/sections/CustomerDashboardSectionComponent.vue | 5 ----- 1 file changed, 5 deletions(-) diff --git a/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue index bcfafad5..9d11ecd0 100644 --- a/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue @@ -3,11 +3,6 @@
-
-
- -
-
From 1526f36e9230cebcf9e05b3a69e52431f2633dc8 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 6 May 2022 13:53:47 +0800 Subject: [PATCH 27/52] remove raya announcement --- .../companies/sections/CustomerDashboardSectionComponent.vue | 5 ----- 1 file changed, 5 deletions(-) diff --git a/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue index bcfafad5..9d11ecd0 100644 --- a/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue @@ -3,11 +3,6 @@
-
-
- -
-
From 74279d6dda17f1e8fb4510dab333d216118632f7 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 11:27:33 +0800 Subject: [PATCH 28/52] fix transaction export --- .../Modules/Exports/Services/ExportsTransactions.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 910fb79b..869114fb 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -25,7 +25,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping */ public function query() { - return Transaction::where('type', TransactionType::BILL); + return Transaction::query(); } /** @@ -60,7 +60,12 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping 6 => 'EXPIRED' ]; + $booking = $transaction->owner->owner; + if($transaction->owner !== Booking::class){ + dump($transaction); + } + return [ $booking ? $booking->company->reference : '', $booking ? $booking->marking : '', From c856fff2034a8745be5b8df1b34b5fa86c0fd6b2 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 11:30:10 +0800 Subject: [PATCH 29/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 869114fb..297fc019 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -62,7 +62,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping $booking = $transaction->owner->owner; - if($transaction->owner !== Booking::class){ + if($transaction->owner instanceof Booking){ dump($transaction); } From 293bd1ffc011daa9715c62e996adc79810b8d2d2 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 11:32:14 +0800 Subject: [PATCH 30/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 297fc019..c0605d55 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -63,7 +63,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping $booking = $transaction->owner->owner; if($transaction->owner instanceof Booking){ - dump($transaction); + dump($transaction->owner); } return [ From 505398f9c592d5c27974e50298d34ea6b177d9c0 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 11:33:16 +0800 Subject: [PATCH 31/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index c0605d55..1b74c447 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -62,7 +62,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping $booking = $transaction->owner->owner; - if($transaction->owner instanceof Booking){ + if(!($transaction->owner instanceof Booking)){ dump($transaction->owner); } From 4bf5c4081dc31e7ef44cc09f3b87ceef87d62a17 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 11:35:01 +0800 Subject: [PATCH 32/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 1b74c447..81b97eb8 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -63,7 +63,9 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping $booking = $transaction->owner->owner; if(!($transaction->owner instanceof Booking)){ - dump($transaction->owner); + if(!($transaction->owner->owner instanceof Booking)){ + dump($transaction->owner); + } } return [ From da22d17b7a203017adb8c06f2fb8c7ad2d5fa3e2 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 14:47:34 +0800 Subject: [PATCH 33/52] fix transaction export --- .../Exports/Services/ExportsTransactions.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 81b97eb8..64a98a5a 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -61,15 +61,24 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping ]; - $booking = $transaction->owner->owner; - if(!($transaction->owner instanceof Booking)){ - if(!($transaction->owner->owner instanceof Booking)){ - dump($transaction->owner); + $booking = $transaction->owner; + $company = $booking->owner; + + if(!($booking instanceof Booking)){ + $booking = $transaction->owner->owner; + + + if($booking instanceof Company){ + $company = $booking; + $booking = null; + } else { + $company = $booking->owner; } } + return [ - $booking ? $booking->company->reference : '', + $company->reference, $booking ? $booking->marking : '', $transaction->bill_no, $transaction->owner_id, From f6090732d1008f281a39cb2c0ecdeee06239dffe Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 14:48:31 +0800 Subject: [PATCH 34/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 64a98a5a..7215e83a 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -76,7 +76,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping } } - +dump($booking, $company); return [ $company->reference, $booking ? $booking->marking : '', From ea9ca284f202d104911eef5eec2b71a88bd0ee1f Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 14:49:46 +0800 Subject: [PATCH 35/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 7215e83a..b79cef5d 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -63,7 +63,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping $booking = $transaction->owner; $company = $booking->owner; - + dump($booking, $company); if(!($booking instanceof Booking)){ $booking = $transaction->owner->owner; @@ -76,7 +76,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping } } -dump($booking, $company); + return [ $company->reference, $booking ? $booking->marking : '', From 9e7216d545430af3e8526770f2276944480e5fe2 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 14:50:37 +0800 Subject: [PATCH 36/52] fix transaction export --- .../Modules/Exports/Services/ExportsTransactions.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index b79cef5d..c7a569ca 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -62,8 +62,8 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping $booking = $transaction->owner; - $company = $booking->owner; - dump($booking, $company); + $company = $booking->company; + if(!($booking instanceof Booking)){ $booking = $transaction->owner->owner; @@ -72,7 +72,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping $company = $booking; $booking = null; } else { - $company = $booking->owner; + $company = $booking->company; } } From 6bbfa1b24f6c35020236709379704d12528a367d Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 15:05:51 +0800 Subject: [PATCH 37/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index c7a569ca..2e9508c6 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -76,6 +76,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping } } + if((!($company instanceof Company) || !($booking instanceof Booking)) && $booking !== null ) dd($company, $booking); return [ $company->reference, From bb39831c9a63d1dcf9abc97c04f6be4ea07b8c62 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 15:35:56 +0800 Subject: [PATCH 38/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 2e9508c6..2d3c270a 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -67,6 +67,9 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping if(!($booking instanceof Booking)){ $booking = $transaction->owner->owner; + if($booking instanceof Transaction){ + $booking = $booking->owner; + } if($booking instanceof Company){ $company = $booking; From 1e782e9e49845f1449346b0e197309c6282122c1 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 15:48:48 +0800 Subject: [PATCH 39/52] fix transaction export --- .../Modules/Exports/Services/ExportsTransactions.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 2d3c270a..581d6152 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -62,8 +62,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping $booking = $transaction->owner; - $company = $booking->company; - + $company = ''; if(!($booking instanceof Booking)){ $booking = $transaction->owner->owner; @@ -77,6 +76,9 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping } else { $company = $booking->company; } + + } else { + $company = $booking->company; } if((!($company instanceof Company) || !($booking instanceof Booking)) && $booking !== null ) dd($company, $booking); From fb59937a8d715849c0b3505a7967edd6ba9bf4d2 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 16:07:59 +0800 Subject: [PATCH 40/52] fix transaction export --- .../Exports/Services/ExportsTransactions.php | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 581d6152..fef7a111 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -25,7 +25,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping */ public function query() { - return Transaction::query(); + return Transaction::whereIn([TransactionType::PAYMENT, TransactionType::BILL]); } /** @@ -62,26 +62,11 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping $booking = $transaction->owner; - $company = ''; if(!($booking instanceof Booking)){ - $booking = $transaction->owner->owner; - - if($booking instanceof Transaction){ - $booking = $booking->owner; - } - - if($booking instanceof Company){ - $company = $booking; - $booking = null; - } else { - $company = $booking->company; - } - - } else { - $company = $booking->company; + $booking = $booking->owner; } - if((!($company instanceof Company) || !($booking instanceof Booking)) && $booking !== null ) dd($company, $booking); + $company = $booking->company; return [ $company->reference, From 71fde21bd5106d1d56a51f40886be75be3251113 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 16:15:07 +0800 Subject: [PATCH 41/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index fef7a111..0fa7a515 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -63,6 +63,8 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping $booking = $transaction->owner; if(!($booking instanceof Booking)){ + dump($booking); + $booking = $booking->owner; } From 28122890af6297de10ae8680684beb52717d25f2 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 16:24:52 +0800 Subject: [PATCH 42/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 0fa7a515..b82c888f 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -25,7 +25,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping */ public function query() { - return Transaction::whereIn([TransactionType::PAYMENT, TransactionType::BILL]); + return Transaction::whereIn('type', [TransactionType::PAYMENT, TransactionType::BILL]); } /** From bea34174baef229286d1f9057a1bd671641c7007 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 16:25:04 +0800 Subject: [PATCH 43/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index b82c888f..66678ea2 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -63,8 +63,6 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping $booking = $transaction->owner; if(!($booking instanceof Booking)){ - dump($booking); - $booking = $booking->owner; } From da7a259000b0ef3e271babeb970e5072853ab018 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 16:28:12 +0800 Subject: [PATCH 44/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 66678ea2..0bb47ab6 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -67,7 +67,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping } $company = $booking->company; - +dump($company); return [ $company->reference, $booking ? $booking->marking : '', From 2c4804a2a0b74716162afc3723d6cde0b67ff862 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 16:36:34 +0800 Subject: [PATCH 45/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 0bb47ab6..66678ea2 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -67,7 +67,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping } $company = $booking->company; -dump($company); + return [ $company->reference, $booking ? $booking->marking : '', From 2ff84186b8c4f7aa7650bca0c1b3220af1557170 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 16:40:41 +0800 Subject: [PATCH 46/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 66678ea2..d5b45be7 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -68,6 +68,8 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping $company = $booking->company; + if(!$company instanceof Company) dd($company); + return [ $company->reference, $booking ? $booking->marking : '', From 2bb93d97438893f06e28b78b4ea64239ba2dd84e Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 18:59:53 +0800 Subject: [PATCH 47/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index d5b45be7..adef7293 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -25,7 +25,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping */ public function query() { - return Transaction::whereIn('type', [TransactionType::PAYMENT, TransactionType::BILL]); + return Transaction::whereMonth('created_at', 4)->whereIn('type', [TransactionType::PAYMENT, TransactionType::BILL]); } /** @@ -68,8 +68,6 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping $company = $booking->company; - if(!$company instanceof Company) dd($company); - return [ $company->reference, $booking ? $booking->marking : '', From 0da50ebae6f4705909d9d0c7751b7d9182adb5e4 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 19:00:46 +0800 Subject: [PATCH 48/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index adef7293..6092f6a6 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -25,7 +25,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping */ public function query() { - return Transaction::whereMonth('created_at', 4)->whereIn('type', [TransactionType::PAYMENT, TransactionType::BILL]); + return Transaction::whereIn('type', [TransactionType::PAYMENT, TransactionType::BILL]); } /** @@ -68,6 +68,8 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping $company = $booking->company; + if(!$company instanceof Company) dd($transaction); + return [ $company->reference, $booking ? $booking->marking : '', From bb5a2b8259818082e1d82d2dd16060666d33321b Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 19:06:52 +0800 Subject: [PATCH 49/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 6092f6a6..f660af96 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -25,7 +25,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping */ public function query() { - return Transaction::whereIn('type', [TransactionType::PAYMENT, TransactionType::BILL]); + return Transaction::whereIn('type', [TransactionType::PAYMENT, TransactionType::BILL])->whereNot('owner_type', Wallet::class); } /** From 5fc2f76bc69587114c11d95978ea50ca67c248c0 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 19:08:11 +0800 Subject: [PATCH 50/52] fix transaction export --- app/Classes/Modules/Exports/Services/ExportsTransactions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index f660af96..89a765e5 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -25,7 +25,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping */ public function query() { - return Transaction::whereIn('type', [TransactionType::PAYMENT, TransactionType::BILL])->whereNot('owner_type', Wallet::class); + return Transaction::whereIn('type', [TransactionType::PAYMENT, TransactionType::BILL])->where('owner_type', '!=',Wallet::class); } /** From 60936ffadf84c2142c0875b1719330533889f2e9 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 11 May 2022 13:15:06 +0800 Subject: [PATCH 51/52] update po day limit notice --- .../bookings/forms/PurchaseOrderFormComponent.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue index cde4d84d..fdb07c35 100644 --- a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue +++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue @@ -7,7 +7,14 @@
2
Purchase Order
-

In order for us to process your order, you will need to provide us with your purchase order information.

+

In order for us to process your order, you will need to provide us with your purchase order information.

+
+
+
+
+
+

Any Purchase Orders that aren't submitted within 60 days will be closed for editing.

+
From 4b12ea3fc548c0cc275c2c0fecc3d78503f5ea5b Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 11 May 2022 13:25:54 +0800 Subject: [PATCH 52/52] update po day limit notice --- .../components/bookings/forms/PurchaseOrderFormComponent.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue index fdb07c35..76a202a1 100644 --- a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue +++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue @@ -10,10 +10,10 @@

In order for us to process your order, you will need to provide us with your purchase order information.

-
+
-

Any Purchase Orders that aren't submitted within 60 days will be closed for editing.

+

Any Purchase Orders that aren't submitted within 60 days will be closed for editing.