From dfec2073b04634a2d33e57f2f4827bb6f4456eb6 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Mon, 6 Feb 2023 23:02:02 +0800 Subject: [PATCH 1/7] update change company and debtor code --- .../ControllersLogic/UpdateCompanyNameAndDebtorLogic.php | 4 +++- .../Modules/Companies/Services/UpdatesCompanyDebtor.php | 2 +- .../orders/forms/ChangeCustomerNameFormComponent.vue | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php index aae07fcc..939294b3 100644 --- a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php +++ b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php @@ -78,7 +78,9 @@ class UpdateCompanyNameAndDebtorLogic extends AbstractControllerLogic $query = $this->updatesCompany->execute($query, $object); - $this->updatesCompanyDebtor->execute($query, $request->input('debtor')); + if ($request->input('debtor') || $query->first()->debtor !== null) { + $this->updatesCompanyDebtor->execute($query, null); + } return $this->resourceResponse(new CompanyResource($query)); } diff --git a/app/Classes/Modules/Companies/Services/UpdatesCompanyDebtor.php b/app/Classes/Modules/Companies/Services/UpdatesCompanyDebtor.php index 70f130f9..3e85df32 100644 --- a/app/Classes/Modules/Companies/Services/UpdatesCompanyDebtor.php +++ b/app/Classes/Modules/Companies/Services/UpdatesCompanyDebtor.php @@ -15,7 +15,7 @@ class UpdatesCompanyDebtor extends AbstractUpdateRecord * @return \Illuminate\Database\Eloquent\Model * @throws \App\Classes\Exceptions\MalformedRequestException */ - public function execute(Company $model, string $debtor) + public function execute(Company $model, ?string $debtor) { $model->debtor = $debtor; diff --git a/resources/assets/vue/components/orders/forms/ChangeCustomerNameFormComponent.vue b/resources/assets/vue/components/orders/forms/ChangeCustomerNameFormComponent.vue index 4373f6d5..5fc2398c 100644 --- a/resources/assets/vue/components/orders/forms/ChangeCustomerNameFormComponent.vue +++ b/resources/assets/vue/components/orders/forms/ChangeCustomerNameFormComponent.vue @@ -27,7 +27,7 @@
Cancel
-
Confirm
+
Confirm
@@ -62,6 +62,9 @@ methods: { successHandler(response) { window.location.replace(this.route('customers', response.payload.data.reference)); + }, + submitForm() { + this.submit(this.route('api.company.update.nameAndDebtor', this.data.id), 'put', this.section, true, true) } }, mixins: [modalFormHandler] From 990508501dd4de9d12c9396732c8e21e93a67e89 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Mon, 6 Feb 2023 23:07:41 +0800 Subject: [PATCH 2/7] revert testing code --- .../ControllersLogic/UpdateCompanyNameAndDebtorLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php index 939294b3..782b3b11 100644 --- a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php +++ b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php @@ -79,7 +79,7 @@ class UpdateCompanyNameAndDebtorLogic extends AbstractControllerLogic $query = $this->updatesCompany->execute($query, $object); if ($request->input('debtor') || $query->first()->debtor !== null) { - $this->updatesCompanyDebtor->execute($query, null); + $this->updatesCompanyDebtor->execute($query, $request->input('debtor')); } return $this->resourceResponse(new CompanyResource($query)); From 86461c19a140c57c1f603c0fa1c66ae33df56fa2 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Tue, 7 Feb 2023 23:32:18 +0800 Subject: [PATCH 3/7] add export function - export/packing-list-warehouse/guangzhou2-to-johor add warehouse prefix 'NX/' --- .../Services/ExportsWarehousePackingList.php | 55 +++++++++++++++++++ .../Exports/ExportArrivedParcelController.php | 8 +++ .../Orders/DownloadOrderQrPdfController.php | 5 ++ routes/web.php | 1 + 4 files changed, 69 insertions(+) create mode 100644 app/Classes/Modules/Exports/Services/ExportsWarehousePackingList.php diff --git a/app/Classes/Modules/Exports/Services/ExportsWarehousePackingList.php b/app/Classes/Modules/Exports/Services/ExportsWarehousePackingList.php new file mode 100644 index 00000000..647dcc1a --- /dev/null +++ b/app/Classes/Modules/Exports/Services/ExportsWarehousePackingList.php @@ -0,0 +1,55 @@ +where('status', ApprovalStatus::APPROVED); + })->whereHas('packingLists', function($packingLists) { + $packingLists->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDoesntHave('transports'); + }); + } + + /** + * @param Order $order + * + * @return array + */ + public function map($order): array + { + $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference; + + return [ + $marking, + $order->reference, + ]; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Exports/ExportArrivedParcelController.php b/app/Http/Controllers/Exports/ExportArrivedParcelController.php index 596df44d..79315b62 100644 --- a/app/Http/Controllers/Exports/ExportArrivedParcelController.php +++ b/app/Http/Controllers/Exports/ExportArrivedParcelController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers\Exports; use App\Classes\Modules\Exports\Services\ExportsArrivedParcel; use App\Classes\Modules\Exports\Services\ExportsParcel; +use App\Classes\Modules\Exports\Services\ExportsWarehousePackingList; use App\Models\User; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -34,4 +35,11 @@ class ExportArrivedParcelController ob_end_clean(); return $response; } + + public function guangZhou2ToJohor(Request $request) { + $exportsWarehousePackingList = new ExportsWarehousePackingList(); + $response = $exportsWarehousePackingList->download('guangzhou2-to-johor-summary.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']); + ob_end_clean(); + return $response; + } } diff --git a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php index ed6f00c3..89e418d3 100644 --- a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php +++ b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php @@ -53,6 +53,11 @@ class DownloadOrderQrPdfController } } + if(in_array($warehouse->reference,[WarehouseReferences::YD_GUANG_ZHOU_2])){ + if(strtolower($deliveryAddress->state->name) === 'johor') { + $warehousePrefix = 'NX/'; + } + } $data = [ 'order' => $order, diff --git a/routes/web.php b/routes/web.php index e9473af4..3b1f78e8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -325,6 +325,7 @@ Route::get('/export/arrived-parcel', 'Exports\ExportArrivedParcelController@expo Route::get('/export/parcel-summary', 'Exports\ExportArrivedParcelController@summary'); Route::get('/export/parcel-postcode', 'Exports\ExportParcelPostcodesController@export'); Route::get('/export/{year}/customer-total-order', 'Exports\ExportCustomersToExcelController@totalOrders'); +Route::get('/export/packing-list-warehouse/guangzhou2-to-johor', 'Exports\ExportArrivedParcelController@guangZhou2ToJohor'); Route::get('/settings', function () { return view('pages.settings'); From 88e7bf44b545356800f02528b20b6da4fb3e4a6f Mon Sep 17 00:00:00 2001 From: edmondlang Date: Tue, 7 Feb 2023 23:40:24 +0800 Subject: [PATCH 4/7] update code on the prefix 'NX' --- app/Http/Controllers/Orders/DownloadOrderQrPdfController.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php index 89e418d3..683e3f58 100644 --- a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php +++ b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php @@ -51,9 +51,7 @@ class DownloadOrderQrPdfController if(strtolower($deliveryAddress->state->name) === 'sarawak' && !in_array(strtolower($deliveryAddress->district->name), ['limbang', 'lawas'])) { $warehousePrefix = 'KU/'; } - } - if(in_array($warehouse->reference,[WarehouseReferences::YD_GUANG_ZHOU_2])){ if(strtolower($deliveryAddress->state->name) === 'johor') { $warehousePrefix = 'NX/'; } From 67a877ca15961061ae8f8d1c34ca5694254d11f5 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Tue, 7 Feb 2023 23:54:33 +0800 Subject: [PATCH 5/7] update laravel mpdf --- config/app.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/app.php b/config/app.php index 08ff6718..5ec43ff6 100644 --- a/config/app.php +++ b/config/app.php @@ -178,7 +178,8 @@ return [ // Third Parties Spatie\Permission\PermissionServiceProvider::class, Barryvdh\DomPDF\ServiceProvider::class, - Meneses\LaravelMpdf\LaravelMpdfServiceProvider::class, + // Meneses\LaravelMpdf\LaravelMpdfServiceProvider::class, + Mccarlosen\LaravelMpdf\LaravelMpdfServiceProvider::class, Maatwebsite\Excel\ExcelServiceProvider::class, ], @@ -233,7 +234,7 @@ return [ 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, 'PDF' => Barryvdh\DomPDF\Facade::class, - 'MPDF' => Meneses\LaravelMpdf\Facades\LaravelMpdf::class, + 'MPDF' => Mccarlosen\LaravelMpdf\LaravelMpdfServiceProvider::class, 'Excel' => Maatwebsite\Excel\Facades\Excel::class, ], From 5f5dbeb3d16e27cd76b769b70c7e3138e1c45f36 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Wed, 8 Feb 2023 18:59:09 +0800 Subject: [PATCH 6/7] update ExportsWarehousePackingList to only johor state --- .../Exports/Services/ExportsWarehousePackingList.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsWarehousePackingList.php b/app/Classes/Modules/Exports/Services/ExportsWarehousePackingList.php index 647dcc1a..d670e02e 100644 --- a/app/Classes/Modules/Exports/Services/ExportsWarehousePackingList.php +++ b/app/Classes/Modules/Exports/Services/ExportsWarehousePackingList.php @@ -5,6 +5,7 @@ namespace App\Classes\Modules\Exports\Services; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\PackingListType; use App\Models\Order; +use App\Models\State; use Maatwebsite\Excel\Concerns\Exportable; use Maatwebsite\Excel\Concerns\FromQuery; use Maatwebsite\Excel\Concerns\WithHeadingRow; @@ -31,8 +32,10 @@ class ExportsWarehousePackingList implements FromQuery, WithHeadings, WithHeadin */ public function query() { - return Order::whereHas('addresses', function($address) { - $address->where('status', ApprovalStatus::APPROVED); + $johor_state_id = State::where('name', 'johor')->first()->id; + + return Order::whereHas('addresses', function($address) use ($johor_state_id){ + $address->where('status', ApprovalStatus::APPROVED)->where('state_id', $johor_state_id); })->whereHas('packingLists', function($packingLists) { $packingLists->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDoesntHave('transports'); }); From 7d09205817f78c1b7a379cad5464403b06a6182e Mon Sep 17 00:00:00 2001 From: edmondlang Date: Fri, 10 Feb 2023 20:55:32 +0800 Subject: [PATCH 7/7] update laravel mpdf --- .../ApproveShippingInvoiceTransactionLogic.php | 2 +- .../ControllersLogic/CreatePaymentTransactionLogic.php | 2 +- .../ControllersLogic/CreateShippingInvoiceTransactionLogic.php | 2 +- .../ControllersLogic/CreateSupplierTransactionLogic.php | 2 +- .../ControllersLogic/UpdateShippingInvoiceTransactionLogic.php | 2 +- .../Processors/CreateInvoiceTransactionProcessor.php | 2 +- app/Http/Controllers/Orders/DownloadOrderQrPdfController.php | 2 +- app/Http/Controllers/Prototype/TestController.php | 2 +- config/app.php | 3 +-- routes/web.php | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/Classes/Modules/Transactions/ControllersLogic/ApproveShippingInvoiceTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/ApproveShippingInvoiceTransactionLogic.php index 42d5b8ac..3eed1f28 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/ApproveShippingInvoiceTransactionLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/ApproveShippingInvoiceTransactionLogic.php @@ -8,7 +8,7 @@ use Illuminate\Http\Request; use Illuminate\Http\JsonResponse; -use Meneses\LaravelMpdf\Facades\LaravelMpdf; +use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf; use App\Classes\ValueObjects\Constants\DocumentType; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\TransactionType; diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreatePaymentTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreatePaymentTransactionLogic.php index 8ba7b2c8..d85e976c 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/CreatePaymentTransactionLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/CreatePaymentTransactionLogic.php @@ -23,7 +23,7 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; -use Meneses\LaravelMpdf\Facades\LaravelMpdf; +use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf; class CreatePaymentTransactionLogic extends AbstractControllerLogic { diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateShippingInvoiceTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateShippingInvoiceTransactionLogic.php index 78180826..fb0b6404 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/CreateShippingInvoiceTransactionLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateShippingInvoiceTransactionLogic.php @@ -34,7 +34,7 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; -use Meneses\LaravelMpdf\Facades\LaravelMpdf; +use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf; class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic { diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php index 054513af..6fad656e 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php @@ -27,7 +27,7 @@ use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; use Meneses\LaravelLaravelMpdf\Facades\LaravelLaravelMpdf; -use Meneses\LaravelMpdf\Facades\LaravelMpdf; +use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf; class CreateSupplierTransactionLogic extends AbstractControllerLogic { diff --git a/app/Classes/Modules/Transactions/ControllersLogic/UpdateShippingInvoiceTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/UpdateShippingInvoiceTransactionLogic.php index a9bc8f99..278d6959 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/UpdateShippingInvoiceTransactionLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/UpdateShippingInvoiceTransactionLogic.php @@ -7,7 +7,7 @@ use App\Models\Transaction; use Illuminate\Http\Request; use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Storage; -use Meneses\LaravelMpdf\Facades\LaravelMpdf; +use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf; use App\Classes\ValueObjects\Constants\DocumentType; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\TransactionType; diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php index 54370591..d0a70946 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php @@ -23,7 +23,7 @@ use App\Classes\ValueObjects\Constants\DocumentType; use App\Models\Booking; use App\Models\Document; use App\Models\SegmentConstant; -use Meneses\LaravelMpdf\Facades\LaravelMpdf; +use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf; class CreateInvoiceTransactionProcessor { diff --git a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php index 683e3f58..11837206 100644 --- a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php +++ b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php @@ -8,7 +8,7 @@ use App\Classes\ValueObjects\Constants\OrderRoleTypes; use App\Classes\ValueObjects\Constants\WarehouseReferences; use App\Models\Order; use Illuminate\Http\Request; -use Meneses\LaravelMpdf\Facades\LaravelMpdf; +use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf; class DownloadOrderQrPdfController { diff --git a/app/Http/Controllers/Prototype/TestController.php b/app/Http/Controllers/Prototype/TestController.php index 2bfae2fb..9f9eb1e3 100644 --- a/app/Http/Controllers/Prototype/TestController.php +++ b/app/Http/Controllers/Prototype/TestController.php @@ -6,7 +6,7 @@ use Auth; use Illuminate\Http\Request; use App\Http\Controllers\Controller; -use Meneses\LaravelMpdf\Facades\LaravelMpdf; +use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf; class TestController extends Controller { diff --git a/config/app.php b/config/app.php index 5ec43ff6..51e32dcb 100644 --- a/config/app.php +++ b/config/app.php @@ -178,7 +178,6 @@ return [ // Third Parties Spatie\Permission\PermissionServiceProvider::class, Barryvdh\DomPDF\ServiceProvider::class, - // Meneses\LaravelMpdf\LaravelMpdfServiceProvider::class, Mccarlosen\LaravelMpdf\LaravelMpdfServiceProvider::class, Maatwebsite\Excel\ExcelServiceProvider::class, ], @@ -234,7 +233,7 @@ return [ 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, 'PDF' => Barryvdh\DomPDF\Facade::class, - 'MPDF' => Mccarlosen\LaravelMpdf\LaravelMpdfServiceProvider::class, + 'MPDF' => Mccarlosen\LaravelMpdf\Facades\LaravelMpdf::class, 'Excel' => Maatwebsite\Excel\Facades\Excel::class, ], diff --git a/routes/web.php b/routes/web.php index 3b1f78e8..ddc54dd1 100644 --- a/routes/web.php +++ b/routes/web.php @@ -26,7 +26,7 @@ use App\Models\Transaction; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Route; -use Meneses\LaravelMpdf\Facades\LaravelMpdf; +use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf; /* |--------------------------------------------------------------------------