Company rename endpoint.

export top order pdf

See merge request CIEFWorldwideSdnBhd/shipping-portal!138

app/Classes/General/Eloquent/Filters/Receiver.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class Receiver implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->where('receiver', '=', $value);
-    }
-
-}

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

@@ -1,98 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
-use App\Classes\Modules\Transactions\Services\ListsTransactions;
-use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
-use App\Classes\Modules\PackingLists\Standards\Rules\CanListPackingLists;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Http\Resources\PackingListResource;
-use App\Http\Resources\TransactionResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ListCompanyModuleInvoicesLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Retrieved Company Module Invoices',
-            'message' => 'You have successfully retrieved a list of Invoices'
-        ];
-    }
-
-    /** @var CanListPackingLists */
-    private $canListPackingLists;
-
-    /** @var ListsPackingLists */
-    private $listsPackingLists;
-
-    /** @var FetchesCompanyModule */
-    private $fetchesCompanyModule;
-
-    /**
-     * ListCompanyModuleInvoicesLogic constructor.
-     * @param CanListPackingLists $canListPackingLists
-     * @param ListsPackingLists $listsPackingLists
-     * @param FetchesCompanyModule $fetchesCompanyModule
-     */
-    public function __construct(CanListPackingLists $canListPackingLists, ListsPackingLists $listsPackingLists, ListsTransactions $listsTransactions, FetchesCompanyModule $fetchesCompanyModule)
-    {
-        $this->canListPackingLists = $canListPackingLists;
-        $this->listsPackingLists = $listsPackingLists;
-        $this->listsTransactions = $listsTransactions;
-        $this->fetchesCompanyModule = $fetchesCompanyModule;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request): JsonResponse
-    {
-        $companyModule = $this->fetchesCompanyModule->execute(['company_id' => $request->route('id')]);
-
-        $filterArray = [
-            "per_page" => 10,
-            "order_by" => (object)[
-                "column" => 'id',
-                "DESC" => true,
-            ],
-            "status_in" => [2],
-            "receiver" => intval($companyModule->id),
-            "type" => TransactionType::SHIPPING_INVOICE
-        ];
-
-        // // dd($request->route('id'));
-
-        // $this->canListPackingLists->passes();
-
-        // $query = $this->listsPackingLists->execute($filterArray);
-
-        // return $this->collectionResponse(PackingListResource::collection($query));
-
-        $query = $this->listsTransactions->execute($filterArray);
-
-        return $this->collectionResponse(TransactionResource::collection($query));
-
-        // transaction -> type shipping invoice -> invoice belongs to company id
-
-        // transaction
-
-        // order has packing_list has transaction
-        // inside order can find (company_module_id)
-    }
-}

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

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

app/Classes/Modules/Companies/Services/UpdatesCompanyName.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 UpdatesCompanyName extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Company $model
+     * @param int $status
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Company $model, CompanyObject $object)
+    {
+        $model->name = $object->getName();
+        return $this->handler($model);
+
+    }
+}

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

@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\CompanyModule;
+use App\Models\Company;
+use App\Models\PackingList;
+use Carbon\Carbon;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Illuminate\Http\Request;
+
+class ExportsCustomerTotalOrderByYear implements FromCollection, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+    use Exportable;
+
+    private $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'CompanyId',
+            'CompanyName',
+            'CompanyReference',
+            'TotalCbm'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function collection()
+    {
+        $packingLists = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->whereHas('containers', function($container){
+            return $container->where('loading_date', '>=', Carbon::parse('01-01-' . $this->request->route('year')))
+                ->where('loading_date', '<=', Carbon::parse('31-12-' . $this->request->route('year')));
+        })->get();
+
+        $packingLists = $packingLists->groupBy(function ($packingList){
+            return $packingList->owner->company_module_id;
+        })->sortByDesc(function($companyModule){
+            return $companyModule->sum(function($packingList){
+                return $packingList->packages->sum(function ($package){
+                    return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
+                });
+            });
+        })->take(10);
+        return $packingLists;
+    }
+
+    /**
+     * @param $row
+     * @return array
+     */
+    public function map($row): array
+    {
+
+        $companyModule = $row[0]->owner->companyModule;
+        $marking = $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+
+        $cbm = $row->sum(function($packingList){
+            return $packingList->packages->sum(function ($package){
+                return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
+            });
+        });
+
+        return [
+            $companyModule->company_id,
+            $companyModule->name,
+            $marking,
+            $cbm
+        ];
+    }
+}

app/Http/Controllers/Companies/ListCompanyModuleInvoicesController.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Companies;
-
-use App\Classes\Modules\Companies\ControllersLogic\ListCompanyModuleInvoicesLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ListCompanyModuleInvoicesController
-{
-    /**
-     * @param Request $request
-     * @param ListCompanyModulesLogic $logic
-     * @return JsonResponse
-     */
-    public function list(Request $request, ListCompanyModuleInvoicesLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-
-}

app/Http/Controllers/Companies/UpdateCompanyNameController.php

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

app/Http/Controllers/Exports/ExportCustomersToExcelController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Exports;
 
 
 use App\Classes\Modules\Exports\Services\ExportsCustomersOrderLatestDate;
+use App\Classes\Modules\Exports\Services\ExportsCustomerTotalOrderByYear;
 use App\Classes\Modules\Exports\Services\ExportsPaymentTransactions;
 use App\Models\User;
 use Illuminate\Http\Request;
@@ -31,4 +32,11 @@ class ExportCustomersToExcelController
         ob_end_clean();
         return $response;
     }
+
+    public function totalOrders(Request $request){
+        $exportsTotalOrders = new ExportsCustomerTotalOrderByYear($request);
+        $response = $exportsTotalOrders->download('total-orders-' . $request->route('year') . '.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
 }

app/Http/Resources/PackageResource.php

@@ -29,6 +29,7 @@ class PackageResource extends JsonResource
             'weight' => $this->weight,
             'quantity' => $this->quantity,
             'cbm' => (($this->width / 100) * ($this->height / 100) * ($this->length / 100)) * $this->quantity,
+            'reference' => $this->packingList->reference,
             'status' => $this->status,
             $this->mergeWhen($originalPackingList->owner instanceof Order, [
                 'order' => New OrderResource($originalPackingList->owner)

resources/assets/vue/components/companies/sections/CustomerPaymentBillingSectionComponent.vue

@@ -1,50 +0,0 @@
-<template>
-    <div class="row" v-if="company">
-        <div class="col">
-            <p>{{ company }}</p>
-        </div>
-    </div>
-</template>
-<script>
-    export default {
-        props: {
-            company_id: {
-                type: Number,
-                required: true,
-            }
-        },
-        data(){
-            return {
-                section: 'customerPaymentBillingSectionComponent',
-                isLoading: true,
-                company: null
-            }
-        },
-        computed: {
-            pendingQueue () {
-                return this.$store.getters.isInCompleteQueue(this.section);
-            }
-        },
-        watch: {
-            pendingQueue(inComplete){
-                if(inComplete){
-                    this.fetchInvoice();
-                }
-            }
-        },
-        created(){
-            this.$store.dispatch('updateListQueue', {'name': this.section});
-        },
-        methods: {
-            fetchInvoice(){
-                this.isLoading = true;
-                this.submit(route('api.company.invoice.list', this.company_id), 'get', this.section, false, false)
-            },
-            successHandler(response){
-                this.$store.dispatch('completeList', {'name': this.section, 'data': []});
-                this.isLoading = false;
-                this.company = response.payload.data;
-            }
-        }
-    }
-</script>

resources/assets/vue/components/orders/elements/PackageComponent.vue

@@ -19,6 +19,12 @@
                                     <p class="bold m-b-5 fs-12">{{item.description}}</p>
                                 </div>
                             </div>
+                            <div class="row m-b-10 align-items-center" v-if="$store.getters.isAdmin">
+                                <div class="col-auto">
+                                    <p class="no-margin all-caps fs-10 lh-10 light">Reference</p>
+                                    <p class="no-margin fs-12">{{item.reference}}</p>
+                                </div>
+                            </div>
                             <div class="row b-t b-b b-grey m-b-15">
                                 <div class="col">
                                     <div class="row">
@@ -174,4 +180,4 @@
         },
         mixins: [componentHandler]
     }
-</script>
+</script>

resources/assets/vue/components/orders/elements/ParcelComponent.vue

@@ -67,6 +67,14 @@
                             <p class="no-margin bold text-info fs-12"><a :href="route('customer.profile', item.order.company_module.marking)">{{item.order.company_module.marking}}</a></p>
                         </div>
                     </div>
+                    <div class="row m-b-5" v-if="$store.getters.isAdmin">
+                        <div class="col-auto p-r-5">
+                            <p class="no-margin all-caps fs-10 light">Reference</p>
+                        </div>
+                        <div class="col p-l-5">
+                            <p class="no-margin bold text-info fs-12">{{item.reference}}</p>
+                        </div>
+                    </div>
                     <div class="row m-b-5">
                         <div class="col-auto p-r-5">
                             <p class="no-margin all-caps fs-10 light">Order Number</p>

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

@@ -53,7 +53,7 @@
                             </div>
                             <div class="row text-center justify-content-center">
                                 <div class="col-8">
-                                    <p class="m-b-0 text-danger m-t-15" v-if="parameters.warehouse_id === 3">近期由于船期的安排和马来西亚海关的运作等一些不可控因数，导致船期延迟，请大家提前做好采购安排。若有不便之处，敬请谅解。 <br>Due to inevitable circumstances, shipping arrangements and Malaysia custom clearance may have delays. Kindly plan your purchases in advance, thank you for your cooperation.</p>
+                                    <p class="m-b-0 text-danger m-t-15" v-if="parameters.warehouse_id === 3">疫情因管控松动飙升，其中几位仓库人员也不幸感染，整个操作可能会受到影响，我们会尽快跟进并恢复。<br>The pandemic spread due to the loosening of movement controls. Some warehouse employees were unfortunately infected and the entire operation may be disrupted. We will do our best to follow up and revert as soon as possible.</p>
                                     <p class="m-b-0 text-danger m-t-15" v-if="false">由于义乌船期不稳定，建议发广州仓库。<br>Due to unexpected shipping delays for Yiwu warehouse, you may select an alternative warehouse.</p>
                                     <p class="m-b-0 text-danger m-t-15" v-if="parameters.warehouse_id === 4">由于义乌船期不稳定，建议发广州仓库。<br>Due to unexpected shipping delays for Yiwu warehouse, you may select an alternative warehouse.</p>
                                 </div>

resources/views/pages/customers/paymentsBilling.blade.php

@@ -1,4 +0,0 @@
-@extends('layouts.base_portal')
-@section('inner_content')
-    <customer-payment-billing-section-component :company_id={{$id}}></customer-payment-billing-section-component>
-@endsection

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/update/{id}', 'UpdateCompanyNameController@rename')->name('update.name');
 
     Route::post('/team/create', 'AddNewMemberController@create')->name('team.create');
 
@@ -33,6 +34,4 @@ Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Compani
     });
 
     Route::get('/module/list', 'ListCompanyModulesController@list')->name('module.list');
-
-    Route::get('/{id}/invoice/list', 'ListCompanyModuleInvoicesController@list')->name('invoice.list');
 });

routes/web.php

@@ -7,20 +7,25 @@ use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob;
 use App\Classes\Jobs\FetchOrdersFromYDPortalJob;
 use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
 use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
 use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
 use App\Classes\Modules\PackingLists\Processors\FetchPackingListFromVTPortalProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackageType;
 use App\Models\CompanyConnection;
 use App\Models\CompanyModule;
+use App\Models\Document;
 use App\Models\PackingList;
 use Illuminate\Support\Facades\Crypt;
 use App\Models\Container;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Route;
+use Meneses\LaravelMpdf\Facades\LaravelMpdf;
 
 /*
 |--------------------------------------------------------------------------
@@ -160,12 +165,6 @@ Route::get('/customer/{marking}/details', function ($marking) {
     return view('pages.customers.profile_details', ['id' => $id]);
 })->name('customer.profile.details');
 
-Route::get('/customer/{marking}/payment-and-billing', function ($marking) {
-    $connection = CompanyConnection::where('invitee_reference', $marking)->first();
-    $id = $connection->invitee->company->id;
-    return view('pages.customers.paymentsBilling', ['id' => $id]);
-})->name('customer.payment-and-billing');
-
 Route::get('/orders/refresh', function(\Illuminate\Http\Request $request){
     $packingLists = \App\Models\PackingList::where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->has('containers')->get();
     dd($packingLists);
@@ -204,9 +203,9 @@ Route::get('/order/{id}/download', 'Orders\DownloadOrderQrPdfController@download
 Route::get('/report/customclearance/{orderid}', 'Reports\CustomcClearanceReportController@download')->name('report.customclearance');
 
 Route::group(['prefix' => 'template', 'as' => 'template.'], function () {
-    Route::get('/payment-and-billing', function () {
+    Route::get('/payments-and-billing', function () {
         return view('pages.templates.paymentsBilling');
-    })->name('payment-and-billing');
+    })->name('payments-and-billing');
 
     Route::get('/shipping-queue', function () {
         return view('pages.templates.shippingQueue');
@@ -318,6 +317,7 @@ Route::get('/export/on-hold-packing-list', 'Exports\ExportPendingArrangementPack
 Route::get('/export/arrived-parcel', 'Exports\ExportArrivedParcelController@export')->name('packing_list.arrived_parcel.export');
 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('/settings', function () {
     return view('pages.settings');
@@ -652,4 +652,34 @@ Route::get('/billplz/fix', function(){
 });
 
 
+Route::get('/invoices/fix', function(){
+
+    $orders = \App\Models\Order::whereIn('company_module_id', [294, 2703])->get();
+
+    foreach ($orders as $order){
+        $invoices = $order->transactions()->where('transactions.type', \App\Classes\ValueObjects\Constants\TransactionType::SHIPPING_INVOICE)->get();
+        foreach ($invoices as $invoice){
+
+            $invoice->documents()->delete();
+
+            $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]);
+
+            $document_object = new DocumentObject(
+                DocumentType::SHIPPING_INVOICE,
+                [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
+                '',
+                ApprovalStatus::COMPLETED,
+                'shipping_invoice'
+            );
+
+            /** @var Document $document */
+            $document = (App()->make(\App\Classes\Modules\Documents\Services\CreatesDocument::class))->execute($invoice, $document_object);
+
+            (App()->make(\App\Classes\Modules\Documents\Services\CreatesFiles::class))->execute($document, $document_object);
+        }
+    }
+
+});
+
+