Merge branch 'master' into 'feature/pipeline'

# Conflicts:
#   config/app.php

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, $request->input('debtor'));
+        }
 
         return $this->resourceResponse(new CompanyResource($query));
     }

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;
 

app/Classes/Modules/Exports/Services/ExportsWarehousePackingList.php

@@ -0,0 +1,58 @@
+<?php
+
+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;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Carbon\Carbon;
+
+class ExportsWarehousePackingList implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Customer Marking',
+            'Order Number'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        $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');
+        });
+    }
+
+    /**
+     * @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,
+        ];
+    }
+}

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;

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
 {

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
 {

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
 {

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;

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
 {

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;
+    }
 }

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
 {
@@ -51,8 +51,11 @@ class DownloadOrderQrPdfController
             if(strtolower($deliveryAddress->state->name) === 'sarawak' && !in_array(strtolower($deliveryAddress->district->name), ['limbang', 'lawas'])) {
                 $warehousePrefix = 'KU/';
             }
-        }
 
+            if(strtolower($deliveryAddress->state->name) === 'johor') {
+                $warehousePrefix = 'NX/';
+            }
+        }
 
         $data = [
             'order' => $order,

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
 {

config/app.php

@@ -178,7 +178,7 @@ return [
         // Third Parties
         Spatie\Permission\PermissionServiceProvider::class,
         Barryvdh\DomPDF\ServiceProvider::class,
-/*        Meneses\LaravelMpdf\LaravelMpdfServiceProvider::class,*/
+        Mccarlosen\LaravelMpdf\LaravelMpdfServiceProvider::class,
         Maatwebsite\Excel\ExcelServiceProvider::class,
     ],
 
@@ -233,7 +233,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\Facades\LaravelMpdf::class,
         'Excel' => Maatwebsite\Excel\Facades\Excel::class,
     ],
 

resources/assets/vue/components/orders/forms/ChangeCustomerNameFormComponent.vue

@@ -27,7 +27,7 @@
                     <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
                 </div>
                 <div class="col p-l-5">
-                    <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.company.update.nameAndDebtor', data.id), 'put', section, true, true)">Confirm</div>
+                    <div class="btn btn-primary w-100 btn-lg" @click="submitForm">Confirm</div>
                 </div>
             </div>
         </div>
@@ -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]

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;
 
 /*
 |--------------------------------------------------------------------------
@@ -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');