push branch

.yarnrc.yml

@@ -0,0 +1 @@
+yarnPath: ".yarn/releases/yarn-berry.cjs"

app/Classes/General/Eloquent/AbstractListRecord.php

@@ -39,6 +39,11 @@ abstract class AbstractListRecord extends AbstractGetRecord
             $query = $query->orderBy($filters->get('order_by')->column, $filters->get('order_by')->DESC ? 'DESC': 'ASC');
         }
 
+        if($filters->has('group_by')){
+            $query = $query->groupBy($filters->get('group_by')->column);
+        }
+
+        //dd($query->toSql());
         return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
 
     }

app/Classes/General/Eloquent/AbstractUpdateRecord.php

@@ -18,7 +18,10 @@ abstract class AbstractUpdateRecord
     public function handler(Model $model){
         try{
 
-            if($model->save()){ return $model; }
+            if($model->save()) {
+                
+                return $model;
+             }
 
         } catch (QueryException $exception){
             throw new MalformedRequestException($exception);

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

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Illuminate\Database\Eloquent\Builder;
+
+class CreditTerm implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder;
+
+        return $builder->whereHas('packingLists.owner', function($query) use($value) {
+             $query->whereHas('companyModule.connections', function($query) use($value){
+                if ($value) {
+                     $query->whereHas('segments', function($query) {
+                         $query->where('segments.id' , 3);
+                    });
+                }else{
+                     $query->whereDoesntHave('segments', function($query) {
+                         $query->where('segments.id' , 3);
+                    });
+                }
+            });
+        });
+    }
+
+}

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

@@ -17,7 +17,7 @@ class DoesNotHaveTransactionType implements Filter
         return $builder->whereDoesntHave('transactions', function (Builder $query) use($value) {
             $query->where('type', $value);
         })->whereHas('containers', function ($query){
-            return $query->whereDate('loading_date', '>=', Carbon::parse('08-08-2022'));
+            return $query->whereDate('loading_date', '>=', Carbon::parse('20-09-2022'));
         });
     }
 }

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

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class IsPublished implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereDate('starting_on', '<=', Carbon::now())
+            ->whereDate('ending_on', '>=', Carbon::now());
+    }
+}

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

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

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

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\PackingList;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\DB;
+
+class PackingListOrderedByInvoiceDate implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->select('packing_lists.*')->join('transactions', function($join){
+            $join->on('transactions.owner_id', '=', 'packing_lists.id');
+            $join->where('transactions.owner_type', '=', PackingList::class);
+            $join->where('transactions.status', '=', ApprovalStatus::APPROVED);
+        })->orderBy('transactions.updated_at', 'DESC');
+    }
+
+}

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

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class PaymentDay implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('transactions', function (Builder $query) use($value) {
+            $query->where('transactions.type', 1)->where('status', ApprovalStatus::APPROVED)->whereDate('updated_at', '<=', Carbon::now()->subdays($value));
+        });
+    }
+}

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

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

app/Classes/General/Eloquent/LogData.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Classes\General\Eloquent;
+use Illuminate\Support\Facades\Schema;
+use DB;
+
+trait logData
+{
+ 
+  public static function boot()
+  {
+      parent::boot();
+
+     
+      static::updating(function($model)
+      {
+
+        if (!Schema::hasTable(''.$model->table.'log')) {
+          DB::statement('CREATE TABLE '.$model->table.'log LIKE '.$model->table);  
+          DB::statement('ALTER TABLE '.$model->table.'log DROP COLUMN id');  
+          DB::statement('ALTER TABLE '.$model->table.'log ADD  id INTEGER FIRST');  
+        }
+    
+        DB::table(''.$model->table.'log')->insert($model->getRawOriginal());  
+      
+      });
+  }
+
+
+    public function logs($model){
+      $result = DB::table(''.$model->table.'log')
+       ->where('id',  $model->id)
+       ->get();
+        return $result;
+     }
+}

app/Classes/General/ExcelHandel.php

@@ -0,0 +1,87 @@
+<?php
+namespace App\Classes\General;
+
+use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Cache;
+
+class ExcelHandel
+{
+	function __construct()
+	{
+
+	}
+
+	public static function generateFolder($path = '')
+    {
+    	$folder = \Storage::disk('public')->makeDirectory($path);
+        return $folder;
+    }
+
+	public static function insertExcel($path = '', $base64Set = [])
+	{
+    	$file_info = [];
+        $folder_path = ExcelHandel::generateFolder('excels/' . $path);
+
+        foreach ($base64Set as $key => $row) {
+
+	    	$exceldata = $row;
+	        $filename = (string) Str::uuid();
+
+	        $f = finfo_open();
+	        $mime_type = finfo_file($f, $exceldata, FILEINFO_MIME_TYPE);
+
+	        $extension = 'xls';
+
+	        switch ($mime_type) {
+	            case 'application/vnd.ms-excel':
+	                $extension = 'xls';
+	                break;
+	            case 'application/zip':
+	                $extension = 'xlsx';
+	                break;
+	        }
+
+	        if (empty($extension)) {
+	            return false;
+	        }
+
+	        $exceldata = explode('base64,', $exceldata);
+	        $exceldata = base64_decode($exceldata[1]);
+
+	        $filename_with_ext = $filename . '.' . $extension;
+
+	        $file = ExcelHandel::generateExcel($path, $exceldata, $filename, $extension);
+
+	        $file_info[] = [
+	            'path' => $path,
+	            'filename' => $filename_with_ext,
+	            'mime_type' => $mime_type,
+	            'extension' => $extension,
+	            'file_info' => empty($file) ? [] : $file,
+	        ];
+    	}
+
+        return $file_info;
+	}
+
+	public static function generateExcel($path = '', $exceldata = '', $filename = '', $extension = '')
+    {
+        $file_info = [];
+        $file = \Storage::disk('public')->put('excels/' . $path . '/' . $filename . '.' . $extension, $exceldata);
+        $file_info['original']['file'] = storage_path('app/public/excels/' . $path . '/' . $filename . '.' . $extension);
+        
+        return $file_info;
+    }
+
+    public static function removeExcel($excel_info = [])
+    {
+        $excel_info = json_decode(json_encode($excel_info), true);
+        foreach ($excel_info as $key => $row) {
+        	if (!empty($row['path'])) {
+	            \File::delete([$row['file_info']['original']['file']]);
+           }
+        }
+        return true;
+    }
+
+}

app/Classes/Modules/Accounts/Processors/AuthenticationProcessor.php

@@ -67,4 +67,4 @@ class AuthenticationProcessor
 
     }
 
-}
+}

app/Classes/Modules/Accounts/Services/AuthenticatesUser.php

@@ -23,4 +23,4 @@ class AuthenticatesUser
 
     }
 
-}
+}

app/Classes/Modules/Announcements/Services/CreatesAnnouncement.php

@@ -5,6 +5,7 @@ namespace App\Classes\Modules\Announcements\Services;
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
 use App\Models\Announcement;
+use DateTime;
 
 class CreatesAnnouncement extends AbstractUpdateRecord
 {
@@ -18,9 +19,17 @@ class CreatesAnnouncement extends AbstractUpdateRecord
         $model = new Announcement();
         $model->title = $object->getTitle();
         $model->description = $object->getDescription();
-        $model->starting_on = $object->getStartingOn();
-        $model->ending_on = $object->getEndingOn();
+        // $model->starting_on = $object->getStartingOn();
+        $model->starting_on = $this->convertDateFormat($object->getStartingOn());
+        // $model->ending_on = $object->getEndingOn();
+        $model->ending_on = $this->convertDateFormat($object->getEndingOn());
 
         return $this->handler($model);
     }
+
+    public function convertDateFormat($value) {
+        $value = DateTime::createFromFormat('d-m-Y', $value)->format('Y-m-d H:i:s');
+
+        return $value;
+    }
 }

app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php

@@ -2,8 +2,12 @@
 
 namespace App\Classes\Modules\Billplzs\ControllersLogic;
 
+use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
 use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
 use App\Classes\Modules\Wallets\Services\UpdatesWallet;
+use App\Classes\Modules\Transactions\ControllersLogic\multipleInvoicesWithOnePaymentLogic;
+
 
 use App\Classes\Exceptions\ResourceNotFoundException;
 use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
@@ -21,6 +25,7 @@ use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 
@@ -35,21 +40,32 @@ class CallbackBillplzLogic
     /** @var UpdatesTransactionStatus */
     private $updatesTransactionStatus;
 
-    /** @var UpdatesWalletBalance */
-    private $updatesWalletBalance;
+    /** @var UpdateDoFromVTPortalProcessor */
+    private $updateDoFromVTPortalProcessor;
+
+    /** @var UpdateDoFromYDPortalProcessor */
+    private $updateDoFromYDPortalProcessor ;
+
+
+    /** @var UpdateDoFromYDPortalProcessor */
+    private $multipleInvoicesWithOnePaymentLogic ;
 
     /**
      * CallbackBillplzLogic constructor.
      * @param GetBillplzBill $getBillplzBill
      * @param FetchesTransaction $fetchesTransaction
      * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param UpdatesWalletBalance $updatesWalletBalance
+     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
+     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
      */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor,multipleInvoicesWithOnePaymentLogic $multipleInvoicesWithOnePaymentLogic)
     {
         $this->getBillplzBill = $getBillplzBill;
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
+        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+        $this->multipleInvoicesWithOnePaymentLogic= $multipleInvoicesWithOnePaymentLogic;
     }
 
 
@@ -58,6 +74,8 @@ class CallbackBillplzLogic
      * @return bool|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
      * @throws MalformedRequestException
      * @throws ResourceNotFoundException
+     * @throws \App\Classes\Exceptions\InternalServerErrorException
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function execute(Request $request)
     {
@@ -73,6 +91,19 @@ class CallbackBillplzLogic
 
         $transaction = $this->fetchesTransaction->execute(['payment_reference' => $billplzXSignatureObject->getBillPlzId()]);
 
+
+        if ($transaction->type == 'topUp') {
+        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
+        $this->multipleInvoicesWithOnePaymentLogic->verifypayment($transaction->id, $transaction->amount);
+        }
+
+        $invoice = $transaction->owner;
+        $packingList = $invoice->owner;
+        $order = $packingList->owner;
+
+        $status = ApprovalStatus::PENDING_VERIFICATION;
+
+        
         if($billPlz->state === 'paid') {
             $status = ApprovalStatus::APPROVED;
         }
@@ -84,8 +115,24 @@ class CallbackBillplzLogic
         $token = Auth::fromUser(User::find(1));
         $request->headers->set('Authorization', 'Bearer '.$token);
 
-        $marking = $transaction->owner()->first()->owner()->first();
+        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
 
-        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $marking->reference, 'transaction' => $transaction, 'status' => $status]);
+        if(($invoice->amount - $transaction->amount) < 0.01) {
+            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
+
+            $packingList->status = ApprovalStatus::APPROVED;
+            $packingList->save();
+
+            if(app()->environment('production')){
+                $this->updateDoFromVTPortalProcessor->execute($packingList);
+                $this->updateDoFromYDPortalProcessor->execute($packingList);
+            }
+        }
+
+
+
+
+
+        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference, 'transaction' => $transaction, 'status' => $status]);
     }
-}
+}

app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php

@@ -23,7 +23,7 @@ class CreatesBillplzBill
         try{
 //            config('billplz.maybank')
             $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [
-                'collection_id' => $wallet ? config('billplz.wallet_collection_id') : config('billplz.collection_id'),
+                'collection_id' => config('billplz.collection_id'),
                 'name' => $name,
                 'email' => $email,
                 'description' => $description,

app/Classes/Modules/Documents/DataTransferObjects/FileObject.php

@@ -28,7 +28,7 @@ class FileObject implements DataTransferObject
      */
     public function getData()
     {
-        return $this->getExtension() === 'pdf' ? $this->data : (new imageManager())->make($this->data);
+        return in_array($this->getExtension(), ['pdf', 'excel'])  ? $this->data : (new imageManager())->make($this->data);
     }
 
     /**
@@ -66,7 +66,7 @@ class FileObject implements DataTransferObject
      */
     public function getDecodedData(): string
     {
-        return $this->getExtension() === 'pdf' ?
+        return in_array($this->getExtension(), ['pdf', 'excel']) ?
             base64_decode((explode('base64,', $this->getData()))[1]):
             $this->getData()->encode('data-url')->encoded;
     }
@@ -78,9 +78,4 @@ class FileObject implements DataTransferObject
     {
         $this->data = $data;
     }
-
-
-
-
-
-}
+}

app/Classes/Modules/Documents/Services/ConvertsBase64ToFile.php

@@ -36,7 +36,7 @@ class ConvertsBase64ToFile
         foreach ($files as $file) {
 
             $object = new FileObject($file);
-            $object->getExtension() === 'pdf' ? $this->generatePDF($object) : $this->generateImage($object);
+            in_array($object->getExtension(), ['pdf', 'excel']) ? $this->generatePDF($object) : $this->generateImage($object);
 
         }
 
@@ -122,4 +122,4 @@ class ConvertsBase64ToFile
         ]);
     }
 
-}
+}

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

@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Company;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class ExportsNullDebtors implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+
+    use Exportable;
+
+
+    public function headings(): array
+    {
+        return [
+            'Code',
+            'DebtorControlAcc',
+            'ControlAccount',
+            'CompanyName',
+            'Desc2',
+            'DebtorType',
+            'DisplayTerm',
+            'CurrencyCode',
+            'RegisterNo',
+            'Address1',
+            'Address2',
+            'Address3',
+            'PostCode',
+            'DeliverAddr1',
+            'DeliverAddr2',
+            'DeliverAddr3',
+            'DeliverPostCode',
+            'EmailAddress',
+            'Attention',
+            'Phone1',
+            'Phone2',
+            'Fax1'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return Company::where(function($query){
+            $query->whereNull('debtor')->orWhere('debtor', '');
+        })->whereHas('companyModules', function($query){
+            $query->where('type', BusinessType::IMPORTER);
+        })->whereHas('parcels')->where('status', ApprovalStatus::APPROVED);
+    }
+
+    /**
+     * @param Company $company
+     *
+     * @return array
+     */
+    public function map($company): array
+    {
+        $marking = $company->companyModules()->where('type', BusinessType::IMPORTER)->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+
+        return [
+            '<<New>>',
+            '300-0000',
+            '300-0000',
+            $company->name.' (Shipping)',
+            $marking,
+            '',
+            'PIA',
+            'MYR',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',//EmailAddress
+            '',
+            '',
+            '',
+            ''
+        ];
+    }
+}

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

@@ -52,7 +52,7 @@ class ExportsOnHoldPackingList implements FromQuery, WithHeadings, WithHeadingRo
 
         return [
             $container->reference,
-            $ContainerTransport ? $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->eta : 'n/a',
+            $ContainerTransport ? $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first() ? $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->eta : 'n/a' : 'n/a',
             $ContainerTransport ? $ContainerTransport->drop_date : 'n/a',
             $marking,
             $order->reference,

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

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\Modules\Exports\Sheets\ContainersSheet;
+use App\Classes\Modules\Exports\Sheets\PackingListsSheet;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\WithMultipleSheets;;
+
+class ExportsParcel implements WithMultipleSheets
+{
+    use Exportable;
+
+
+    /**
+     * @return array
+     */
+    public function sheets(): array
+    {
+        $sheets = [];
+
+        $sheets[] = new ContainersSheet();
+        $sheets[] = new PackingListsSheet();
+
+        return $sheets;
+    }
+
+}

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

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\Order;
+use App\Models\PackingList;
+use Carbon\Carbon;
+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 App\Classes\ValueObjects\Constants\OrderRoleTypes;
+
+class ExportsParcelPostcodes implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Order Number',
+            'Postcode'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->whereRaw('LENGTH(reference) > 8')->where('reference', 'not like', "%YW%")->where('owner_type', Order::class)->whereDate('created_at', '>=', Carbon::parse('20-09-2022'))->whereDoesntHave('containers');
+    }
+
+    /**
+     * @param $packingList
+     * @return array
+     */
+    public function map($packingList): array
+    {
+
+        $address = $packingList->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+        return [
+            $packingList->reference,
+            $address->postcode
+        ];
+    }
+}

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

@@ -0,0 +1,135 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Transaction;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Illuminate\Http\Request;
+use Carbon\Carbon;
+
+class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+    use Exportable;
+
+    private $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'DocNo',
+            'DocDate',
+            'DebtorCode',
+            'ShipInfo',
+            'AccNo',
+            'DetailDescription',
+            'FurtherDescription',
+            'ProjNo',
+            'DeptNo',
+            'Qty',
+            'UnitPrice'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        $start_date = $this->request->input('startDate', null);
+        if ($start_date) {
+            $start_date = Carbon::parse($this->request->input('startDate'))->format('Y-m-d');
+        }
+
+        $end_date = $this->request->input('endDate', null);
+        if ($end_date) {
+            $end_date = Carbon::parse($this->request->input('endDate'))->format('Y-m-d');
+        }
+
+        $query = Transaction::query();
+
+        $query->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::COMPLETED]);
+
+        if($start_date && $end_date) {
+            $query->whereBetween('updated_at', [
+                Carbon::parse($start_date)->format('Y-m-d 0:00:00'),
+                Carbon::parse($end_date)->format('Y-m-d 23:59:59')
+            ]);
+        }
+        elseif($start_date && !$end_date) {
+            $query->whereHas('transactions', function($transaction) use ($start_date) {
+                $transaction->where('type', TransactionType::PAYMENT)->where('updated_at', '>=',  Carbon::parse($start_date)->format('Y-m-d 0:00:00'));
+            });
+
+        }
+        elseif(!$start_date && $end_date) {
+            $query->whereHas('transactions', function($transaction) use ($end_date) {
+                $transaction->where('type', TransactionType::PAYMENT)->where('updated_at', '>=',  Carbon::parse($end_date)->format('Y-m-d 0:00:00'));
+            });
+        }
+
+        return $query;
+    }
+
+    public function map($transaction): array
+    {
+        $container = $transaction->owner->containers()->first();
+        $order = $transaction->owner->owner;
+        $company = $order->companyModule->company;
+        $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'SHIPPING_FEE')->first();
+
+        $furtherDescription = '';
+
+        foreach ($transaction->transactionDetails as $item){
+
+            if($item->reference === 'SHIPPING_FEE')
+                $furtherDescription .= str_replace('X1 Freight Service Charge<br>', '', $item->name)."\n";
+            elseif($item->reference === 'OVER_WEIGHT_CHARGES')
+                $furtherDescription .= $item->name.' '.$item->quantity.' CBM'."\n";
+            elseif($item->reference === 'MIN_CBM_CHARGES')
+                $furtherDescription .= $item->name.' '.$item->quantity.' CBM'."\n";
+            else
+                $furtherDescription .= $item->name.' '.$item->quantity.' X '.$item->price."\n";
+        }
+
+        return [
+            '<<New>>',
+            $transaction->created_at->format('m/d/Y H:m'),
+            $company->debtor,
+            $order->reference,
+            '500-0000',
+            'X1 Freight Service Charge',
+            $furtherDescription,
+            $container->reference,
+            'CIEF',
+            $shippingTransactionDetails->quantity,
+            $shippingTransactionDetails->price
+        ];
+        return [
+            '<<New>>',
+            $transaction->updated_at->format('m/d/Y H:m'),
+            $company->debtor,
+            $container->reference,
+            '500-0000',
+            'X1 Freight Service Charge',
+            'FurtherDescription',
+            $container->reference,
+            'M3',
+            'CIEF',
+            $shippingTransactionDetails->quantity,
+            $shippingTransactionDetails->price,
+        ];
+    }
+}

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

@@ -43,7 +43,7 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
     public function query()
     {
         return PackingList::where('type', '=', 2)->whereHas('containers', function ($query){
-            $query->where('containers.status', ApprovalStatus::COMPLETED);
+            $query->where('containers.status', ApprovalStatus::COMPLETED)->where('containers.created_at', '>',  Carbon::now()->subMonths(3));
         });
     }
 
@@ -64,15 +64,16 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
         $originalPackingList = $packingList->owner instanceof PackingList ? $packingList->owner : $packingList;
         $transport = $originalPackingList->containers()->first()->transports()->first();
         $deliveryTransport = $originalPackingList->transports()->first();
+        $schedule = $deliveryTransport ? $deliveryTransport->schedules()->first() : null;
 
         return [
             $container->reference,
-            $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->eta,
+            $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first() ? $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->eta : '',
             $ContainerTransport->drop_date,
             $marking,
             $order->reference,
-            $deliveryTransport ? (Carbon::parse($deliveryTransport->schedules()->first()->eta) < Carbon::now() ? 'Delivered' : 'Pending Delivery') :  'Pending Arrangement',
-            $deliveryTransport ? $deliveryTransport->schedules()->first()->eta : ($transport ? Carbon::now()->diffInDays($transport->drop_date, false) . ' Days' : ''),
+            $schedule ?  (Carbon::parse($schedule->eta) < Carbon::now() ? 'Delivered' : 'Pending Delivery') :  'Pending Arrangement',
+            $schedule ?  $schedule->eta : ($transport ? Carbon::now()->diffInDays($transport->drop_date, false) . ' Days' : ''),
             $packingList->packages()->sum('quantity'),
             $address->state->name,
             $address->postcode,

app/Classes/Modules/Exports/Sheets/ContainersSheet.php

@@ -0,0 +1,105 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Omair Saleh
+ * Date: 20/9/2022
+ * Time: 12:20 AM
+ */
+
+namespace App\Classes\Modules\Exports\Sheets;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Container;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithTitle;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+
+
+class ContainersSheet implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery, WithTitle
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Container No.',
+            'Loaded Date',
+            'ETD',
+            'ETA',
+            'Delay',
+            'Unstuffing date',
+            'Status',
+            'CTN',
+            'CBM'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return Container::query();
+    }
+
+    /**
+     * @param $container
+     * @return array
+     */
+    public function map($container): array
+    {
+
+        $transport = $container->transports()->first();
+        $currentSchedule = $transport ? $transport->schedules()->where('status', '!=', ApprovalStatus::EXPIRED)->first() : null;
+        $scheduleHistory = $transport ? $transport->schedules()->where('status', ApprovalStatus::EXPIRED)->get() : null;
+
+        $status = 'Loaded';
+
+        if($currentSchedule) {
+            if(Carbon::parse($currentSchedule->etd) >= Carbon::today()){
+                $status = 'Shipping';
+            }
+
+            if(Carbon::parse($currentSchedule->eta) >= Carbon::today()){
+                $status = 'Arrived?';
+            }
+
+            if($transport->drop_date){
+                $status = 'Pending deliveries';
+                if(!$container->packinglists()->whereDoesntHave('transports')->get()){
+                    $status = 'Complete';
+                }
+            }
+
+
+        }
+
+        return [
+            $container->reference,
+            $container->loading_date,
+            $currentSchedule ? $currentSchedule->etd : null,
+            $currentSchedule ? $currentSchedule->eta : null,
+            $scheduleHistory ? count($scheduleHistory) : 0,
+            $transport ? $transport->drop_date : null,
+            $status,
+            $container->packages()->sum('quantity'),
+            $container->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity')),
+
+        ];
+    }
+
+    /**
+     * @return string
+     */
+    public function title(): string
+    {
+        return 'Containers';
+    }
+}

app/Classes/Modules/Exports/Sheets/PackingListsSheet.php

@@ -0,0 +1,131 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Omair Saleh
+ * Date: 20/9/2022
+ * Time: 12:20 AM
+ */
+
+namespace App\Classes\Modules\Exports\Sheets;
+
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackageType;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\Order;
+use App\Models\PackingList;
+use Illuminate\Support\Facades\DB;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithTitle;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+
+
+
+class PackingListsSheet implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromCollection, WithTitle
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Arrival Date',
+            'Marking',
+            'Order No.',
+            'Reference',
+            'Quantity',
+            'CBM',
+            'Overweight',
+            'Total CBM',
+            'Container No.',
+            'Delivery Date',
+            'Warehouse',
+            'Warehouse District',
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function collection()
+    {
+        $packingLists = PackingList::where('status', '=', 2)->whereIn('type', [PackingListType::WAREHOUSE_RECEIVE_LIST, PackingListType::SHIPPING_PACKING_LIST])->get();
+
+        return $packingLists->filter(function ($packingList) {
+
+            if($packingList->type === PackingListType::SHIPPING_PACKING_LIST){
+                $warehouseArrival = PackingList::where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->where('reference', $packingList->reference)->get();
+                return $warehouseArrival ? false : true;
+            }
+
+            return true;
+        });
+    }
+
+    /**
+     * @param $packingList
+     * @return array
+     */
+    public function map($packingList): array
+    {
+
+        $warehouseArrivalList = $packingList;
+        $shippingList = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->where('reference', $packingList->reference)->first();
+
+        if($packingList->type === PackingListType::SHIPPING_PACKING_LIST) {
+            $warehouseArrivalList = null;
+            $shippingList = $packingList;
+
+        }
+
+        $arrivalTransport = null;
+
+        if($warehouseArrivalList){
+            $arrivalTransport = $warehouseArrivalList->transports()->first();
+        }
+
+        $order = null;
+        if($packingList->owner instanceof Order){
+            $order = $packingList->owner;
+        }
+
+        $cbm = $packingList->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum(function($package) {
+            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
+        });
+
+        $overWeight = $packingList->packages->where('type', PackageType::OVER_WEIGHT)->sum(function($package) {
+            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
+        });
+
+        $container = $shippingList ? $shippingList->container : null;
+
+        $delivery = $shippingList ? $shippingList->transport : null;
+
+        return [
+            $arrivalTransport ? $arrivalTransport->drop_date : null,
+            $order ? $order->reference : 'Unclaimed',
+            $order ? $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference : 'Unclaimed',
+            $packingList->reference,
+            $packingList->packages()->sum('quantity'),
+            $cbm,
+            $overWeight ? $overWeight : 0,
+            $cbm + $overWeight,
+            $container ? $container->reference : null,
+            $delivery ? $delivery->drop_date : null,
+            strlen($packingList->reference) > 8 ? 'YD' : 'VT',
+            $order ? $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->name : null,
+        ];
+
+    }
+
+    /**
+     * @return string
+     */
+    public function title(): string
+    {
+        return 'Packing Lists';
+    }
+}

app/Classes/Modules/Imports/Services/Importorder.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Imports\Services;
+
+use Illuminate\Support\Collection;
+use Maatwebsite\Excel\Concerns\ToCollection;
+use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromExcel;
+
+class Importorder implements ToCollection
+{
+    /**
+    * @param Collection $collection
+    */
+    public function collection(Collection $collection)
+    {
+        // dd($collection);
+        (App()->make(FetchOrderListsFromExcel::class))->execute($collection);
+    }
+}

app/Classes/Modules/Imports/Services/ImportsDebtor.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Classes\Modules\Imports\Services;
+
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Models\Company;
+
+use Maatwebsite\Excel\Concerns\ToModel;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithBatchInserts;
+use Maatwebsite\Excel\Concerns\WithValidation;
+
+class ImportsDebtor implements ToModel, WithHeadingRow, WithBatchInserts, WithValidation
+{
+  public function __construct() {
+
+  }
+
+  public function model($row = [])
+  {
+      try {
+          preg_match_all('/([0-9]{3,4}[a-zA-Z]{3,4})/', $row['desc2'], $matches);
+
+          foreach ($matches[0] as $match){
+              $reference = $match;
+              $debtor =  $row['code'];
+              $company = Company::whereNull('debtor')->whereHas('companyModules', function($query) use ($reference) {
+                  $query->whereHas('connections', function($query) use ($reference) {
+                      $query->where('invitee_reference', $reference);
+                  });
+              })->first();
+
+              if ($company) {
+                  $company->debtor = $debtor;
+                  $company->update();
+              }
+
+          }
+
+      } catch (\Exception $exception){
+          dd($exception);
+      }
+  }
+
+  public function batchSize(): int
+  {
+    return 100;
+  }
+
+  public function rules(): array
+  {
+      return [
+
+      ];
+  }
+}

app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php

@@ -3,6 +3,7 @@
 namespace App\Classes\Modules\Orders\Processors;
 
 use App\Classes\Exceptions\InternalServerErrorException;
+use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 
@@ -54,6 +55,7 @@ class UpdateDoFromYDPortalProcessor
             $reference = $contact ? $contact->reference : null;
             $remark = $remark ? $remark->content :  'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.';
 
+            if(!$phone || !$reference) throw new MalformedRequestException('Can\'t release this packing list because it doesn\'t have the person in charge contact information');
             $this->fetchesDataFRomYDPortal->clientRequest(
                 'http://www.yd-wl.com/api/UpdateOrderAddress.ashx',
                 'POST',

app/Classes/Modules/PackingLists/ControllersLogic/DeletePackingListLogic.php

@@ -8,6 +8,7 @@ use App\Classes\Modules\PackingLists\Services\DeletesPackingList;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanDeletePackingList;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\PackingList;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -59,11 +60,9 @@ class DeletePackingListLogic extends AbstractControllerLogic
 
             $this->canDeletePackingList->passes();
 
-            $warehouseList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
-            $packingList = $this->fetchesPackingList->execute(['reference' => $warehouseList->reference, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
+            $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-            $this->deletesPackingList->execute($warehouseList);
-            $this->deletesPackingList->execute($packingList);
+            PackingList::where('reference', $packingList->reference)->delete();
 
             return $this->response([]);
 

app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php

@@ -162,8 +162,8 @@ class FetchLoadedContainersFromVTPortalProcessor
                     $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
                 }
 
-                $eta = Carbon::parse($containerInfo[4]);
-                $etd = Carbon::parse($eta)->subDays(5);
+                $eta = Carbon::parse($containerInfo[4])->addDays(2);
+                $etd = Carbon::parse($eta)->subDays(7);
 
                 $delayDate = $containerInfo[7];
 
@@ -183,7 +183,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                 }
 
                 if($delayDate){
-                    $delayDate = Carbon::parse($delayDate);
+                    $delayDate = Carbon::parse($delayDate)->addDays(2);
                     $transport = $container->transports()->first();
 
                     if(!$transport->schedules()->where('eta', '=', $delayDate)->first()) {

app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromExcel.php

@@ -0,0 +1,488 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Processors;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
+
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Classes\Modules\Schedules\Services\CreatesSchedule;
+use App\Classes\Modules\Steps\DataTransferObjects\StepsObject;
+use App\Classes\Modules\Steps\Services\CreatesStep;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+use App\Classes\Modules\Transports\Services\CreatesTransport;
+use App\Classes\Modules\Unity\Processors\ActivateContractProcessor;
+use App\Classes\Modules\Unity\Processors\AssignContractEntityProcessor;
+use App\Classes\Modules\Unity\Processors\CreateContractEntityProcessor;
+use App\Classes\Modules\Unity\Services\CreatesContract;
+use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
+use App\Classes\Notifications\ShipmentDepartureEmail;
+use App\Classes\Notifications\ShipmentRescheduleEmail;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\ContainerTypes;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackageType;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransportType;
+use App\Models\Container;
+use App\Models\Order;
+use App\Models\PackingList;
+use App\Models\Transport;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
+
+class FetchOrderListsFromExcel
+{
+    /** @var FetchesDataFromYDPortal */
+    private $fetchesDataFRomYDPortal;
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /** @var UpdatesContractObligation */
+    private $updatesContractObligations;
+
+    /** @var CreatePackingListProcessor */
+    private $createPackingListProcessor;
+
+    /** @var CreatePackageProcessor */
+    private $createPackageProcessor;
+
+    /** @var CreatesTransport */
+    private $createsTransport;
+
+    /** @var CreatesSchedule */
+    private $createsSchedule;
+
+    /** @var FetchesContainer */
+    private $fetchesContainer;
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
+    /** @var CreateContainerProcessor */
+    private $createContainerProcessor;
+
+    /** @var CreatesContract */
+    private $unityCreateContract;
+
+    /** @var AssignContractEntityProcessor */
+    private $unityAssignContractEntity;
+
+    /** @var CreateContractEntityProcessor */
+    private $unityCreateContractEntity;
+
+    /** @var CreatesStep */
+    private $createsStep;
+
+    /** @var ActivateContractProcessor */
+    private $unityActivateContract;
+
+    /**
+     * FetchOrderListsFromYdPortalProcessor constructor.
+     * @param FetchesDataFromYDPortal $fetchesDataFRomYDPortal
+     * @param FetchesOrder $fetchesOrder
+     * @param UpdatesContractObligation $updatesContractObligations
+     * @param CreatePackingListProcessor $createPackingListProcessor
+     * @param CreatePackageProcessor $createPackageProcessor
+     * @param CreatesTransport $createsTransport
+     * @param CreatesSchedule $createsSchedule
+     * @param FetchesContainer $fetchesContainer
+     * @param FetchesPackingList $fetchesPackingList
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     * @param CreateContainerProcessor $createContainerProcessor
+     * @param CreatesContract $unityCreateContract
+     * @param AssignContractEntityProcessor $unityAssignContractEntity
+     * @param CreateContractEntityProcessor $unityCreateContractEntity
+     * @param CreatesStep $createsStep
+     * @param ActivateContractProcessor $unityActivateContract
+     */
+    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal , FetchesOrder $fetchesOrder, UpdatesContractObligation $updatesContractObligations, CreatePackingListProcessor $createPackingListProcessor, CreatePackageProcessor $createPackageProcessor, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, FetchesContainer $fetchesContainer, FetchesPackingList $fetchesPackingList, FetchesCompanyModule $fetchesCompanyModule, CreateContainerProcessor $createContainerProcessor, CreatesContract $unityCreateContract, AssignContractEntityProcessor $unityAssignContractEntity, CreateContractEntityProcessor $unityCreateContractEntity, CreatesStep $createsStep, ActivateContractProcessor $unityActivateContract)
+    {
+        $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
+        $this->fetchesOrder = $fetchesOrder;
+        $this->updatesContractObligations = $updatesContractObligations;
+        $this->createPackingListProcessor = $createPackingListProcessor;
+        $this->createPackageProcessor = $createPackageProcessor;
+        $this->createsTransport = $createsTransport;
+        $this->createsSchedule = $createsSchedule;
+        $this->fetchesContainer = $fetchesContainer;
+        $this->fetchesPackingList = $fetchesPackingList;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->createContainerProcessor = $createContainerProcessor;
+        $this->unityCreateContract = $unityCreateContract;
+        $this->unityAssignContractEntity = $unityAssignContractEntity;
+        $this->unityCreateContractEntity = $unityCreateContractEntity;
+        $this->createsStep = $createsStep;
+        $this->unityActivateContract = $unityActivateContract;
+    }
+
+
+    /**
+     * @param Carbon|null $start
+     * @param Carbon|null $end
+     * @return void
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    public function execute( $excelData )
+    {
+        try {
+            // dd($start);
+            // $start = $start ? $start : Carbon::today()->subDays(30);
+
+            // $startLimit = Carbon::parse('01-12-2021');
+
+            // if($start->isBefore($startLimit)){
+            //     $start = $startLimit;
+            // }
+
+            // $end = $end ? $end : Carbon::today()->addDay();
+
+            // $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
+            //     'begintime' => $start->timestamp,
+            //     'endtime' => $end->timestamp,
+            // ]);
+
+            // $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
+
+            foreach($excelData as $row){
+
+                if("expressno"!= $row[0] && $row[0] != null){
+                    // dd($row[0]);
+              
+
+                $containerReference = null;
+                $loadingDate = null;
+                $unstuffingDate = null;
+                $deliveryDate = null;
+                $etd = null;
+                $eta = null;
+                $delayDate = null;
+
+                $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
+                    'trakingno' => $row[0]
+                ]);
+
+                $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
+                if($rows->data == null){
+                    continue;
+                }else{
+
+                    dd($rows);
+                }
+            }else{
+                continue;
+            }
+                if(!$rows){
+                    continue;
+                }
+               
+
+                foreach (array_reverse($rows->data) as $trackingRow) {
+                    if ($trackingRow->tracking === '货物已送达仓库准备入库中') {
+                        $receiveDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+
+                    if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) {
+                        $tracking = explode(':', $trackingRow->tracking);
+                        $containerReference = explode('预计到港时间', $tracking[1])[0];
+                        $loadingDate = Carbon::parse($trackingRow->trackingtime);
+                        $etd = Carbon::parse($tracking[2])->subDays(5);
+                        $eta = Carbon::parse($tracking[2])->addDays(2);
+                    }
+
+                    $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
+                    $rescheduleETA = strpos($trackingRow->remark, '到港');
+                    if (($rescheduleETD !== false || $rescheduleETA !== false) && strpos($trackingRow->tracking, '货物装柜完成。') === false) {
+                        preg_match_all('/([0-9]+.{3})/', $trackingRow->remark, $matches);
+                        $dates = collect();
+
+                        foreach($matches[0] as $date){
+                            try {
+                                $dates->push(Carbon::parse(str_replace('.', '/', $date).Carbon::now()->format('Y')));
+                            } catch (\Exception $exception) {
+                                continue;
+                            }
+
+                        }
+
+                        $rescheduleDate = $dates->sortDesc()->first();
+
+                        if(!$delayDate || $rescheduleDate > $delayDate){
+                            /** @var Carbon $delayDate */
+                            $delayDate = $rescheduleDate;
+
+                            if($rescheduleETA === false && $delayDate) {
+                                $delayDate = $delayDate->addDays('5');
+                            }
+                        }
+
+                    }
+
+                    if ($trackingRow->tracking === '到港') {
+                        $delayDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+
+                    if ($trackingRow->tracking === '已开船') {
+                        $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5');
+                    }
+
+                    if ($trackingRow->tracking === '货物已进目的港仓库') {
+                        $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+
+                    if (Str::contains($trackingRow->tracking, ['派送中', '已签收', '签收完成', ' 第三方提货', '货物已派送完成', '派送', 'delivery', 'delivered'])) {
+                        $deliveryDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+                }
+
+                $client = new \GuzzleHttp\Client(['cookies' => true, 'headers' => ['Cookie' => 'utc_offset=480']]);
+
+                try {
+                    $request = $client->request('get', 'https://main.universe.com.my/Tracking/User/Paging?sEcho=1&sTrackingNo='.$row->expressno.'&sOrgId=sti');
+                    $deliveryTracking = json_decode($request->getBody()->getContents());
+                    foreach (array_reverse($deliveryTracking->aaData) as $trackingRow) {
+                        $trackingDate = Carbon::createFromFormat('d/m/y H:i', $trackingRow->LocalDateTime);
+                        if (Str::contains($trackingRow->PublicDescription, ['accepted/picked'])){
+                            $unstuffingDate = $trackingDate;
+                        }
+
+                        if (Str::contains($trackingRow->PublicDescription, ['delivered'])) {
+                            $deliveryDate = $trackingDate;
+                        }
+                    }
+                } catch (\Exception $exception){
+                    Log::debug('failed to fetch delivery tracking');
+                }
+
+                $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
+
+                $orderNumber = $customerno[array_key_last($customerno)];
+                $allow_contract = true;
+
+                try {
+                    $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
+                } catch (ResourceNotFoundException $exception) {
+                    try {
+                        $order = $this->fetchesOrder->execute(['reference' => substr($orderNumber, -9)]);
+                    } catch (ResourceNotFoundException $exception) {
+                        $order = $this->fetchesCompanyModule->execute(['id' => 1]);
+                        $allow_contract = false;
+                    }
+
+                }
+
+                $packingListReference = $row->expressno;
+
+                try{
+                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
+
+                    $packingList->packages()->delete();
+                    $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+                    if($replica) $replica->packages()->delete();
+
+                    $warehouseReceiveList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::WAREHOUSE_RECEIVE_LIST]);
+                    $warehouseReceiveList->packages()->delete();
+                    $replica = $warehouseReceiveList->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA)->first();
+                    if($replica) $replica->packages()->delete();
+
+                } catch (ResourceNotFoundException $exception) {
+
+                    if (!$allow_contract) {
+                        $appointee_id = 2037;
+                    } else {
+                        $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
+                    }
+
+                    $warehouseReceiveObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::WAREHOUSE_RECEIVE_LIST, $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
+
+                    /** @var PackingList $warehouseReceiveList */
+                    $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
+
+                    $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
+                    $transport = $this->createsTransport->execute($transportObject, $warehouseReceiveList);
+
+                    if ($allow_contract) {
+
+                        $contract = $this->unityCreateContract->execute();
+
+                        $contractReference = $contract->hash_id;
+                        $contractObligations = $contract->contract_obligation_list;
+
+                        $this->unityActivateContract->execute($contractReference);
+
+                        $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
+
+                        $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
+                        $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
+
+                        $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
+                        $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
+
+                        $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
+                    }
+
+                    $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, !$allow_contract ? null : $contractReference);
+
+                    /** @var PackingList $packingList */
+                    $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
+
+                    if ($allow_contract) {
+                        foreach ($contractObligations as $obligation) {
+                            $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
+                            $this->createsStep->execute($packingList, $stepObject);
+                        }
+                    }
+                }
+
+                foreach($row->deliverysize as $package) {
+                    $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $package->width, (float) $package->height, (float) $package->length, 0, (float) $package->num, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+                }
+
+                if(!count($row->deliverysize)){
+                    $measurement = round(((float) $row->volume / (float) $row->goodcount) ** (1/3) * 100, 2);
+                    $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $measurement, (float) $measurement, (float) $measurement, 0, (float) $row->goodcount, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+                }
+
+                $weightCbm = (float) $row->weight / 500;
+                $overWeightCbm = $weightCbm - $packingList->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity'));
+
+                if($overWeightCbm > 0){
+                    $measurement = round($overWeightCbm ** (1/3) * 100, 2);
+                    $packageObject = new PackageObject(PackageType::OVER_WEIGHT, 'Overweight CBM', (float) $measurement, (float) $measurement, (float) $measurement, 0, 1, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+                }
+
+                if($order instanceof Order){
+                    $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+                    if(!in_array($marking, ['1290CSW', '8997ITB', '3992WHE', '962LOW', '1152AAT'])){
+                        $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [
+                            'expressno' => $row->expressno
+                        ]);
+                    }
+                }
+
+
+                if($containerReference) {
+                    try {
+                        $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
+                        $container->packingLists()->detach($packingList);
+                        $container->packingLists()->attach($packingList);
+                    } catch (ResourceNotFoundException $exception){
+
+                        if (!$allow_contract) {
+                            $appointee_id = 2037;
+                        }
+                        else {
+                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id;
+                        }
+
+                        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $appointee_id]);
+
+                        $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
+                        /** @var Container $container */
+                        $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
+
+                        $container->packingLists()->detach($packingList);
+                        $container->packingLists()->attach($packingList);
+
+                        $transport = $container->transports()->first();
+
+                        if(!$transport){
+                            $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);
+                            /** @var Transport $transport */
+                            $transport = $this->createsTransport->execute($transportObject, $container);
+                            $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
+                        }
+                    }
+
+                    if($delayDate){
+                        $delayDate = $delayDate->addDays(2);
+                        $transport = $container->transports()->first();
+
+                        if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {
+                            $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
+                            $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
+                            $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
+                            foreach ($container->packingLists as $packingList){
+                                if(!($packingList->owner instanceof Order)) continue;
+                                $user = $packingList->owner->companyModule->employees()->first();
+                                if(app()->environment(['production'])) {
+                                    $user->notify(new ShipmentRescheduleEmail($user, $packingList));
+                                }
+                            }
+                        }
+
+                    }
+
+                    if($unstuffingDate && $container->status !== ApprovalStatus::COMPLETED){
+                        $container->update(['status' => ApprovalStatus::COMPLETED]);
+                        $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
+
+                        /** @var PackingList $packingList */
+                        foreach($container->packingLists as $packingList){
+
+                            if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
+                                $packingList->status = ApprovalStatus::APPROVED;
+                                $packingList->save();
+                            }
+
+                            if ($allow_contract) {
+                                $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
+                                foreach($packingList->steps()->where('reference', '!=', 'DELIVERY')->get() as $step){
+                                    $this->updatesContractObligations->execute($signature, $step->obligation_hash_id);
+                                    $step->update(['status' => ApprovalStatus::COMPLETED]);
+                                }
+                            }
+
+                        }
+                    }
+                }
+
+                if($deliveryDate && !$packingList->transports()->exists()){
+                    $packingList->status = ApprovalStatus::COMPLETED;
+                    $packingList->save();
+
+                    $deliveryDate = Carbon::parse($deliveryDate);
+                    $transportObject = new TransportObject(TransportType::LAND, null, null,  $deliveryDate, $deliveryDate, ApprovalStatus::APPROVED);
+                    /** @var Transport $transport */
+                    $transport = $this->createsTransport->execute($transportObject, $packingList);
+                    $this->createsSchedule->execute($transport, new ScheduleObject($deliveryDate, $deliveryDate, ApprovalStatus::APPROVED));
+
+
+                    if ($allow_contract) {
+                        $deliveryStep = $packingList->steps()->where('reference', '=', 'LAST_MILE_DELIVERY')->first();
+                        $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
+                        $this->updatesContractObligations->execute($signature, $deliveryStep->obligation_hash_id);
+                        $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
+                    }
+
+                }
+
+                echo 'successful';
+
+            }
+        } catch (\Exception $exception) {
+            Log::debug($exception);
+        }
+
+
+    }
+}

app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php

@@ -2,6 +2,7 @@
 
 namespace App\Classes\Modules\PackingLists\Processors;
 
+use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\Exceptions\ResourceNotFoundException;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
@@ -23,6 +24,8 @@ use App\Classes\Modules\Unity\Processors\AssignContractEntityProcessor;
 use App\Classes\Modules\Unity\Processors\CreateContractEntityProcessor;
 use App\Classes\Modules\Unity\Services\CreatesContract;
 use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
+use App\Classes\Notifications\ShipmentDepartureEmail;
+use App\Classes\Notifications\ShipmentRescheduleEmail;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\ContainerTypes;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
@@ -137,7 +140,7 @@ class FetchOrderListsFromYdPortalProcessor
     public function execute(?Carbon $start = null, ?Carbon $end = null)
     {
         try {
-            $start = $start ? $start : Carbon::today()->subMonths(1);
+            $start = $start ? $start : Carbon::today()->subDays(30);
 
             $startLimit = Carbon::parse('01-12-2021');
 
@@ -184,7 +187,7 @@ class FetchOrderListsFromYdPortalProcessor
                         $containerReference = explode('预计到港时间', $tracking[1])[0];
                         $loadingDate = Carbon::parse($trackingRow->trackingtime);
                         $etd = Carbon::parse($tracking[2])->subDays(5);
-                        $eta = Carbon::parse($tracking[2]);
+                        $eta = Carbon::parse($tracking[2])->addDays(2);
                     }
 
                     $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
@@ -227,24 +230,28 @@ class FetchOrderListsFromYdPortalProcessor
                         $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
                     }
 
-                    if (Str::contains($trackingRow->tracking, ['派送中', '签收完成', ' 第三方提货', '货物已派送完成'])) {
+                    if (Str::contains($trackingRow->tracking, ['派送中', '已签收', '签收完成', ' 第三方提货', '货物已派送完成', '派送', 'delivery', 'delivered'])) {
                         $deliveryDate = Carbon::parse($trackingRow->trackingtime);
                     }
                 }
 
                 $client = new \GuzzleHttp\Client(['cookies' => true, 'headers' => ['Cookie' => 'utc_offset=480']]);
 
-                $request = $client->request('get', 'https://main.universe.com.my/Tracking/User/Paging?sEcho=1&sTrackingNo='.$row->expressno.'&sOrgId=sti');
-                $deliveryTracking = json_decode($request->getBody()->getContents());
-                foreach (array_reverse($deliveryTracking->aaData) as $trackingRow) {
-                    $trackingDate = Carbon::createFromFormat('d/m/y H:i', $trackingRow->LocalDateTime);
-                    if (Str::contains($trackingRow->PublicDescription, ['accepted/picked'])){
-                        $unstuffingDate = $trackingDate;
-                    }
+                try {
+                    $request = $client->request('get', 'https://main.universe.com.my/Tracking/User/Paging?sEcho=1&sTrackingNo='.$row->expressno.'&sOrgId=sti');
+                    $deliveryTracking = json_decode($request->getBody()->getContents());
+                    foreach (array_reverse($deliveryTracking->aaData) as $trackingRow) {
+                        $trackingDate = Carbon::createFromFormat('d/m/y H:i', $trackingRow->LocalDateTime);
+                        if (Str::contains($trackingRow->PublicDescription, ['accepted/picked'])){
+                            $unstuffingDate = $trackingDate;
+                        }
 
-                    if (Str::contains($trackingRow->PublicDescription, ['delivered'])) {
-                        $deliveryDate = $trackingDate;
+                        if (Str::contains($trackingRow->PublicDescription, ['delivered'])) {
+                            $deliveryDate = $trackingDate;
+                        }
                     }
+                } catch (\Exception $exception){
+                    Log::debug('failed to fetch delivery tracking');
                 }
 
                 $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
@@ -351,7 +358,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                 if($order instanceof Order){
                     $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-                    if(!in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '153DSR', '1291NSC', '8288MIB', '1152AAT', '962LOW', '3992WHE', '1290CSW', '9493TYS', '3397GSH'])){
+                    if(!in_array($marking, ['1290CSW', '8997ITB', '3992WHE', '962LOW', '1152AAT'])){
                         $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [
                             'expressno' => $row->expressno
                         ]);
@@ -393,13 +400,20 @@ class FetchOrderListsFromYdPortalProcessor
                     }
 
                     if($delayDate){
-
+                        $delayDate = $delayDate->addDays(2);
                         $transport = $container->transports()->first();
 
                         if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {
                             $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
                             $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
                             $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
+                            foreach ($container->packingLists as $packingList){
+                                if(!($packingList->owner instanceof Order)) continue;
+                                $user = $packingList->owner->companyModule->employees()->first();
+                                if(app()->environment(['production'])) {
+                                    $user->notify(new ShipmentRescheduleEmail($user, $packingList));
+                                }
+                            }
                         }
 
                     }

app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php

@@ -116,7 +116,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
         try {
 
-            $start = $start ? $start : Carbon::today()->subDays(5);
+            $start = $start ? $start : Carbon::today()->subDays(10);
 
             $startLimit = Carbon::parse('11-08-2021');
 
@@ -133,15 +133,19 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
             $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest);
 
             foreach ($response->Rows as $parcel){
+
                 $allow_contract = true;
                 $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[11]));
                 $orderNumber = $marking[array_key_last($marking)];
 
                 $quantity = $parcel[16];
+
                 if(!$quantity){
                     continue;
                 }
 
+                if(!$parcel[23] || !$parcel[22] || !$parcel[21]) continue;
+
                 try {
                     $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
                     $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
@@ -152,7 +156,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
                 }
 
                 $packingListReference = $parcel[0];
-//                $measurement = round(($parcel[10]/$quantity) ** (1/3) * 100, 2);
+//                $measurement = round(($parcel[26]/$quantity) ** (1/3) * 100, 2);
                 $description = $parcel[13];
                 $tracking = $parcel[37];
                 $receiveDate = $parcel[1];

app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php

@@ -102,7 +102,7 @@ class UpdateConstantLogic  extends AbstractControllerLogic
 
             $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference')]);
 
-            $constantValue = $this->updatesConstantValue->execute($constant->value, $request->input('id'), $request->input('value'));
+            $constantValue = $this->updatesConstantValue->execute($constant->value, $request->input('id'), $request->input('rate'));
 
             $object = new ConstantObject($request->input('reference'), $constantValue);
 

app/Classes/Modules/Segments/ControllersLogic/UpdateConstantPostcodeLogic.php

@@ -25,8 +25,8 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
      */
     protected function notification():array {
         return [
-            'title' => 'Updated Segment Constant',
-            'message' => 'You have successfully updated the Segment Constant'
+            'title' => 'Updated Postcode Constant',
+            'message' => 'You have successfully updated the Postcode Constant'
         ];
     }
 

app/Classes/Modules/Segments/ControllersLogic/UpdateSegmentLogic.php

@@ -70,7 +70,8 @@ class UpdateSegmentLogic extends AbstractControllerLogic
             $segment_query = $this->fetchesSegment->execute(['id' => $request->route('id')]);
 
             $segment_object = new SegmentObject(
-                $request->input('name', $segment_query->name)
+                $request->input('name'),
+                $segment_query->company_module_id
             );
             $this->canUpdateSegment->passes($segment_object);
             $segment_query = $this->updatesSegment->execute($segment_query, $segment_object);

app/Classes/Modules/Segments/ControllersLogic/UpdateSegmentPriceLogic.php

@@ -0,0 +1,124 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
+use App\Classes\Modules\Segments\Services\CreatesConstant;
+use App\Classes\Modules\Segments\Services\CreatesSegment;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\Modules\Segments\Standards\Rules\CanCreateConstant;
+use App\Classes\Modules\Segments\Standards\Rules\CanUpdateConstant;
+use App\Classes\Modules\Segments\Services\UpdatesConstant;
+use App\Http\Resources\ConstantResource;
+use App\Models\SegmentConstant;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Segments\Services\UpdatesConstantValue;
+
+class UpdateSegmentPriceLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Segment Price',
+            'message' => 'You have successfully updated the Segment Price'
+        ];
+    }
+
+    /** @var CanUpdateConstant */
+    private $canUpdateConstant;
+
+    /** @var UpdatesConstant */
+    private $updatesConstant;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /** @var CanCreateConstant */
+    private $canCreateConstant;
+
+    /** @var CreatesConstant */
+    private $createsConstant;
+
+    /** @var CreatesSegment */
+    private $createsSegment;
+
+    /** @var UpdatesConstantValue */
+    private $updatesConstantValue;
+
+    /**
+     * UpdateConstantLogic constructor.
+     * @param CanUpdateConstant $canUpdateConstant
+     * @param UpdatesConstant $updatesConstant
+     * @param FetchesSegment $fetchesSegment
+     * @param FetchesConstant $fetchesConstant
+     * @param CanCreateConstant $canCreateConstant
+     * @param CreatesConstant $createsConstant
+     * @param UpdatesConstantValueByState $updatesConstantValueByState
+     * @param CreatesSegment $createsSegment
+     */
+    public function __construct(
+        CanUpdateConstant $canUpdateConstant, 
+        UpdatesConstant $updatesConstant, 
+        FetchesSegment $fetchesSegment, 
+        FetchesConstant $fetchesConstant, 
+        CanCreateConstant $canCreateConstant, 
+        CreatesConstant $createsConstant,
+        UpdatesConstantValue $updatesConstantValue,
+        CreatesSegment $createsSegment
+    )
+    {
+        $this->canUpdateConstant = $canUpdateConstant;
+        $this->updatesConstant = $updatesConstant;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->fetchesConstant = $fetchesConstant;
+        $this->canCreateConstant = $canCreateConstant;
+        $this->createsConstant = $createsConstant;
+        $this->updatesConstantValue = $updatesConstantValue;
+        $this->createsSegment = $createsSegment;
+    }
+    /**
+     * @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
+    {
+        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+        try {
+
+            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference')]);
+
+            $object = new ConstantObject($request->input('reference'), [$request->input('value')]);
+
+            $this->canUpdateConstant->passes($object);
+
+        } catch (ResourceNotFoundException $exception){
+
+            $object = new ConstantObject(
+                $request->input('reference'),
+                [$request->input('value')]
+            );
+
+            $constant = $this->createsConstant->execute($segment, $object);
+        }
+        
+        $constant = $this->updatesConstant->execute($constant, $object);
+
+        return $this->resourceResponse(new ConstantResource($constant));
+    }
+
+}

app/Classes/Modules/Transactions/ControllersLogic/ApprovePaymentTransactionLogic.php

@@ -9,6 +9,8 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Documents\Services\ApprovesDocument;
 use App\Classes\Modules\Documents\Services\FetchesDocument;
 use App\Classes\Modules\Documents\Services\RejectsDocument;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
 
@@ -20,20 +22,22 @@ use Illuminate\Http\Request;
 class ApprovePaymentTransactionLogic extends AbstractControllerLogic
 {
     /**
-     * ApprovePaymentVerificationLogic constructor.
+     * ApprovePaymentTransactionLogic constructor.
      * @param FetchesTransaction $fetchesTransaction
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param ApprovesDocument $approvesDocument
      * @param RejectsDocument $rejectsDocument
-     * @param FetchesDocument $fetchesDocument
-     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
+     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
+     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
      */
-    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument)
+    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor)
     {
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->approvesDocument = $approvesDocument;
         $this->rejectsDocument = $rejectsDocument;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
+        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
     }
 
     /**
@@ -58,10 +62,18 @@ class ApprovePaymentTransactionLogic extends AbstractControllerLogic
     /** @var RejectsDocument */
     private $rejectsDocument;
 
+    /** @var UpdateDoFromVTPortalProcessor */
+    private $updateDoFromVTPortalProcessor;
+
+    /** @var UpdateDoFromYDPortalProcessor */
+    private $updateDoFromYDPortalProcessor ;
+
     /**
      * @param Request $request
      * @return JsonResponse
+     * @throws \App\Classes\Exceptions\InternalServerErrorException
      * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function logic(Request $request) : JsonResponse
     {
@@ -69,13 +81,31 @@ class ApprovePaymentTransactionLogic extends AbstractControllerLogic
         $status = $request->route('status');
 
         $transaction = $this->fetchesTransaction->execute(['id' => $request->route('transaction_id')]);
-        
+
         $status === 'approve' ? $this->approvesDocument->execute($transaction->documents()->first()) : $this->rejectsDocument->execute($transaction->documents()->first());
 
         $this->updatesTransactionStatus->execute($transaction, $status === 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
 
-        // $this->createInvoiceTransactionProcessor->execute($transaction->booking);
+        if($transaction->status === ApprovalStatus::APPROVED){
+            $invoice = $transaction->owner;
+            $packingList = $invoice->owner;
+
+            if(($invoice->amount - $transaction->amount) < 0.01) {
+                $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
+
+                $packingList->status = ApprovalStatus::APPROVED;
+                $packingList->save();
+
+                if(app()->environment('production')){
+                    $this->updateDoFromVTPortalProcessor->execute($packingList);
+                    $this->updateDoFromYDPortalProcessor->execute($packingList);
+                }
+            }
+
+        }
+
+
         return $this->response([]);
     }
 
-}
+}

app/Classes/Modules/Transactions/ControllersLogic/ApproveShippingInvoiceTransactionLogic.php

@@ -3,6 +3,7 @@
 namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 
+use App\Classes\Notifications\InvoiceIssuedEmail;
 use Illuminate\Http\Request;
 
 
@@ -69,7 +70,7 @@ class ApproveShippingInvoiceTransactionLogic extends AbstractControllerLogic
     {
         $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-        $invoice_transaction = $packing_list->transactions->where('type', TransactionType::SHIPPING_INVOICE)->first();
+        $invoice_transaction = $packing_list->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::PENDING_SUBMISSION])->first();
 
         $this->updatesTransactionStatus->execute($invoice_transaction, ApprovalStatus::APPROVED);
 
@@ -87,8 +88,11 @@ class ApproveShippingInvoiceTransactionLogic extends AbstractControllerLogic
         $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/Classes/Modules/Transactions/ControllersLogic/CreatePaymentTransactionLogic.php

@@ -18,6 +18,7 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 
+use App\Http\Resources\TransactionResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
@@ -83,7 +84,7 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic
             $payment_method = PaymentMethodType::PAYMENT_GATEWAY;
             $billPlzBill = $this->createsBillplzBill->execute(
                 $company_module->name, 
-                $company_module->employees()->first()->email, 
+                (app()->environment(['production'])) ? $company_module->employees()->first()->email : 'uldvstar@gmail.com',
                 'This payment is for the invoice number . ' . $invoice_transaction->bill_no,
                 $amount,
                 $billNumber, 
@@ -119,6 +120,6 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic
 
         $payment_transaction = $this->createsPaymentTransaction->execute($invoice_transaction, $object);
 
-        return $this->response([]);
+        return $this->resourceResponse(new TransactionResource($payment_transaction));
     }
 }

app/Classes/Modules/Transactions/ControllersLogic/CreateShippingInvoiceTransactionLogic.php

@@ -6,8 +6,6 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
 use App\Classes\Modules\SegmentConstants\Services\FetchesSegmentConstant;
-use App\Classes\Modules\Segments\Services\ListsConstants;
-use App\Classes\Modules\Segments\Services\ListsSegments;
 use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
 use App\Classes\Modules\Transactions\Services\CreatesTransaction;
 use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
@@ -18,6 +16,7 @@ use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
@@ -26,7 +25,6 @@ use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\SegmentConstants;
 use App\Classes\ValueObjects\Constants\TransactionDetailType;
 
-use App\Http\Resources\PackingListResource;
 use App\Models\Document;
 use App\Models\PackingList;
 use App\Models\Transaction;
@@ -40,6 +38,7 @@ use Meneses\LaravelMpdf\Facades\LaravelMpdf;
 class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
 {
 
+
     /**
      * @return array
      */
@@ -56,9 +55,6 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
     /** @var FetchesSegmentConstant */
     private $fetchesSegmentConstant;
 
-    /** @var ListsConstants */
-    private $listsConstants;
-
     /** @var GeneratesTransactionBillNumber */
     private $generatesTransactionBillNumber;
 
@@ -74,23 +70,19 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
     /** @var CreatesFiles */
     private $createsFile;
 
-
-    /**
-     * CreateShippingInvoiceTransactionLogic constructor.
-     * @param FetchesPackingList $fetchesPackingList
-     * @param FetchesSegmentConstant $fetchesSegmentConstant
-     * @param ListsConstants $listsConstants
-     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
-     * @param CreatesTransaction $createsTransaction
-     * @param CreatesTransactionDetail $createsTransactionDetail
-     * @param CreatesDocument $createsDocument
-     * @param CreatesFiles $createsFile
-     */
-    public function __construct(FetchesPackingList $fetchesPackingList, FetchesSegmentConstant $fetchesSegmentConstant, ListsConstants $listsConstants, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CreatesTransactionDetail $createsTransactionDetail, CreatesDocument $createsDocument, CreatesFiles $createsFile)
+    public function __construct(
+        FetchesPackingList $fetchesPackingList,
+        FetchesSegmentConstant $fetchesSegmentConstant,
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
+        CreatesTransaction $createsTransaction,
+        CreatesTransactionDetail $createsTransactionDetail,
+        CreatesDocument $createsDocument,
+        CreatesFiles $createsFile
+    )
     {
+
         $this->fetchesPackingList = $fetchesPackingList;
         $this->fetchesSegmentConstant = $fetchesSegmentConstant;
-        $this->listsConstants = $listsConstants;
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
         $this->createsTransaction = $createsTransaction;
         $this->createsTransactionDetail = $createsTransactionDetail;
@@ -98,46 +90,53 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
         $this->createsFile = $createsFile;
     }
 
-
     public function logic(Request $request) : JsonResponse
     {
         $packing_list = $this->fetchesPackingList->execute(['id' => $request->input('packing_list_id')]);
+        $packing_list = PackingList::where('reference', $packing_list->reference)->where('type', PackingListType::SHIPPING_PACKING_LIST)->first();
 
-        $cbm = $packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum(function($package) {
+        $billable_packing_list = $packing_list->packingLists()->first();
+
+        $billable_packing_list = $billable_packing_list ? $billable_packing_list : $packing_list;
+
+        $cbm = round($billable_packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum(function($package) {
             return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
-        });
+        }), 3);
 
-        $over_weight_cbm = $packing_list->packages->where('type', PackageType::OVER_WEIGHT)->sum(function($package) {
+        $over_weight_cbm = round($billable_packing_list->packages->where('type', PackageType::OVER_WEIGHT)->sum(function($package) {
             return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
-        });
-
-        $minimum_charges = ($cbm + $over_weight_cbm) < 0.3 ? (0.3 - ($cbm + $over_weight_cbm)) : 0;
+        }), 3);
 
         $order =  $packing_list->owner;
+        $companyModule = $order->companyModule;
+        $connection = $companyModule->connections()->first();
         $address = $order->addresses()->first();
 
-        $segments = $order->companyModule->connections->first()->segments->pluck('id');
-
-        $segment_price = 0;
         $base_price_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::BASE_PRICE]);
-
-        if(count($segments)){
-            $segment_price_constants = $this->listsConstants->execute(['segment_id_in' => $segments, 'reference' => SegmentConstants::CUSTOM_PRICE]);
-            $segment_price_constant = $segment_price_constants->sortBy(function ($constant){
-                return $constant->value[0];
-            })->first();
-            $segment_price = $segment_price_constant->value[0];
-
-        }
-
         $warehouse_rate_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::WAREHOUSE_RATE]);
         $state_rate_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::STATE_RATE]);
         $center_postcode_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::CENTER_POSTCODE]);
         $outstation_postcode_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::OUTSTATION_POSTCODE]);
+
+        $noMinimumCharge = $connection->segments()->where('segments.id', 2)->first();
+
+        $base_price = 0;
+        $warehouse_rate = 0;
+        $state_rate = 0;
+        $minimum_cbm = 0.3;
+        $segment_price = 0;
         $state_select = '';
 
-        $packing_list_drop_date = Carbon::parse(PackingList::where('reference', $packing_list->reference)->where('type', 1)->first()->transports->first()->drop_date)->format('Y-m-d');
+        $segment_price = $connection->segments()->whereHas('constants', function($query){
+            return $query->where('reference', SegmentConstants::CUSTOM_PRICE);
+        })->get()->map(function($segment){
+            return (float) $segment->constants()->first()->value[0];
+        })->sort()->first();
+        $segment_price = $segment_price ? $segment_price : 0;
+
+        $packing_list_drop_date = PackingList::where('reference', $packing_list->reference)->where('type', 1)->first()->transports->first()->drop_date->format('Y-m-d');
         $base_price = $this->getConstantByKey($base_price_constant, $packing_list_drop_date);
+
         $warehouseId = $order->orderRoles()->where('role_id', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->company_module_id;
         $selected_warehouse_rate = $this->getConstantByKey($warehouse_rate_constant, $warehouseId);
         $warehouse_rate = is_object($selected_warehouse_rate) ? $selected_warehouse_rate->amount : 0;
@@ -150,31 +149,64 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
         $this->checkPostcodeExistInConstant($center_postcode_constant, $postcode) === true ? $state_select = 'center' : '' ;
         $this->checkPostcodeExistInConstant($outstation_postcode_constant, $postcode) === true ? $state_select = 'outstation' : '' ;
         $state_rate_constant = (array)$state_rate_constant;
-        $state_rate = $state_select == '' ? 0 : $state_rate_constant['center'] + ($state_select === 'outstation' ? $state_rate_constant['outstation'] : 0);
+        $state_rate = $state_select == '' ? 0 : $state_rate_constant[$state_select];
+
+        $container = $packing_list->containers()->first();
+        $containerPackingLists = collect();
+        $hasMinimumCharge = null;
+
+        foreach ($container->packingLists as $packingList){
+            if($packingList->owner->companyModule->id !== $companyModule->id) continue;
+            $containerPackingLists->push($packingList);
+
+            if(!$hasMinimumCharge) {
+                $hasMinimumCharge = $packingList->transactions()->whereHas('transactionDetails', function ($query){
+                    $query->where('reference', 'MIN_CBM_CHARGES');
+                })->first();
+            }
+
+        }
+
+        $totalContainerCbm = $containerPackingLists->sum(function($packingList){
+            $billable_packing_list = $packingList->packingLists()->first();
+            $billable_packing_list = $billable_packing_list ? $billable_packing_list : $packingList;
+            return $billable_packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum(function($package) {
+                return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
+            });
+        });
+
+        $minimum_charge = $minimum_cbm - $totalContainerCbm;
+        $minimum_charge = $minimum_charge < 0 ? 0 : $minimum_charge;
+        $minimum_charge = $noMinimumCharge ? 0 : $minimum_charge;
+
+        $minimum_charge = $noMinimumCharge ? 0 : round($minimum_charge, 3);
+
+
+        if($hasMinimumCharge) {
+            $minimum_charge = 0;
+        }
 
         $price_cbm = $base_price + $segment_price + $warehouse_rate + $state_rate;
 
-        $total_cbm = $price_cbm * ($cbm + $over_weight_cbm);
+        $total_cbm = $price_cbm * ($cbm + $minimum_charge + $over_weight_cbm);
 
-
-
-        $billNumber = $this->generatesTransactionBillNumber->execute('SI-');
+        $billNumber = $this->generatesTransactionBillNumber->execute('SHIP-');
 
         $object = new TransactionObject(
-            $billNumber, 
-            TransactionType::SHIPPING_INVOICE, 
-            1, 
+            $billNumber,
+            TransactionType::SHIPPING_INVOICE,
+            1,
             $order->company_module_id,
-            1, 
+            1,
             PaymentMethodType::CASH,
             $total_cbm,
             $total_cbm,
             1,
-            1, 
-            0, 
-            0, 
+            1,
             0,
-            null, 
+            0,
+            0,
+            null,
             ApprovalStatus::PENDING_SUBMISSION
         );
 
@@ -183,13 +215,13 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
 
         $object_detail = new TransactionDetailObject(
             'SHIPPING_FEE',
-            TransactionDetailType::SHIPPING_FEE.'<br>'.round($packing_list->packages->sum('quantity'), 3).' CTNS - '.$cbm.' CBM',
+            TransactionDetailType::SHIPPING_FEE.'<br>'.round($packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum('quantity'), 3).' CTNS - '.round($cbm, 3).' CBM',
             $cbm,
             $price_cbm
         );
 
         $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
-        
+
         if ($over_weight_cbm > 0) {
             $object_detail = new TransactionDetailObject(
                 'OVER_WEIGHT_CHARGES',
@@ -201,13 +233,25 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
             $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
         }
 
-        return $this->resourceResponse(new PackingListResource($packing_list));
+        if ($minimum_charge > 0) {
+            $object_detail = new TransactionDetailObject(
+                'MIN_CBM_CHARGES',
+                TransactionDetailType::MIN_CBM_CHARGES,
+                $minimum_charge,
+                $price_cbm
+            );
+
+            $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
+        }
+
+        return $this->response([]);
     }
 
     function getConstantByKey($segmentConstantObject, $key) {
         if ($segmentConstantObject) {
             $base_rate = (array) $segmentConstantObject->value;
             $base_rate = array_key_exists($key, $base_rate) === true ? $base_rate[$key] : 0;
+
             return $base_rate;
         }
     }

app/Classes/Modules/Transactions/ControllersLogic/SuspendTransactionLogic.php

@@ -50,10 +50,10 @@ class SuspendTransactionLogic extends AbstractControllerLogic
 
         $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
 
-        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::SUSPENDED);
-
-        return $this->response([]);
+        $transaction = $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::SUSPENDED);
 
+        return $this->resourceResponse(new TransactionResource($transaction));
+        
     }
 
 

app/Classes/Modules/Transactions/ControllersLogic/UpdateShippingInvoiceTransactionLogic.php

@@ -85,7 +85,7 @@ class UpdateShippingInvoiceTransactionLogic extends AbstractControllerLogic
     {
         $invoice_transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
 
-        $old_transaction_details = $invoice_transaction->transactionDetails->whereNotIn('reference', ['SHIPPING_FEE', 'OVER_WEIGHT_CHARGES'])->pluck('id')->toArray();
+        $old_transaction_details = $invoice_transaction->transactionDetails->whereNotIn('reference', ['SHIPPING_FEE', 'OVER_WEIGHT_CHARGES', 'MIN_CBM_CHARGES'])->pluck('id')->toArray();
 
         $new_transaction_details = collect($request->input('transaction_details'));
 
@@ -104,7 +104,7 @@ class UpdateShippingInvoiceTransactionLogic extends AbstractControllerLogic
         foreach($new_transaction_details as $transaction_detail){
             $transaction_detail = (object) $transaction_detail;
 
-            if(!in_array($transaction_detail->reference, ['SHIPPING_FEE', 'OVER_WHEIGHT_CHARGES'])){
+            if(!in_array($transaction_detail->reference, ['SHIPPING_FEE', 'OVER_WEIGHT_CHARGES', 'MIN_CBM_CHARGES'])){
                 $object_detail = new TransactionDetailObject(
                     'CUSTOM_CHARGES',
                     isset($transaction_detail->name) ? $transaction_detail->name : TransactionDetailType::CUSTOM_CHARGES,
@@ -117,8 +117,6 @@ class UpdateShippingInvoiceTransactionLogic extends AbstractControllerLogic
                 }else{
                     $new_transaction_detail = $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
                 }
-
-                $total_cbm += $new_transaction_detail->amount;
             }
         }
 
@@ -129,8 +127,8 @@ class UpdateShippingInvoiceTransactionLogic extends AbstractControllerLogic
             $invoice_transaction->issuer,
             1, 
             PaymentMethodType::CASH,
-            $total_cbm,
-            $total_cbm,
+            $invoice_transaction->transactionDetails()->sum('amount'),
+            $invoice_transaction->transactionDetails()->sum('amount'),
             1,
             1, 
             0, 

app/Classes/Modules/Transactions/ControllersLogic/UpdateTransactionStatusLogic.php

@@ -0,0 +1,71 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Http\Resources\BookingResource;
+use App\Http\Resources\TransactionResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateTransactionStatusLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Transaction Status',
+            'message' => 'You have successfully updated the Transaction Status'
+        ];
+    }
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+
+    /**
+     * SuspendTransactionLogic constructor.
+     * @param FetchesTransaction $fetchesTransaction
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     */
+    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus)
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+    }
+
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $approvalArray = [
+            'approve' => ApprovalStatus::APPROVED,
+            'expire' => ApprovalStatus::EXPIRED,
+            'reject' => ApprovalStatus::REJECTED,
+        ];
+
+        $approvalStatus = $approvalArray[$request->route('status')];
+
+        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
+
+        if ($request->route('status') === 'reject') {
+            $transaction->delete();
+        } else {
+            $transaction = $this->updatesTransactionStatus->execute($transaction, $approvalStatus);
+        }
+
+        return $this->resourceResponse(new TransactionResource($transaction));
+    }
+
+
+
+}

app/Classes/Modules/Transactions/ControllersLogic/multipleInvoicesWithOnePaymentLogic.php

@@ -0,0 +1,204 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\Standards\Rules\CanCreateTransaction;
+use App\Classes\Modules\Transactions\Standards\Rules\CanCreateTransactionDetail;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Http\Resources\TransactionResource;
+use App\Http\Resources\TransactionDetailResource;
+
+use App\Classes\Modules\Receipts\Standards\Rules\CanCreateReceipt;
+use App\Classes\Modules\Receipts\Standards\Rules\CanCreateReceiptDetail;
+use App\Classes\Modules\Receipts\DataTransferObjects\ReceiptObject;
+use App\Classes\Modules\Receipts\DataTransferObjects\ReceiptDetailObject;
+use App\Classes\Modules\Receipts\Services\CreatesReceipt;
+use App\Classes\Modules\Receipts\Services\CreatesReceiptDetail;
+use App\Classes\Modules\Receipts\Services\GeneratesReceiptBillNo;
+
+use App\Classes\Modules\Currencies\Services\FetchesCurrency;
+use App\Classes\Modules\Currencies\Services\RateCalculatesCurrency;
+
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\FetchesTransactionDetail;
+
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+
+
+use App\Models\Transaction;
+use App\Models\multipleInvoicesWithOnePayment;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
+use App\Classes\Modules\Wallets\Services\CreatesWallet;
+use APP\models\PackingList;
+
+
+
+class multipleInvoicesWithOnePaymentLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Transaction',
+            'message' => 'You have successfully created a transaction'
+        ];
+    }
+
+    
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNo;
+
+    /** @var CanCreateTransaction */
+    private $canCreateTransaction;
+    
+    private $fetchesCurrency;
+   
+    private $rateCalculatesCurrency;
+    
+    private $fetchesCompany;
+
+    private $createsTransaction;
+    
+    private $canCreateTransactionDetail;
+    
+    private $createsTransactionDetail;
+    
+    private $fetchesTransaction;
+    
+    private $fetchesTransactionDetail;
+    
+    private $generatesReceiptBillNo;
+
+    /** @var CanCreateReceipt */
+    private $canCreateReceipt;
+    
+    private $createsReceipt;
+    
+    private $canCreateReceiptDetail;
+    
+    private $createsReceiptDetail;
+
+   
+    public function __construct(
+        GeneratesTransactionBillNumber $generatesTransactionBillNo, CanCreateTransaction $canCreateTransaction,
+        FetchesCurrency $fetchesCurrency, RateCalculatesCurrency $rateCalculatesCurrency, FetchesCompany $fetchesCompany,
+        CreatesTransaction $createsTransaction,
+        CanCreateTransactionDetail $canCreateTransactionDetail, CreatesTransactionDetail $createsTransactionDetail,
+        FetchesTransaction $fetchesTransaction , FetchesTransactionDetail $fetchesTransactionDetail,
+        GeneratesReceiptBillNo $generatesReceiptBillNo, CanCreateReceipt $canCreateReceipt,
+        CreatesReceipt $createsReceipt,
+        CanCreateReceiptDetail $canCreateReceiptDetail, CreatesReceiptDetail $createsReceiptDetail
+    ){
+        $this->generatesTransactionBillNo = $generatesTransactionBillNo;
+        $this->canCreateTransaction = $canCreateTransaction;
+        $this->fetchesCurrency = $fetchesCurrency;
+        $this->rateCalculatesCurrency = $rateCalculatesCurrency;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->createsTransaction =$createsTransaction;
+        $this->canCreateTransactionDetail =$canCreateTransactionDetail;
+        $this->createsTransactionDetail = $createsTransactionDetail;
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->fetchesTransactionDetail = $fetchesTransactionDetail;
+        
+        $this->generatesReceiptBillNo = $generatesReceiptBillNo;
+        $this->canCreateReceipt = $canCreateReceipt;
+        $this->createsReceipt =$createsReceipt;
+        $this->canCreateReceiptDetail =$canCreateReceiptDetail;
+        $this->createsReceiptDetail = $createsReceiptDetail;
+        
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+
+    
+    public function logic( $transactionsArray) : JsonResponse
+    {
+        // dd($request);
+        try {
+
+               
+        // dd(json_decode($transactionsArray));
+        $transactions = Transaction::whereIn('id', json_decode($transactionsArray))->where('type', TransactionType::SHIPPING_INVOICE)->get();
+        $total = $transactions->sum('amount');
+        $packingList =$transactions[1]->owner;
+        $order = $packingList->owner;
+        $companyModule = $order->companyModule;
+        $company = $companyModule->company;
+        $wallet = $company->wallets()->first();
+        
+        if (!$wallet) {
+            $object = new WalletObject($company->id, 1, (App()->make(GeneratesWalletCode::class))->execute());
+            /** @var Wallet $wallet */
+            $wallet = (App()->make(CreatesWallet::class))->execute($object, $company);
+        }
+
+        $billNumber = (App()->make(GeneratesTransactionBillNumber::class))->execute('TOPUP-');
+
+        if($total < 0) {
+            throw new MalformedRequestException('Top up credit value must be greater than zero.');
+        }
+        $billPlzBill = (App()->make(CreatesBillplzBill::class))->execute($company->name, 'example@gmail.com', 'This payment is credit topup for company ref. ' . $company->reference, $total, $billNumber, 'bank code', true);
+
+        $transaction_object = new TransactionObject($billNumber, TransactionType::TOP_UP, 1, $company->id, 1, PaymentMethodType::PAYMENT_GATEWAY, $total, $total, 1, 1, 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, [], 'test');
+        
+        // $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
+        
+        $transaction = (App()->make(CreatesTransaction::class))->execute($wallet, $transaction_object);
+        $result= (App()->make(UpdatesWalletBalance::class))->execute($wallet, $total);
+
+      foreach ($transactions as $key => $value) {
+        multipleInvoicesWithOnePayment::create([ 'topUp_request_id' => $transaction->id, 'transaction_id' => $value->id  ]);
+            
+            }
+            return $this->response([]); ;
+            
+
+        } catch (\Exception $exception) {
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+    public function verifypayment( $topUp_transaction_id, $amount) : JsonResponse
+    {
+        $totalamount =0;
+       $topup = multipleInvoicesWithOnePayment::where('topUp_request_id',$topUp_transaction_id)->get();
+       
+       foreach ($topup as $key => $value) {
+           $transaction =  Transaction::where('id',$value->transaction_id)->frist();
+           $totalamount += $transaction->amount;  
+           (App()->make(updatesTransactionStatus::class))->execute($transaction, ApprovalStatus::APPROVED);
+           
+        $transaction_object = new TransactionObject($transaction->bill_no, TransactionType::PAYMENT, 1, $topUp_transaction_id, 1, PaymentMethodType::PAYMENT_GATEWAY, $transaction->amount, $transaction->amount, 1, 1, 1, 0, 0, null, ApprovalStatus::APPROVED, [], 'test');
+        $transaction = (App()->make(CreatesTransaction::class))->execute($transaction, $transaction_object);
+           
+        }
+        $amount = $amount - $totalamount;
+        Transaction::where('id', $topUp_transaction_id)->update(['amount'=> $amount]);  
+
+    }
+}

app/Classes/Modules/Transactions/Services/CreatesPaymentTransaction.php

@@ -22,6 +22,7 @@ class CreatesPaymentTransaction extends AbstractUpdateRelationshipRecord
         $model->receiver = $object->getReceiver();
         $model->recipient_bank_account_id = $object->getRecipientBankAccountId();
         $model->payment_method = $object->getPaymentMethod();
+        $model->payment_reference = $object->getPaymentReference();
         $model->amount = $object->getAmount();
         $model->original_amount = $object->getOriginalAmount();
         $model->currency_id = $object->getCurrencyId();

app/Classes/Modules/Transactions/Services/CreatesTransaction.php

@@ -15,7 +15,7 @@ class CreatesTransaction extends AbstractUpdateRelationshipRecord
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(PackingList $packing_list, TransactionObject $object) {
+    public function execute( $packing_list, TransactionObject $object) {
         $model = new Transaction();
         $model->bill_no = $object->getBillNo();
         $model->type = $object->getTransactionType();

app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\CreatesWallet;
+use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
+use App\Classes\Modules\Wallets\Standards\Rules\CanCreateCompanyWallet;
+use App\Http\Resources\WalletResource;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class CreateWalletLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Company Wallet',
+            'message' => 'You have successfully created a company wallet'
+        ];
+    }
+
+    /** @var CreatesWallet  */
+   private $createsWallet;
+
+   /** @var GeneratesWalletCode */
+   private $generatesWalletCode;
+
+   /** @var CanCreateCompanyWallet */
+   private $canCreateCompanyWallet;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CanCreateCompanyWallet $canCreateCompanyWallet
+     */
+    public function __construct(CreatesWallet $createsWallet, GeneratesWalletCode $generatesWalletCode, CanCreateCompanyWallet $canCreateCompanyWallet, FetchesCompany $fetchesCompany)
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->createsWallet = $createsWallet;
+        $this->generatesWalletCode = $generatesWalletCode;
+        $this->canCreateCompanyWallet = $canCreateCompanyWallet;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $object = new WalletObject($request->input('company_id'), $request->input('currency_id'), $this->generatesWalletCode->execute());
+
+        $this->canCreateCompanyWallet->passes($object);
+
+        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
+
+        $wallet = $this->createsWallet->execute($object, $company);
+
+        return $this->resourceResponse(new WalletResource($wallet));
+    }
+}

app/Classes/Modules/Wallets/ControllersLogic/CreateWalletTransactionLogic.php

@@ -0,0 +1,132 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\Standards\Rules\CanCreateWalletTransaction;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletTransactionObject;
+use App\Classes\Modules\Wallets\Services\CreatesWalletTransaction;
+use App\Classes\Modules\Wallets\Services\GeneratesWalletTransactionBillNo;
+use App\Http\Resources\WalletTransactionResource;
+use App\Classes\Modules\Wallets\Services\FetchesWallet;
+
+use App\Classes\Modules\Currencies\Services\FetchesCurrency;
+use App\Classes\Modules\Currencies\Services\RateCalculatesCurrency;
+/*
+use App\Classes\Modules\Accounts\Standards\Rules\CanCreateUser;
+use App\Classes\Modules\Accounts\Services\CreatesUser;
+use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
+use App\Http\Resources\UserResource;
+
+use App\Classes\Modules\Companies\Standards\Rules\CanCreateCompany;
+use App\Classes\Modules\Companies\Services\CreatesCompany;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+
+use App\Classes\Modules\Contacts\Standards\Rules\CanCreateContact;
+use App\Classes\Modules\Contacts\Services\CreatesContact;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+
+use App\Classes\Modules\Companies\Standards\Rules\CanCreateCompanyEmployee;
+use App\Classes\Modules\Companies\Services\CreatesCompanyEmployee;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyEmployeeObject;
+
+use App\Classes\Modules\SegmentCompanies\Standards\Rules\CanCreateSegmentCompany;
+use App\Classes\Modules\SegmentCompanies\Services\CreatesSegmentCompany;
+use App\Classes\Modules\SegmentCompanies\DataTransferObjects\SegmentCompanyObject;
+*/
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class CreateWalletTransactionLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Wallet Transaction',
+            'message' => 'You have successfully created a wallet transaction'
+        ];
+    }
+
+    /** @var CreatesWalletTransaction  */
+   private $createsWalletTransaction;
+
+   /** @var GeneratesWalletTransactionBillNo */
+   private $generatesWalletTransactionBillNo;
+
+   /** @var CanCreateWalletTransaction */
+   private $canCreateWalletTransaction;
+   
+   private $fetchesCurrency;
+   
+   private $rateCalculatesCurrency;
+   
+   private $fetchesWallet;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWalletTransaction $createsWalletTransaction
+     * @param GeneratesWalletTransactionBillNo $generatesWalletTransactionBillNo
+     * @param CanCreateWalletTransaction $canCreateWalletTransaction
+     * @param FetchesCurrency $fetchesCurrency
+     * @param RateCalculatesCurrency $rateCalculatesCurrency
+     * @param FetchesWallet $fetchesWallet
+     */
+    public function __construct(
+            CreatesWalletTransaction $createsWalletTransaction, GeneratesWalletTransactionBillNo $generatesWalletTransactionBillNo, CanCreateWalletTransaction $canCreateWalletTransaction,
+            FetchesCurrency $fetchesCurrency,RateCalculatesCurrency $rateCalculatesCurrency, FetchesWallet $fetchesWallet
+        )
+    {
+        $this->createsWalletTransaction = $createsWalletTransaction;
+        $this->generatesWalletTransactionBillNo = $generatesWalletTransactionBillNo;
+        $this->canCreateWalletTransaction = $canCreateWalletTransaction;
+        $this->fetchesCurrency = $fetchesCurrency;
+        $this->rateCalculatesCurrency = $rateCalculatesCurrency;
+        $this->fetchesWallet = $fetchesWallet;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            DB::beginTransaction();
+            
+            $wallet =  $this->fetchesWallet->execute(['id' => $request->route('id')]);
+            $conversion_currency = $this->fetchesCurrency->execute(['id' => $request->input('currency_id')]);
+            $convertable_currency = $this->fetchesCurrency->execute(['id' => $wallet->currency_id]);//MYR
+            
+            $convert_amount = $this->rateCalculatesCurrency->execute($conversion_currency, $convertable_currency, $request->input('amount'));
+            $convert_rate = $this->rateCalculatesCurrency->execute_rate($conversion_currency, $convertable_currency);
+            
+
+            $object = new WalletTransactionObject(
+                $wallet->id, $this->generatesWalletTransactionBillNo->execute(),$request->input('trans_type'),
+                number_format( (float) $convert_amount, 5, '.', ''), $wallet->currency_id , number_format( (float) $request->input('amount'), 5, '.', ''),
+                $request->input('currency_id'),number_format( (float) $convert_rate, 5, '.', '')
+            );
+
+            $this->canCreateWalletTransaction->passes($object);
+
+            $wallet_transaction = $this->createsWalletTransaction->execute($object);
+
+            DB::commit();
+
+            return $this->resourceResponse(new WalletTransactionResource($wallet_transaction));
+
+        } catch (\Exception $exception) {
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+}

app/Classes/Modules/Wallets/ControllersLogic/CreditWalletLogic.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+use App\Http\Resources\WalletResource;
+use App\Classes\Modules\Wallets\Services\CreatesWallet;
+use App\Classes\Modules\Wallets\Services\UpdatesWallet;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
+
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Wallets\Processors\CreditWalletProcessor;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+
+class CreditWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Credit into Company Wallet',
+            'message' => 'You have successfully credit company wallet'
+        ];
+    }
+
+
+    /** @var FetchesCompany  */
+    private $fetchesCompany;
+
+    /** @var GeneratesWalletCode */
+    private $generatesWalletCode;
+
+    /** @var CreatesWallet  */
+    private $createsWallet;
+
+    /** @var GeneratesTransactionBillNumber  */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var UpdatesWallet */
+    private $updatesWallet;
+
+    /** @var CreditWalletProcessor */
+    private $creditWalletProcessor;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CreatesTransaction $createsTransaction
+     * @param UpdatesWallet $updatesWallet
+     * @param CreditWalletProcessor $creditWalletProcessor
+     */
+    public function __construct(
+        FetchesCompany $fetchesCompany,
+        GeneratesWalletCode $generatesWalletCode,
+        CreatesWallet $createsWallet,
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
+        CreatesTransaction $createsTransaction,
+        UpdatesWallet $updatesWallet,
+        CreditWalletProcessor $creditWalletProcessor
+    )
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->generatesWalletCode = $generatesWalletCode;
+        $this->createsWallet = $createsWallet;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsTransaction = $createsTransaction;
+        $this->updatesWallet = $updatesWallet;
+        $this->creditWalletProcessor = $creditWalletProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $amount = floatval(str_replace(',', '', $request->input('amount')));
+
+        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
+
+        $reference = $request->input('reference');
+
+        $type = $request->input('transaction_type');
+
+        $wallet = $this->creditWalletProcessor->execute($company, $type, $amount, $reference);
+
+        return $this->resourceResponse(new WalletResource($wallet));
+    }
+}

app/Classes/Modules/Wallets/ControllersLogic/DebitWalletLogic.php

@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Wallets\Services\UpdatesWallet;
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Http\Resources\WalletResource;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class DebitWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Debit into Company Wallet',
+            'message' => 'You have successfully debit company wallet'
+        ];
+    }
+
+
+    /** @var FetchesCompany  */
+    private $fetchesCompany;
+
+    /** @var GeneratesTransactionBillNumber  */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var UpdatesWallet */
+    private $updatesWallet;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CreatesTransaction $createsTransaction
+     * @param UpdatesWallet $updatesWallet
+     */
+    public function __construct(
+        FetchesCompany $fetchesCompany,
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
+        CreatesTransaction $createsTransaction,
+        UpdatesWallet $updatesWallet
+    )
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsTransaction = $createsTransaction;
+        $this->updatesWallet = $updatesWallet;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $amount = floatval(str_replace(',', '', $request->input('amount')));
+        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
+        $reference = $request->input('reference');
+
+        if (!$company->wallets()->first()) {
+            $object = new WalletObject($company->id, 1, $this->generatesWalletCode->execute());
+            $wallet = $this->createsWallet->execute($object, $company);
+        }
+
+        $wallet = $company->wallets()->first();
+
+        $billNumber = $this->generatesTransactionBillNumber->execute('DEBIT-NOTE-');
+        
+        $transaction_object = new TransactionObject(
+            $billNumber, 
+            TransactionType::DEBIT_NOTE, 
+            1, 
+            $wallet->company->id,
+            1, 
+            PaymentMethodType::CASH,
+            $amount, 
+            $amount, 
+            1,
+            1, 
+            1,
+            0, 
+            0, 
+            null, 
+            ApprovalStatus::APPROVED,
+            [],
+            $reference
+        );
+
+        $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
+        $updateWalletAmount = $wallet->amount - $transaction->amount;
+
+        $walletOject = new WalletObject($wallet->company->id, $wallet->currency_id, $wallet->code, $updateWalletAmount);
+
+        $wallet = $this->updatesWallet->execute($wallet, $walletOject);
+
+        return $this->resourceResponse(new WalletResource($wallet));
+    }
+}

app/Classes/Modules/Wallets/ControllersLogic/ListWalletLogic.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\ListsWallet;
+use App\Classes\Modules\Wallets\Standards\Rules\CanListWallet;
+use App\Http\Resources\WalletResource;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class ListWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'List Company Wallet',
+            'message' => 'You have successfully list company wallet'
+        ];
+    }
+
+    /** @var ListWallet  */
+   private $listsWallet;
+
+   /** @var CanCreateCompanyWallet */
+   private $canListWallet;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CanCreateCompanyWallet $canCreateCompanyWallet
+     */
+    public function __construct(CanListWallet $canListWallet, ListsWallet $listsWallet)
+    {
+        $this->canListWallet = $canListWallet;
+        $this->listsWallet = $listsWallet;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        //$this->canListWallet->passes();
+
+        $query = $this->listsWallet->execute($this->listsWallet->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(WalletResource::collection($query));
+    }
+}

app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Wallets\Services\CreatesWallet;
+use App\Classes\Modules\Wallets\Services\CreatesWalletTransaction;
+use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Http\Resources\WalletResource;
+use App\Http\Resources\WalletTransactionResource;
+use App\Models\Wallet;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class TopUpWalletLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'TopUp into Company Wallet',
+            'message' => 'You have successfully created a topup request for company\'s wallet'
+        ];
+    }
+
+
+    /** @var FetchesCompany  */
+    private $fetchesCompany;
+
+    /** @var GeneratesWalletCode */
+    private $generatesWalletCode;
+
+    /** @var CreatesWallet  */
+    private $createsWallet;
+
+    /** @var GeneratesTransactionBillNumber  */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesBillplzBill */
+    private $createsBillplzBill;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+
+    /**
+     * TopUpWalletLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CreatesBillplzBill $createsBillplzBill
+     * @param CreatesTransaction $createsTransaction
+     */
+    public function __construct(FetchesCompany $fetchesCompany, GeneratesWalletCode $generatesWalletCode, CreatesWallet $createsWallet, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesBillplzBill $createsBillplzBill, CreatesTransaction $createsTransaction)
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->generatesWalletCode = $generatesWalletCode;
+        $this->createsWallet = $createsWallet;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsBillplzBill = $createsBillplzBill;
+        $this->createsTransaction = $createsTransaction;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $amount = floatval(str_replace(',', '', $request->input('amount')));
+        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
+
+        /** @var Wallet $wallet */
+        $wallet = $company->wallets()->first();
+
+        if (!$wallet) {
+            $object = new WalletObject($company->id, 1, $this->generatesWalletCode->execute());
+            /** @var Wallet $wallet */
+            $wallet = $this->createsWallet->execute($object, $company);
+        }
+
+        $user = $company->employees()->first();
+        $billNumber = $this->generatesTransactionBillNumber->execute('TOPUP-');
+
+        if($amount < 0) {
+            throw new MalformedRequestException('Top up credit value must be greater than zero.');
+        }
+
+        $billPlzBill = $this->createsBillplzBill->execute($company->name, $user->email, 'This payment is credit topup for company ref. ' . $company->reference, $amount, $billNumber, $request->input('bank_code'), true);
+
+        $transaction_object = new TransactionObject($billNumber, TransactionType::TOP_UP, 1, $company->id, 1, PaymentMethodType::PAYMENT_GATEWAY, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, [], $billPlzBill->id);
+
+        $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
+
+        return $this->resourceResponse(new WalletTransactionResource($transaction));
+    }
+}

app/Classes/Modules/Wallets/ControllersLogic/UpdateStatusWalletLogic.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\ListsWallet;
+use App\Classes\Modules\Wallets\Services\FetchesWallet;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+
+use App\Classes\Modules\Wallets\Standards\Rules\CanListWallet;
+use App\Http\Resources\WalletResource;
+use App\Classes\Modules\Transactions\Processors\UpdateWalletTransactionProcessor;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class UpdateStatusWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Status Transaction Company Wallet',
+            'message' => 'You have successfully status transaction company wallet'
+        ];
+    }
+
+    /** @var ListWallet  */
+   private $fetchesWallet;
+
+   /** @var CanCreateCompanyWallet */
+   private $canListWallet;
+
+    /** @var UpdateWalletTransactionProcessor */
+    private $updateWalletTransactionProcessor;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CanCreateCompanyWallet $canCreateCompanyWallet
+     */
+    public function __construct(FetchesWallet $fetchesWallet, UpdateWalletTransactionProcessor $updateWalletTransactionProcessor)
+    {
+        $this->fetchesWallet = $fetchesWallet;
+        $this->updateWalletTransactionProcessor = $updateWalletTransactionProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $status = ($request->route('status')=='approve') ? 2 : 4;
+
+        $wallet = $this->updateWalletTransactionProcessor->execute($request->route('transaction_id'), $status);
+
+        return $this->resourceResponse(new WalletResource($wallet));
+
+    }
+}

app/Classes/Modules/Wallets/ControllersLogic/WithdrawWalletLogic.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\ListsWallet;
+use App\Classes\Modules\Wallets\Services\FetchesWallet;
+use App\Classes\ValueObjects\Constants\TransactionType;
+
+use App\Classes\Modules\Wallets\Standards\Rules\CanWithdrawWallet;
+use App\Http\Resources\WalletResource;
+use App\Classes\Modules\Transactions\Processors\CreateWalletTransactionProcessor;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class WithdrawWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Withdraw from Company Wallet',
+            'message' => 'You have successfully withdraw company wallet'
+        ];
+    }
+
+    /** @var FetchesWallet  */
+   private $fetchesWallet;
+
+   /** @var CanWithdrawWallet */
+   private $canWithdrawWallet;
+
+    /** @var CreateWalletTransactionProcessor */
+    private $createWalletTransactionProcessor;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CanCreateCompanyWallet $canCreateCompanyWallet
+     */
+    public function __construct(CanWithdrawWallet $canWithdrawWallet, FetchesWallet $fetchesWallet, CreateWalletTransactionProcessor $createWalletTransactionProcessor)
+    {
+        $this->canWithdrawWallet = $canWithdrawWallet;
+        $this->fetchesWallet = $fetchesWallet;
+        $this->createWalletTransactionProcessor = $createWalletTransactionProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $wallet = $this->fetchesWallet->execute(['id' => $request->input('wallet_id')]);
+
+        $walletOject = new WalletObject( $wallet->company->id,  $wallet->currency_id,  $wallet->code, $request->input('amount'));
+
+        $this->canWithdrawWallet->passes($walletOject);
+
+        $transaction = $this->createWalletTransactionProcessor->execute($wallet, $walletOject, TransactionType::WITHDRAW);
+
+        return $this->resourceResponse(new WalletResource($wallet));
+    }
+}

app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class WalletObject implements DataTransferObject
+{
+
+    /** @var int */
+    private $company_id;
+
+    /** @var int */
+	private $currency_id;
+
+	/** @var int */
+	private $code;
+
+    private $amount;
+
+    /**
+     * WalletObject constructor.
+     * @param int $company_id
+     * @param int $currency
+     * @param int $code
+     */
+    public function __construct(int $company_id, int $currency, int $code, float $amount=0)
+    {
+        $this->company_id = $company_id;
+        $this->currency_id = $currency;
+        $this->code = $code;
+        $this->amount = $amount;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCompanyId(): int
+    {
+        return $this->company_id;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCurrency(): int
+    {
+        return $this->currency_id;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCode(): int
+    {
+        return $this->code;
+    }
+
+    public function getAmount(): float
+    {
+        return $this->amount;
+    }
+
+
+}

app/Classes/Modules/Wallets/DataTransferObjects/WalletTransactionObject.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class WalletTransactionObject implements DataTransferObject
+{
+
+    private $wallet_id;
+
+    private $bill_no;
+    
+    private $trans_type;
+    
+    private $amount;
+    
+    private $currency_id;
+    
+    private $original_amount;
+    
+    private $original_currency_id;
+
+    private $currency_rate;
+    
+    public function __construct(
+        int $wallet_id, int $bill_no,int $trans_type,
+        float $amount, int $currency_id, int $original_amount,
+        int $original_currency_id, float $currency_rate
+    ){
+        $this->wallet_id = $wallet_id;
+        $this->bill_no = $bill_no;
+        $this->trans_type = $trans_type;
+        $this->amount= $amount;
+        $this->currency_id = $currency_id;
+        $this->original_amount = $original_amount;
+        $this->original_currency_id = $original_currency_id;
+        $this->currency_rate = $currency_rate;
+    }
+
+    /**
+     * @return int
+     */
+    public function getWalletId(): int
+    {
+        return $this->wallet_id;
+    }
+    
+    /**
+     * @return int
+     */
+    public function getBillNo(): int
+    {
+        return $this->bill_no;
+    }
+    
+    /**
+     * @return int
+     */
+    public function getTransType(): int
+    {
+        return $this->trans_type;
+    }
+    
+    
+    public function getAmount(): float
+    {
+        return $this->amount;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCurrency(): int
+    {
+        return $this->currency_id;
+    }
+    
+    
+    public function getOriginalAmount(): float
+    {
+        return $this->original_amount;
+    }
+    
+    public function getOriginalCurrency(): int
+    {
+        return $this->original_currency_id;
+    }
+    
+    public function getCurrencyRate(): float
+    {
+        return $this->currency_rate;
+    }
+}

app/Classes/Modules/Wallets/Processors/CreditWalletProcessor.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Processors;
+
+use App\Models\Wallet;
+use App\Models\Company;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\Modules\Wallets\Services\CreatesWallet;
+use App\Classes\Modules\Wallets\Services\UpdatesWallet;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+
+class CreditWalletProcessor
+{
+    /** @var GeneratesWalletCode */
+    private $generatesWalletCode;
+
+    /** @var CreatesWallet  */
+    private $createsWallet;
+
+    /** @var GeneratesTransactionBillNumber  */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var UpdatesWallet */
+    private $updatesWallet;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CreatesTransaction $createsTransaction
+     * @param UpdatesWallet $updatesWallet
+     */
+    public function __construct(
+        GeneratesWalletCode $generatesWalletCode,
+        CreatesWallet $createsWallet,
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
+        CreatesTransaction $createsTransaction,
+        UpdatesWallet $updatesWallet
+    )
+    {
+        $this->generatesWalletCode = $generatesWalletCode;
+        $this->createsWallet = $createsWallet;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsTransaction = $createsTransaction;
+        $this->updatesWallet = $updatesWallet;
+    }
+
+
+    /**
+     * @param Company $company
+     * @param int $transactionType
+     * @param float $amount
+     * @param string $reference
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Company $company, int $transactionType, float $amount, string $reference)
+    {
+        if (!$company->wallets()->first()) {
+            $object = new WalletObject($company->id, 1, $this->generatesWalletCode->execute());
+            $this->createsWallet->execute($object, $company);
+        }
+
+        /** @var Wallet $wallet */
+        $wallet = $company->wallets()->first();
+
+        $billNumber = $this->generatesTransactionBillNumber->execute($transactionType === 2 ? 'DEBIT-NOTE-' : 'CREDIT-NOTE-');
+        
+        $transaction_object = new TransactionObject($billNumber, $transactionType === 2 ? TransactionType::DEBIT_NOTE : TransactionType::CREDIT_NOTE, 1,  $wallet->owner->id,  1, PaymentMethodType::CASH,  $amount,  $amount,  1,  1,  1,  0,  0,  null,  ApprovalStatus::APPROVED,  [], $reference);
+        $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
+        
+        $updateWalletAmount = $transactionType === 2 ? ($wallet->amount - $transaction->amount) : ($wallet->amount + $transaction->amount);
+
+        $walletObject = new WalletObject($wallet->owner->id, $wallet->currency_id, $wallet->code, $updateWalletAmount);
+
+        $wallet = $this->updatesWallet->execute($wallet, $walletObject);
+
+        return $wallet;
+    }
+}

app/Classes/Modules/Wallets/Services/ChecksIfWalletCodeExists.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+
+use App\Models\Wallet;
+
+class ChecksIfWalletCodeExists
+{
+
+    /** @var wallet */
+    private $repository;
+
+
+    /**
+     * ChecksIfWalletCodeExists constructor.
+     * @param Wallet $repository
+     */
+    public function __construct(wallet $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    public function execute(int $code): bool {
+        return $this->repository->where('code', $code)->exists();
+    }
+
+}

app/Classes/Modules/Wallets/Services/ChecksIfWalletTransactionBillNoExists.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+
+use App\Models\WalletTransaction;
+
+class ChecksIfWalletTransactionBillNoExists
+{
+
+    private $repository;
+
+    public function __construct(WalletTransaction $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    public function execute(int $bill_no): bool {
+        return $this->repository->where('bill_no', $bill_no)->exists();
+    }
+
+}

app/Classes/Modules/Wallets/Services/CreatesWallet.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Models\Wallet;
+use App\Models\Company;
+
+class CreatesWallet extends AbstractUpdateRelationshipRecord
+{
+    /**
+     * @param WalletObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(WalletObject $object, Company $company) {
+        $model = new Wallet();
+        //$model->company_id = $object->getCompanyId();
+        $model->code = $object->getCode();
+        $model->currency_id = $object->getCurrency();
+
+        return $this->handler($company->wallets(), $model);
+    }
+}

app/Classes/Modules/Wallets/Services/CreatesWalletTransaction.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletTransactionObject;
+use App\Models\WalletTransaction;
+
+class CreatesWalletTransaction extends AbstractUpdateRecord
+{
+    /**
+     * @param WalletTransactionObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(WalletTransactionObject $object) {
+        $model = new WalletTransaction();
+        $model->wallet_id = $object->getWalletId();
+        $model->bill_no = $object->getBillNo();
+        $model->trans_type = $object->getTransType();
+        $model->amount = $object->getAmount();
+        $model->currency_id = $object->getCurrency();
+        $model->original_amount = $object->getOriginalAmount();
+        $model->original_currency_id = $object->getOriginalCurrency();
+        $model->currency_rate = $object->getCurrencyRate();
+
+        return $this->handler($model);
+
+    }
+}

app/Classes/Modules/Wallets/Services/FetchesWallet.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Wallet;
+
+class FetchesWallet extends AbstractFetchRecord
+{
+
+    /** @var Wallet */
+    private $repository;
+
+
+    /**
+     * FetchesWallet constructor.
+     * @param Wallet $repository
+     */
+    public function __construct(Wallet $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}

app/Classes/Modules/Wallets/Services/GeneratesWalletCode.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+
+class GeneratesWalletCode
+{
+
+    /** @var ChecksIfWalletCodeExists */
+    private $walletCodeExists;
+
+    /**
+     * GeneratesWalletCode constructor.
+     * @param ChecksIfWalletCodeExists $walletCodeExists
+     */
+    public function __construct(ChecksIfWalletCodeExists $walletCodeExists)
+    {
+        $this->walletCodeExists = $walletCodeExists;
+    }
+
+
+    /**
+     * @return int
+     */
+    public function execute(): int {
+
+        $code = mt_rand(100000001, 999999999);
+        return !$this->walletCodeExists->execute($code) ? $code : self::execute();
+
+    }
+
+}

app/Classes/Modules/Wallets/Services/GeneratesWalletTransactionBillNo.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+
+class GeneratesWalletTransactionBillNo
+{
+
+    
+    private $walletTransationBillNoExists;
+
+   
+    public function __construct(ChecksIfWalletTransactionBillNoExists $walletTransationBillNoExists)
+    {
+        $this->walletTransationBillNoExists = $walletTransationBillNoExists;
+    }
+
+
+   
+    public function execute(): int {
+
+        $code = mt_rand(100000001, 999999999);
+        return !$this->walletTransationBillNoExists->execute($code) ? $code : self::execute();
+
+    }
+
+}

app/Classes/Modules/Wallets/Services/ListsWallet.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+use Illuminate\Database\Eloquent\Builder;
+use App\Classes\General\Eloquent\AbstractListRecord;
+use App\Models\Wallet;
+
+class ListsWallet extends AbstractListRecord
+{
+    /** @var Booking */
+    private $repository;
+
+    /**
+     * ListsBookings constructor.
+     * @param Booking $repository
+     */
+    public function __construct(Wallet $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}

app/Classes/Modules/Wallets/Services/UpdatesWallet.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Models\Wallet;
+use App\Models\Company;
+
+class UpdatesWallet extends AbstractUpdateRecord
+{
+    /**
+     * @param WalletObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Wallet $model, WalletObject  $object) {
+        $model->amount = $object->getAmount();
+        $model->code = $object->getCode();
+        $model->currency_id = $object->getCurrency();
+
+
+        return $this->handler($model);
+
+    }
+}

app/Classes/Modules/Wallets/Services/UpdatesWalletBalance.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Models\Wallet;
+use App\Models\Company;
+
+class UpdatesWalletBalance extends AbstractUpdateRecord
+{
+    /**
+     * @param Wallet $model
+     * @param $amount
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Wallet $model, $amount) {
+
+        $model->amount = $model->amount + $amount;
+        return $this->handler($model);
+
+    }
+}

app/Classes/Modules/Wallets/Standards/Rules/CanCreateCompanyWallet.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Standards\Validators\CompanyWalletValidation;
+
+class CanCreateCompanyWallet extends AbstractRule
+{
+
+    /** @var CompanyWalletValidation */
+    private $companyWalletValidation;
+
+    /**
+     * CanCreateCompanyWallet constructor.
+     * @param CompanyWalletValidation $companyWalletValidation
+     */
+    public function __construct(CompanyWalletValidation $companyWalletValidation)
+    {
+        $this->companyWalletValidation = $companyWalletValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param WalletObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->companyWalletValidation->validate($object);
+    }
+
+
+    /**
+     * @param WalletObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}

app/Classes/Modules/Wallets/Standards/Rules/CanCreateWalletTransaction.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletTransactionObject;
+use App\Classes\Modules\Wallets\Standards\Validators\WalletTransactionValidation;
+
+class CanCreateWalletTransaction extends AbstractRule
+{
+
+    /** @var WalletTransactionValidation */
+    private $walletTransactionValidation;
+
+  
+    public function __construct(WalletTransactionValidation $walletTransactionValidation)
+    {
+        $this->walletTransactionValidation = $walletTransactionValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param WalletTransactionObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->walletTransactionValidation->validate($object);
+    }
+
+    /**
+     * @param WalletTransactionObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}

app/Classes/Modules/Wallets/Standards/Rules/CanListWallet.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Standards\Validators\ListWalletValidation;
+
+class CanListWallet extends AbstractRule
+{
+
+    /** @var ListWalletValidation */
+    private $listWalletValidation;
+
+
+    public function __construct(ListWalletValidation $listWalletValidation)
+    {
+        $this->listWalletValidation = $listWalletValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param WalletObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->listWalletValidation->validate($object);
+    }
+
+    /**
+     * @param WalletTransactionObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}

app/Classes/Modules/Wallets/Standards/Rules/CanTopUpWallet.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Standards\Validators\TopUpWalletValidation;
+
+class CanTopUpWallet extends AbstractRule
+{
+
+    /** @var TopUpWalletValidation */
+    private $topUpWalletValidation;
+
+
+    public function __construct(TopUpWalletValidation $topUpWalletValidation)
+    {
+        $this->topUpWalletValidation = $topUpWalletValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param WalletObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->topUpWalletValidation->validate($object);
+    }
+
+    /**
+     * @param WalletTransactionObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}

app/Classes/Modules/Wallets/Standards/Rules/CanWithdrawWallet.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Standards\Validators\WithdrawWalletValidation;
+
+class CanWithdrawWallet extends AbstractRule
+{
+
+    /** @var WithdrawWalletValidation */
+    private $witdrawWalletValidation;
+
+
+    public function __construct(WithdrawWalletValidation $witdrawWalletValidation)
+    {
+        $this->witdrawWalletValidation = $witdrawWalletValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param WalletObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->witdrawWalletValidation->validate($object);
+    }
+
+    /**
+     * @param WalletTransactionObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}

app/Classes/Modules/Wallets/Standards/Validators/CompanyWalletValidation.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+
+class CompanyWalletValidation extends AbstractValidation
+{
+    /**
+     * @param WalletObject $object
+     * @return array
+     */
+    protected function data($object): array 
+    {
+        return [
+            'company_id' => $object->getCompanyId(),
+            'currency_id' => $object->getCurrency(),
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array 
+    {
+        return [
+            'company_id' => 'required',
+            'currency_id' => 'required',
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array 
+    {
+        return [];
+    }
+}

app/Classes/Modules/Wallets/Standards/Validators/ListWalletValidation.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+
+class ListWalletValidation extends AbstractValidation
+{
+
+    protected function data($object): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array
+    {
+        return [];
+    }
+}

app/Classes/Modules/Wallets/Standards/Validators/TopUpWalletValidation.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+
+class TopUpWalletValidation extends AbstractValidation
+{
+
+    protected function data($object): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array
+    {
+        return [];
+    }
+}

app/Classes/Modules/Wallets/Standards/Validators/WalletTransactionValidation.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+
+class WalletTransactionValidation extends AbstractValidation
+{
+    
+    protected function data($object): array 
+    {
+        return [
+            'wallet_id' => $object->getWalletId(),
+            'currency_id' => $object->getCurrency(),
+            'amount' => $object->getAmount(),
+            'trans_type'=>$object->getTransType()
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array 
+    {
+        return [
+            'wallet_id' => 'required',
+            'currency_id' => 'required',
+            'amount' => 'required',
+            'trans_type'=>'required'
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array 
+    {
+        return [];
+    }
+}

app/Classes/Modules/Wallets/Standards/Validators/WithdrawWalletValidation.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+
+class WithdrawWalletValidation extends AbstractValidation
+{
+
+    protected function data($object): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array
+    {
+        return [];
+    }
+}

app/Classes/Notifications/AbstractEmail.php

@@ -2,14 +2,17 @@
 
 namespace App\Classes\Notifications;
 
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Notification;
 
-class AbstractEmail extends Notification
+class AbstractEmail extends Notification implements ShouldQueue
 {
+    use Queueable;
 
     public function via()
     {
         return 'mail';
     }
 
-}
+}

app/Classes/Notifications/InvoiceIssuedEmail.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Classes\Notifications;
+
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\PackingList;
+use App\Models\PasswordReset;
+use App\Models\User;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Storage;
+
+class InvoiceIssuedEmail extends AbstractEmail
+{
+
+    /** @var User */
+    private $user;
+
+    /** @var PackingList */
+    private $packingList;
+
+    /**
+     * @param User $user
+     * @param PackingList $packingList
+     */
+    public function __construct(User $user, PackingList $packingList)
+    {
+        $this->user = $user;
+        $this->packingList = $packingList;
+    }
+
+
+    public function toMail()
+    {
+        $invoice = $this->packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::APPROVED)->first();
+        $invoiceDocument = $invoice->documents()->first()->files;
+
+
+        return (new MailMessage)
+            ->subject('Att: '.$this->user->name.' - Invoice for order no.'. $this->packingList->owner->reference)
+            ->attach(Storage::disk('documents')->get($invoiceDocument->file->file_info->original->file), [
+                'as' => 'name.pdf',
+                'mime' => 'application/pdf',
+            ])->view('emails.shipment.invoice', ['user' => $this->user, 'packingList' => $this->packingList]);
+    }
+
+
+}

app/Classes/Notifications/ShipmentDepartureEmail.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Classes\Notifications;
+
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\PackingList;
+use App\Models\PasswordReset;
+use App\Models\User;
+use Illuminate\Notifications\Messages\MailMessage;
+
+class ShipmentDepartureEmail extends AbstractEmail
+{
+
+    /** @var User */
+    private $user;
+
+    /** @var PackingList */
+    private $packingList;
+
+    /**
+     * @param User $user
+     * @param PackingList $packingList
+     */
+    public function __construct(User $user, PackingList $packingList)
+    {
+        $this->user = $user;
+        $this->packingList = $packingList;
+    }
+
+
+
+    public function toMail()
+    {
+        $invoice = $this->packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::APPROVED)->first();
+
+        if(!$invoice) return false;
+
+        $invoiceDocument = $invoice->documents()->first()->files;
+
+
+        return (new MailMessage)
+            ->subject('Your packages are on the way to malaysia - Invoice pending payment for order no.'. $this->packingList->owner->reference)
+            ->attach(Storage::disk('documents')->get($invoiceDocument->file->file_info->original->file), [
+                'as' => 'name.pdf',
+                'mime' => 'application/pdf',
+            ])->bcc(['email_test@cief-malaysia.com'])->view('emails.shipment.ETD', ['user' => $this->user, 'packingList' => $this->packingList]);
+    }
+
+
+}

app/Classes/Notifications/ShipmentRescheduleEmail.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Classes\Notifications;
+
+
+use App\Models\PackingList;
+use App\Models\PasswordReset;
+use App\Models\User;
+use Illuminate\Notifications\Messages\MailMessage;
+
+class ShipmentRescheduleEmail extends AbstractEmail
+{
+
+    /** @var User */
+    private $user;
+
+    /** @var PackingList */
+    private $packingList;
+
+    /**
+     * @param User $user
+     * @param PackingList $packingList
+     */
+    public function __construct(User $user, PackingList $packingList)
+    {
+        $this->user = $user;
+        $this->packingList = $packingList;
+    }
+
+
+    public function toMail()
+    {
+        return (new MailMessage)
+            ->subject('Update on your recent shipment(s)')
+            ->bcc(['email_test@cief-malaysia.com'])->view('emails.shipment.reschedule', ['user' => $this->user, 'packingList' => $this->packingList]);
+    }
+
+
+}

app/Classes/Notifications/UserVerificationEmail.php

@@ -32,7 +32,7 @@ class UserVerificationEmail extends AbstractEmail
     {
         return (new MailMessage)
             ->subject('Email Verification')
-            ->view('emails.accounts.user_verification', ['user' => $this->user, 'attempt' => $this->attempt]);
+            ->bcc(['email_test@cief-malaysia.com'])->view('emails.accounts.user_verification', ['user' => $this->user, 'attempt' => $this->attempt]);
     }
 
 

app/Classes/ValueObjects/Constants/FileType.php

@@ -14,12 +14,16 @@ class FileType
 
     public const PDF = 'application/pdf';
 
+    public const EXCEL = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+
     public const EXTENSION = [
         'image/gif' => 'gif',
         'image/png' => 'png',
         'image/jpeg' => 'jpeg',
         'application/pdf' => 'pdf',
         'application/octet-stream' => 'pdf',
+        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'excel',
+        'application/vnd.ms-excel' => 'excel',
     ];
 
-}
+}

app/Classes/ValueObjects/Constants/TransactionDetailType.php

@@ -8,5 +8,7 @@ final class TransactionDetailType {
 
     public const OVER_WEIGHT_CHARGES = 'Overweight Charges';
 
+    public const MIN_CBM_CHARGES = 'Minimum Charge for 0.3 CBM Per Container';
+
     public const CUSTOM_CHARGES = 'Custom charges';
 }

app/Classes/ValueObjects/Constants/TransactionType.php

@@ -17,7 +17,7 @@ final class TransactionType {
 
     // public const PERFORMA = 4;
 
-    // public const TOP_UP = 5;
+    public const TOP_UP = 3;
 
     // public const REFUND = 6;
 

app/Classes/ValueObjects/Constants/WarehouseReferences.php

@@ -43,11 +43,11 @@ final class WarehouseReferences {
 
     public const YD_DESTINATION_WAREHOUSE = self::YD_KLANG;
 
-    public const YD_EXEMPT_LIST = [230, 294, 320, 652, 1248, 1726, 2349, 2574, 652];
+    public const YD_EXEMPT_LIST = [230, 294, 320, 1248, 1726, 2349, 2574];
 
     public const MIN_CBM_EXEMPT_LIST = [230, 294, 320, 652, 1248, 1726, 2349, 2574];
 
-    public const REPLICA_WHITE_LIST = [502];
+    public const REPLICA_WHITE_LIST = [502, 2237];
 
     //2376 qce
 

app/Console/Commands/SendContainerDepartureEmailCommand.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Classes\Notifications\InvoiceIssuedEmail;
+use App\Classes\Notifications\ShipmentDepartureEmail;
+use App\Http\Helpers\General;
+use App\Models\Order;
+use Carbon\Carbon;
+
+use App\Models\Container;
+use Illuminate\Console\Command;
+
+class SendContainerDepartureEmailCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+
+    protected $signature = 'command:sendContainerDepartureEmailCommand';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $containers = Container::whereHas('transports', function ($transport){
+           return $transport->whereDate('dispatch_date', '=', Carbon::today());
+        })->get();
+
+        foreach ($containers as $container){
+            foreach ($container->packingLists as $packingList){
+                if(!($packingList->owner instanceof Order)) continue;
+                $user = $packingList->owner->companyModule->employees()->first();
+                if(app()->environment(['production'])) {
+                    $user->notify(new ShipmentDepartureEmail($user, $packingList));
+                }
+            }
+        }
+
+
+    }
+}

app/Console/Kernel.php

@@ -38,6 +38,11 @@ class Kernel extends ConsoleKernel
             ->withoutOverlapping()
             ->appendOutputTo (storage_path().'/logs/curlyd.log');
 
+        $schedule->command('command:curlYdOrderListCommand')
+            ->cron('0 9 * * *')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/departure_email.log');
+
 
     }
 

app/Http/Controllers/Exports/ExportArrivedParcelController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Exports;
 
 use App\Classes\Modules\Exports\Services\ExportsArrivedParcel;
+use App\Classes\Modules\Exports\Services\ExportsParcel;
 use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -26,4 +27,11 @@ class ExportArrivedParcelController
         ob_end_clean();
         return $response;
     }
+
+    public function summary(Request $request) {
+        $exportsParcelsSummary = new ExportsParcel();
+        $response = $exportsParcelsSummary->download('parcel-summary.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
 }

app/Http/Controllers/Exports/ExportCustomersToExcelController.php

@@ -4,10 +4,12 @@ namespace App\Http\Controllers\Exports;
 
 
 use App\Classes\Modules\Exports\Services\ExportsCustomersOrderLatestDate;
+use App\Classes\Modules\Exports\Services\ExportsPaymentTransactions;
 use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Maatwebsite\Excel\Excel;
+use App\Classes\Modules\Exports\Services\ExportsNullDebtors;
 
 class ExportCustomersToExcelController
 {
@@ -16,4 +18,17 @@ class ExportCustomersToExcelController
         $request->headers->set('Authorization', 'Bearer '.$token);
         return $exportsCustomers->download('customer-latest-order-date.csv', Excel::CSV, ['Content-Type' => 'text/csv']);
     }
+
+    public function nullDebtor(ExportsNullDebtors $exportsNullDebtors, Request $request){
+        $response = $exportsNullDebtors->download('nullDebtor.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+
+    public function paymentTransactions(Request $request){
+        $exportsTransactions = new ExportsPaymentTransactions($request);
+        $response = $exportsTransactions->download('payment-transactions.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
 }

app/Http/Controllers/Exports/ExportParcelPostcodesController.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers\Exports;
+
+use App\Classes\Modules\Exports\Services\ExportsParcelPostcodes;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Maatwebsite\Excel\Excel;
+
+class ExportParcelPostcodesController
+{
+    /**
+     * ExportArrivedParcelController constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $token = Auth::fromUser(User::find(1));
+        $request->headers->set('Authorization', 'Bearer '.$token);
+    }
+
+    public function export(Request $request) {
+        $exportsPendingArrangementDeliveryList = new ExportsParcelPostcodes($request);
+        $response = $exportsPendingArrangementDeliveryList->download('parcel-postcodes.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+}

app/Http/Controllers/Imports/ImportUpdateDebtorController.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers\Imports;
+
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Imports\Services\ImportsDebtor;
+use  App\Classes\General\ExcelHandel;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\User;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Str;
+use Maatwebsite\Excel\Facades\Excel;
+use Maatwebsite\Excel\Excel as ExcelFileTypes;
+
+class ImportUpdateDebtorController
+{
+    /**
+     * @param Request $request
+     * @return array
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function import(Request $request) {
+        $object = new DocumentObject('', $request->input('files'), '', ApprovalStatus::APPROVED, 'imports');
+        Excel::import(new ImportsDebtor(), 'documents/'.json_decode($object->getFiles()[0])->file_info->original->file);
+        return [];
+    }
+}

app/Http/Controllers/Invoice/MultipleInvoiceOnePaymentController.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Http\Controllers\Invoice;
+
+use App\Http\Controllers\Controller;
+use App\Classes\Modules\Transactions\ControllersLogic\multipleInvoicesWithOnePaymentLogic;
+use Illuminate\Http\JsonResponse;
+
+use Illuminate\Http\Request;
+use App\Models\Transaction;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
+use App\Classes\Modules\Wallets\Services\CreatesWallet;
+use APP\models\PackingList;
+use App\Models\multipleInvoicesWithOnePayment;
+use DB;
+
+
+class MultipleInvoiceOnePaymentController extends Controller
+{
+  
+    public function getallivoiceid1($transactionsArray,  multipleInvoicesWithOnePaymentLogic $logic): JsonResponse {
+       
+        return  $logic->logic($transactionsArray);
+    }
+    
+    public function getallivoiceid( $transactionsArray)
+    {
+
+        
+        // dd(json_decode($transactionsArray));
+        $transactions = Transaction::whereIn('id', json_decode($transactionsArray))->where('type', TransactionType::SHIPPING_INVOICE)->get();
+        $total = $transactions->sum('amount');
+        $packingList =$transactions[1]->owner;
+        $order = $packingList->owner;
+        $companyModule = $order->companyModule;
+        $company = $companyModule->company;
+        $wallet = $company->wallets()->first();
+        
+        if (!$wallet) {
+            $object = new WalletObject($company->id, 1, $this->generatesWalletCode->execute());
+            /** @var Wallet $wallet */
+            $wallet = $this->createsWallet->execute($object, $company);
+        }
+
+        $billNumber = (App()->make(GeneratesTransactionBillNumber::class))->execute('TOPUP-');
+
+        if($total < 0) {
+            throw new MalformedRequestException('Top up credit value must be greater than zero.');
+        }
+        $billPlzBill = (App()->make(CreatesBillplzBill::class))->execute($company->name, 'example@gmail.com', 'This payment is credit topup for company ref. ' . $company->reference, $total, $billNumber, 'bank code', true);
+
+        $transaction_object = new TransactionObject($billNumber, TransactionType::TOP_UP, 1, $company->id, 1, PaymentMethodType::PAYMENT_GATEWAY, $total, $total, 1, 1, 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, [], 'test');
+        
+        // $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
+        
+        $transaction = (App()->make(CreatesTransaction::class))->execute($wallet, $transaction_object);
+        $result= (App()->make(UpdatesWalletBalance::class))->execute($wallet, $total);
+
+      foreach ($transactions as $key => $value) {
+        multipleInvoicesWithOnePayment::create([ 'topUp_request_id' => $transaction->id, 'transaction_id' => $value->id  ]);
+        
+      }
+        dd($transaction->id);
+    }
+
+
+}

app/Http/Controllers/Orders/OrderFromExcelController.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Controllers\Orders;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Imports\Services\Importorder;
+use Maatwebsite\Excel\Facades\Excel;
+
+class OrderFromExcelController extends Controller
+{
+    public function importView(){
+
+        return view('importFile');
+    }
+    
+
+    public function import(Request $request){
+        Excel::import(new Importorder,
+                      $request->file('file')->store('files'));
+
+                     
+        return redirect()->back();
+    }
+}

app/Http/Controllers/Segments/UpdateSegmentPriceController.php

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

app/Http/Controllers/Transactions/UpdateTransactionStatusController.php

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