Multiple invoices into one

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

@@ -0,0 +1,20 @@
+<?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/Accounts/ControllersLogic/FetchUserByEmailLogic.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\ControllersLogic;
-
-use App\Classes\Modules\Accounts\Services\FetchesUser;
-use App\Classes\Modules\Accounts\Standards\Rules\CanFetchUser;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Http\Resources\UserCompanyResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class FetchUserByEmailLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Fetch Users',
-            'message' => 'You have successfully retrieved the user by email'
-        ];
-    }
-
-    /** @var CanFetchUser */
-    private $canFetchUser;
-
-    /** @var FetchesUser */
-    private $fetchesUser;
-
-    /**
-     * FetchUserByEmailLogic constructor.
-     * @param CanFetchUser $canFetchUser
-     * @param FetchesUser $fetchessUser
-     */
-    public function __construct(CanFetchUser $canFetchUser, FetchesUser $fetchesUser)
-    {
-        $this->canFetchUser = $canFetchUser;
-        $this->fetchesUser = $fetchesUser;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-
-            $this->canFetchUser->passes();
-
-            $query = $this->fetchesUser->execute(['email' => $request->route('email')]);
-
-            return $this->resourceResponse(new UserCompanyResource($query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-    }
-
-}

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

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Http\Resources\TransactionResource;
+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 ListsTransactions */
+    private $listsTransactions;
+
+    /**
+     * ListCompanyModuleInvoicesLogic constructor.
+     * @param ListsTransactions $listsTransactions
+     */
+    public function __construct(ListsTransactions $listsTransactions)
+    {
+        $this->listsTransactions = $listsTransactions;
+    }
+
+
+    /**
+     * @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
+    {
+        $filterArray = [
+            "per_page" => 10,
+            "order_by" => (object)[
+                "column" => 'id',
+                "DESC" => true,
+            ],
+            "status_in" => [2],
+            "receiver" => intval($request->route('company_module_id')),
+            "type" => TransactionType::SHIPPING_INVOICE
+        ];
+
+        // $this->canListTransactions->passes();
+
+        $query = $this->listsTransactions->execute($filterArray);
+
+        return $this->collectionResponse(TransactionResource::collection($query));
+    }
+}

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

@@ -1,84 +0,0 @@
-<?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/Classes/Modules/Transactions/ControllersLogic/CreateCombinedInvoicesLogic.php

@@ -0,0 +1,104 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+
+use App\Classes\Notifications\InvoiceIssuedEmail;
+use Illuminate\Http\Request;
+
+
+use Illuminate\Http\JsonResponse;
+use Meneses\LaravelMpdf\Facades\LaravelMpdf;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Transactions\ControllersLogic\Document;
+
+class CreateCombinedInvoicesLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Shipping Invoice Status',
+            'message' => 'You have successfully updated multiple shipping invoices status'
+        ];
+    }
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFiles;
+
+    /**
+     * ApprovePaymentVerificationLogic constructor.
+     * @param FetchesPackingList $fetchesPackingList
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFiles
+     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
+     */
+    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles)
+    {
+        $this->fetchesPackingList = $fetchesPackingList;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->createsDocument = $createsDocument;
+        $this->createsFiles = $createsFiles;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $items = $request->input('ids');
+        $invoice_transactions=array();
+        foreach($items as $item){
+
+            $packing_list = $this->fetchesPackingList->execute(['id' => $item['id']]);
+
+            $invoice_transaction = $packing_list->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::PENDING_SUBMISSION])->first();
+            array_push($invoice_transactions, $invoice_transaction);
+
+            // $this->updatesTransactionStatus->execute($invoice_transaction, ApprovalStatus::APPROVED);
+        }
+
+        $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoices_combined', ['invoice_transactions' => $invoice_transactions]);
+
+        $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 = $this->createsDocument->execute($invoice_transaction, $document_object);
+
+        $this->createsFiles->execute($document, $document_object);
+        $user = $packing_list->owner->companyModule->employees()->first();
+        if(app()->environment(['production'])) {
+            $user->notify(new InvoiceIssuedEmail($user, $packing_list));
+        }
+
+        return $this->response([]);
+    }
+
+}

app/Http/Controllers/Accounts/FetchUserByEmailController.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Accounts;
-
-
-use App\Classes\Modules\Accounts\ControllersLogic\FetchUserByEmailLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class FetchUserByEmailController
-{
-
-    /**
-     * @param Request $request
-     * @param FetchUserByEmailLogic $logic
-     * @return JsonResponse
-     */
-    public function fetch(Request $request, FetchUserByEmailLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-
-}

app/Http/Controllers/Companies/ListCompanyModuleInvoicesController.php

@@ -0,0 +1,20 @@
+<?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/Exports/ExportCustomersToExcelController.php

@@ -4,7 +4,6 @@ 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;
@@ -32,11 +31,4 @@ 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/Controllers/PackingLists/Containers/InboundCustomClearedController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\PackingLists\Packages;
+namespace App\Http\Controllers\PackingLists\Containers;
 
 use App\Classes\Modules\PackingLists\ControllersLogic\Containers\InboundCustomClearedLogic;
 use Illuminate\Http\JsonResponse;

app/Http/Controllers/Transactions/CreateCombinedInvoicesController.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers\Transactions;
+
+use App\Classes\Modules\Transactions\ControllersLogic\CreateCombinedInvoicesLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateCombinedInvoicesController
+{
+
+    public function combine(Request $request, CreateCombinedInvoicesLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Resources/PackageResource.php

@@ -29,7 +29,6 @@ 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)

app/Http/Resources/UserCompanyResource.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class UserCompanyResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'name' => $this->name,
-            'reference' => $this->companyModule()->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference,
-            'type' => (int) $this->type,
-            'status' => (int) $this->status,
-            'email' => $this->email
-        ];
-    }
-}

resources/assets/vue/components/companies/elements/UserCompanyComponent.vue

@@ -1,39 +0,0 @@
-<template>
-    <div class="row m-b-15 align-items-end">
-        <div class="col-auto">
-            <div class="row">
-                <div class="col">
-                    <div class="font-heading fs-10 muted all-caps">Name</div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col">
-                    <div class="font-heading all-caps fs-11">{{this.item.name}}</div>
-                </div>
-            </div>
-        </div>
-        <div class="col-2 text-right">
-            <div class="row">
-                <div class="col">
-                    <div class="font-heading fs-10 muted all-caps">Reference</div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col">
-                    <div class="font-heading all-caps fs-11">{{this.item.reference}}</div>
-                </div>
-            </div>
-        </div>
-        <div class="col-auto">
-            <a :href="route('customer.profile', this.item.reference)" target="_blank">
-                <button type="button" class="btn btn-xs btn-primary fs-11">Open in new tab</button>
-            </a>
-        </div>
-    </div>
-</template>
-<script>
-     import componentHandler from '../../../general/mixins/componentHandler';
-    export default {
-        mixins: [componentHandler]
-    }
-</script>

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

@@ -0,0 +1,175 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col-12 col-sm-12 col-md-9">
+                    <div class="row m-b-15 m-l-5 m-r-10">
+                        <div class="col b-a b-grey rounded bg-master-light">
+                            <div class="row">
+                                <div class="col padding-20">
+                                    <div class="row align-items-center justify-conten-center">
+                                        <div class="col-auto pointer">
+                                            <i class="fa fs-30 fa-fw fa-square-o"></i>
+                                        </div>
+                                        <div class="col">
+                                            <h5 class="no-margin font-heading">Invoice No</h5>
+                                        </div>
+                                        <div class="col">
+                                            <h5 class="no-margin">Invoice Date</h5>
+                                        </div>
+                                        <div class="col">
+                                            <h5 class="no-margin">Status</h5>
+                                        </div>
+                                        <div class="col">
+                                            <h5 class="no-margin">Amount</h5>
+                                        </div>
+                                        <div class="col-auto invisible">
+                                            <div class="btn btn-default no-border">
+                                                <i class="fa fa-angle-up"></i>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <!-- <list-component section="containerListSection" :endpoint="route('api.address.district.list')">
+                        <template slot="list" slot-scope="{data}">
+                            <payments-billing-components :data="data"></payments-billing-components>
+                        </template>
+                    </list-component> -->
+                    <payments-billing-components :data="invoice" v-for="invoice in invoices"></payments-billing-components>
+                    <!-- <div class="row" v-for="invoice in invoices">
+                        <div class="col">
+                            {{ invoice.id }}
+                        </div>
+                    </div> -->
+                </div>
+                <div class="col-12 col-sm-12 col-md-3">
+                    <div class="row align-items-center">
+                        <div class="col b-a b-grey rounded padding-25">
+                            <div class="row">
+                                <div class="col">
+                                    <h6 class="semi-bold muted">Payment Summary</h6>
+                                </div>
+                            </div>
+                            <div class="row align-items-center justify-content-center">
+                                <div class="col-auto">
+                                    <div class="padding-5">
+                                        <i class="fa fa-angle-up"></i>
+                                    </div>
+                                </div>
+                                <div class="col p-l-0">
+                                    <h6 class="semi-bold text-primary">2 Invoice Selected</h6>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col-auto">
+                                            <h6 class="no-margin">x1</h6>
+                                        </div>
+                                        <div class="col">
+                                            <h6 class="no-margin">lorem ipsum</h6>
+                                        </div>
+                                        <div class="col-auto">
+                                            <h6 class="no-margin">52x62x635 CM</h6>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-auto">
+                                            <h6 class="no-margin">x1</h6>
+                                        </div>
+                                        <div class="col">
+                                            <h6 class="no-margin">lorem ipsum</h6>
+                                        </div>
+                                        <div class="col-auto">
+                                            <h6 class="no-margin">52x62x635 CM</h6>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <hr>
+                            <div class="row">
+                                <div class="col">
+                                    <h6 class="normal m-t-5 m-b-5">Shipping Fee</h6>
+                                </div>
+                                <div class="col-auto">
+                                    <h6 class="normal m-t-5 m-b-5">RM 212.15</h6>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <h6 class="normal m-t-5 m-b-5">Serrvice Fee</h6>
+                                </div>
+                                <div class="col-auto">
+                                    <h6 class="normal m-t-5 m-b-5">RM 41.25</h6>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <h6 class="normal m-t-5 m-b-5">Discount</h6>
+                                </div>
+                                <div class="col-auto">
+                                    <h6 class="normal m-t-5 m-b-5">RM 0.00</h6>
+                                </div>
+                            </div>
+                            <hr>
+                            <div class="row">
+                                <div class="col">
+                                    <h6 class="normal">Total Payments</h6>
+                                </div>
+                                <div class="col-auto">
+                                    <h6 class="text-primary bold">RM 3300.00</h6>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        props: {
+            company_module_id: {
+                type: Number,
+                required: true,
+            }
+        },
+        data(){
+            return {
+                section: 'customerPaymentBillingSectionComponent',
+                isLoading: true,
+                invoices: 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_module_id), 'get', this.section, false, false)
+            },
+            successHandler(response){
+                this.$store.dispatch('completeList', {'name': this.section, 'data': []});
+                this.isLoading = false;
+                this.invoices = response.payload.data;
+            }
+        }
+    }
+</script>

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

@@ -19,12 +19,6 @@
                                     <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">
@@ -180,4 +174,4 @@
         },
         mixins: [componentHandler]
     }
-</script>
+</script>

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

@@ -67,14 +67,6 @@
                             <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>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="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="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/assets/vue/components/paymentsBilling/elements/PaymentsBillingComponents.vue

@@ -8,7 +8,7 @@
                             <i class="fa fs-30 fa-fw" :class="{'fa-square-o': !selected, 'fa-check-square': selected, 'text-primary':selected}" ></i>
                         </div>
                         <div class="col">
-                            <h5 class="no-margin">{{item.country.id}}05052021</h5>
+                            <h5 class="no-margin">05052021</h5>
                         </div>
                         <div class="col">
                             <h5 class="no-margin">Invoice Date Invoice Date</h5>

resources/assets/vue/components/reports/sections/SearchCustomerByEmailComponent.vue

@@ -1,82 +0,0 @@
-<template>
-    <div class="row" @keyup.enter="fetchReport">
-        <div class="col">
-            <div class="row m-b-15">
-                <div class="col-8 p-r-0">
-                    <div class="row">
-                        <div class="col p-r-0">
-                            <div class="form-group no-margin form-group-default b-rad-none">
-                                <label class="text-primary">Email</label>
-                                <input type="text" class="form-control" v-model="email" />
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-                <div class="col p-l-0">
-                    <div class="btn btn-primary b-rad-none" @click="fetchReport()">
-                        <i class="fa fa-search lh-40"></i>
-                    </div>
-                    <div class="btn btn-secondary b-rad-none" @click="resetSearch()">
-                        <i class="fa fa-remove lh-40"></i>
-                    </div>
-                </div>
-            </div>
-            <div class="row" v-if="search">
-                <div class="col bg-white padding-25">
-                    <p v-if="!userCompany">{{ message }}</p>
-                    <loading-component v-if="isLoading"></loading-component>
-                    <user-company-component v-if="userCompany" :data="userCompany"></user-company-component>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-
-    import LoadingComponent from "../../general/elements/LoadingComponent";
-    export default {
-        components: {LoadingComponent},
-        data(){
-            return {
-                section: 'searchUserCompanyByEmailSection',
-                isLoading: false,
-                search: false,
-                email: '',
-                userCompany: null,
-                message: 'Searching...'
-            }
-        },
-        validations: {
-            marking: {},
-        },
-        methods: {
-            fetchReport(){
-                this.isLoading = true;
-                this.search = true;
-                this.userCompany = null;
-                this.message = 'Searching...';
-                this.submit(route('api.account.user.company', this.email), 'get', this.section, false, false);
-            },
-            successHandler(response){
-                this.isLoading = false;
-                this.report = response.payload.data;
-                if(response.payload.data != undefined)
-                    this.userCompany = response.payload.data;
-                else
-                    this.message = 'Customer not found';
-            },
-            errorHandler(response){
-                this.isLoading = false;
-                this.userCompany = null;
-                this.message = 'Customer not found';
-            },
-            resetSearch() {
-                this.userCompany = null;
-                this.search = false;
-                this.email = '';
-                message: 'Searching...';
-            }
-        }
-    }
-</script>

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

@@ -3,7 +3,6 @@
     <div class="row" :class="[{'d-flex': $store.getters.isAdmin}]" v-if="$store.getters.isAdmin">
         <div class="col">
             <customer-activity-report-section-component></customer-activity-report-section-component>
-            <search-customer-by-email-component></search-customer-by-email-component>
             <div class="row" v-show="!$store.getters.isShowing('customerActivityReportSection')">
                 <div class="col">
                     <customer-report-section-component></customer-report-section-component>

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

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

resources/views/pages/pdfs/shipping_invoices_combined.blade.php

@@ -0,0 +1,220 @@
+@extends('layouts.base_pdf')
+@section('inner_content')
+@php
+$grandTotal = 0;
+$grandSubTotal = 0;
+@endphp
+
+    <br>
+    <br>
+    <table class="line-table" style="overflow: wrap" autosize="1">
+        <thead>
+            <tr>
+                <th width="5%">No</th>
+                <th class="description">Description</th>
+                <th width="15%">Quantity</th>
+                <th width="20%">Unit Price (RM)</th>
+                <th width="20%">Total Amount<br>(RM)</th>
+            </tr>
+        </thead>
+        <tbody>
+        @foreach ($invoice_transactions as $invoice_transaction)
+            @foreach ($invoice_transaction->transactionDetails as $key => $transaction_detail)
+                <tr>
+                    <td width="5%" class="center top">{{ $key + 1 }}</td>
+                    <td class="description">{!! $transaction_detail->name  !!}</td>
+                    <td width="15%" class="center top" style="text-align: center">{{ round($transaction_detail->quantity, 3) }}</td>
+                    <td width="20%" class="center top" style="text-align: center">
+                        {{ round($transaction_detail->price, 2) }}
+                    </td>
+                    <td width="20%" class="right top">
+                        {{ round($transaction_detail->amount, 2) }}
+                    </td>
+                </tr>
+                @php
+                    $grandSubTotal = $grandSubTotal + $invoice_transaction->amount;
+                    $grandTotal = $grandTotal + $invoice_transaction->amount;
+                @endphp
+
+            @endforeach
+        @endforeach
+        </tbody>
+        <tfoot>
+            <tr class="subtotal">
+                <td colspan="3"></td>
+                <td class="right middle">Subtotal</td>
+                <td class="right middle">
+                    {{ round($grandSubTotal, 2) }}
+                </td>
+            </tr>
+            <!-- <tr class="billingcharges">
+                <td colspan="3"></td>
+                <td class="right">Service Charges</td>
+                <td class="right">
+                    {{ round($invoice_transaction->service_charge, 2) }}
+                </td>
+            </tr>
+            @if($invoice_transaction->tax > 0)
+                <tr class="billingcharges">
+                    <td colspan="3"></td>
+                    <td class="right">Tax</td>
+                    <td class="right">{{ number_format($invoice_transaction->tax, 2) }}</td>
+                </tr>
+            @endif -->
+            <tr>
+                <td colspan="3"></td>
+                <td class="right middle">Total</td>
+                <td class="total right middle">
+                    {{ round($grandTotal, 2) }}
+
+                </td>
+            </tr>
+        </tfoot>
+    </table>
+
+
+    @foreach ($invoice_transactions as $invoice_transaction)
+    <br>
+    <htmlpageheader name="page-header">
+        <br><br>
+        <div class="separator"><strong><i>{{ $invoice_transaction->bill_no }}</i></strong></div>
+    </htmlpageheader>
+    <table>
+        <tr>
+            <td class="header-logo">
+                <img src="{{ asset('images/ri_1.png') }}" alt="logo" id="logo" class="logo">
+            </td>
+            <td class="header-cief-address">
+                <span class="company-name">
+                    <strong>
+                        CIEF WORLDWIDE SDN BHD
+                    </strong>
+                </span>
+                <span class="company-reg">(1134596-M)</span><br>
+                No. 72-3, Jalan Jalil 1,<br>
+                The Earth Bukit Jalil,<br>
+                57000 Kuala Lumpur<br>
+                Tel: 03-8082 1252
+            </td>
+            <td class="header-details">
+                <div class="title" style="font-size: 20px; text-transform: uppercase;">
+                    <strong>
+                        Invoice
+                    </strong>
+                </div>
+
+                <div class="number">Invoice No: {{ $invoice_transaction->bill_no }}</div>
+
+                @php
+                    $companyModule = $invoice_transaction->owner->owner->companyModule;
+                @endphp
+
+                <div class="date">Date: {{ $invoice_transaction->created_at }}</div>
+                <div class="ref">Order No: {{ $invoice_transaction->owner->owner->reference }}</div>
+                <div class="ref">Container Ref: {{ $invoice_transaction->owner->containers()->first()->reference }}</div>
+                {{--<div class="d-none">{{ $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference }}</div>--}}
+                <div>&nbsp;</div>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="3" class="bill-to">
+                <span class="sub-title">
+                    Bill To
+                </span>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="3" class="address">
+                <div class="label">
+                    {{ $companyModule->name }}
+                </div>
+                <div class="address">
+                    @php
+                        $addresses = $companyModule->addresses()->where('status', '=', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)->where('type', '=', \App\Classes\ValueObjects\Constants\AddressType::BILLING)->first();
+                    @endphp
+                    {{ $addresses->street_one }}
+                    {{ $addresses->street_two }} ,
+                    {{ $addresses->district()->first()->name }},
+                    {{ $addresses->postcode }}
+                    {{ $addresses->state()->first()->name }},
+                    {{ $addresses->country()->first()->name }}
+                </div>
+                <div>
+                @php
+                    $contact = $companyModule->contacts()->first();
+                @endphp
+                    Phone: {{ $contact ? $contact->phone : '' }}
+                </div>
+            </td>
+        </tr>
+    </table>
+
+    <br>
+    <br>
+    <table class="line-table" style="overflow: wrap" autosize="1">
+        <thead>
+            <tr>
+                <th width="5%">No</th>
+                <th class="description">Description</th>
+                <th width="15%">Quantity</th>
+                <th width="20%">Unit Price (RM)</th>
+                <th width="20%">Total Amount<br>(RM)</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach ($invoice_transaction->transactionDetails as $key => $transaction_detail)
+                <tr>
+                    <td width="5%" class="center top">{{ $key + 1 }}</td>
+                    <td class="description">{!! $transaction_detail->name  !!}</td>
+                    <td width="15%" class="center top" style="text-align: center">{{ round($transaction_detail->quantity, 3) }}</td>
+                    <td width="20%" class="center top" style="text-align: center">
+                        {{ round($transaction_detail->price, 2) }}
+                    </td>
+                    <td width="20%" class="right top">
+                        {{ round($transaction_detail->amount, 2) }}
+                    </td>
+                </tr>
+            @endforeach
+        </tbody>
+        <tfoot>
+            <tr class="subtotal">
+                <td colspan="3"></td>
+                <td class="right middle">Subtotal</td>
+                <td class="right middle">
+                    {{ round($invoice_transaction->amount, 2) }}
+                </td>
+            </tr>
+            <tr class="billingcharges">
+                <td colspan="3"></td>
+                <td class="right">Service Charges</td>
+                <td class="right">
+                    {{ round($invoice_transaction->service_charge, 2) }}
+                </td>
+            </tr>
+            @if($invoice_transaction->tax > 0)
+                <tr class="billingcharges">
+                    <td colspan="3"></td>
+                    <td class="right">Tax</td>
+                    <td class="right">{{ number_format($invoice_transaction->tax, 2) }}</td>
+                </tr>
+            @endif
+            <tr>
+                <td colspan="3"></td>
+                <td class="right middle">Total</td>
+                <td class="total right middle">
+                    {{ round($invoice_transaction->amount, 2) }}
+                </td>
+            </tr>
+        </tfoot>
+    </table>
+    <htmlpagefooter name="page-footer">
+        <table width="100%">
+            <tr>
+                <td style="text-align: right; ">This is generated by computer. No signature required.</td>
+                <td style="text-align: right; ">Page {PAGENO} of {nbpg}</td>
+            </tr>
+        </table>
+    </htmlpagefooter>
+    @endforeach
+@endsection

routes/account.php

@@ -35,7 +35,6 @@ Route::group(['prefix' => 'account', 'namespace' => 'Accounts', 'as' => 'account
     });
 
     Route::group(['middleware' => 'valid.token', 'prefix' => 'user', 'as' => 'user.'], function () {
-        Route::get('/{email}', 'FetchUserByEmailController@fetch')->name('company');
         Route::post('/show', 'FetchUserController@fetch')->name('show');
         Route::get('/list', 'ListUsersController@list')->name('list');
         Route::put('/update/{id}', 'UpdateUserController@update')->name('update');

routes/company.php

@@ -33,4 +33,6 @@ Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Compani
     });
 
     Route::get('/module/list', 'ListCompanyModulesController@list')->name('module.list');
+
+    Route::get('/{company_module_id}/invoice/list', 'ListCompanyModuleInvoicesController@list')->name('invoice.list');
 });

routes/packing_list.php

@@ -44,7 +44,7 @@ Route::group(['namespace' => 'PackingLists', 'as' => 'packing_list.', 'prefix' =
         Route::get('/inbound-custom-cleared', 'InboundCustomClearedController@list')->name('list.inbound.custom.cleared');
         Route::put('/switch-packing-list/{id}', 'SwitchPackagePackingListController@switch')->name('switch.packing_list');
 
-        Route::group(['namespace' => 'Items', 'prefix' => 'item', 'as' => 'item.'], function () {
+        Route::group(['namespace' => 'PackageItems', 'prefix' => 'item', 'as' => 'item.'], function () {
             Route::get('/{id}/show', 'FetchPackageItemController@fetch')->name('show');
             Route::get('/list', 'ListPackageItemsController@list')->name('list');
             Route::post('/create', 'CreatePackageItemController@create')->name('create');

routes/transaction.php

@@ -13,13 +13,18 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
         Route::post('/upload-verification-document/{transaction_id}', 'UploadPaymentVerificationDocumentController@upload')->name('verification.create');
         Route::put('/approve/{transaction_id}/{status}', 'ApprovePaymentTransactionController@approve')->where('status', 'approve|reject')->name('approval');
     });
-    
+
     Route::group(['prefix' => 'invoice', 'as' => 'invoice.'], function () {
         route::post('/shipping-invoice/create', 'CreateShippingInvoiceTransactionController@create')->name('create');
         route::put('/shipping-invoice/{id}/update', 'UpdateShippingInvoiceTransactionController@update')->name('update');
         route::put('/shipping-invoice/{id}/approve', 'ApproveShippingInvoiceTransactionController@approve')->name('approve');
     });
 
+
+    Route::group(['prefix' => 'invoices', 'as' => 'invoices.'], function () {
+        route::put('/combine', 'CreateCombinedInvoicesController@combine')->name('combine');
+    });
+
     route::post('/shipping-invoice/calculator', 'ShippingEstimationCalculatorController@calculate')->name('shipping.estimation.calculator');
 
     // Route::group(['prefix' => '{id}/payment', 'as' => 'payment.'], function () {
@@ -34,4 +39,4 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
 
     // Route::post('booking/{id}/details/update', 'CreatePurchaseOrderTransactionController@create')->name('po.create');
 
-});
+});

routes/web.php

@@ -7,25 +7,20 @@ 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;
 
 /*
 |--------------------------------------------------------------------------
@@ -165,6 +160,12 @@ 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();
+    $company_module_id = $connection->invitee->id;
+    return view('pages.customers.paymentsBilling', ['company_module_id' => $company_module_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);
@@ -203,9 +204,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('/payments-and-billing', function () {
+    Route::get('/payment-and-billing', function () {
         return view('pages.templates.paymentsBilling');
-    })->name('payments-and-billing');
+    })->name('payment-and-billing');
 
     Route::get('/shipping-queue', function () {
         return view('pages.templates.shippingQueue');
@@ -317,7 +318,6 @@ 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,34 +652,4 @@ 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);
-        }
-    }
-
-});
-
-