update create billPlz service, if environment is local, use withoutVerifying()

.gitignore

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

.gitlab-ci.yml

@@ -1,39 +0,0 @@
-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/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/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/Billplzs/Services/CreatesBillplzBill.php

@@ -22,7 +22,7 @@ class CreatesBillplzBill
     public function execute(string $name, string $email, string $description, float $amount, string $billNumber, ?string $bankCode = null, ?bool $wallet = null) {
         try{
 //            config('billplz.maybank')
-            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [
+            $requestBody = [
                 'collection_id' => config('billplz.collection_id'),
                 'name' => $name,
                 'email' => $email,
@@ -34,7 +34,13 @@ class CreatesBillplzBill
                 'reference_1' => $bankCode ? $bankCode : '',
                 'reference_2_label' => 'Bill Number',
                 'reference_2' => $billNumber
-            ]);
+            ];
+
+            if (in_array(app()->environment(), ['development', 'staging', 'production'])) {
+                $response = Http::withBasicAuth(config('billplz.api_key') . ':', '')->post(config('billplz.base_url') . '/api/v3/bills', $requestBody);
+            } else {
+                $response = Http::withoutVerifying()->withBasicAuth(config('billplz.api_key') . ':', '')->post(config('billplz.base_url') . '/api/v3/bills', $requestBody);
+            }
 
             if($response->successful()){
                 $data = $response->json();

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

@@ -1,88 +0,0 @@
-<?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

@@ -1,24 +0,0 @@
-<?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/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/Exports/Services/ExportsWarehousePackingList.php

@@ -1,55 +0,0 @@
-<?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 Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+use Meneses\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 Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+use Meneses\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 Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+use Meneses\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 Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+use Meneses\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 Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+use Meneses\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 Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+use Meneses\LaravelMpdf\Facades\LaravelMpdf;
 
 class CreateInvoiceTransactionProcessor
 {

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

@@ -1,21 +0,0 @@
-<?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,7 +4,6 @@ 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;
@@ -35,11 +34,4 @@ 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/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/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 Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+use Meneses\LaravelMpdf\Facades\LaravelMpdf;
 
 class DownloadOrderQrPdfController
 {
@@ -51,12 +51,9 @@ 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,
             'marking' => $warehousePrefix.$deliveryPrefix.'CIEF/'.$customerMarking,

app/Http/Controllers/Prototype/TestController.php

@@ -6,7 +6,7 @@ use Auth;
 use Illuminate\Http\Request;
 
 use App\Http\Controllers\Controller;
-use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+use Meneses\LaravelMpdf\Facades\LaravelMpdf;
 
 class TestController extends Controller
 {

app/Http/Resources/CompanyResource.php

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

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

config/app.php

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

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

@@ -13,14 +13,7 @@
                 <div class="col-auto">
                     <div class="row">
                         <div class="col">
-                            <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 class="font-heading fs-20 light">{{item.name}}</div>
                         </div>
                     </div>
                     <div class="row">
@@ -39,12 +32,6 @@
         </div>
         <div class="col-auto">
             <div class="row align-items-center parentContainer">
-                <div class="col-auto padding-5 b-a b-grey b-rad-lg pointer m-r-15" @click="hrefPaymenBillingPage">
-                   <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                        width="35" height="35"
-                        viewBox="0 0 172 172"
-                        style=" fill:#000000;"><defs><linearGradient x1="69.875" y1="96.52694" x2="69.875" y2="108.37075" gradientUnits="userSpaceOnUse" id="color-1_44039_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="21.05119" x2="86" y2="153.19019" gradientUnits="userSpaceOnUse" id="color-2_44039_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="80.625" y1="21.05119" x2="80.625" y2="153.19019" gradientUnits="userSpaceOnUse" id="color-3_44039_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="75.25" y1="21.05119" x2="75.25" y2="153.19019" gradientUnits="userSpaceOnUse" id="color-4_44039_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="69.875" y1="21.05119" x2="69.875" y2="153.19019" gradientUnits="userSpaceOnUse" id="color-5_44039_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="129" y1="21.05119" x2="129" y2="153.19019" gradientUnits="userSpaceOnUse" id="color-6_44039_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="139.75" y1="21.05119" x2="139.75" y2="153.19019" gradientUnits="userSpaceOnUse" id="color-7_44039_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="118.25" y1="21.05119" x2="118.25" y2="153.19019" gradientUnits="userSpaceOnUse" id="color-8_44039_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M86,104.8125c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-26.875c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-5.375c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h26.875c1.4835,0 2.6875,1.204 2.6875,2.6875z" fill="url(#color-1_44039_gr1)"></path><path d="M154.0045,83.57856c-1.58025,-1.87856 -3.913,-2.95356 -6.407,-2.95356h-5.16v-8.0625c0,-4.44513 -4.03125,-8.0625 -8.0625,-8.0625v-26.875c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-38.65162l-3.88881,-7.77762c-0.91375,-1.83288 -2.75469,-2.97237 -4.80794,-2.97237h-18.17825h-1.66088h-18.8125c-2.96431,0 -5.375,2.41069 -5.375,5.375v96.75h-21.5v13.4375c0,7.40944 6.02806,13.4375 13.4375,13.4375h91.375c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-18.8125h4.74344c6.80475,0 12.55869,-4.71119 13.68475,-11.20419l2.95625,-17.02263c0.39775,-2.29512 -0.23919,-4.644 -1.75494,-6.44463zM137.0625,72.5625v8.0625h-16.125v-8.0625c0,-1.4835 1.20669,-2.6875 2.6875,-2.6875h10.75c1.4835,0 2.6875,1.204 2.6875,2.6875zM129,43h-5.375v-5.375h5.375zM81.65163,26.875l2.6875,5.375h-15.49344l-2.6875,-5.375zM60.15163,26.875l3.88881,7.78031c0.91913,1.83019 2.76275,2.96969 4.81063,2.96969h49.39894v5.375h-75.25v-16.125zM29.5625,145.125c-4.44513,0 -8.0625,-3.61469 -8.0625,-8.0625v-8.0625h86v8.0625c0,3.02344 1.00244,5.375 2.69288,8.0625zM129,137.0625c0,4.44512 -3.61738,8.0625 -8.0625,8.0625c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-13.4375h-69.875v-75.25h86v16.125h-5.375c-4.44512,0 -8.0625,3.61737 -8.0625,8.0625v8.0625h-5.16c-2.494,0 -4.82675,1.075 -6.407,2.95356c-1.51306,1.80062 -2.15269,4.1495 -1.75225,6.44194l2.95625,17.02531c1.12606,6.493 6.87731,11.20419 13.68475,11.20419h10.11575zM150.46237,89.10138l-2.95625,17.02531c-0.67725,3.91031 -4.20325,6.74831 -8.38769,6.74831h-20.23419c-4.18444,0 -7.71044,-2.838 -8.38769,-6.74831l-2.95625,-17.028c-0.172,-0.99706 0.28219,-1.72 0.57244,-2.064c0.55362,-0.65575 1.38675,-1.03469 2.28975,-1.03469h37.195c0.903,0 1.73613,0.37894 2.29244,1.03738c0.28756,0.344 0.74444,1.06425 0.57244,2.064z" fill="url(#color-2_44039_gr2)"></path><path d="M53.75,59.125h53.75v5.375h-53.75z" fill="url(#color-3_44039_gr3)"></path><path d="M53.75,69.875h43v5.375h-43z" fill="url(#color-4_44039_gr4)"></path><path d="M53.75,80.625h32.25v5.375h-32.25z" fill="url(#color-5_44039_gr5)"></path><path d="M126.3125,91.375h5.375v16.125h-5.375z" fill="url(#color-6_44039_gr6)"></path><path d="M137.0625,91.375h5.375v10.75h-5.375z" fill="url(#color-7_44039_gr7)"></path><path d="M115.5625,91.375h5.375v10.75h-5.375z" fill="url(#color-8_44039_gr8)"></path></g></g></svg>
-                </div>
                 <div class="col-auto padding-5 b-a b-grey b-rad-lg pointer requestModal" data-type="assignSegment">
                     <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
                          width="30" height="30"
@@ -194,10 +181,7 @@
                     delay: 1000
                 });
                 $(this.$refs.copyButton).tooltip('show');
-            },
-            hrefPaymenBillingPage(){
-                window.location.href = route('customer.payment-and-billing', this.item.company_module.marking);
-            },
+            }
         },
         mixins: [componentHandler]
     }

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/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/ChangeCustomerNameFormComponent.vue

@@ -1,73 +0,0 @@
-<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>

resources/assets/vue/components/paymentsBilling/elements/PaymentsBillingComponents.vue

@@ -1,43 +1,113 @@
 <template>
     <div class="row m-b-15 m-l-5 m-r-10">
-        <div class="col bg-white rounded b-a" :class="{'b-white': !selected, 'b-primary': selected, 'bg-primary-lighter': selected}">
+        <div class="col bg-master-lightest rounded" :class="{'b-gray': !selected, 'b-primary': selected, 'bg-primary-lighter': selected}">
             <div class="row">
                 <div class="col padding-20">
                     <div class="row align-items-center">
-                        <div class="col-auto pointer align-items-center" @click="activate()">
+                        <div class="col-auto pointer align-items-center" @click="selected = !selected">
                             <i class="fa fs-30 fa-fw" :class="{'fa-square-o': !selected, 'fa-check-square': selected, 'text-primary':selected}" ></i>
                         </div>
                         <div class="col">
-                            <p class="no-margin fs-10 all-caps">Invoice No</p>
-                            <div>{{ item.bill_no }}</div>
+                            <h5 class="no-margin">{{item.country.id}}05052021</h5>
                         </div>
                         <div class="col">
-                            <p class="no-margin fs-10 all-caps">Order</p>
-                            <div><a :href="route('order.show', item.order.reference)">{{item.order.reference}}</a></div>
+                            <h5 class="no-margin">Invoice Date Invoice Date</h5>
                         </div>
                         <div class="col">
-                            <p class="no-margin fs-10 all-caps">Invoice Date</p>
-                            <div>{{ item.created_at }}</div>
+                            <h5 class="no-margin">Status</h5>
                         </div>
                         <div class="col">
-                            <p class="no-margin fs-10 all-caps">Amount</p>
-                            <div>MYR  {{ item.amount.toFixed(2) }}</div>
+                            <h5 class="no-margin">Amount</h5>
                         </div>
                         <div class="col-auto">
-                            <div v-if="item.documents.length">
-                                <div v-for="file in item.documents[0].files" v-bind:key="file.id" class="col-auto no-padding">
-                                    <document-file-viewer-component :file="file">
-                                        <template slot="button">
-                                            <div class="btn btn-success no-border muted">
-                                                <i class="fa fa-file-pdf-o"></i>
-                                            </div>
-                                        </template>
-                                    </document-file-viewer-component>
+                            <div class="btn bg-grey no-border" @click="expanded = !expanded">
+                                <i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row b-t b-grey p-t-10" v-show="expanded">
+                <div class="col p-b-10">
+                    <div class="row">
+                        <div class="col p-l-20 p-r-20 p-t-10 p-b-10">
+                            <div class="row align-items-center">
+                                <div class="col-auto invisible">
+                                    <i class="fa fs-30 fa-fw" :class="{'fa-square-o': !selected, 'fa-check-square': selected, 'text-primary':selected}" ></i>
+                                </div>
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="m-b-0">Carrier Tracking Number</h5>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="semi-bold m-t-0 m-b-0 large-text">#1zbr06tw403742920</h5>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="m-b-0">Due Date</h5>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="semi-bold m-t-0 m-b-0 large-text">11.04.2021</h5>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="semi-bold m-t-0 m-b-0 large-text">Outstanding</h5>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="semi-bold m-t-0 m-b-0 large-text">RM0.00</h5>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
-                            <div v-else>
-                                <div class="btn bg-grey no-border muted invisible">
-                                    <i class="fa fa-file-pdf-o"></i>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-l-20 p-r-20 p-t-10 p-b-10">
+                            <div class="row align-items-center">
+                                <div class="col-auto invisible">
+                                    <i class="fa fs-30 fa-fw" :class="{'fa-square-o': !selected, 'fa-check-square': selected, 'text-primary':selected}" ></i>
+                                </div>
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="m-b-0 normal-text">This package was delivered by</h5>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="semi-bold m-t-0 m-b-0 large-text">#1zbr06tw403742920</h5>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="m-b-0">Date Paid</h5>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="semi-bold m-t-0 m-b-0 large-text">21.01.2021</h5>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col">
+                                    <div class="btn btn-outline-complete btn-lg">
+                                        Invoice Detail
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -50,33 +120,10 @@
 <script>
     import componentHandler from '../../../general/mixins/componentHandler';
     export default {
-        props: {
-            selectedInvoice: {
-                type: Array,
-                required: false,
-            }  
-        },
         data(){
             return {
                 expanded: false,
-                selectedValue: false,
-            }
-        },
-        methods: {
-            activate(){
-                this.select = !this.select;
-                this.$emit('input', this.data);
-            }
-        },
-        computed: {
-            selected() {
-                var response = false;
-                this.selectedInvoice.forEach((value, index) => {
-                    if (value.id == this.item.id) {
-                        response = true;
-                    }
-                });
-                return response;
+                selected: false,
             }
         },
         mixins: [componentHandler]

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

@@ -1,4 +0,0 @@
-@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_invoice.blade.php

@@ -5,9 +5,135 @@
         <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>
 
-    @include('pages.pdfs.shipping_invoice_inner', ['invoice_transaction' => $invoice_transaction])
+                <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>

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

@@ -1,129 +0,0 @@
-<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>

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

@@ -1,143 +0,0 @@
-@extends('layouts.base_pdf')
-@section('inner_content')
-@php
-$grandTotal = 0;
-$grandSubTotal = 0;
-@endphp
-
-    <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>
-                        Summary
-                    </strong>
-                </div>
-
-                @php
-                    $companyModule = $invoice_transactions[0]->owner->owner->companyModule;
-                @endphp
-
-                {{-- <div class="date">Date: {{ $invoice_transactions[0]->created_at }}</div> --}}
-                <div class="date">Date: {{ \Carbon\Carbon::now() }}</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">Invoice 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 $key => $invoice_transaction)
-            @foreach ($invoice_transaction->transactionDetails as $transaction_detail)
-                <tr>
-                    <td width="5%" class="center top">{{ $key + 1 }}</td>
-                    <td width="15%" class="center top">{{ $invoice_transaction->bill_no }}</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="15%" class="center top" style="text-align: center">
-                        {{ round($transaction_detail->price, 2) }}
-                    </td>
-                    <td width="15%" class="right top">
-                        {{ round($transaction_detail->amount, 2) }}
-                    </td>
-                </tr>
-            @endforeach
-            @php
-                $grandSubTotal = $grandSubTotal + round($invoice_transaction->amount, 2);
-                $grandTotal = $grandTotal + round($invoice_transaction->amount, 2);
-            @endphp
-        @endforeach
-        </tbody>
-        <tfoot>
-            <tr class="subtotal">
-                <td colspan="4"></td>
-                <td class="right middle">Subtotal</td>
-                <td class="right middle">
-                    {{ round($grandSubTotal, 2) }}
-                </td>
-            </tr>
-            <tr>
-                <td colspan="4"></td>
-                <td class="right middle">Total</td>
-                <td class="total right middle">
-                    {{ round($grandTotal, 2) }}
-
-                </td>
-            </tr>
-        </tfoot>
-    </table>
-    
-    @foreach ($invoice_transactions as $transaction)
-        <pagebreak />
-        @include('pages.pdfs.shipping_invoice_inner', ['invoice_transaction' => $transaction])
-    @endforeach
-
-
-    <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>
-@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

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

@@ -7,26 +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 App\Models\Transaction;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Route;
-use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
 
 /*
 |--------------------------------------------------------------------------
@@ -166,12 +160,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();
-    $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);
@@ -210,9 +198,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');
@@ -324,8 +312,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('/export/packing-list-warehouse/guangzhou2-to-johor', 'Exports\ExportArrivedParcelController@guangZhou2ToJohor');
 
 Route::get('/settings', function () {
     return view('pages.settings');
@@ -660,43 +646,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);
-        }
-    }
-
-});
-
-Route::get('/invoices/combine/{ids}', function($ids){
-
-    $ids = json_decode($ids);
-
-    $transactions = Transaction::whereIn('id', $ids)->get();
-
-    $pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoices_combined', ['invoice_transactions' => $transactions]);
-    return $pdf->download('combined_invoice_.pdf');
-})->name('invoice.combined_summary');
-
 

tests/acceptance/DashboardCest.php

@@ -1,49 +0,0 @@
-<?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');
-    }
-}