remove spaces on Export warehouse service

# Conflicts:
#   config/app.php

.gitignore

@@ -2,6 +2,8 @@
 /public/hot
 /public/storage
 /storage/*.key
+/tests/_output
+/tests/_support
 /vendor
 **/.idea/
 .env

.gitlab-ci.yml

@@ -0,0 +1,39 @@
+image: php:7.4
+stages:
+  - build
+  - test
+
+before_script:
+- apt-get update -yqq
+- apt-get install -yqq
+- apt-get install -y  libonig-dev
+- apt-get install -y libxml2-dev
+- apt-get install -y libzip-dev
+- apt-get install -y libgd-dev
+
+#install php depandancies
+- docker-php-ext-install mbstring xml zip gd
+
+#  Install composer package manager
+- curl --location --output /usr/local/bin/composer https://getcomposer.org/download/latest-stable/composer.phar
+- chmod +x /usr/local/bin/composer
+
+#jobs
+build_job:
+  stage: build
+  script:
+    - composer install
+  rules:
+    - if: '$CI_COMMIT_BRANCH =~ /.*/'
+
+test_job:
+  stage: test
+  script:
+    - composer install
+    - cp .env.example .env
+    - php artisan key:generate
+   # - php artisan migrate
+    #- php artisan db:seed
+    - php artisan test
+  rules:
+    - if: '$CI_COMMIT_BRANCH =~ /.*/'

app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\UpdatesCompany;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyModuleName;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyDebtor;
+use App\Http\Resources\CompanyResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCompanyNameAndDebtorLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Company Name and Debtor',
+            'message' => 'You have successfully updated the Company'
+        ];
+    }
+
+    /** @var CanUpdateCompany */
+    private $canUpdateCompany;
+ 
+    /** @var UpdatesCompany */
+    private $updatesCompany;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var UpdatesCompanyDebtor */
+    private $updatesCompanyDebtor;
+
+    /** @var UpdatesCompanyModuleName */
+    private $updatesCompanyModuleName;
+
+    /**
+     * UpdateCompanyControllersLogic constructor.
+     * @param CanUpdateCompany $canUpdateCompany
+     * @param UpdatesCompany $updatesCompany
+     * @param FetchesCompany $fetchesCompany
+     * @param UpdatesCompanyDebtor $updatesCompanyDebtor
+     * @param UpdatesCompanyModuleName $updatesCompanyModuleName
+     */
+    public function __construct(CanUpdateCompany $canUpdateCompany, UpdatesCompany $updatesCompany, FetchesCompany $fetchesCompany, UpdatesCompanyDebtor $updatesCompanyDebtor, UpdatesCompanyModuleName $updatesCompanyModuleName)
+    {
+        $this->canUpdateCompany = $canUpdateCompany;
+        $this->updatesCompany = $updatesCompany;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->updatesCompanyDebtor = $updatesCompanyDebtor;
+        $this->updatesCompanyModuleName = $updatesCompanyModuleName;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $object = new CompanyObject($request->input('name'), $request->input('reference'), $request->input('type'));
+
+        $this->canUpdateCompany->passes($object);
+
+        $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+
+        $this->updatesCompanyModuleName->execute($query->companyModules()->first(), $object->getName());
+
+        $query = $this->updatesCompany->execute($query, $object);
+
+        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

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Models\Company;
+
+class UpdatesCompanyDebtor extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Company $model
+     * @param CompanyObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Company $model, ?string $debtor) 
+    {
+        $model->debtor = $debtor;
+
+        return $this->handler($model);
+    }
+}

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

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\Order;
+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()
+    {
+        return Order::whereHas('addresses', function($address) {
+            $address->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,
+        ];
+    }
+}

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/Companies/UpdateCompanyNameAndDebtorController.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Companies\ControllersLogic\UpdateCompanyNameAndDebtorLogic;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCompanyNameAndDebtorController extends Controller
+{
+    /**
+     * @param Request $request
+     * @param UpdateCompanyLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateCompanyNameAndDebtorLogic $logic): JsonResponse
+    {
+        return $logic->execute($request);
+    }
+}

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
 {

app/Http/Resources/CompanyResource.php

@@ -23,6 +23,7 @@ class CompanyResource extends JsonResource
             'id' => $this->id,
             'hash_id' => Crypt::encryptString($this->id),
             'name' => $this->name,
+            'debtor' => $this->debtor,
             'reference' => $this->reference,
             'type' => (int) $this->type,
             'business_type' => (int) $this->business_type,

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/companies/elements/CustomerProfileComponent.vue

@@ -13,7 +13,14 @@
                 <div class="col-auto">
                     <div class="row">
                         <div class="col">
-                            <div class="font-heading fs-20 light">{{item.name}}</div>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeCustomerName">
+                                <change-customer-name-form-component :section="'customerProfileSection'" :data="item"></change-customer-name-form-component>
+                            </modal-component>
+                            <div class="font-heading fs-20 light">{{item.name}}  
+                                <div class="btn btn-xs b-rad-none pointer requestModal d-inline rounded no-border hover-primary" data-type="changeCustomerName" >
+                                    <i class="fa fa-edit pointer fa-fw fs-15 m-l-5"></i>
+                                </div>
+                            </div>
                         </div>
                     </div>
                     <div class="row">

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

@@ -0,0 +1,73 @@
+<template>
+    <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <div class="row m-b-10">
+                <div class="col text-center">
+                    <h3>Edit Company Details</h3>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.name">
+                        <label class="text-primary">Name</label>
+                        <input class="form-control" v-model="parameters.name">
+                    </validation-wrapper-component>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.debtor">
+                        <label class="text-primary">Debtor Code</label>
+                        <input class="form-control" v-model="parameters.debtor">
+                    </validation-wrapper-component>
+                </div>
+            </div>
+            <div class="row m-t-15">
+                <div class="col-auto p-r-5">
+                    <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="submitForm">Confirm</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required, minLength } from "vuelidate/lib/validators";
+
+    export default {
+        data() {
+            return {
+                parameters: {
+                    id: this.data.id, 
+                    name: this.data.name, 
+                    debtor: this.data.debtor, 
+                    reference: this.data.reference, 
+                    type: this.data.type, 
+                }
+            };
+        },
+        validations: {
+            parameters: {
+                name: { 
+                    required,
+                    minLength: minLength(8)
+                },
+                debtor: { 
+                },
+            }
+        },
+        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]
+    }
+
+</script>

routes/company.php

@@ -8,6 +8,7 @@ Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Compani
     Route::post('/create', 'CreateCompanyController@create')->name('create');
     Route::put('/update/{id}', 'UpdateCompanyController@update')->name('update');
     Route::delete('/delete/{id}', 'DeleteCompanyController@destroy')->name('delete');
+    Route::put('/name-and-debtor/update/{id}', 'UpdateCompanyNameAndDebtorController@update')->name('update.nameAndDebtor');
 
     Route::post('/team/create', 'AddNewMemberController@create')->name('team.create');
 

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');

tests/acceptance/DashboardCest.php

@@ -0,0 +1,49 @@
+<?php
+
+class DashboardCest
+{
+    public function _before(AcceptanceTester $I)
+    {
+
+        $I->wantTo('Test All Dashboard Data is Loaded');
+        $I->amOnPage('/dashboard');
+    }
+
+    /**
+     * test if the sidebar was loaded
+     * @param AcceptanceTester $I
+     * @return void
+     */
+    public function tryToTestIfAllAdminSidebarAreLoaded(AcceptanceTester $I)
+    {
+        $I->amOnPage('/dashboard');
+        $I->see('DASHBOARD');
+        $I->see('CUSTOMERS');
+        $I->see('DELIVERY LIST');
+        $I->see('CONTAINERS');
+        $I->see('PAYMENT AND BILLING');
+
+    }
+
+
+    /**
+     * test if the dashboard content is Loaded
+     * @param AcceptanceTester $I
+     * @return void
+     */
+    public function tryToTestAllDashboardComponentLoaded(AcceptanceTester $I)
+    {
+        $I->amOnPage('/dashboard');
+        $I->see('Dashboard');
+        $I->see('NEW CUSTOMERS');
+        $I->see('Unclaimed Packing Lists');
+        $I->see('Identification Verification');
+        $I->see('ACTIVATED ORDERS');
+        $I->see('PENDING SHIPMENT');
+
+        //delay a few second
+        $I->wait(5); // 2 seconds delay
+
+        $I->see('Unclaimed Packing Lists');
+    }
+}