diff --git a/.env.example b/.env.example
index 5ac21009..b26bfbf8 100644
--- a/.env.example
+++ b/.env.example
@@ -45,4 +45,7 @@ PUSHER_APP_CLUSTER=mt1
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
-JWT_SECRET=
\ No newline at end of file
+FILESYSTEM_DRIVER="documents"
+
+JWT_SECRET=
+JWT_TTL=1440
\ No newline at end of file
diff --git a/app/Classes/Exceptions/ErrorException.php b/app/Classes/Exceptions/ErrorException.php
index 34cfdbb5..a1a71069 100644
--- a/app/Classes/Exceptions/ErrorException.php
+++ b/app/Classes/Exceptions/ErrorException.php
@@ -3,7 +3,6 @@
 namespace App\Classes\Exceptions;
 
 use Exception;
-use Illuminate\Support\Facades\Log;
 
 
 class ErrorException extends Exception {
diff --git a/app/Classes/General/Abstracts/AbstractControllerLogic.php b/app/Classes/General/Abstracts/AbstractControllerLogic.php
index c07da1ce..2fdd0dab 100644
--- a/app/Classes/General/Abstracts/AbstractControllerLogic.php
+++ b/app/Classes/General/Abstracts/AbstractControllerLogic.php
@@ -3,16 +3,19 @@
 namespace App\Classes\General\Abstracts;
 
 
+use App\Classes\Exceptions\ErrorException;
+use App\Classes\Exceptions\InternalServerErrorException;
 use App\Classes\ValueObjects\Constants\Notifications;
 use App\Classes\ValueObjects\Constants\HttpStatus;
 use App\Classes\ValueObjects\Response\ApiResponseObject;
-use ErrorException;
+use ErrorException as GeneralExceptions;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceCollection;
+use Illuminate\Support\Facades\DB;
 
-abstract class AbstractControllersLogic
+abstract class AbstractControllerLogic
 {
 
     /**
@@ -49,10 +52,17 @@ abstract class AbstractControllersLogic
 
         try {
 
-            return $this->logic($request);
+            DB::beginTransaction();
 
-        } catch (ErrorException $exception){
-            return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(), $exception->getCode()))->handler();
+            $response = $this->logic($request);
+
+            DB::commit();
+
+            return $response;
+
+        } catch (ErrorException|GeneralExceptions $exception){
+            return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(),
+                $exception->getCode() ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
 
         }
     }
diff --git a/app/Classes/General/Abstracts/AbstractRule.php b/app/Classes/General/Abstracts/AbstractRule.php
index a4506ba2..d2e0568b 100644
--- a/app/Classes/General/Abstracts/AbstractRule.php
+++ b/app/Classes/General/Abstracts/AbstractRule.php
@@ -5,7 +5,7 @@ namespace App\Classes\General\Abstracts;
 
 use App\Classes\Exceptions\AccessForbiddenException;
 use App\Classes\Exceptions\RequestValidationException;
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
 
 abstract class AbstractRule
 {
diff --git a/app/Classes/General/Abstracts/AbstractService.php b/app/Classes/General/Abstracts/AbstractService.php
index 03a2e8cc..7c7b6ddb 100644
--- a/app/Classes/General/Abstracts/AbstractService.php
+++ b/app/Classes/General/Abstracts/AbstractService.php
@@ -3,7 +3,7 @@
 namespace App\Classes\General\Abstracts;
 
 use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\QueryException;
 
@@ -16,7 +16,7 @@ abstract class AbstractService
      * @return mixed
      * @throws MalformedRequestException
      */
-    public function execute(Model $model, DataTransferObject $object){
+    public function execute(Model $model){
 
         try{
 
diff --git a/app/Classes/General/Abstracts/AbstractValidation.php b/app/Classes/General/Abstracts/AbstractValidation.php
index 27f51272..fae27298 100644
--- a/app/Classes/General/Abstracts/AbstractValidation.php
+++ b/app/Classes/General/Abstracts/AbstractValidation.php
@@ -4,7 +4,7 @@ namespace App\Classes\General\Abstracts;
 
 
 use App\Classes\Exceptions\RequestValidationException;
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
 use Illuminate\Support\Facades\Validator;
 
 abstract class AbstractValidation
@@ -31,6 +31,7 @@ abstract class AbstractValidation
 
     /**
      * @param DataTransferObject $object
+     * @param null|string $type
      * @return bool
      * @throws RequestValidationException
      */
diff --git a/app/Classes/General/DummyDataTransferObject.php b/app/Classes/General/DummyDataTransferObject.php
new file mode 100644
index 00000000..98f2a056
--- /dev/null
+++ b/app/Classes/General/DummyDataTransferObject.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Classes\General;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class DummyDataTransferObject implements DataTransferObject
+{
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/AbstractDeleteRecord.php b/app/Classes/General/Eloquent/AbstractDeleteRecord.php
index 76648842..963df421 100644
--- a/app/Classes/General/Eloquent/AbstractDeleteRecord.php
+++ b/app/Classes/General/Eloquent/AbstractDeleteRecord.php
@@ -22,7 +22,6 @@ abstract class AbstractDeleteRecord
             }
 
         } catch (QueryException|\Exception $exception){
-            dd($exception->getMessage());
             throw new MalformedRequestException('Unable to update the record due to unexpected error');
         }
     }
diff --git a/app/Classes/General/Eloquent/AbstractUpdateRecord.php b/app/Classes/General/Eloquent/AbstractUpdateRecord.php
index 63d22180..44129c92 100644
--- a/app/Classes/General/Eloquent/AbstractUpdateRecord.php
+++ b/app/Classes/General/Eloquent/AbstractUpdateRecord.php
@@ -18,13 +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);
-            // throw new MalformedRequestException('Unable to update the record due to unexpected error');
         }
     }
 
diff --git a/app/Classes/General/Eloquent/AbstractUpdateRelationshipRecord.php b/app/Classes/General/Eloquent/AbstractUpdateRelationshipRecord.php
new file mode 100644
index 00000000..00894f11
--- /dev/null
+++ b/app/Classes/General/Eloquent/AbstractUpdateRelationshipRecord.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\General\Eloquent;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasOneOrMany;
+use Illuminate\Database\QueryException;
+
+abstract class AbstractUpdateRelationshipRecord
+{
+
+
+    /**
+     * @param HasOneOrMany $relation
+     * @param Model $model
+     * @return Model
+     * @throws MalformedRequestException
+     */
+    public function handler(HasOneOrMany $relation, Model $model){
+        try{
+            if($relation->save($model)){
+                return $model;
+            }
+
+        } catch (QueryException $exception){
+            throw new MalformedRequestException($exception->getMessage());
+        }
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/ApplyFiltersToQuery.php b/app/Classes/General/Eloquent/ApplyFiltersToQuery.php
index 7531a2cf..afa2adb8 100644
--- a/app/Classes/General/Eloquent/ApplyFiltersToQuery.php
+++ b/app/Classes/General/Eloquent/ApplyFiltersToQuery.php
@@ -4,7 +4,6 @@ namespace App\Classes\General\Eloquent;
 
 
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 
 class ApplyFiltersToQuery
diff --git a/app/Classes/General/Eloquent/Filters/UserName.php b/app/Classes/General/Eloquent/Filters/BusinessType.php
similarity index 54%
rename from app/Classes/General/Eloquent/Filters/UserName.php
rename to app/Classes/General/Eloquent/Filters/BusinessType.php
index 6cf60e7f..a654c9ac 100644
--- a/app/Classes/General/Eloquent/Filters/UserName.php
+++ b/app/Classes/General/Eloquent/Filters/BusinessType.php
@@ -4,7 +4,7 @@ namespace App\Classes\General\Eloquent\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
 
-class UserName implements Filter
+class BusinessType implements Filter
 {
 
     /**
@@ -14,9 +14,7 @@ class UserName implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->where(function($query) use ($value) {
-            $query->where('first_name', 'LIKE', '%' . $value . '%')->orWhere('last_name', 'LIKE', '%' . $value . '%');
-        });
+        return $builder->where('business_type', $value);
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/CountryId.php b/app/Classes/General/Eloquent/Filters/CountryId.php
new file mode 100644
index 00000000..eb1a8b8e
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/CountryId.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class CountryId implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('country_id', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/CustomServiceType.php b/app/Classes/General/Eloquent/Filters/CustomServiceType.php
new file mode 100644
index 00000000..e894a5e0
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/CustomServiceType.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use Illuminate\Database\Eloquent\Builder;
+
+class CustomServiceType implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('reference', SegmentConstants::CUSTOM_SERVICE_TYPE)->where('detail->id', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/DocumentTypeIn.php b/app/Classes/General/Eloquent/Filters/DocumentTypeIn.php
new file mode 100644
index 00000000..c6382c10
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/DocumentTypeIn.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class DocumentTypeIn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereIn('document_type', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/Email.php b/app/Classes/General/Eloquent/Filters/Email.php
index c02c97f7..cc403255 100644
--- a/app/Classes/General/Eloquent/Filters/Email.php
+++ b/app/Classes/General/Eloquent/Filters/Email.php
@@ -14,7 +14,7 @@ class Email implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->where('email',  'LIKE', '%' . $value . '%');
+        return $builder->where('email',  '=', $value);
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/NotId.php b/app/Classes/General/Eloquent/Filters/IdNot.php
similarity index 91%
rename from app/Classes/General/Eloquent/Filters/NotId.php
rename to app/Classes/General/Eloquent/Filters/IdNot.php
index ea73b39c..8ed35044 100644
--- a/app/Classes/General/Eloquent/Filters/NotId.php
+++ b/app/Classes/General/Eloquent/Filters/IdNot.php
@@ -4,7 +4,7 @@ namespace App\Classes\General\Eloquent\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
 
-class NotId implements Filter
+class IdNot implements Filter
 {
 
     /**
diff --git a/app/Classes/General/Eloquent/Filters/IdNotIn.php b/app/Classes/General/Eloquent/Filters/IdNotIn.php
new file mode 100644
index 00000000..12dd733d
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/IdNotIn.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class IdNotIn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereNotIn('id', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/Marking.php b/app/Classes/General/Eloquent/Filters/Marking.php
new file mode 100644
index 00000000..77a4dae2
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/Marking.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class Marking implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('marking', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/NotExpired.php b/app/Classes/General/Eloquent/Filters/NotExpired.php
new file mode 100644
index 00000000..c61a2fe8
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/NotExpired.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class NotExpired implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereDate('expires_on', '>=', Carbon::now());
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/OriginalCurrencyIdIn.php b/app/Classes/General/Eloquent/Filters/OriginalCurrencyIdIn.php
new file mode 100644
index 00000000..628a27fa
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/OriginalCurrencyIdIn.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class OriginalCurrencyIdIn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereIn('original_currency_id', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/Reference.php b/app/Classes/General/Eloquent/Filters/Reference.php
new file mode 100644
index 00000000..fe2cbf03
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/Reference.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class Reference implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('Reference', '=', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/ServiceId.php b/app/Classes/General/Eloquent/Filters/ServiceId.php
new file mode 100644
index 00000000..b5a55286
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/ServiceId.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class ServiceId implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('service_id', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/ServiceType.php b/app/Classes/General/Eloquent/Filters/ServiceType.php
new file mode 100644
index 00000000..d3d8a2f1
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/ServiceType.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use Illuminate\Database\Eloquent\Builder;
+
+class ServiceType implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('reference', SegmentConstants::SERVICE_TYPE)->where('detail->id', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/ShortCode.php b/app/Classes/General/Eloquent/Filters/ShortCode.php
new file mode 100644
index 00000000..a5030343
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/ShortCode.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class ShortCode implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('short_code', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/StatusIn.php b/app/Classes/General/Eloquent/Filters/StatusIn.php
new file mode 100644
index 00000000..cbfdfbd0
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/StatusIn.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class StatusIn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereIn('status', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/SupplierCurrencies.php b/app/Classes/General/Eloquent/Filters/SupplierCurrencies.php
new file mode 100644
index 00000000..1461dbae
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/SupplierCurrencies.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use Illuminate\Database\Eloquent\Builder;
+
+class SupplierCurrencies implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('reference', SegmentConstants::SUPPLIER_CURRENCIES)->where('detail->id', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/Type.php b/app/Classes/General/Eloquent/Filters/Type.php
new file mode 100644
index 00000000..60555260
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/Type.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class Type implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('type', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/WithBookings.php b/app/Classes/General/Eloquent/Filters/WithBookings.php
new file mode 100644
index 00000000..8728e119
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/WithBookings.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class WithBookings implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->with('bookings');
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/WithCompany.php b/app/Classes/General/Eloquent/Filters/WithCompany.php
new file mode 100644
index 00000000..7c19bd29
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/WithCompany.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class WithCompany implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->with('owner');
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/WithTransactions.php b/app/Classes/General/Eloquent/Filters/WithTransactions.php
new file mode 100644
index 00000000..15cbd88e
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/WithTransactions.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class WithTransactions implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->with('transactions');
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/DefaultType.php b/app/Classes/General/Eloquent/Filters/isDefault.php
similarity index 89%
rename from app/Classes/General/Eloquent/Filters/DefaultType.php
rename to app/Classes/General/Eloquent/Filters/isDefault.php
index c23ceaaf..da62e1f6 100644
--- a/app/Classes/General/Eloquent/Filters/DefaultType.php
+++ b/app/Classes/General/Eloquent/Filters/isDefault.php
@@ -4,7 +4,7 @@ namespace App\Classes\General\Eloquent\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
 
-class DefaultType implements Filter
+class isDefault implements Filter
 {
 
     /**
diff --git a/app/Classes/General/Helper.php b/app/Classes/General/Helper.php
new file mode 100644
index 00000000..cad68208
--- /dev/null
+++ b/app/Classes/General/Helper.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\General;
+
+
+use Illuminate\Support\Str;
+
+class Helper
+{
+
+    /**
+     * @param string $methodName
+     * @return string
+     */
+    static function getPropertyName(string $methodName){
+        return Str::snake(str_replace('get', '', $methodName));
+    }
+
+    /**
+     * @param string $className
+     * @return array
+     */
+    static function getClassMethodsArray(string $className){
+        return array_slice(get_class_methods($className), 1);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Interfaces/DataTransferObject.php b/app/Classes/General/Interfaces/DataTransferObject.php
similarity index 50%
rename from app/Classes/Interfaces/DataTransferObject.php
rename to app/Classes/General/Interfaces/DataTransferObject.php
index 43b44d7d..8373e1db 100644
--- a/app/Classes/Interfaces/DataTransferObject.php
+++ b/app/Classes/General/Interfaces/DataTransferObject.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Classes\Interfaces;
+namespace App\Classes\General\Interfaces;
 
 
 Interface DataTransferObject
diff --git a/app/Classes/General/Interfaces/Documentable.php b/app/Classes/General/Interfaces/Documentable.php
new file mode 100644
index 00000000..bc2baa71
--- /dev/null
+++ b/app/Classes/General/Interfaces/Documentable.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+interface Documentable
+{
+
+    public function documents(): morphMany;
+
+}
\ No newline at end of file
diff --git a/app/Classes/Jobs/EmailVerificationAttemptExpiration.php b/app/Classes/Jobs/EmailVerificationAttemptExpiration.php
new file mode 100644
index 00000000..e327a941
--- /dev/null
+++ b/app/Classes/Jobs/EmailVerificationAttemptExpiration.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Modules\Accounts\Services\ExpiresEmailVerificationAttempt;
+use App\Classes\Modules\Accounts\Services\ExpiresPasswordReset;
+use App\Models\PasswordReset;
+use App\Models\UserEmailVerification;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class EmailVerificationAttemptExpiration implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+
+    /** @var UserEmailVerification */
+    private $attempt;
+
+    /**
+     * EmailVerificationAttemptExpiration constructor.
+     * @param UserEmailVerification $attempt
+     */
+    public function __construct(UserEmailVerification $attempt)
+    {
+        $this->attempt = $attempt;
+    }
+
+
+    /**
+     * @throws MalformedRequestException
+     */
+    public function handle()
+    {
+        (new ExpiresEmailVerificationAttempt())->execute($this->attempt);
+
+    }
+}
diff --git a/app/Classes/Jobs/PasswordResetTokenExpiration.php b/app/Classes/Jobs/PasswordResetTokenExpiration.php
new file mode 100644
index 00000000..d5010964
--- /dev/null
+++ b/app/Classes/Jobs/PasswordResetTokenExpiration.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Modules\Accounts\Services\ExpiresPasswordReset;
+use App\Models\PasswordReset;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class PasswordResetTokenExpiration implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+
+    /** @var PasswordReset */
+    private $attempt;
+
+    /**
+     * PasswordResetTokenExpiration constructor.
+     * @param PasswordReset $attempt
+     */
+    public function __construct(PasswordReset $attempt)
+    {
+        $this->attempt = $attempt;
+    }
+
+
+    /**
+     * @throws MalformedRequestException
+     */
+    public function handle()
+    {
+        (new ExpiresPasswordReset())->execute($this->attempt);
+    }
+}
diff --git a/app/Classes/Jobs/SendResetPasswordEmail.php b/app/Classes/Jobs/SendResetPasswordEmail.php
new file mode 100644
index 00000000..1a8d2488
--- /dev/null
+++ b/app/Classes/Jobs/SendResetPasswordEmail.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Notifications\ResetPasswordEmail;
+use App\Models\PasswordReset;
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class SendResetPasswordEmail implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+
+    /** @var User */
+    private $user;
+
+    /** @var PasswordReset */
+    private $attempt;
+
+    /**
+     * SendResetPasswordEmail constructor.
+     * @param User $user
+     * @param PasswordReset $attempt
+     */
+    public function __construct(User $user, PasswordReset $attempt)
+    {
+        $this->user = $user;
+        $this->attempt = $attempt;
+    }
+
+
+    public function handle()
+    {
+        $this->user->notify(new ResetPasswordEmail($this->user, $this->attempt));
+
+    }
+}
diff --git a/app/Classes/Jobs/SendUserVerificationEmail.php b/app/Classes/Jobs/SendUserVerificationEmail.php
new file mode 100644
index 00000000..2bb54f47
--- /dev/null
+++ b/app/Classes/Jobs/SendUserVerificationEmail.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Notifications\UserVerificationEmail;
+use App\Models\User;
+use App\Models\UserEmailVerification;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class SendUserVerificationEmail implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+
+    /** @var User */
+    private $user;
+
+    /** @var UserEmailVerification */
+    private $attempt;
+
+    /**
+     * SendUserVerificationEmail constructor.
+     * @param User $user
+     * @param UserEmailVerification $attempt
+     */
+    public function __construct(User $user, UserEmailVerification $attempt)
+    {
+        $this->user = $user;
+        $this->attempt = $attempt;
+    }
+
+
+    public function handle()
+    {
+        $this->user->notify(new UserVerificationEmail($this->user, $this->attempt));
+    }
+}
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/AuthenticateUserLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/AuthenticateUserLogic.php
index 198ee6df..f3353622 100644
--- a/app/Classes/Modules/Accounts/ControllersLogic/AuthenticateUserLogic.php
+++ b/app/Classes/Modules/Accounts/ControllersLogic/AuthenticateUserLogic.php
@@ -2,17 +2,12 @@
 
 namespace App\Classes\Modules\Accounts\ControllersLogic;
 
-use App\Classes\Modules\Accounts\DataTransferObjects\AuthenticationCredentialsObject;
-use App\Classes\Modules\Accounts\Services\AuthenticatesUser;
-use App\Classes\Modules\Accounts\Services\AuthenticationRedirect;
-use App\Classes\Modules\Accounts\Standards\Rules\CanAuthenticateUser;
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-use App\Classes\ValueObjects\Constants\Notifications;
-use ErrorException;
+use App\Classes\Modules\Accounts\Processors\AuthenticationProcessor;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class AuthenticateUserLogic extends AbstractControllersLogic
+class AuthenticateUserLogic extends AbstractControllerLogic
 {
 
     protected function notification():array {
@@ -22,51 +17,30 @@ class AuthenticateUserLogic extends AbstractControllersLogic
         ];
     }
 
-    /** @var CanAuthenticateUser */
-    private $canAuthenticateUser;
+    /** @var AuthenticationProcessor */
+    private $authenticationProcessor;
 
-    /** @var AuthenticatesUser */
-    private $authenticatesUser;
-
-    /** @var AuthenticationRedirect */
-    private $authenticationRedirect;
 
     /**
      * AuthenticateUserLogic constructor.
-     * @param CanAuthenticateUser $canAuthenticateUser
-     * @param AuthenticatesUser $authenticatesUser
-     * @param AuthenticationRedirect $authenticationRedirect
+     * @param AuthenticationProcessor $authenticationProcessor
      */
-    public function __construct(CanAuthenticateUser $canAuthenticateUser, AuthenticatesUser $authenticatesUser, AuthenticationRedirect $authenticationRedirect)
+    public function __construct(AuthenticationProcessor $authenticationProcessor)
     {
-        $this->canAuthenticateUser = $canAuthenticateUser;
-        $this->authenticatesUser = $authenticatesUser;
-        $this->authenticationRedirect = $authenticationRedirect;
+        $this->authenticationProcessor = $authenticationProcessor;
     }
 
-
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
+     * @throws \App\Classes\Exceptions\InternalServerErrorException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     protected function logic(Request $request): JsonResponse {
 
-        try {
-            $object = new AuthenticationCredentialsObject($request->input('email'),
-                $request->input('password'), $request->input('remember_me'));
-
-            $this->canAuthenticateUser->passes($object);
-
-            $token = $this->authenticatesUser->execute($object);
-
-            return $this->response(['access_token' => $token, 'redirect_url' => $this->authenticationRedirect->url()]);
-
-        } catch (\Exception $exception){
-            dd($exception);
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
+        return $this->response($this->authenticationProcessor->execute($request));
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/CheckEmailLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/CheckEmailLogic.php
index 76cdc888..b73b150a 100644
--- a/app/Classes/Modules/Accounts/ControllersLogic/CheckEmailLogic.php
+++ b/app/Classes/Modules/Accounts/ControllersLogic/CheckEmailLogic.php
@@ -2,18 +2,13 @@
 
 namespace App\Classes\Modules\Accounts\ControllersLogic;
 
-use App\Classes\Modules\Accounts\DataTransferObjects\AuthenticationCredentialsObject;
-use App\Classes\Modules\Accounts\Services\AuthenticatesUser;
-use App\Classes\Modules\Accounts\Services\AuthenticationRedirect;
 use App\Classes\Modules\Accounts\Services\FetchesUser;
-use App\Classes\Modules\Accounts\Standards\Rules\CanAuthenticateUser;
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-use App\Classes\ValueObjects\Constants\Notifications;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class CheckEmailLogic extends AbstractControllersLogic
+class CheckEmailLogic extends AbstractControllerLogic
 {
 
     protected function notification():array {
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
new file mode 100644
index 00000000..b1fc4285
--- /dev/null
+++ b/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Accounts\Processors\AuthenticationProcessor;
+use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
+use App\Classes\Modules\Accounts\Processors\GenerateEmailVerificationAttemptProcessor;
+use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
+use App\Classes\Modules\Companies\Processors\AssignSegmentProcessor;
+use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Models\Company;
+use App\Models\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+
+class CreateCustomerLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created User',
+            'message' => 'You have successfully created a new User'
+        ];
+    }
+
+    /** @var CreateUserProcessor */
+    private $createUserProcessor;
+
+    /** @var CreateCompanyProcessor */
+    private $createCompanyProcessor;
+
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var AssignEmployeeProcessor */
+    private $assignEmployeeProcessor;
+
+    /** @var AssignSegmentProcessor */
+    private $assignSegmentProcessor;
+
+    /** @var AuthenticationProcessor */
+    private $authenticationProcessor;
+
+    /** @var GenerateEmailVerificationAttemptProcessor */
+    private $generateEmailVerificationAttemptProcessor;
+
+    /**
+     * CreateCustomerLogic constructor.
+     * @param CreateUserProcessor $createUserProcessor
+     * @param CreateCompanyProcessor $createCompanyProcessor
+     * @param CreateContactProcessor $createContactProcessor
+     * @param AssignEmployeeProcessor $assignEmployeeProcessor
+     * @param AssignSegmentProcessor $assignSegmentProcessor
+     * @param AuthenticationProcessor $authenticationProcessor
+     * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
+     */
+    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateContactProcessor $createContactProcessor, AssignEmployeeProcessor $assignEmployeeProcessor, AssignSegmentProcessor $assignSegmentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor)
+    {
+        $this->createUserProcessor = $createUserProcessor;
+        $this->createCompanyProcessor = $createCompanyProcessor;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
+        $this->assignSegmentProcessor = $assignSegmentProcessor;
+        $this->authenticationProcessor = $authenticationProcessor;
+        $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
+     * @throws \App\Classes\Exceptions\InternalServerErrorException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        /** @var User $user */
+        $user = $this->createUserProcessor->execute($request, RoleTypes::USER, App::environment(['local', 'staging']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
+
+        /** @var Company $company */
+        $company = $this->createCompanyProcessor->execute($request, BusinessType::IMPORTER, $request->input('type'), ApprovalStatus::PENDING_SUBMISSION);
+
+        $this->createContactProcessor->execute($request, $company);
+
+        $Object = new EmploymentObject($company, $user);
+        $this->assignEmployeeProcessor->execute($Object);
+
+        $this->assignSegmentProcessor->execute($company);
+
+        $this->generateEmailVerificationAttemptProcessor->execute($user);
+
+        return $this->response($this->authenticationProcessor->execute($request));
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/CreateUserLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/CreateUserLogic.php
deleted file mode 100644
index 55b5152c..00000000
--- a/app/Classes/Modules/Accounts/ControllersLogic/CreateUserLogic.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-
-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\CompanyEmployees\Standards\Rules\CanCreateCompanyEmployee;
-use App\Classes\Modules\CompanyEmployees\Services\CreatesCompanyEmployee;
-use App\Classes\Modules\CompanyEmployees\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 CreateUserLogic extends AbstractControllersLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created User',
-            'message' => 'You have successfully created a new User'
-        ];
-    }
-
-    /** @var CanCreateUser */
-    private $canCreateUser;
-
-    /** @var CreatesUser */
-    private $createsUser;
-
-    /** @var CanCreateCompany */
-    private $canCreateCompany;
-
-    /** @var CreatesCompany */
-    private $createsCompany;
-
-    /** @var CanCreateContact */
-    private $canCreateContact;
-
-    /** @var CreatesContact */
-    private $createsContact;
-
-    /** @var CanCreateCompanyEmployee */
-    private $canCreateCompanyEmployee;
-
-    /** @var CreatesCompanyEmployee */
-    private $createsCompanyEmployee;
-
-    /** @var CanCreateSegmentCompany */
-    private $canCreateSegmentCompany;
-
-    /** @var CreatesSegmentCompany */
-    private $createsSegmentCompany;
-
-
-    /**
-     * CreateUserLogic constructor.
-     * @param CanCreateUser $canCreateUser
-     * @param CreatesUser $createsUser
-     * @param CanCreateCompany $canCreateCompany
-     * @param CreatesCompany $createsCompany
-     * @param CanCreateContact $canCreateContact
-     * @param CreatesContact $createsContact
-     * @param CanCreateCompanyEmployee $canCreateCompanyEmployee
-     * @param CreatesCompanyEmployee $createsCompanyEmployee
-     * @param CanCreateSegmentCompany $canCreateSegmentCompany
-     * @param CreatesSegmentCompany $createsSegmentCompany
-     */
-    public function __construct(
-        CanCreateUser $canCreateUser, 
-        CreatesUser $createsUser,
-        CanCreateCompany $canCreateCompany, 
-        CreatesCompany $createsCompany,
-        CanCreateContact $canCreateContact, 
-        CreatesContact $createsContact,
-        CanCreateCompanyEmployee $canCreateCompanyEmployee, 
-        CreatesCompanyEmployee $createsCompanyEmployee,
-        CanCreateSegmentCompany $canCreateSegmentCompany, 
-        CreatesSegmentCompany $createsSegmentCompany
-    )
-    {
-        $this->canCreateUser = $canCreateUser;
-        $this->createsUser = $createsUser;
-        $this->canCreateCompany = $canCreateCompany;
-        $this->createsCompany = $createsCompany;
-        $this->canCreateContact = $canCreateContact;
-        $this->createsContact = $createsContact;
-        $this->canCreateCompanyEmployee = $canCreateCompanyEmployee;
-        $this->createsCompanyEmployee = $createsCompanyEmployee;
-        $this->canCreateSegmentCompany = $canCreateSegmentCompany;
-        $this->createsSegmentCompany = $createsSegmentCompany;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            DB::beginTransaction();
-
-            $user_object = new UserObject(
-                $request->input('name'), 
-                $request->input('email'), 
-                $request->input('password'), 
-                $request->input('password_confirmation'), 
-                2,
-                9
-            );
-
-            $this->canCreateUser->passes($user_object);
-            $user_query = $this->createsUser->execute($user_object);
-
-            $company_object = new CompanyObject(
-                $request->input('company_name'), 
-                $request->input('company_reference'), 
-                null
-            );
-           
-            $this->canCreateCompany->passes($company_object);   
-            $company_query = $this->createsCompany->execute($company_object);
-
-            $contact_object = new ContactObject(
-                1, 
-                $company_query->id, 
-                $request->input('contact_reference'), 
-                $request->input('phone'),
-                $request->input('contact_email'),
-                $request->input('wechat_id')
-            );
-           
-            $this->canCreateContact->passes($contact_object);   
-            $contact_query = $this->createsContact->execute($contact_object);
-
-            $company_employee_object = new CompanyEmployeeObject(
-                $company_query->id, 
-                $user_query->id
-            );
-           
-            $this->canCreateCompanyEmployee->passes($company_employee_object);   
-            $company_employee_query = $this->createsCompanyEmployee->execute($user_query, $company_employee_object);
-
-
-            $segment_company_object = new SegmentCompanyObject(
-                1,
-                $company_query->id
-            );
-           
-            $this->canCreateSegmentCompany->passes($segment_company_object);   
-            $segment_company_query = $this->createsSegmentCompany->execute($company_query, $segment_company_object);
-
-            DB::commit();
-
-            return $this->resourceResponse(new UserResource($user_query));
-
-        } catch (\Exception $exception) {
-            dd($exception);
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/FetchUserLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/FetchUserLogic.php
new file mode 100644
index 00000000..eafd55a3
--- /dev/null
+++ b/app/Classes/Modules/Accounts/ControllersLogic/FetchUserLogic.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\Modules\Accounts\Services\FetchesUser;
+use App\Classes\Modules\Accounts\Standards\Rules\CanFetchUser;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Http\Resources\UserResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchUserLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Fetch Users',
+            'message' => 'You have successfully retrieved the user'
+        ];
+    }
+
+    /** @var CanFetchUser */
+    private $canFetchUser;
+
+    /** @var FetchesUser */
+    private $fetchessUser;
+
+    /**
+     * FetchUserLogic constructor.
+     * @param CanFetchUser $canFetchUser
+     * @param FetchesUser $fetchessUser
+     */
+    public function __construct(CanFetchUser $canFetchUser, FetchesUser $fetchessUser)
+    {
+        $this->canFetchUser = $canFetchUser;
+        $this->fetchessUser = $fetchessUser;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $this->canFetchUser->passes();
+
+            $query = $this->fetchessUser->execute(['id' => $request->input('user_id')]);
+
+            return $this->collectionResponse(UserResource::collection($query));
+
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/GeneratePasswordResetLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/GeneratePasswordResetLogic.php
new file mode 100644
index 00000000..36b560a6
--- /dev/null
+++ b/app/Classes/Modules/Accounts/ControllersLogic/GeneratePasswordResetLogic.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\Jobs\PasswordResetTokenExpiration;
+use App\Classes\Jobs\SendResetPasswordEmail;
+use App\Classes\Modules\Accounts\DataTransferObjects\GeneratePasswordResetObject;
+use App\Classes\Modules\Accounts\Services\FetchesUser;
+use App\Classes\Modules\Accounts\Services\GeneratesPasswordReset;
+use App\Classes\Modules\Accounts\Standards\Rules\CanGeneratePasswordReset;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\ValueObjects\Constants\Notifications;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class GeneratePasswordResetLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Reset Password',
+            'message' => 'You have successfully sent you an email to reset your password'
+        ];
+    }
+
+
+    /** @var CanGeneratePasswordReset */
+    private $canGeneratePasswordReset;
+
+    /** @var FetchesUser */
+    private $fetchesUser;
+
+    /** @var GeneratesPasswordReset */
+    private $generatesPasswordReset;
+
+    /** @var PasswordResetTokenExpiration */
+    private $passwordResetTokenExpiration;
+
+    /** @var SendResetPasswordEmail */
+    private $sendResetPasswordEmail;
+
+    /**
+     * GeneratePasswordResetLogic constructor.
+     * @param CanGeneratePasswordReset $canGeneratePasswordReset
+     * @param FetchesUser $fetchesUser
+     * @param GeneratesPasswordReset $generatesPasswordReset
+     * @param PasswordResetTokenExpiration $passwordResetTokenExpiration
+     * @param SendResetPasswordEmail $sendResetPasswordEmail
+     */
+    public function __construct(CanGeneratePasswordReset $canGeneratePasswordReset, FetchesUser $fetchesUser, GeneratesPasswordReset $generatesPasswordReset, PasswordResetTokenExpiration $passwordResetTokenExpiration, SendResetPasswordEmail $sendResetPasswordEmail)
+    {
+        $this->canGeneratePasswordReset = $canGeneratePasswordReset;
+        $this->fetchesUser = $fetchesUser;
+        $this->generatesPasswordReset = $generatesPasswordReset;
+        $this->passwordResetTokenExpiration = $passwordResetTokenExpiration;
+        $this->sendResetPasswordEmail = $sendResetPasswordEmail;
+    }
+
+
+    /**
+     * @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 {
+
+        $object = new GeneratePasswordResetObject($request->input('email'));
+
+        if($this->canGeneratePasswordReset->passes($object)) {
+            $user = $this->fetchesUser->execute(['email' => $object->getEmail()]);
+
+            $attempt = $this->generatesPasswordReset->execute($user);
+
+            $this->passwordResetTokenExpiration::dispatch($attempt)->delay(now()->addHours(24));
+            $this->sendResetPasswordEmail::dispatch($user, $attempt);
+
+            return $this->response(['email' => $object->getEmail()]);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/ListUsersLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/ListUsersLogic.php
index 8796765f..626876bc 100644
--- a/app/Classes/Modules/Accounts/ControllersLogic/ListUsersLogic.php
+++ b/app/Classes/Modules/Accounts/ControllersLogic/ListUsersLogic.php
@@ -4,13 +4,13 @@ namespace App\Classes\Modules\Accounts\ControllersLogic;
 
 use App\Classes\Modules\Accounts\Services\ListsUsers;
 use App\Classes\Modules\Accounts\Standards\Rules\CanListUsers;
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Http\Resources\UserResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class ListUsersLogic extends AbstractControllersLogic
+class ListUsersLogic extends AbstractControllerLogic
 {
 
     /**
@@ -24,19 +24,19 @@ class ListUsersLogic extends AbstractControllersLogic
     }
 
     /** @var CanListUsers */
-    private $canListUser;
+    private $canListUsers;
 
     /** @var ListsUsers */
     private $listsUsers;
 
     /**
-     * ListUsersControllersLogic constructor.
-     * @param CanListUsers $canListUser
+     * ListUsersLogic constructor.
+     * @param CanListUsers $canListUsers
      * @param ListsUsers $listsUsers
      */
-    public function __construct(CanListUsers $canListUser, ListsUsers $listsUsers)
+    public function __construct(CanListUsers $canListUsers, ListsUsers $listsUsers)
     {
-        $this->canListUser = $canListUser;
+        $this->canListUsers = $canListUsers;
         $this->listsUsers = $listsUsers;
     }
 
@@ -44,22 +44,17 @@ class ListUsersLogic extends AbstractControllersLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
+        $this->canListUsers->passes();
 
-            $this->canListUser->passes();
+        $query = $this->listsUsers->execute($this->listsUsers->deserializeFilters($request->input('filters')));
 
-            $query = $this->listsUsers->execute($this->listsUsers->deserializeFilters($request->input('filters')));
-
-            return $this->collectionResponse(UserResource::collection($query));
-
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->collectionResponse(UserResource::collection($query));
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/LogoutUserLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/LogoutUserLogic.php
new file mode 100644
index 00000000..fed6e182
--- /dev/null
+++ b/app/Classes/Modules/Accounts/ControllersLogic/LogoutUserLogic.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Accounts\Services\InvalidatesAuthenticationToken;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class LogoutUserLogic extends AbstractControllerLogic
+{
+
+    protected function notification():array {
+        return [
+            'title' => 'Logout',
+            'message' => 'You have successfully logged out of your account'
+        ];
+    }
+
+    /** @var InvalidatesAuthenticationToken */
+    private $invalidatesAuthenticationToken;
+
+    /**
+     * LogoutUserLogic constructor.
+     * @param InvalidatesAuthenticationToken $invalidatesAuthenticationToken
+     */
+    public function __construct(InvalidatesAuthenticationToken $invalidatesAuthenticationToken)
+    {
+        $this->invalidatesAuthenticationToken = $invalidatesAuthenticationToken;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    protected function logic(Request $request): JsonResponse {
+
+        $this->invalidatesAuthenticationToken->execute();
+
+        return $this->response();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/RefreshAuthenticationTokenLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/RefreshAuthenticationTokenLogic.php
new file mode 100644
index 00000000..9e4c5519
--- /dev/null
+++ b/app/Classes/Modules/Accounts/ControllersLogic/RefreshAuthenticationTokenLogic.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Accounts\Processors\RefreshAuthenticationTokenProcessor;
+use App\Models\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RefreshAuthenticationTokenLogic extends AbstractControllerLogic
+{
+
+    protected function notification():array {
+        return [
+            'title' => 'Refresh Authentication',
+            'message' => 'You have successfully your account authentication'
+        ];
+    }
+
+    /** @var RefreshAuthenticationTokenProcessor */
+    private $refreshAuthenticationTokenProcessor;
+
+    /**
+     * RefreshAuthenticationTokenLogic constructor.
+     * @param RefreshAuthenticationTokenProcessor $refreshAuthenticationTokenProcessor
+     */
+    public function __construct(RefreshAuthenticationTokenProcessor $refreshAuthenticationTokenProcessor)
+    {
+        $this->refreshAuthenticationTokenProcessor = $refreshAuthenticationTokenProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\InternalServerErrorException
+     */
+    protected function logic(Request $request): JsonResponse {
+
+        /** @var User $user */
+        $user = Auth()->user();
+
+        return $this->response($this->refreshAuthenticationTokenProcessor->execute($user));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/RegistrationStep2Logic.php b/app/Classes/Modules/Accounts/ControllersLogic/RegistrationStep2Logic.php
deleted file mode 100644
index 3bd510c7..00000000
--- a/app/Classes/Modules/Accounts/ControllersLogic/RegistrationStep2Logic.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\ControllersLogic;
-
-use App\Http\Resources\UserResource;
-
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-
-use App\Classes\Modules\Accounts\Services\FetchesUser;
-
-use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
-use App\Classes\Modules\Companies\Services\UpdatesCompany;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
-
-use App\Classes\Modules\Documents\Standards\Rules\CanCreateDocument;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-
-use App\Classes\Modules\Documents\Standards\Rules\CanCreateFile;
-use App\Classes\Modules\Documents\Services\CreatesFile;
-use App\Classes\Modules\Documents\Services\Convert64ToFile;
-use App\Classes\Modules\Documents\DataTransferObjects\FileObject;
-
-use App\Classes\ValueObjects\Constants\OwnerType;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\ObjectStatus;
-use App\Classes\ValueObjects\Constants\FileType;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class RegistrationStep2Logic extends AbstractControllersLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Registration Step 2',
-            'message' => 'You have completed registration step 2'
-        ];
-    }
-
-     /** @var FetchesUser */
-    private $fetchesUser;
-
-    /** @var CanUpdateCompany */
-    private $canUpdateCompany;
-
-    /** @var UpdatesCompany */
-    private $updatesCompany;
-
-    /** @var CanCreateDocument */
-    private $canCreateDocument;
-
-    /** @var CreatesDocument */
-    private $createsDocument;
-
-    /** @var CanCreateFile */
-    private $canCreateFIle;
-
-    /** @var CreatesFile */
-    private $createsFile;
-
-    /** @var Convert64ToFile */
-    private $convert64ToFile;
-
-
-    /**
-     * RegistrationStep2Logic constructor.
-     * @param FetchesUser $fetchesUser
-     * @param CanUpdateCompany $canUpdateCompany
-     * @param UpdatesCompany $updatesCompany
-     * @param CanCreateDocument $canCreateDocument
-     * @param CreatesDocument $createsDocument
-     * @param CanCreateFile $canCreateFile
-     * @param CreatesFile $createsFile
-     * @param Convert64ToFile $convert64ToFile
-     */
-    public function __construct(
-        FetchesUser $fetchesUser, 
-        CanUpdateCompany $canUpdateCompany, 
-        UpdatesCompany $updatesCompany,
-        CanCreateDocument $canCreateDocument, 
-        CreatesDocument $createsDocument,
-        CanCreateFile $canCreateFile, 
-        CreatesFile $createsFile,
-        Convert64ToFile $convert64ToFile
-    )
-    {
-        $this->fetchesUser = $fetchesUser;
-        $this->canUpdateCompany = $canUpdateCompany;
-        $this->updatesCompany = $updatesCompany;
-        $this->canCreateDocument = $canCreateDocument;
-        $this->createsDocument = $createsDocument;
-        $this->canCreateFile = $canCreateFile;
-        $this->createsFile = $createsFile;
-        $this->convert64ToFile = $convert64ToFile;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            DB::beginTransaction();
-
-            $user_query = $this->fetchesUser->execute(['id' => \Auth::user()->id]);
-            $company_query = $user_query->company()->first();
-
-            $company_object = new CompanyObject(
-                $request->input('company_name', $company_query->name),
-                $request->input('company_reference', $company_query->refence),
-                $request->input('type', $company_query->type)
-            );
-            $this->canUpdateCompany->passes($company_object);
-            $company_query = $this->updatesCompany->execute($company_query, $company_object);
-
-            $document_type = $company_query->type == 1 ? DocumentType::COMPANY_PUBLIC_SMS_REGISTER : DocumentType::COMPANY_PERSONAL_IC;
-            $document_object = new DocumentObject(
-                $user_query->id,
-                OwnerType::COMPANY,
-                $document_type,
-                $request->input('document_reference'),
-                ObjectStatus::PENDING,
-                null,
-                null,
-                null,
-                null
-            );
-            $this->canCreateDocument->passes($document_object);
-            $document_query = $this->createsDocument->execute($document_object);
-
-            $file = $this->convert64ToFile->convert($request->input('file'));
-            $file_type = $company_query->type == 1 ? FileType::COMPANY_PUBLIC_SMS_REGISTER : FileType::COMPANY_PERSONAL_IC;
-
-            $file_object = new FileObject(
-                $document_query->id,
-                !empty($file[0]) ? json_encode($file[0]) : null,
-                $file_type
-            );
-            $this->canCreateFile->passes($file_object);
-            $file_query = $this->createsFile->execute($file_object);
-
-            DB::commit();
-
-            return $this->resourceResponse(new UserResource(\Auth::user()));
-
-        } catch (\Exception $exception) {
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/ResendEmailVerificationLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/ResendEmailVerificationLogic.php
new file mode 100644
index 00000000..1723b370
--- /dev/null
+++ b/app/Classes/Modules/Accounts/ControllersLogic/ResendEmailVerificationLogic.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Accounts\Processors\GenerateEmailVerificationAttemptProcessor;
+use App\Classes\Modules\Accounts\Services\FetchesUser;
+use App\Models\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ResendEmailVerificationLogic extends AbstractControllerLogic
+{
+
+    public function notification(): array
+    {
+        return [
+            'title' => 'Resend Verification Email',
+            'message' => 'Successfully resent a new verification email'
+        ];
+    }
+
+    /** @var FetchesUser */
+    private $fetchesUser;
+
+    /** @var GenerateEmailVerificationAttemptProcessor */
+    private $generateEmailVerificationAttemptProcessor;
+
+    /**
+     * ResendEmailVerificationLogic constructor.
+     * @param FetchesUser $fetchesUser
+     * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
+     */
+    public function __construct(FetchesUser $fetchesUser, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor)
+    {
+        $this->fetchesUser = $fetchesUser;
+        $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
+    }
+
+    public function logic(Request $request) : JsonResponse {
+
+        /** @var User $user */
+        $user = $this->fetchesUser->execute(['id' => $request->input('user_id')]);
+
+        $this->generateEmailVerificationAttemptProcessor->execute($user);
+
+        return $this->response([]);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/ResetPasswordLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/ResetPasswordLogic.php
new file mode 100644
index 00000000..1058286c
--- /dev/null
+++ b/app/Classes/Modules/Accounts/ControllersLogic/ResetPasswordLogic.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\Modules\Accounts\DataTransferObjects\NewPasswordObject;
+use App\Classes\Modules\Accounts\DataTransferObjects\PasswordResetObject;
+use App\Classes\Modules\Accounts\Services\ChangesPassword;
+use App\Classes\Modules\Accounts\Services\CompletesPasswordReset;
+use App\Classes\Modules\Accounts\Services\FetchesPasswordReset;
+use App\Classes\Modules\Accounts\Standards\Rules\CanResetPassword;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Models\PasswordReset;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ResetPasswordLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Password Change',
+            'message' => 'You have successfully changed your account\'t password'
+        ];
+    }
+
+    /** @var CanResetPassword */
+    private $canResetPassword;
+
+    /** @var FetchesPasswordReset */
+    private $fetchesPasswordReset;
+
+    /** @var ChangesPassword */
+    private $changePassword;
+
+    /** @var CompletesPasswordReset */
+    private $completesPasswordResetToken;
+
+    /**
+     * ResetPasswordLogic constructor.
+     * @param CanResetPassword $canResetPassword
+     * @param FetchesPasswordReset $fetchesPasswordReset
+     * @param ChangesPassword $changePassword
+     * @param CompletesPasswordReset $completesPasswordResetToken
+     */
+    public function __construct(CanResetPassword $canResetPassword, FetchesPasswordReset $fetchesPasswordReset, ChangesPassword $changePassword, CompletesPasswordReset $completesPasswordResetToken)
+    {
+        $this->canResetPassword = $canResetPassword;
+        $this->fetchesPasswordReset = $fetchesPasswordReset;
+        $this->changePassword = $changePassword;
+        $this->completesPasswordResetToken = $completesPasswordResetToken;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\InternalServerErrorException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request): JsonResponse {
+
+        $object = new PasswordResetObject($request->input('token'),
+            new NewPasswordObject($request->input('password'), $request->input('confirmPassword')));
+
+        $this->canResetPassword->passes($object);
+
+        /** @var PasswordReset $passwordReset */
+        $passwordReset = $this->fetchesPasswordReset->execute(['token' => $object->getToken(), 'with_user']);
+        $this->changePassword->execute($passwordReset->user, $object->getNewPassword());
+        $this->completesPasswordResetToken->execute($passwordReset);
+
+        return $this->response();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/UpdateUserLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/UpdateUserLogic.php
deleted file mode 100644
index 368f34ce..00000000
--- a/app/Classes/Modules/Accounts/ControllersLogic/UpdateUserLogic.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\ControllersLogic;
-
-use App\Http\Resources\UserResource;
-
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-
-use App\Classes\Modules\Accounts\Services\FetchesUser;
-
-use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
-use App\Classes\Modules\Companies\Services\UpdatesCompany;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
-
-use App\Classes\Modules\Documents\Standards\Rules\CanCreateDocument;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-
-use App\Classes\Modules\Documents\Standards\Rules\CanCreateFile;
-use App\Classes\Modules\Documents\Services\CreatesFile;
-use App\Classes\Modules\Documents\Services\Convert64ToFile;
-use App\Classes\Modules\Documents\DataTransferObjects\FileObject;
-
-use App\Classes\ValueObjects\Constants\OwnerType;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\ObjectStatus;
-use App\Classes\ValueObjects\Constants\FileType;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class UpdateUserLogic extends AbstractControllersLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Update User',
-            'message' => 'You have successfully update a user'
-        ];
-    }
-
-     /** @var FetchesUser */
-    private $fetchesUser;
-
-    /** @var CanUpdateCompany */
-    private $canUpdateCompany;
-
-    /** @var UpdatesCompany */
-    private $updatesCompany;
-
-    /** @var CanCreateDocument */
-    private $canCreateDocument;
-
-    /** @var CreatesDocument */
-    private $createsDocument;
-
-    /** @var CanCreateFile */
-    private $canCreateFIle;
-
-    /** @var CreatesFile */
-    private $createsFile;
-
-    /** @var Convert64ToFile */
-    private $convert64ToFile;
-
-
-    /**
-     * UpdateUserLogic constructor.
-     * @param FetchesUser $fetchesUser
-     * @param CanUpdateCompany $canUpdateCompany
-     * @param UpdatesCompany $updatesCompany
-     * @param CanCreateDocument $canCreateDocument
-     * @param CreatesDocument $createsDocument
-     * @param CanCreateFile $canCreateFile
-     * @param CreatesFile $createsFile
-     * @param Convert64ToFile $convert64ToFile
-     */
-    public function __construct(
-        FetchesUser $fetchesUser, 
-        CanUpdateCompany $canUpdateCompany, 
-        UpdatesCompany $updatesCompany,
-        CanCreateDocument $canCreateDocument, 
-        CreatesDocument $createsDocument,
-        CanCreateFile $canCreateFile, 
-        CreatesFile $createsFile,
-        Convert64ToFile $convert64ToFile
-    )
-    {
-        $this->fetchesUser = $fetchesUser;
-        $this->canUpdateCompany = $canUpdateCompany;
-        $this->updatesCompany = $updatesCompany;
-        $this->canCreateDocument = $canCreateDocument;
-        $this->createsDocument = $createsDocument;
-        $this->canCreateFile = $canCreateFile;
-        $this->createsFile = $createsFile;
-        $this->convert64ToFile = $convert64ToFile;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            DB::beginTransaction();
-
-            $user_query = $this->fetchesUser->execute(['id' => \Auth::user()->id]);
-            $company_query = $user_query->company()->first();
-
-            $company_object = new CompanyObject(
-                $request->input('company_name', $company_query->name),
-                $request->input('company_reference', $company_query->refence),
-                $request->input('type', $company_query->type)
-            );
-            $this->canUpdateCompany->passes($company_object);
-            $company_query = $this->updatesCompany->execute($company_query, $company_object);
-
-            $document_type = $company_query->type == 1 ? DocumentType::COMPANY_PUBLIC_SMS_REGISTER : DocumentType::COMPANY_PERSONAL_IC;
-            $document_object = new DocumentObject(
-                $user_query->id,
-                OwnerType::COMPANY,
-                $document_type,
-                $request->input('document_reference'),
-                ObjectStatus::PENDING,
-                null,
-                null,
-                null,
-                null
-            );
-            $this->canCreateDocument->passes($document_object);
-            $document_query = $this->createsDocument->execute($document_object);
-
-            $file = $this->convert64ToFile->convert($request->input('file'));
-            $file_type = $company_query->type == 1 ? FileType::COMPANY_PUBLIC_SMS_REGISTER : FileType::COMPANY_PERSONAL_IC;
-
-            $file_object = new FileObject(
-                $document_query->id,
-                !empty($file[0]) ? json_encode($file[0]) : null,
-                $file_type
-            );
-            $this->canCreateFile->passes($file_object);
-            $file_query = $this->createsFile->execute($file_object);
-
-            DB::commit();
-
-            return $this->resourceResponse(new UserResource(\Auth::user()));
-
-        } catch (\Exception $exception) {
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/UserEmailVerificationLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/UserEmailVerificationLogic.php
new file mode 100644
index 00000000..bae6f5eb
--- /dev/null
+++ b/app/Classes/Modules/Accounts/ControllersLogic/UserEmailVerificationLogic.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Accounts\Services\CompletesEmailVerificationAttempt;
+use App\Classes\Modules\Accounts\Services\FetchesEmailVerificationAttempt;
+use App\Classes\Modules\Accounts\Services\VerifiesUser;
+use App\Classes\Modules\Accounts\Standards\Criteria\EmailVerificationActiveAttemptExists;
+use App\Models\UserEmailVerification;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UserEmailVerificationLogic extends AbstractControllerLogic
+{
+
+    public function notification(): array
+    {
+        return [
+            'title' => 'Email Verification',
+            'message' => 'You have successfully verified your email address'
+        ];
+    }
+
+    /** @var emailVerificationActiveAttemptExists */
+    private $emailVerificationActiveAttemptExists;
+
+    /** @var CompletesEmailVerificationAttempt */
+    private $completesEmailVerificationAttempt;
+
+    /** @var FetchesEmailVerificationAttempt */
+    private $fetchesEmailVerificationAttempt;
+
+    /** @var VerifiesUser */
+    private $verifiesUser;
+
+    /**
+     * UserEmailVerificationLogic constructor.
+     * @param EmailVerificationActiveAttemptExists $emailVerificationActiveAttemptExists
+     * @param CompletesEmailVerificationAttempt $completesEmailVerificationAttempt
+     * @param FetchesEmailVerificationAttempt $fetchesEmailVerificationAttempt
+     * @param VerifiesUser $verifiesUser
+     */
+    public function __construct(EmailVerificationActiveAttemptExists $emailVerificationActiveAttemptExists, CompletesEmailVerificationAttempt $completesEmailVerificationAttempt, FetchesEmailVerificationAttempt $fetchesEmailVerificationAttempt, VerifiesUser $verifiesUser)
+    {
+        $this->emailVerificationActiveAttemptExists = $emailVerificationActiveAttemptExists;
+        $this->completesEmailVerificationAttempt = $completesEmailVerificationAttempt;
+        $this->fetchesEmailVerificationAttempt = $fetchesEmailVerificationAttempt;
+        $this->verifiesUser = $verifiesUser;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws MalformedRequestException
+     * @throws ResourceNotFoundException
+     */
+    public function logic(Request $request) : JsonResponse {
+
+        $token = $request->input('token');
+
+        $this->emailVerificationActiveAttemptExists->execute($token);
+
+        /** @var UserEmailVerification $attempt */
+        $attempt = $this->fetchesEmailVerificationAttempt->execute(['token' => $token]);
+
+        $this->completesEmailVerificationAttempt->execute($attempt);
+
+        $this->verifiesUser->execute($attempt->user);
+
+        return $this->response([]);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/DataTransferObjects/AuthenticationCredentialsObject.php b/app/Classes/Modules/Accounts/DataTransferObjects/AuthenticationCredentialsObject.php
index 7db93777..528ea709 100644
--- a/app/Classes/Modules/Accounts/DataTransferObjects/AuthenticationCredentialsObject.php
+++ b/app/Classes/Modules/Accounts/DataTransferObjects/AuthenticationCredentialsObject.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Accounts\DataTransferObjects;
 
 
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
 
 class AuthenticationCredentialsObject implements DataTransferObject
 {
diff --git a/app/Classes/Modules/Accounts/DataTransferObjects/GeneratePasswordResetObject.php b/app/Classes/Modules/Accounts/DataTransferObjects/GeneratePasswordResetObject.php
new file mode 100644
index 00000000..0051577e
--- /dev/null
+++ b/app/Classes/Modules/Accounts/DataTransferObjects/GeneratePasswordResetObject.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\DataTransferObjects;
+
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class GeneratePasswordResetObject implements DataTransferObject
+{
+
+    /** @var string */
+    private $email;
+
+    /**
+     * GeneratePasswordResetObject constructor.
+     * @param string $email
+     */
+    public function __construct(string $email)
+    {
+        $this->email = $email;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEmail(): string
+    {
+        return $this->email;
+    }
+
+
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/DataTransferObjects/NewPasswordObject.php b/app/Classes/Modules/Accounts/DataTransferObjects/NewPasswordObject.php
new file mode 100644
index 00000000..cc3c83e1
--- /dev/null
+++ b/app/Classes/Modules/Accounts/DataTransferObjects/NewPasswordObject.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\DataTransferObjects;
+
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class NewPasswordObject implements DataTransferObject
+{
+
+    /** @var String */
+    private $password;
+
+    /** @var String */
+    private $ConfirmPassword;
+
+    /**
+     * NewPassword constructor.
+     * @param String $password
+     * @param String $ConfirmPassword
+     */
+    public function __construct(String $password, String $ConfirmPassword)
+    {
+        $this->password = $password;
+        $this->ConfirmPassword = $ConfirmPassword;
+    }
+
+    /**
+     * @return String
+     */
+    public function getPassword(): String
+    {
+        return $this->password;
+    }
+
+    /**
+     * @return String
+     */
+    public function getConfirmPassword(): String
+    {
+        return $this->ConfirmPassword;
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/DataTransferObjects/PasswordResetObject.php b/app/Classes/Modules/Accounts/DataTransferObjects/PasswordResetObject.php
new file mode 100644
index 00000000..93b6b559
--- /dev/null
+++ b/app/Classes/Modules/Accounts/DataTransferObjects/PasswordResetObject.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class PasswordResetObject implements DataTransferObject
+{
+    
+    /** @var String */
+    private $token;
+    
+    /** @var NewPasswordObject */
+    private $newPassword;
+
+    /**
+     * PasswordResetObject constructor.
+     * @param String $token
+     * @param NewPasswordObject $newPassword
+     */
+    public function __construct(String $token, NewPasswordObject $newPassword)
+    {
+        $this->token = $token;
+        $this->newPassword = $newPassword;
+    }
+
+    /**
+     * @return String
+     */
+    public function getToken(): String
+    {
+        return $this->token;
+    }
+
+    /**
+     * @return NewPasswordObject
+     */
+    public function getNewPassword(): NewPasswordObject
+    {
+        return $this->newPassword;
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/DataTransferObjects/RegistrationObject.php b/app/Classes/Modules/Accounts/DataTransferObjects/RegistrationObject.php
new file mode 100644
index 00000000..533979b0
--- /dev/null
+++ b/app/Classes/Modules/Accounts/DataTransferObjects/RegistrationObject.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+
+class RegistrationObject implements DataTransferObject
+{
+    /** @var string */
+    private $name;
+
+    /** @var string */
+    private $email;
+
+    /** @var string */
+    private $password;
+
+    /** @var string */
+    private $passwordConfirmation;
+
+    /** @var int|null */
+    private $type;
+
+    /** @var int|null */
+    private $status;
+
+    /**
+     * UserObject constructor.
+     * @param string $name
+     * @param string $email
+     * @param string $password
+     * @param string $passwordConfirmation
+     * @param int|null $type
+     * @param int|null $status
+     */
+    public function __construct(string $name, string $email, string $password, string $passwordConfirmation, ?int $type = RoleTypes::USER, ?int $status = ApprovalStatus::PENDING_VERIFICATION)
+    {
+        $this->name = $name;
+        $this->email = $email;
+        $this->password = $password;
+        $this->passwordConfirmation = $passwordConfirmation;
+        $this->type = $type;
+        $this->status = $status;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEmail(): string
+    {
+        return $this->email;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPassword(): string
+    {
+        return $this->password;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPasswordConfirmation(): string
+    {
+        return $this->passwordConfirmation;
+    }
+
+    /**
+     * @return int
+     */
+    public function getType(): int
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/DataTransferObjects/UserObject.php b/app/Classes/Modules/Accounts/DataTransferObjects/UserObject.php
deleted file mode 100644
index 36a6d40a..00000000
--- a/app/Classes/Modules/Accounts/DataTransferObjects/UserObject.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\DataTransferObjects;
-
-use App\Classes\Interfaces\DataTransferObject;
-
-class UserObject implements DataTransferObject
-{
-    /** @var string|null */
-    private $name;
-
-    /** @var string|null */
-    private $email;
-
-    /** @var string|null */
-    private $password;
-
-    /** @var string|null */
-    private $password_confirmation;
-
-    /** @var int */
-    private $type;
-
-    /** @var int */
-    private $status;
-
-    /**
-     * UserObject constructor.
-     * @param string|null $name
-     * @param string|null $email
-     * @param string|null $password
-     * @param string|null $password_confirmation
-     * @param int $type
-     * @param int $status
-     */
-    public function __construct(
-        ?string $name, 
-        ?string $email, 
-        ?string $password, 
-        ?string $password_confirmation, 
-        int $type, 
-        int $status
-    )
-    {
-        $this->name = $name;
-        $this->email = $email;
-        $this->password = $password;
-        $this->password_confirmation = $password_confirmation;
-        $this->type = $type;
-        $this->status = $status;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName(): ?string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEmail(): ?string
-    {
-        return $this->email;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPassword(): ?string
-    {
-        return $this->password;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPasswordConfirmation(): ?string
-    {
-        return $this->password_confirmation;
-    }
-
-    /**
-     * @return int
-     */
-    public function getType(): int
-    {
-        return $this->type;
-    }
-
-    /**
-     * @return int
-     */
-    public function getStatus(): int
-    {
-        return $this->status;
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Processors/AuthenticationProcessor.php b/app/Classes/Modules/Accounts/Processors/AuthenticationProcessor.php
new file mode 100644
index 00000000..7b55a39f
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Processors/AuthenticationProcessor.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Processors;
+
+use App\Classes\Modules\Accounts\DataTransferObjects\AuthenticationCredentialsObject;
+use App\Classes\Modules\Accounts\Services\AuthenticatesUser;
+use App\Classes\Modules\Accounts\Services\AuthenticationRedirect;
+use App\Classes\Modules\Accounts\Services\FetchesUser;
+use App\Classes\Modules\Accounts\Services\GeneratesAuthenticationToken;
+use App\Classes\Modules\Accounts\Standards\Rules\CanAuthenticateUser;
+use Illuminate\Http\Request;
+
+class AuthenticationProcessor
+{
+
+    /** @var CanAuthenticateUser */
+    private $canAuthenticateUser;
+
+    /** @var AuthenticatesUser */
+    private $authenticatesUser;
+
+    /** @var GeneratesAuthenticationToken */
+    private $generatesAuthenticationToken;
+
+    /** @var FetchesUser */
+    private $fetchesUser;
+
+    /** @var AuthenticationRedirect */
+    private $authenticationRedirect;
+
+    /**
+     * AuthenticationProcessor constructor.
+     * @param CanAuthenticateUser $canAuthenticateUser
+     * @param AuthenticatesUser $authenticatesUser
+     * @param GeneratesAuthenticationToken $generatesAuthenticationToken
+     * @param FetchesUser $fetchesUser
+     * @param AuthenticationRedirect $authenticationRedirect
+     */
+    public function __construct(CanAuthenticateUser $canAuthenticateUser, AuthenticatesUser $authenticatesUser, GeneratesAuthenticationToken $generatesAuthenticationToken, FetchesUser $fetchesUser, AuthenticationRedirect $authenticationRedirect)
+    {
+        $this->canAuthenticateUser = $canAuthenticateUser;
+        $this->authenticatesUser = $authenticatesUser;
+        $this->generatesAuthenticationToken = $generatesAuthenticationToken;
+        $this->fetchesUser = $fetchesUser;
+        $this->authenticationRedirect = $authenticationRedirect;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return array
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
+     * @throws \App\Classes\Exceptions\InternalServerErrorException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(Request $request): array {
+
+        $object = new AuthenticationCredentialsObject($request->input('email'), $request->input('password'));
+
+        $this->canAuthenticateUser->passes($object);
+
+        $this->authenticatesUser->execute($object);
+
+        $user = $this->fetchesUser->execute(['email' => $object->getEmail()]);
+
+        return ['access_token' => $this->generatesAuthenticationToken->execute($user), 'redirect_url' => $this->authenticationRedirect->url($user)];
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Processors/CreateUserProcessor.php b/app/Classes/Modules/Accounts/Processors/CreateUserProcessor.php
new file mode 100644
index 00000000..1b4d2b64
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Processors/CreateUserProcessor.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Processors;
+
+use App\Classes\Modules\Accounts\DataTransferObjects\RegistrationObject;
+use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
+use App\Classes\Modules\Accounts\Services\CreatesUser;
+use App\Classes\Modules\Accounts\Standards\Rules\CanRegisterUser;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Database\Eloquent\Model;
+
+class CreateUserProcessor
+{
+    /** @var CanRegisterUser */
+    private $canRegisterUser;
+
+    /** @var CreatesUser */
+    private $createsUser;
+
+    /**
+     * CreateUserProcessor constructor.
+     * @param CanRegisterUser $canRegisterUser
+     * @param CreatesUser $createsUser
+     */
+    public function __construct(CanRegisterUser $canRegisterUser, CreatesUser $createsUser)
+    {
+        $this->canRegisterUser = $canRegisterUser;
+        $this->createsUser = $createsUser;
+    }
+
+
+    /**
+     * @param Request $request
+     * @param $roleType
+     * @param $status
+     * @return Model
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(Request $request, $roleType, $status): Model {
+
+        $userObject = new RegistrationObject($request->input('name'), $request->input('email'),
+            $request->input('password'), $request->input('password_confirmation'),
+            $roleType, $status);
+
+        $this->canRegisterUser->passes($userObject);
+
+        /** @var User $user_query */
+        return $this->createsUser->execute($userObject);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Processors/GenerateEmailVerificationAttemptProcessor.php b/app/Classes/Modules/Accounts/Processors/GenerateEmailVerificationAttemptProcessor.php
new file mode 100644
index 00000000..23853f27
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Processors/GenerateEmailVerificationAttemptProcessor.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Processors;
+
+use App\Classes\Jobs\EmailVerificationAttemptExpiration;
+use App\Classes\Jobs\SendUserVerificationEmail;
+use App\Classes\Modules\Accounts\Services\GeneratesEmailVerificationAttempt;
+use App\Classes\Modules\Accounts\Services\InvalidatesActiveEmailVerificationAttempts;
+use App\Models\User;
+
+class GenerateEmailVerificationAttemptProcessor
+{
+
+    /** @var InvalidatesActiveEmailVerificationAttempts */
+    private $invalidatesActiveEmailVerificationAttempts;
+
+    /** @var GeneratesEmailVerificationAttempt */
+    private $generatesEmailVerificationAttempt;
+
+    /** @var EmailVerificationAttemptExpiration */
+    private $emailVerificationAttemptExpiration;
+
+    /** @var SendUserVerificationEmail */
+    private $sendUserVerificationEmail;
+
+    /**
+     * GenerateEmailVerificationAttemptProcessor constructor.
+     * @param InvalidatesActiveEmailVerificationAttempts $invalidatesActiveEmailVerificationAttempts
+     * @param GeneratesEmailVerificationAttempt $generatesEmailVerificationAttempt
+     * @param EmailVerificationAttemptExpiration $emailVerificationAttemptExpiration
+     * @param SendUserVerificationEmail $sendUserVerificationEmail
+     */
+    public function __construct(InvalidatesActiveEmailVerificationAttempts $invalidatesActiveEmailVerificationAttempts, GeneratesEmailVerificationAttempt $generatesEmailVerificationAttempt, EmailVerificationAttemptExpiration $emailVerificationAttemptExpiration, SendUserVerificationEmail $sendUserVerificationEmail)
+    {
+        $this->invalidatesActiveEmailVerificationAttempts = $invalidatesActiveEmailVerificationAttempts;
+        $this->generatesEmailVerificationAttempt = $generatesEmailVerificationAttempt;
+        $this->emailVerificationAttemptExpiration = $emailVerificationAttemptExpiration;
+        $this->sendUserVerificationEmail = $sendUserVerificationEmail;
+    }
+
+
+    /**
+     * @param User $user
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(User $user) {
+
+        $this->invalidatesActiveEmailVerificationAttempts->execute($user);
+
+        $attempt = $this->generatesEmailVerificationAttempt->execute($user);
+
+        $this->emailVerificationAttemptExpiration::dispatch($attempt)->delay(now()->addHours(48));
+
+        $this->sendUserVerificationEmail::dispatch($user, $attempt);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Processors/RefreshAuthenticationTokenProcessor.php b/app/Classes/Modules/Accounts/Processors/RefreshAuthenticationTokenProcessor.php
new file mode 100644
index 00000000..288fcb1c
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Processors/RefreshAuthenticationTokenProcessor.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Processors;
+
+use App\Classes\Modules\Accounts\Services\GeneratesAuthenticationToken;
+use App\Classes\Modules\Accounts\Services\InvalidatesAuthenticationToken;
+use App\Models\User;
+
+class RefreshAuthenticationTokenProcessor
+{
+
+    /** @var InvalidatesAuthenticationToken */
+    private $invalidatesAuthenticationToken;
+
+    /** @var GeneratesAuthenticationToken */
+    private $generatesAuthenticationToken;
+
+    /**
+     * RefreshAuthenticationTokenLogic constructor.
+     * @param InvalidatesAuthenticationToken $invalidatesAuthenticationToken
+     * @param GeneratesAuthenticationToken $generatesAuthenticationToken
+     */
+    public function __construct(InvalidatesAuthenticationToken $invalidatesAuthenticationToken, GeneratesAuthenticationToken $generatesAuthenticationToken)
+    {
+        $this->invalidatesAuthenticationToken = $invalidatesAuthenticationToken;
+        $this->generatesAuthenticationToken = $generatesAuthenticationToken;
+    }
+
+
+    /**
+     * @param User $user
+     * @return array
+     * @throws \App\Classes\Exceptions\InternalServerErrorException
+     */
+    public function execute(User $user): array {
+
+        $this->invalidatesAuthenticationToken->execute();
+
+        return ['refresh_token' => $this->generatesAuthenticationToken->execute($user)];
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Services/AuthenticatesUser.php b/app/Classes/Modules/Accounts/Services/AuthenticatesUser.php
index 40a89cce..3f4e69cd 100644
--- a/app/Classes/Modules/Accounts/Services/AuthenticatesUser.php
+++ b/app/Classes/Modules/Accounts/Services/AuthenticatesUser.php
@@ -5,8 +5,6 @@ namespace App\Classes\Modules\Accounts\Services;
 
 use App\Classes\Exceptions\AccessUnauthorisedException;
 use App\Classes\Modules\Accounts\DataTransferObjects\AuthenticationCredentialsObject;
-use Tymon\JWTAuth\Facades\JWTAuth;
-
 class AuthenticatesUser
 {
 
@@ -17,11 +15,12 @@ class AuthenticatesUser
      */
     public function execute(AuthenticationCredentialsObject $object){
 
-        if (! $token = JWTAuth::attempt(['email' => $object->getEmail(), 'password' => $object->getPassword()])) {
+        if (! auth()->validate(['email' => $object->getEmail(), 'password' => $object->getPassword()])) {
             throw new AccessUnauthorisedException('These credentials do not match our records.');
         }
 
-        return $token;
+        return true;
+
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Services/AuthenticationRedirect.php b/app/Classes/Modules/Accounts/Services/AuthenticationRedirect.php
index 5b7e964f..b359108d 100644
--- a/app/Classes/Modules/Accounts/Services/AuthenticationRedirect.php
+++ b/app/Classes/Modules/Accounts/Services/AuthenticationRedirect.php
@@ -2,18 +2,19 @@
 
 namespace App\Classes\Modules\Accounts\Services;
 
-use App\Classes\ValueObjects\Constants\Roles;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Models\User;
 
 class AuthenticationRedirect
 {
 
-    public function url(){
+    public function url(User $user){
 
-        if(\Auth::user()->hasRole('Shadow Admin') || \Auth::user()->hasRole('Ultimate Admin')){
-            return route('dashboard.forwarder');
+        if($user->type === RoleTypes::USER){
+            return route('dashboard');
         }
 
-        // return route('dashboard.importer', ['id' => Auth()->user()->employers->first()->company->id]);
+        return route('dashboard');
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Services/ChangesPassword.php b/app/Classes/Modules/Accounts/Services/ChangesPassword.php
new file mode 100644
index 00000000..f22334ca
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Services/ChangesPassword.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+
+use App\Classes\Exceptions\InternalServerErrorException;
+use App\Classes\Modules\Accounts\DataTransferObjects\NewPasswordObject;
+use App\Models\User;
+use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\Hash;
+
+class ChangesPassword
+{
+
+    /**
+     * @param User $user
+     * @param NewPasswordObject $object
+     * @return bool
+     * @throws InternalServerErrorException
+     */
+    public function execute(User $user, NewPasswordObject $object): bool {
+        try {
+
+            $user->password = Hash::make($object->getPassword());
+            return $user->save();
+
+        } catch (QueryException $exception){
+            throw new InternalServerErrorException($exception->getMessage());
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Services/CompletesEmailVerificationAttempt.php b/app/Classes/Modules/Accounts/Services/CompletesEmailVerificationAttempt.php
new file mode 100644
index 00000000..bba1705f
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Services/CompletesEmailVerificationAttempt.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\UserEmailVerification;
+use Illuminate\Database\Eloquent\Model;
+
+class CompletesEmailVerificationAttempt extends AbstractUpdateRecord
+{
+
+    /**
+     * @param UserEmailVerification $model
+     * @return Model
+     * @throws MalformedRequestException
+     */
+    public function execute(UserEmailVerification $model): Model {
+        $model->is_complete = true;
+        return $this->handler($model);
+    }
+
+}
diff --git a/app/Classes/Modules/Accounts/Services/CompletesPasswordReset.php b/app/Classes/Modules/Accounts/Services/CompletesPasswordReset.php
new file mode 100644
index 00000000..b733fe81
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Services/CompletesPasswordReset.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\PasswordReset;
+
+class CompletesPasswordReset extends AbstractUpdateRecord
+{
+
+
+    /**
+     * @param PasswordReset $model
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws MalformedRequestException
+     */
+    public function execute(PasswordReset $model){
+
+        $model->is_complete = true;
+        return $this->handler($model);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Services/CreatesUser.php b/app/Classes/Modules/Accounts/Services/CreatesUser.php
index c14ac186..2dba3898 100644
--- a/app/Classes/Modules/Accounts/Services/CreatesUser.php
+++ b/app/Classes/Modules/Accounts/Services/CreatesUser.php
@@ -3,17 +3,18 @@
 namespace App\Classes\Modules\Accounts\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Accounts\DataTransferObjects\RegistrationObject;
 use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
 use App\Models\User;
 
 class CreatesUser extends AbstractUpdateRecord
 {
     /**
-     * @param UserObject $object
+     * @param RegistrationObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(UserObject $object) {
+    public function execute(RegistrationObject $object) {
         $model = new User();
         $model->name = $object->getName();
         $model->email = $object->getEmail();
diff --git a/app/Classes/Modules/Accounts/Services/ExpiresEmailVerificationAttempt.php b/app/Classes/Modules/Accounts/Services/ExpiresEmailVerificationAttempt.php
new file mode 100644
index 00000000..ebce5271
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Services/ExpiresEmailVerificationAttempt.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\PasswordReset;
+use App\Models\UserEmailVerification;
+
+class ExpiresEmailVerificationAttempt extends AbstractUpdateRecord
+{
+
+
+    /**
+     * @param UserEmailVerification $model
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws MalformedRequestException
+     */
+    public function execute(UserEmailVerification $model){
+
+        $model->is_active = false;
+        return $this->handler($model);
+
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Services/ExpiresPasswordReset.php b/app/Classes/Modules/Accounts/Services/ExpiresPasswordReset.php
new file mode 100644
index 00000000..b8b27692
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Services/ExpiresPasswordReset.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\PasswordReset;
+
+class ExpiresPasswordReset extends AbstractUpdateRecord
+{
+
+
+    /**
+     * @param PasswordReset $model
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws MalformedRequestException
+     */
+    public function execute(PasswordReset $model){
+
+        $model->is_expired = true;
+        return $this->handler($model);
+
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Services/FetchesEmailVerificationAttempt.php b/app/Classes/Modules/Accounts/Services/FetchesEmailVerificationAttempt.php
new file mode 100644
index 00000000..ed835693
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Services/FetchesEmailVerificationAttempt.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use App\Models\PasswordReset;
+use App\Models\UserEmailVerification;
+use Illuminate\Database\Eloquent\Builder;
+
+class FetchesEmailVerificationAttempt extends AbstractFetchRecord
+{
+
+    /** @var UserEmailVerification */
+    private $repository;
+
+    /**
+     * FetchesResetPasswordToken constructor.
+     * @param UserEmailVerification $repository
+     */
+    public function __construct(UserEmailVerification $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Services/FetchesPasswordReset.php b/app/Classes/Modules/Accounts/Services/FetchesPasswordReset.php
new file mode 100644
index 00000000..2f0a18bc
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Services/FetchesPasswordReset.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use App\Models\PasswordReset;
+use Illuminate\Database\Eloquent\Builder;
+
+class FetchesPasswordReset extends AbstractFetchRecord
+{
+
+    /** @var PasswordReset */
+    private $repository;
+
+    /**
+     * FetchesResetPasswordToken constructor.
+     * @param PasswordReset $repository
+     */
+    public function __construct(PasswordReset $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Services/GeneratesAuthenticationToken.php b/app/Classes/Modules/Accounts/Services/GeneratesAuthenticationToken.php
new file mode 100644
index 00000000..72296b97
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Services/GeneratesAuthenticationToken.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+use App\Classes\Exceptions\InternalServerErrorException;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Models\Company;
+use App\Models\Role;
+use App\Models\User;
+use Carbon\Carbon;
+use Tymon\JWTAuth\JWT;
+
+class GeneratesAuthenticationToken {
+
+    /** @var JWT */
+    private $builder;
+
+
+    /**
+     * GeneratesAuthenticationToken constructor.
+     * @param JWT $builder
+     */
+    public function __construct(JWT $builder) {
+        $this->builder = $builder;
+    }
+
+
+    /**
+     * @param User $user
+     * @param bool $rememberUser
+     * @return string
+     */
+    public function execute(User $user, bool $rememberUser = false): string {
+
+        $this->builder->manager()->setBlacklistEnabled(false);
+
+        // generate token for the customer
+        $this->builder->factory()->setTTL(Carbon::now()->addDay()->timestamp);
+
+        if ($rememberUser === true) {
+            $this->builder->factory()->setTTL(Carbon::now()->addWeek()->timestamp);
+        }
+
+        // set the claim based on the object
+        $this->setTokenClaims($user);
+
+        return $this->builder->fromUser($user);
+    }
+
+
+    /**
+     * @param User $user
+     */
+    private function setTokenClaims(User $user): void {
+
+        /** @var Company $company */
+        $company = $user->company()->first();
+
+        $claims = [
+            'id' => $user->id,
+            'name' => $user->name,
+            'email' => $user->email,
+            'type' => $user->type,
+            'status' => $user->status
+        ];
+
+        if($user->type === RoleTypes::USER) {
+            $claims = array_merge($claims, [
+                'company_id' => $company->id
+            ]);
+        }
+
+        $this->builder->factory()->customClaims(['user' => $claims]);
+
+
+        $this->builder->factory()->buildClaimsCollection();
+
+    }
+}
diff --git a/app/Classes/Modules/Accounts/Services/GeneratesEmailVerificationAttempt.php b/app/Classes/Modules/Accounts/Services/GeneratesEmailVerificationAttempt.php
new file mode 100644
index 00000000..215bc7ac
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Services/GeneratesEmailVerificationAttempt.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Models\User;
+use App\Models\UserEmailVerification;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\QueryException;
+use Illuminate\Support\Str;
+
+class GeneratesEmailVerificationAttempt extends AbstractUpdateRelationshipRecord
+{
+
+    /**
+     * @param User $user
+     * @return Model
+     * @throws MalformedRequestException
+     */
+    public function execute(User $user): Model {
+        $model = new UserEmailVerification();
+        $model->token = Str::random(25);
+        $model->is_complete = false;
+        $model->is_active = true;
+        $model->is_sent = true;
+
+        return $this->handler($user->emailVerification(), $model);
+    }
+
+}
diff --git a/app/Classes/Modules/Accounts/Services/GeneratesPasswordReset.php b/app/Classes/Modules/Accounts/Services/GeneratesPasswordReset.php
new file mode 100644
index 00000000..d57bd66a
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Services/GeneratesPasswordReset.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Models\PasswordReset;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Str;
+
+class GeneratesPasswordReset extends AbstractUpdateRelationshipRecord
+{
+
+    /**
+     * @param User $user
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws MalformedRequestException
+     */
+    public function execute(User $user): Model {
+        $model = new PasswordReset();
+        $model->token = Str::random(60);
+        $model->is_expired = false;
+        $model->is_complete = false;
+
+        return $this->handler($user->passwordReset(), $model);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Services/InvalidatesActiveEmailVerificationAttempts.php b/app/Classes/Modules/Accounts/Services/InvalidatesActiveEmailVerificationAttempts.php
new file mode 100644
index 00000000..21605bb9
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Services/InvalidatesActiveEmailVerificationAttempts.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+
+use App\Models\User;
+
+class InvalidatesActiveEmailVerificationAttempts
+{
+
+    /**
+     * @param User $user
+     * @return void
+     */
+    public function execute(User $user) {
+        $user->emailVerification()->active()->update([
+            'is_active' => false
+        ]);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Services/InvalidatesAuthenticationToken.php b/app/Classes/Modules/Accounts/Services/InvalidatesAuthenticationToken.php
new file mode 100644
index 00000000..e243e5d4
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Services/InvalidatesAuthenticationToken.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+class InvalidatesAuthenticationToken
+{
+
+    /**
+     * @return false|string
+     */
+    public function execute(){
+        auth()->logout();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Services/VerifiesUser.php b/app/Classes/Modules/Accounts/Services/VerifiesUser.php
new file mode 100644
index 00000000..6d9e296c
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Services/VerifiesUser.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\User;
+use App\Models\UserEmailVerification;
+use Illuminate\Database\Eloquent\Model;
+
+class VerifiesUser extends AbstractUpdateRecord
+{
+
+    /**
+     * @param User $model
+     * @return Model
+     * @throws MalformedRequestException
+     */
+    public function execute(User $model): Model {
+
+        $model->status = ApprovalStatus::APPROVED;
+
+        return $this->handler($model);
+
+    }
+
+}
diff --git a/app/Classes/Modules/Accounts/Standards/Criteria/EmailVerificationActiveAttemptExists.php b/app/Classes/Modules/Accounts/Standards/Criteria/EmailVerificationActiveAttemptExists.php
new file mode 100644
index 00000000..5df54812
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Standards/Criteria/EmailVerificationActiveAttemptExists.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Standards\Criteria;
+
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Models\UserEmailVerification;
+
+class EmailVerificationActiveAttemptExists
+{
+
+    /** @var UserEmailVerification */
+    private $repository;
+
+    /**
+     * TokenExistsValidation constructor.
+     * @param UserEmailVerification $repository
+     */
+    public function __construct(UserEmailVerification $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @param string $token
+     * @return bool
+     * @throws ResourceNotFoundException
+     */
+    public function execute(string $token){
+
+        if(!$this->repository->active()->where('token', $token)->first()){
+            throw new ResourceNotFoundException('The email verification token has expired or doesn\'t exist');
+        }
+
+        return true;
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Standards/Criteria/PasswordResetTokenExists.php b/app/Classes/Modules/Accounts/Standards/Criteria/PasswordResetTokenExists.php
new file mode 100644
index 00000000..2ba48718
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Standards/Criteria/PasswordResetTokenExists.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Standards\Criteria;
+
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Models\PasswordReset;
+
+class PasswordResetTokenExists
+{
+
+    /** @var PasswordReset */
+    private $repository;
+
+    /**
+     * TokenExistsValidation constructor.
+     * @param PasswordReset $repository
+     */
+    public function __construct(PasswordReset $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @param string $token
+     * @return bool
+     * @throws ResourceNotFoundException
+     */
+    public function execute(string $token){
+
+        if(!$this->repository->active()->where('token', $token)->first()){
+            throw new ResourceNotFoundException('The reset password token has expired or doesn\'t exist');
+        }
+        return true;
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Standards/Criteria/UnverifiedUserEmail.php b/app/Classes/Modules/Accounts/Standards/Criteria/UnverifiedUserEmail.php
new file mode 100644
index 00000000..d23b2041
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Standards/Criteria/UnverifiedUserEmail.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Standards\Criteria;
+
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\User;
+use App\Models\UserEmailVerification;
+
+class UnverifiedUserEmail
+{
+
+    /** @var User */
+    private $repository;
+
+    /**
+     * TokenExistsValidation constructor.
+     * @param UserEmailVerification $repository
+     */
+    public function __construct(UserEmailVerification $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @param string $token
+     * @return bool
+     * @throws MalformedRequestException
+     */
+    public function execute(string $user){
+
+        if(!$this->repository->status === ApprovalStatus::PENDING_VERIFICATION){
+            throw new MalformedRequestException('The user email address has been verified already');
+        }
+
+        return true;
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Standards/Criteria/UserEmailExists.php b/app/Classes/Modules/Accounts/Standards/Criteria/UserEmailExists.php
new file mode 100644
index 00000000..9b65263d
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Standards/Criteria/UserEmailExists.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Standards\Criteria;
+
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Models\User;
+
+class UserEmailExists
+{
+
+    /** @var User */
+    private $repository;
+
+    /**
+     * UserEmailExists constructor.
+     * @param User $repository
+     */
+    public function __construct(User $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @param string $email
+     * @return bool
+     * @throws ResourceNotFoundException
+     */
+    public function execute(string $email){
+
+        if(!$this->repository->where('email', $email)->first()){
+            throw new ResourceNotFoundException('Unable to find any record that matches the email address provided');
+        }
+
+        return true;
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Standards/Rules/CanFetchUser.php b/app/Classes/Modules/Accounts/Standards/Rules/CanFetchUser.php
new file mode 100644
index 00000000..740e231c
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Standards/Rules/CanFetchUser.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+
+class CanFetchUser extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Standards/Rules/CanGeneratePasswordReset.php b/app/Classes/Modules/Accounts/Standards/Rules/CanGeneratePasswordReset.php
new file mode 100644
index 00000000..8a9b8226
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Standards/Rules/CanGeneratePasswordReset.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Exceptions\RequestValidationException;
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\Modules\Accounts\DataTransferObjects\GeneratePasswordResetObject;
+use App\Classes\Modules\Accounts\Standards\Criteria\UserEmailExists;
+use App\Classes\Modules\Accounts\Standards\Validators\GeneratePasswordResetValidation;
+
+class CanGeneratePasswordReset extends AbstractRule
+{
+
+    /** @var GeneratePasswordResetValidation */
+    private $generatePasswordResetValidation;
+
+    /** @var UserEmailExists */
+    private $userEmailExists;
+
+    /**
+     * CanGeneratePasswordReset constructor.
+     * @param GeneratePasswordResetValidation $generatePasswordResetValidation
+     * @param UserEmailExists $userEmailExists
+     */
+    public function __construct(GeneratePasswordResetValidation $generatePasswordResetValidation, UserEmailExists $userEmailExists)
+    {
+        $this->generatePasswordResetValidation = $generatePasswordResetValidation;
+        $this->userEmailExists = $userEmailExists;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param GeneratePasswordResetObject $object
+     * @return bool
+     * @throws RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->generatePasswordResetValidation->validate($object);
+    }
+
+
+    /**
+     * @param GeneratePasswordResetObject $object
+     * @return bool
+     * @throws ResourceNotFoundException
+     */
+    protected function criteria($object): bool
+    {
+        return $this->userEmailExists->execute($object->getEmail());
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Standards/Rules/CanListUsers.php b/app/Classes/Modules/Accounts/Standards/Rules/CanListUsers.php
index 0039de25..d1ba2ea0 100644
--- a/app/Classes/Modules/Accounts/Standards/Rules/CanListUsers.php
+++ b/app/Classes/Modules/Accounts/Standards/Rules/CanListUsers.php
@@ -4,11 +4,7 @@ namespace App\Classes\Modules\Accounts\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Exceptions\RequestValidationException;
-use App\Classes\Exceptions\ResourceNotFoundException;
-use App\Classes\Modules\Accounts\DataTransferObjects\PasswordResetObject;
-use App\Classes\Modules\Accounts\Standards\Criteria\PasswordResetTokenExists;
-use App\Classes\Modules\Accounts\Standards\Validators\ResetPasswordValidation;
+use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
 
 class CanListUsers extends AbstractRule
 {
@@ -24,7 +20,7 @@ class CanListUsers extends AbstractRule
     }
 
     /**
-     * @param PasswordResetObject $object
+     * @param UserObject $object
      * @return bool
      */
     protected function validators($object): bool
@@ -35,7 +31,7 @@ class CanListUsers extends AbstractRule
 
 
     /**
-     * @param PasswordResetObject $object
+     * @param UserObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/Accounts/Standards/Rules/CanCreateUser.php b/app/Classes/Modules/Accounts/Standards/Rules/CanRegisterUser.php
similarity index 62%
rename from app/Classes/Modules/Accounts/Standards/Rules/CanCreateUser.php
rename to app/Classes/Modules/Accounts/Standards/Rules/CanRegisterUser.php
index dfb328ce..d0720d1c 100644
--- a/app/Classes/Modules/Accounts/Standards/Rules/CanCreateUser.php
+++ b/app/Classes/Modules/Accounts/Standards/Rules/CanRegisterUser.php
@@ -3,20 +3,20 @@
 namespace App\Classes\Modules\Accounts\Standards\Rules;
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
-use App\Classes\Modules\Accounts\Standards\Validators\UserValidation;
+use App\Classes\Modules\Accounts\DataTransferObjects\RegistrationObject;
+use App\Classes\Modules\Accounts\Standards\Validators\UserRegistrationValidation;
 
-class CanCreateUser extends AbstractRule
+class CanRegisterUser extends AbstractRule
 {
 
-    /** @var UserValidation */
+    /** @var UserRegistrationValidation */
     private $userValidation;
 
     /**
      * CanCreateUser constructor.
-     * @param UserValidation $userValidation
+     * @param UserRegistrationValidation $userValidation
      */
-    public function __construct(UserValidation $userValidation)
+    public function __construct(UserRegistrationValidation $userValidation)
     {
         $this->userValidation = $userValidation;
     }
@@ -31,7 +31,7 @@ class CanCreateUser extends AbstractRule
     }
 
     /**
-     * @param UserObject $object
+     * @param RegistrationObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
@@ -41,7 +41,7 @@ class CanCreateUser extends AbstractRule
     }
 
     /**
-     * @param UserObject $object
+     * @param RegistrationObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/Accounts/Standards/Rules/CanResendEmailVerification.php b/app/Classes/Modules/Accounts/Standards/Rules/CanResendEmailVerification.php
new file mode 100644
index 00000000..4a9f016c
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Standards/Rules/CanResendEmailVerification.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+
+class CanResendEmailVerification extends AbstractRule
+{
+
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        return true;
+
+    }
+
+    /**
+     * @param $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return $this->passwordResetTokenExists->execute($object->getToken());
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Standards/Rules/CanResetPassword.php b/app/Classes/Modules/Accounts/Standards/Rules/CanResetPassword.php
new file mode 100644
index 00000000..cf620414
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Standards/Rules/CanResetPassword.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Exceptions\RequestValidationException;
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\Modules\Accounts\DataTransferObjects\PasswordResetObject;
+use App\Classes\Modules\Accounts\Standards\Criteria\PasswordResetTokenExists;
+use App\Classes\Modules\Accounts\Standards\Validators\ResetPasswordValidation;
+
+class CanResetPassword extends AbstractRule
+{
+
+    /** @var ResetPasswordValidation */
+    private $resetPasswordValidation;
+
+    /** @var PasswordResetTokenExists */
+    private $passwordResetTokenExists;
+
+    /**
+     * CanResetPassword constructor.
+     * @param ResetPasswordValidation $resetPasswordValidation
+     * @param PasswordResetTokenExists $passwordResetTokenExists
+     */
+    public function __construct(ResetPasswordValidation $resetPasswordValidation, PasswordResetTokenExists $passwordResetTokenExists)
+    {
+        $this->resetPasswordValidation = $resetPasswordValidation;
+        $this->passwordResetTokenExists = $passwordResetTokenExists;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        return true;
+
+    }
+
+    /**
+     * @param PasswordResetObject $object
+     * @return bool
+     * @throws RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->resetPasswordValidation->validate($object);
+
+    }
+
+
+    /**
+     * @param PasswordResetObject $object
+     * @return bool
+     * @throws ResourceNotFoundException
+     */
+    protected function criteria($object): bool
+    {
+        return $this->passwordResetTokenExists->execute($object->getToken());
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Standards/Validators/GeneratePasswordResetValidation.php b/app/Classes/Modules/Accounts/Standards/Validators/GeneratePasswordResetValidation.php
new file mode 100644
index 00000000..e4deb0ea
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Standards/Validators/GeneratePasswordResetValidation.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Standards\Validators;
+
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Accounts\DataTransferObjects\GeneratePasswordResetObject;
+
+class GeneratePasswordResetValidation extends AbstractValidation
+{
+
+
+    /**
+     * @param GeneratePasswordResetObject $object
+     * @return array
+     */
+    protected function data($object): array {
+        return [
+            'email' => $object->getEmail()
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array {
+        return [
+            'email' => 'required|email'
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array {
+        return [];
+    }
+
+
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Standards/Validators/ResetPasswordValidation.php b/app/Classes/Modules/Accounts/Standards/Validators/ResetPasswordValidation.php
new file mode 100644
index 00000000..7963dc10
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Standards/Validators/ResetPasswordValidation.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Accounts\DataTransferObjects\PasswordResetObject;
+
+class ResetPasswordValidation extends AbstractValidation
+{
+
+
+    /**
+     * @param PasswordResetObject $object
+     * @return array
+     */
+    protected function data($object): array {
+        return [
+            'token' => $object->getToken(),
+            'password' => $object->getNewPassword()->getPassword(),
+            'confirm_password' => $object->getNewPassword()->getConfirmPassword()
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array {
+        return [
+            'token' => 'required',
+            'password' => 'required|min:6',
+            'confirm_password' => 'same:password'
+
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array {
+        return [
+            'confirm_password' => [
+                'same' => 'The :attribute and :other must match.'
+            ]
+        ];
+    }
+
+
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Standards/Validators/UserValidation.php b/app/Classes/Modules/Accounts/Standards/Validators/UserRegistrationValidation.php
similarity index 74%
rename from app/Classes/Modules/Accounts/Standards/Validators/UserValidation.php
rename to app/Classes/Modules/Accounts/Standards/Validators/UserRegistrationValidation.php
index 2fea6460..673b7961 100644
--- a/app/Classes/Modules/Accounts/Standards/Validators/UserValidation.php
+++ b/app/Classes/Modules/Accounts/Standards/Validators/UserRegistrationValidation.php
@@ -3,15 +3,17 @@
 namespace App\Classes\Modules\Accounts\Standards\Validators;
 
 use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
+use App\Classes\Modules\Accounts\DataTransferObjects\RegistrationObject;
 
-class UserValidation extends AbstractValidation
+class UserRegistrationValidation extends AbstractValidation
 {
+
+
     /**
-     * @param UserObject $object
+     * @param RegistrationObject $object
      * @return array
      */
-    protected function data($object): array 
+    protected function data($object): array
     {
         return [
             'name' => $object->getName(),
@@ -26,7 +28,7 @@ class UserValidation extends AbstractValidation
     /**
      * @return array
      */
-    protected function rules(): array 
+    protected function rules(): array
     {
         return [
             'name' => 'required',
@@ -40,7 +42,7 @@ class UserValidation extends AbstractValidation
     /**
      * @return array
      */
-    protected function messages(): array 
+    protected function messages(): array
     {
         return [];
     }
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
index 81531ca4..8fd6fe7f 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
@@ -3,16 +3,18 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\CreatesAddress;
+use App\Classes\Modules\Addresses\Services\FetchesDistrict;
 use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Http\Resources\AddressResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class CreateAddressLogic extends AbstractControllersLogic
+class CreateAddressLogic extends AbstractControllerLogic
 {
 
     /**
@@ -28,41 +30,49 @@ class CreateAddressLogic extends AbstractControllersLogic
     /** @var CanCreateAddress */
     private $canCreateAddress;
 
+    /** @var FetchesDistrict */
+    private $fetchesDistrict;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
     /** @var CreatesAddress */
     private $createsAddress;
 
     /**
-     * CreateAddressControllersLogic constructor.
+     * CreateAddressLogic constructor.
      * @param CanCreateAddress $canCreateAddress
+     * @param FetchesDistrict $fetchesDistrict
+     * @param FetchesCompany $fetchesCompany
      * @param CreatesAddress $createsAddress
      */
-    public function __construct(CanCreateAddress $canCreateAddress, CreatesAddress $createsAddress)
+    public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesAddress $createsAddress)
     {
         $this->canCreateAddress = $canCreateAddress;
+        $this->fetchesDistrict = $fetchesDistrict;
+        $this->fetchesCompany = $fetchesCompany;
         $this->createsAddress = $createsAddress;
     }
 
-
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
 
-            $object = new AddressObject($request->input('company_id'), $request->input('street_one'), $request->input('street_two'), $request->input('city'), $request->input('state'), $request->input('post_code'), $request->input('country'), $request->input('default'), $request->input('billing'));
+        $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
 
-            $this->canCreateAddress->passes($object);
+        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
 
-            $query = $this->createsAddress->execute($object);
+        $this->canCreateAddress->passes($object);
 
-            return $this->resourceResponse(new AddressResource($query));
+        $query = $this->createsAddress->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object);
 
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->resourceResponse(new AddressResource($query));
 
     }
 
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/DeleteAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/DeleteAddressLogic.php
index b5f6753b..3a3593aa 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/DeleteAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/DeleteAddressLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\DeletesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Standards\Rules\CanDeleteAddress;
@@ -11,7 +11,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class DeleteAddressLogic extends AbstractControllersLogic
+class DeleteAddressLogic extends AbstractControllerLogic
 {
     /**
      * @return array
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/FetchAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/FetchAddressLogic.php
index 84b4b1a3..12320e0f 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/FetchAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/FetchAddressLogic.php
@@ -3,16 +3,15 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Standards\Rules\CanFetchAddress;
-use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
 use App\Http\Resources\AddressResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class FetchAddressLogic extends AbstractControllersLogic
+class FetchAddressLogic extends AbstractControllerLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/ListAddressesLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/ListAddressesLogic.php
index 24a7b932..57e3a2f0 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/ListAddressesLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/ListAddressesLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\ListsAddresses;
 use App\Classes\Modules\Addresses\Standards\Rules\CanListAddresses;
 use App\Http\Resources\AddressResource;
@@ -11,7 +11,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class ListAddressesLogic extends AbstractControllersLogic
+class ListAddressesLogic extends AbstractControllerLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/ListDistrictsLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/ListDistrictsLogic.php
new file mode 100644
index 00000000..b9a97fb3
--- /dev/null
+++ b/app/Classes/Modules/Addresses/ControllersLogic/ListDistrictsLogic.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Addresses\Services\ListsAddresses;
+use App\Classes\Modules\Addresses\Services\ListsDistricts;
+use App\Classes\Modules\Addresses\Standards\Rules\CanListAddresses;
+use App\Http\Resources\AddressResource;
+use App\Http\Resources\DistrictResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListDistrictsLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Addresses',
+            'message' => 'You have successfully retrieved a list of Addresses'
+        ];
+    }
+
+    /** @var ListsDistricts */
+    private $listDistricts;
+
+    /**
+     * ListDistrictsLogic constructor.
+     * @param ListsDistricts $listDistricts
+     */
+    public function __construct(ListsDistricts $listDistricts)
+    {
+        $this->listDistricts = $listDistricts;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->listDistricts->execute($this->listDistricts->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(DistrictResource::collection($query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
index 3b4937d5..aa7b4434 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\UpdatesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Standards\Rules\CanUpdateAddress;
@@ -13,7 +13,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class UpdateAddressLogic extends AbstractControllersLogic
+class UpdateAddressLogic extends AbstractControllerLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Addresses/DataTransferObjects/AddressObject.php b/app/Classes/Modules/Addresses/DataTransferObjects/AddressObject.php
index abacaa67..8c164317 100644
--- a/app/Classes/Modules/Addresses/DataTransferObjects/AddressObject.php
+++ b/app/Classes/Modules/Addresses/DataTransferObjects/AddressObject.php
@@ -2,69 +2,46 @@
 
 namespace App\Classes\Modules\Addresses\DataTransferObjects;
 
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
 
 class AddressObject implements DataTransferObject
 {
 
-    /** @var int */
-    private $companyId;
-
     /** @var string */
     private $streetOne;
 
     /** @var string|null */
     private $streetTwo;
 
-    /** @var string */
-    private $city;
+    /** @var int */
+    private $countryId;
 
-    /** @var string */
-    private $state;
+    /** @var int */
+    private $stateId;
 
-    /** @var string */
+    /** @var int */
+    private $districtId;
+
+    /** @var int */
     private $postCode;
 
-    /** @var string */
-    private $country;
-
-    /** @var int */
-    private $default;
-
-    /** @var int */
-    private $billing;
-
     /**
      * AddressObject constructor.
-     * @param int $companyId
      * @param string $streetOne
      * @param null|string $streetTwo
-     * @param string $city
-     * @param string $state
-     * @param string $postCode
-     * @param string $country
-     * @param int $default
-     * @param int $billing
+     * @param int $countryId
+     * @param int $stateId
+     * @param int $districtId
+     * @param int $postCode
      */
-    public function __construct(int $companyId, string $streetOne, ?string $streetTwo, string $city, string $state, string $postCode, string $country, int $default, int $billing)
+    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode)
     {
-        $this->companyId = $companyId;
         $this->streetOne = $streetOne;
         $this->streetTwo = $streetTwo;
-        $this->city = $city;
-        $this->state = $state;
+        $this->countryId = $countryId;
+        $this->stateId = $stateId;
+        $this->districtId = $districtId;
         $this->postCode = $postCode;
-        $this->country = $country;
-        $this->default = $default;
-        $this->billing = $billing;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCompanyId(): int
-    {
-        return $this->companyId;
     }
 
     /**
@@ -84,52 +61,36 @@ class AddressObject implements DataTransferObject
     }
 
     /**
-     * @return string
+     * @return int
      */
-    public function getCity(): string
+    public function getCountryId(): int
     {
-        return $this->city;
+        return $this->countryId;
     }
 
     /**
-     * @return string
+     * @return int
      */
-    public function getState(): string
+    public function getStateId(): int
     {
-        return $this->state;
+        return $this->stateId;
     }
 
     /**
-     * @return string
+     * @return int
      */
-    public function getPostCode(): string
+    public function getDistrictId(): int
+    {
+        return $this->districtId;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPostCode(): int
     {
         return $this->postCode;
     }
 
-    /**
-     * @return string
-     */
-    public function getCountry(): string
-    {
-        return $this->country;
-    }
-
-    /**
-     * @return int
-     */
-    public function getDefault(): int
-    {
-        return $this->default;
-    }
-
-    /**
-     * @return int
-     */
-    public function getBilling(): int
-    {
-        return $this->billing;
-    }
-
 
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Addresses/Services/CreatesAddress.php b/app/Classes/Modules/Addresses/Services/CreatesAddress.php
index b5e5b0df..e6a7b8b3 100644
--- a/app/Classes/Modules/Addresses/Services/CreatesAddress.php
+++ b/app/Classes/Modules/Addresses/Services/CreatesAddress.php
@@ -3,30 +3,30 @@
 namespace App\Classes\Modules\Addresses\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
 use App\Models\Address;
+use App\Models\Company;
 
-class CreatesAddress extends AbstractUpdateRecord
+class CreatesAddress extends AbstractUpdateRelationshipRecord
 {
 
     /**
+     * @param Company $company
      * @param AddressObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(AddressObject $object) {
+    public function execute(Company $company, AddressObject $object) {
         $model = new Address();
-        $model->company_id = $object->getCompanyId();
         $model->street_one = $object->getStreetOne();
         $model->street_two = $object->getStreetTwo();
-        $model->city = $object->getCity();
-        $model->state = $object->getState();
-        $model->post_code = $object->getPostCode();
-        $model->country = $object->getCountry();
-        $model->default = $object->getDefault();
-        $model->billing = $object->getBilling();
+        $model->country_id = $object->getCountryId();
+        $model->state_id = $object->getStateId();
+        $model->district_id = $object->getDistrictId();
+        $model->postcode = $object->getPostCode();
 
-        return $this->handler($model);
+        return $this->handler($company->addresses(), $model);
 
     }
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Addresses/Services/DeletesAddress.php b/app/Classes/Modules/Addresses/Services/DeletesAddress.php
index 75cbbca8..a36ab903 100644
--- a/app/Classes/Modules/Addresses/Services/DeletesAddress.php
+++ b/app/Classes/Modules/Addresses/Services/DeletesAddress.php
@@ -3,12 +3,16 @@
 namespace App\Classes\Modules\Addresses\Services;
 
 use App\Classes\General\Eloquent\AbstractDeleteRecord;
-use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
 use App\Models\Address;
 
 class DeletesAddress extends AbstractDeleteRecord
 {
 
+    /**
+     * @param Address $model
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
     public function execute(Address $model) {
         return $this->handler($model);
     }
diff --git a/app/Classes/Modules/Addresses/Services/FetchesDistrict.php b/app/Classes/Modules/Addresses/Services/FetchesDistrict.php
new file mode 100644
index 00000000..f2fcd371
--- /dev/null
+++ b/app/Classes/Modules/Addresses/Services/FetchesDistrict.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use App\Models\District;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Address;
+
+class FetchesDistrict extends AbstractFetchRecord
+{
+
+    /** @var District */
+    private $repository;
+
+    /**
+     * FetchesDistrict constructor.
+     * @param District $repository
+     */
+    public function __construct(District $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/CompanyBanks/Services/ListsCompanyBank.php b/app/Classes/Modules/Addresses/Services/ListsDistricts.php
similarity index 54%
rename from app/Classes/Modules/CompanyBanks/Services/ListsCompanyBank.php
rename to app/Classes/Modules/Addresses/Services/ListsDistricts.php
index e9420517..b5b65341 100644
--- a/app/Classes/Modules/CompanyBanks/Services/ListsCompanyBank.php
+++ b/app/Classes/Modules/Addresses/Services/ListsDistricts.php
@@ -1,23 +1,23 @@
 <?php
 
-namespace App\Classes\Modules\CompanyBanks\Services;
+namespace App\Classes\Modules\Addresses\Services;
 
 
 use App\Classes\General\Eloquent\AbstractListRecord;
+use App\Models\District;
 use Illuminate\Database\Eloquent\Builder;
-use App\Models\CompanyBank;
 
-class ListsCompanyBank extends AbstractListRecord
+class ListsDistricts extends AbstractListRecord
 {
 
-    /** @var Currency */
+    /** @var District */
     private $repository;
 
     /**
-     * ListsCompanyBank constructor.
-     * @param CompanyBank $repository
+     * ListsDistricts constructor.
+     * @param District $repository
      */
-    public function __construct(CompanyBank $repository)
+    public function __construct(District $repository)
     {
         $this->repository = $repository;
     }
diff --git a/app/Classes/Modules/Addresses/Standards/Validators/AddressValidation.php b/app/Classes/Modules/Addresses/Standards/Validators/AddressValidation.php
index 6d4e873c..5d8b0ee6 100644
--- a/app/Classes/Modules/Addresses/Standards/Validators/AddressValidation.php
+++ b/app/Classes/Modules/Addresses/Standards/Validators/AddressValidation.php
@@ -16,15 +16,9 @@ class AddressValidation extends AbstractValidation
      */
     protected function data($object): array {
         return [
-            'company_id' => $object->getCompanyId(),
             'street_one' => $object->getStreetOne(),
             'street_two' => $object->getStreetTwo(),
-            'city' => $object->getCity(),
-            'state' => $object->getState(),
-            'post_code' => $object->getPostCode(),
-            'country' => $object->getCountry(),
-            'default' => $object->getDefault(),
-            'billing' => $object->getBilling()
+            'district_id' => $object->getDistrictId()
         ];
     }
 
@@ -33,14 +27,8 @@ class AddressValidation extends AbstractValidation
      */
     protected function rules(): array {
         return [
-            'company_id' => 'required',
             'street_one' => 'required',
-            'city' => 'required',
-            'state' => 'required',
-            'post_code' => 'required',
-            'country' => 'required',
-            'default' => 'required',
-            'billing' => 'required'
+            'district_id' => 'required',
         ];
     }
 
diff --git a/app/Classes/Modules/Banks/ControllersLogic/CreateBankLogic.php b/app/Classes/Modules/Banks/ControllersLogic/CreateBankLogic.php
new file mode 100644
index 00000000..41684344
--- /dev/null
+++ b/app/Classes/Modules/Banks/ControllersLogic/CreateBankLogic.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Classes\Modules\Banks\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Banks\Standards\Rules\CanCreateBank;
+use App\Classes\Modules\Banks\Services\CreatesBank;
+use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
+use App\Http\Resources\BankResource;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class CreateBankLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Bank',
+            'message' => 'You have successfully created a new Bank'
+        ];
+    }
+
+    /** @var CanCreateBank */
+    private $canCreateBank;
+
+    /** @var CreatesBank */
+    private $createsBank;
+
+
+    /**
+     * CreateBankLogic constructor.
+     * @param CanCreateBank $canCreateBank
+     * @param CreatesBank $createsBank
+     */
+    public function __construct(
+        CanCreateBank $canCreateBank,
+        CreatesBank $createsBank
+    )
+    {
+        $this->canCreateBank = $canCreateBank;
+        $this->createsBank = $createsBank;
+    }
+
+    /**
+     * @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
+    {
+
+        $bank_object = new BankObject($request->input('company_id'), $request->input('account_type'),
+            $request->input('bank_name'), $request->input('holder_name'),  $request->input('account_no'),
+            $request->input('country_id'), $request->input('reference'));
+
+        $this->canCreateBank->passes($bank_object);
+
+        $bank = $this->createsBank->execute($bank_object);
+
+        return $this->resourceResponse(new BankResource($bank));
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Banks/ControllersLogic/DeleteBankLogic.php b/app/Classes/Modules/Banks/ControllersLogic/DeleteBankLogic.php
new file mode 100644
index 00000000..24975379
--- /dev/null
+++ b/app/Classes/Modules/Banks/ControllersLogic/DeleteBankLogic.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Classes\Modules\Banks\ControllersLogic;
+
+use App\Classes\Exceptions\RequestValidationException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Banks\Services\FetchesBank;
+use App\Classes\Modules\Banks\Standards\Rules\CanDeleteBank;
+use App\Classes\Modules\Banks\Services\DeletesBank;
+use App\Http\Resources\BankResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteBankLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Delete Bank',
+            'message' => 'You have successfully deleted the Bank'
+        ];
+    }
+
+    /** @var CanDeleteBank */
+    private $canDeleteBank;
+
+    /** @var DeletesBank */
+    private $deletesBank;
+
+    /** @var FetchesBank */
+    private $fetchesBank;
+
+
+    /**
+     * DeleteBankLogic constructor.
+     * @param CanDeleteBank $canDeleteBank
+     * @param DeletesBank $deletesBank
+     * @param FetchesBank $fetchesBank
+     */
+    public function __construct(
+        CanDeleteBank $canDeleteBank,
+        DeletesBank $deletesBank,
+        FetchesBank $fetchesBank
+    )
+    {
+        $this->canDeleteBank = $canDeleteBank;
+        $this->deletesBank = $deletesBank;
+        $this->fetchesBank = $fetchesBank;
+    }
+
+    /**
+     * @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
+    {
+
+        $this->canDeleteBank->passes();
+
+        $bank = $this->fetchesBank->execute(['id' => $request->route('id')]);
+
+        if($bank->default){
+            throw new RequestValidationException('You can\'t delete bank account when it set to default');
+        }
+
+        $this->deletesBank->execute($bank);
+
+        return $this->response([]);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Banks/ControllersLogic/ListBanksLogic.php b/app/Classes/Modules/Banks/ControllersLogic/ListBanksLogic.php
new file mode 100644
index 00000000..94396d61
--- /dev/null
+++ b/app/Classes/Modules/Banks/ControllersLogic/ListBanksLogic.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Classes\Modules\Banks\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Banks\Services\ListsBanks;
+use App\Classes\Modules\Banks\Standards\Rules\CanListBanks;
+use App\Http\Resources\BankResource;
+use App\Http\Resources\CompanyResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListBanksLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieve Banks',
+            'message' => 'You have successfully retrieved a list of Banks'
+        ];
+    }
+
+    /** @var CanListBanks */
+    private $canListBanks;
+
+    /** @var ListsBanks */
+    private $listsBanks;
+
+    /**
+     * ListBanksLogic constructor.
+     * @param CanListBanks $canListBanks
+     * @param ListsBanks $listsBanks
+     */
+    public function __construct(CanListBanks $canListBanks, ListsBanks $listsBanks)
+    {
+        $this->canListBanks = $canListBanks;
+        $this->listsBanks = $listsBanks;
+    }
+
+
+    /**
+     * @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
+    {
+        $this->canListBanks->passes();
+
+        $banks = $this->listsBanks->execute($this->listsBanks->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(BankResource::collection($banks));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Banks/ControllersLogic/SetBankToDefaultLogic.php b/app/Classes/Modules/Banks/ControllersLogic/SetBankToDefaultLogic.php
new file mode 100644
index 00000000..0e9885ae
--- /dev/null
+++ b/app/Classes/Modules/Banks/ControllersLogic/SetBankToDefaultLogic.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Classes\Modules\Banks\ControllersLogic;
+
+use App\Http\Resources\BankResource;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Banks\Services\FetchesBank;
+use App\Classes\Modules\Banks\Services\ListsBanks;
+
+use App\Classes\Modules\Banks\Standards\Rules\CanUpdateBank;
+use App\Classes\Modules\Banks\Services\ResetsBanksDefault;
+use App\Classes\Modules\Banks\Services\SetsBankToDefault;
+
+use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
+use App\Classes\ValueObjects\Constants\DefaultType;
+
+use App\Models\Bank;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class SetBankToDefaultLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Bank',
+            'message' => 'You have successfully updated the Bank'
+        ];
+    }
+
+    /** @var ResetsBanksDefault */
+    private $resetsBanksDefault;
+
+    /** @var FetchesBank */
+    private $fetchesBank;
+
+    /** @var SetsBankToDefault*/
+    private $setsBankToDefault ;
+
+    /**
+     * SetBankToDefaultLogic constructor.
+     * @param ResetsBanksDefault $resetsBanksDefault
+     * @param FetchesBank $fetchesBank
+     * @param SetsBankToDefault $setsBankToDefault
+     */
+    public function __construct(ResetsBanksDefault $resetsBanksDefault, FetchesBank $fetchesBank, SetsBankToDefault $setsBankToDefault)
+    {
+        $this->resetsBanksDefault = $resetsBanksDefault;
+        $this->fetchesBank = $fetchesBank;
+        $this->setsBankToDefault = $setsBankToDefault;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        /** @var Bank $bank */
+        $bank = $this->fetchesBank->execute(['id' => $request->route('id')]);
+
+        $this->resetsBanksDefault->execute($bank);
+
+        $this->setsBankToDefault->execute($bank);
+
+        return $this->resourceResponse(new BankResource($this->setsBankToDefault->execute($bank)));
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Banks/ControllersLogic/UpdateBankLogic.php b/app/Classes/Modules/Banks/ControllersLogic/UpdateBankLogic.php
new file mode 100644
index 00000000..85e3449c
--- /dev/null
+++ b/app/Classes/Modules/Banks/ControllersLogic/UpdateBankLogic.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Classes\Modules\Banks\ControllersLogic;
+
+use App\Http\Resources\BankResource;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Banks\Services\FetchesBank;
+
+use App\Classes\Modules\Banks\Standards\Rules\CanUpdateBank;
+use App\Classes\Modules\Banks\Services\UpdatesBank;
+use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class UpdateBankLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Bank Account',
+            'message' => 'You have successfully updated the Bank Account'
+        ];
+    }
+
+    /** @var CanUpdateBank */
+    private $canUpdateBank;
+
+    /** @var UpdatesBank */
+    private $updatesBank;
+
+    /** @var FetchesBank */
+    private $fetchesBank;
+
+
+    /**
+     * UpdateBankLogic constructor.
+     * @param CanUpdateBank $canUpdateBank
+     * @param UpdatesBank $updatesBank
+     * @param FetchesBank $fetchesBank
+     */
+    public function __construct(
+        CanUpdateBank $canUpdateBank,
+        UpdatesBank $updatesBank,
+        FetchesBank $fetchesBank
+    )
+    {
+        $this->canUpdateBank = $canUpdateBank;
+        $this->updatesBank = $updatesBank;
+        $this->fetchesBank = $fetchesBank;
+    }
+
+    /**
+     * @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
+    {
+
+        $bankObject = new BankObject($request->input('company_id'), $request->input('country_id'),
+            $request->input('reference'), $request->input('bank_name'), $request->input('holder_name'),
+            $request->input('account_no'));
+
+
+        $bank = $this->fetchesBank->execute(['id' => $request->route('id')]);
+
+        $this->canUpdateBank->passes($bankObject);
+
+        $bank_query = $this->updatesBank->execute($bank, $bankObject);
+
+        return $this->resourceResponse(new BankResource($bank_query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Banks/DataTransferObjects/BankObject.php b/app/Classes/Modules/Banks/DataTransferObjects/BankObject.php
new file mode 100644
index 00000000..08ef54f7
--- /dev/null
+++ b/app/Classes/Modules/Banks/DataTransferObjects/BankObject.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace App\Classes\Modules\Banks\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class BankObject implements DataTransferObject
+{
+
+    /** @var int  */
+    private $company_id;
+
+    /** @var int */
+    private $type;
+
+    /** @var string */
+    private $bank_name;
+
+    /** @var string */
+    private $holder_name;
+
+    /** @var string */
+    private $account_no;
+
+    /** @var int */
+    private $country_id;
+
+    /** @var string|null */
+    private $reference;
+
+    /**
+     * BankObject constructor.
+     * @param int $company_id
+     * @param int $type
+     * @param string $bank_name
+     * @param string $holder_name
+     * @param string $account_no
+     * @param int $country_id
+     * @param null|string $reference
+     */
+    public function __construct(int $company_id, int $type, string $bank_name, string $holder_name, string $account_no, int $country_id, ?string $reference = null)
+    {
+        $this->company_id = $company_id;
+        $this->type = $type;
+        $this->bank_name = $bank_name;
+        $this->holder_name = $holder_name;
+        $this->account_no = $account_no;
+        $this->country_id = $country_id;
+        $this->reference = $reference;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCompanyId(): int
+    {
+        return $this->company_id;
+    }
+
+    /**
+     * @return int
+     */
+    public function getType(): int
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBankName(): string
+    {
+        return $this->bank_name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getHolderName(): string
+    {
+        return $this->holder_name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAccountNo(): string
+    {
+        return $this->account_no;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCountryId(): int
+    {
+        return $this->country_id;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getReference(): ?string
+    {
+        return $this->reference;
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/CompanyBanks/Services/CreatesCompanyBank.php b/app/Classes/Modules/Banks/Services/CreatesBank.php
similarity index 58%
rename from app/Classes/Modules/CompanyBanks/Services/CreatesCompanyBank.php
rename to app/Classes/Modules/Banks/Services/CreatesBank.php
index 06223f49..3aea73e3 100644
--- a/app/Classes/Modules/CompanyBanks/Services/CreatesCompanyBank.php
+++ b/app/Classes/Modules/Banks/Services/CreatesBank.php
@@ -1,27 +1,29 @@
 <?php
 
-namespace App\Classes\Modules\CompanyBanks\Services;
+namespace App\Classes\Modules\Banks\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\CompanyBanks\DataTransferObjects\CompanyBankObject;
-use App\Models\CompanyBank;
+use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
+use App\Models\Bank;
 
-class CreatesCompanyBank extends AbstractUpdateRecord
+class CreatesBank extends AbstractUpdateRecord
 {
     /**
-     * @param CompanyBankObject $object
+     * @param BankObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(CompanyBankObject $object) {
-        $model = new CompanyBank();
-        $model->country_id = $object->getCountryId();
+    public function execute(BankObject $object) {
+
+        $model = new Bank();
         $model->company_id = $object->getCompanyId();
+        $model->reference = $object->getReference();
         $model->bank_name = $object->getBankName();
         $model->holder_name = $object->getHolderName();
         $model->account_no = $object->getAccountNo();
         $model->type = $object->getType();
-        $model->default = $object->getDefault();
+        $model->country_id = $object->getCountryId();
+
         return $this->handler($model);
 
     }
diff --git a/app/Classes/Modules/Banks/Services/DeletesBank.php b/app/Classes/Modules/Banks/Services/DeletesBank.php
new file mode 100644
index 00000000..2aeb8ea7
--- /dev/null
+++ b/app/Classes/Modules/Banks/Services/DeletesBank.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Banks\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Models\Bank;
+
+class DeletesBank extends AbstractDeleteRecord
+{
+
+    /**
+     * @param Bank $model
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Bank $model) {
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/CompanyBanks/Services/FetchesCompanyBank.php b/app/Classes/Modules/Banks/Services/FetchesBank.php
similarity index 54%
rename from app/Classes/Modules/CompanyBanks/Services/FetchesCompanyBank.php
rename to app/Classes/Modules/Banks/Services/FetchesBank.php
index 669075d2..dd075da6 100644
--- a/app/Classes/Modules/CompanyBanks/Services/FetchesCompanyBank.php
+++ b/app/Classes/Modules/Banks/Services/FetchesBank.php
@@ -1,24 +1,24 @@
 <?php
 
-namespace App\Classes\Modules\CompanyBanks\Services;
+namespace App\Classes\Modules\Banks\Services;
 
 
 use App\Classes\General\Eloquent\AbstractFetchRecord;
 use Illuminate\Database\Eloquent\Builder;
-use App\Models\CompanyBank;
+use App\Models\Bank;
 
-class FetchesCompanyBank extends AbstractFetchRecord
+class FetchesBank extends AbstractFetchRecord
 {
 
-    /** @var CompanyBank */
+    /** @var Bank */
     private $repository;
 
 
     /**
-     * FetchesCompanyBank constructor.
-     * @param CompanyBank $repository
+     * FetchesBank constructor.
+     * @param Bank $repository
      */
-    public function __construct(CompanyBank $repository)
+    public function __construct(Bank $repository)
     {
         $this->repository = $repository;
     }
diff --git a/app/Classes/Modules/Banks/Services/ListsBanks.php b/app/Classes/Modules/Banks/Services/ListsBanks.php
new file mode 100644
index 00000000..f1470ca4
--- /dev/null
+++ b/app/Classes/Modules/Banks/Services/ListsBanks.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Banks\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Bank;
+
+class ListsBanks extends AbstractListRecord
+{
+
+    /** @var Bank */
+    private $repository;
+
+    /**
+     * ListsBank constructor.
+     * @param Bank $repository
+     */
+    public function __construct(Bank $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Banks/Services/ResetsBanksDefault.php b/app/Classes/Modules/Banks/Services/ResetsBanksDefault.php
new file mode 100644
index 00000000..29e010a5
--- /dev/null
+++ b/app/Classes/Modules/Banks/Services/ResetsBanksDefault.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Classes\Modules\Banks\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Bank;
+use App\Models\Company;
+
+class ResetsBanksDefault extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Bank $bank
+     * @return void
+     */
+    public function execute(Bank $bank)
+    {
+        $bank->company->banks()->where('type', $bank->type)->update(['default' => false]);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Banks/Services/SetsBankToDefault.php b/app/Classes/Modules/Banks/Services/SetsBankToDefault.php
new file mode 100644
index 00000000..eab9b709
--- /dev/null
+++ b/app/Classes/Modules/Banks/Services/SetsBankToDefault.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\Modules\Banks\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Bank;
+
+class SetsBankToDefault extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Bank $model
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Bank $model)
+    {
+        $model->default = true;
+
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/CompanyBanks/Services/UpdatesCompanyBank.php b/app/Classes/Modules/Banks/Services/UpdatesBank.php
similarity index 58%
rename from app/Classes/Modules/CompanyBanks/Services/UpdatesCompanyBank.php
rename to app/Classes/Modules/Banks/Services/UpdatesBank.php
index 3116b3c3..85249fb9 100644
--- a/app/Classes/Modules/CompanyBanks/Services/UpdatesCompanyBank.php
+++ b/app/Classes/Modules/Banks/Services/UpdatesBank.php
@@ -1,20 +1,21 @@
 <?php
 
-namespace App\Classes\Modules\CompanyBanks\Services;
+namespace App\Classes\Modules\Banks\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\CompanyBanks\DataTransferObjects\CompanyBankObject;
-use App\Models\CompanyBank;
+use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
+use App\Models\Bank;
 
-class UpdatesCompanyBank extends AbstractUpdateRecord
+class UpdatesBank extends AbstractUpdateRecord
 {
 
     /**
-     * @param CompanyBankObject $object
+     * @param Bank $model
+     * @param BankObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(CompanyBank $model, CompanyBankObject $object) 
+    public function execute(Bank $model, BankObject $object)
     {
         $model->bank_name = $object->getBankName();
         $model->holder_name = $object->getHolderName();
diff --git a/app/Classes/Modules/Banks/Standards/Rules/CanCreateBank.php b/app/Classes/Modules/Banks/Standards/Rules/CanCreateBank.php
new file mode 100644
index 00000000..8cef85d8
--- /dev/null
+++ b/app/Classes/Modules/Banks/Standards/Rules/CanCreateBank.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Classes\Modules\Banks\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Banks\Standards\Validators\BankValidation;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+
+class CanCreateBank extends AbstractRule
+{
+
+    /** @var BankValidation */
+    private $BankValidation;
+
+    /**
+     * CanCreateBank constructor.
+     * @param BankValidation $BankValidation
+     */
+    public function __construct(BankValidation $BankValidation)
+    {
+        $this->BankValidation = $BankValidation;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param CompanyObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->BankValidation->validate($object);
+    }
+
+    /**
+     * @param CompanyObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Banks/Standards/Rules/CanDeleteBank.php b/app/Classes/Modules/Banks/Standards/Rules/CanDeleteBank.php
new file mode 100644
index 00000000..074550e5
--- /dev/null
+++ b/app/Classes/Modules/Banks/Standards/Rules/CanDeleteBank.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Banks\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
+
+class CanDeleteBank extends AbstractRule
+{
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param BankObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param BankObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Banks/Standards/Rules/CanListBanks.php b/app/Classes/Modules/Banks/Standards/Rules/CanListBanks.php
new file mode 100644
index 00000000..d01232e7
--- /dev/null
+++ b/app/Classes/Modules/Banks/Standards/Rules/CanListBanks.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Classes\Modules\Banks\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Banks\Standards\Validators\BankValidation;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+
+class CanListBanks extends AbstractRule
+{
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param CompanyObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param CompanyObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Banks/Standards/Rules/CanUpdateBank.php b/app/Classes/Modules/Banks/Standards/Rules/CanUpdateBank.php
new file mode 100644
index 00000000..e7a6d0fc
--- /dev/null
+++ b/app/Classes/Modules/Banks/Standards/Rules/CanUpdateBank.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Banks\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
+use App\Classes\Modules\Banks\Standards\Validators\BankValidation;
+
+class CanUpdateBank extends AbstractRule
+{
+
+    /** @var BankValidation */
+    private $BankValidation;
+
+
+    /**
+     * CanUpdateBank constructor.
+     * @param BankValidation $BankValidation
+     */
+    public function __construct(BankValidation $BankValidation)
+    {
+        $this->BankValidation = $BankValidation;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param BankObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->BankValidation->validate($object);
+    }
+
+    /**
+     * @param BankObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/CompanyBanks/Standards/Validators/CompanyBankValidation.php b/app/Classes/Modules/Banks/Standards/Validators/BankValidation.php
similarity index 61%
rename from app/Classes/Modules/CompanyBanks/Standards/Validators/CompanyBankValidation.php
rename to app/Classes/Modules/Banks/Standards/Validators/BankValidation.php
index e8614e78..896f70bc 100644
--- a/app/Classes/Modules/CompanyBanks/Standards/Validators/CompanyBankValidation.php
+++ b/app/Classes/Modules/Banks/Standards/Validators/BankValidation.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Classes\Modules\CompanyBanks\Standards\Validators;
+namespace App\Classes\Modules\Banks\Standards\Validators;
 
 use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\CompanyBanks\DataTransferObjects\CompanyBankObject;
+use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
 
-class CompanyBankValidation extends AbstractValidation
+class BankValidation extends AbstractValidation
 {
     /**
-     * @param CompanyBankObject $object
+     * @param BankObject $object
      * @return array
      */
     protected function data($object): array 
@@ -18,9 +18,7 @@ class CompanyBankValidation extends AbstractValidation
             'company_id' => $object->getCompanyId(),
             'bank_name' => $object->getBankName(),
             'holder_name' => $object->getHolderName(),
-            'account_no' => $object->getAccountNo(),
-            'type' => $object->getType(),
-            'default' => $object->getDefault(),
+            'account_no' => $object->getAccountNo()
         ];
     }
 
@@ -34,9 +32,7 @@ class CompanyBankValidation extends AbstractValidation
             'company_id' => 'required',
             'bank_name' => 'required',
             'holder_name' => 'required',
-            'account_no' => 'required',
-            'type' => 'required',
-            'default' => 'required',
+            'account_no' => 'required'
         ];
     }
 
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/ApprovePaymentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/ApprovePaymentLogic.php
new file mode 100644
index 00000000..0a4ef334
--- /dev/null
+++ b/app/Classes/Modules/Bookings/ControllersLogic/ApprovePaymentLogic.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Documents\Services\ApprovesDocument;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Models\Document;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ApprovePaymentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Payment Proof Approved',
+            'message' => 'You have successfully approve the payment'
+        ];
+    }
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var ApprovesDocument */
+    private $approvesDocument;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('payment_id')]);
+
+        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::PENDING_VERIFICATION);
+
+
+
+        return $this->response([]);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/ApprovePaymentVerificationLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/ApprovePaymentVerificationLogic.php
new file mode 100644
index 00000000..1f814831
--- /dev/null
+++ b/app/Classes/Modules/Bookings/ControllersLogic/ApprovePaymentVerificationLogic.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+
+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\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ApprovePaymentVerificationLogic extends AbstractControllerLogic
+{
+    /**
+     * ApprovePaymentVerificationLogic constructor.
+     * @param FetchesTransaction $fetchesTransaction
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param ApprovesDocument $approvesDocument
+     * @param RejectsDocument $rejectsDocument
+     * @param FetchesDocument $fetchesDocument
+     */
+    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument)
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->approvesDocument = $approvesDocument;
+        $this->rejectsDocument = $rejectsDocument;
+        $this->fetchesDocument = $fetchesDocument;
+    }
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Payment Status',
+            'message' => 'You have successfully updated the payment status'
+        ];
+    }
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var ApprovesDocument */
+    private $approvesDocument;
+
+    /** @var RejectsDocument */
+    private $rejectsDocument;
+
+    /** @var FetchesDocument */
+    private $fetchesDocument;
+
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $status = $request->route('status');
+
+        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('payment_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);
+
+        return $this->response([]);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/ApprovePurchaseOrderLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/ApprovePurchaseOrderLogic.php
new file mode 100644
index 00000000..3f394557
--- /dev/null
+++ b/app/Classes/Modules/Bookings/ControllersLogic/ApprovePurchaseOrderLogic.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Bookings\Services\FetchesBooking;
+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\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ApprovePurchaseOrderLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Purchase Order Approval',
+            'message' => 'You have successfully updated the Purchase order status'
+        ];
+    }
+
+    /** @var FetchesBooking */
+    private $fetchesBooking;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /**
+     * ApprovePurchaseOrderLogic constructor.
+     * @param FetchesBooking $fetchesBooking
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     */
+    public function __construct(FetchesBooking $fetchesBooking, UpdatesTransactionStatus $updatesTransactionStatus)
+    {
+        $this->fetchesBooking = $fetchesBooking;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $booking = $this->fetchesBooking->execute(['id' => $request->route('id')]);
+
+        $this->updatesTransactionStatus->execute($booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first(), ApprovalStatus::APPROVED);
+
+        return $this->response([]);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingLogic.php
index 88f82349..e4fa3666 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingLogic.php
@@ -2,10 +2,10 @@
 
 namespace App\Classes\Modules\Bookings\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 
 use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\CompanyBanks\Services\FetchesCompanyBank;
+use App\Classes\Modules\Banks\Services\FetchesBank;
 use App\Classes\Modules\Currencies\Services\FetchesCurrency;
 
 use App\Classes\Modules\Bookings\Standards\Rules\CanCreateBooking;
@@ -18,10 +18,10 @@ use App\Http\Resources\BookingResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 
-class CreateBookingLogic extends AbstractControllersLogic
+class CreateBookingLogic extends AbstractControllerLogic
 {
+
     /**
      * @return array
      */
@@ -44,75 +44,40 @@ class CreateBookingLogic extends AbstractControllersLogic
     /** @var FetchesCompany */
     private $fetchesCompany;
 
-    /** @var FetchesCompanyBank */
-    private $fetchesCompanyBank;
-
-    /** @var FetchesCurrency */
-    private $fetchesCurrency;
-
-
     /**
      * CreateBookingLogic constructor.
      * @param CanCreateBooking $canCreateBooking
      * @param CreatesBooking $createsBooking
      * @param GeneratesBookingMarking $generatesBookingMarking
      * @param FetchesCompany $fetchesCompany
-     * @param FetchesCompanyBank $fetchesCompanyBank
-     * @param FetchesCurrency $fetchesCurrency
      */
-    public function __construct(
-        CanCreateBooking $canCreateBooking, 
-        CreatesBooking $createsBooking,
-        GeneratesBookingMarking $generatesBookingMarking,
-        FetchesCompany $fetchesCompany,
-        FetchesCompanyBank $fetchesCompanyBank,
-        FetchesCurrency $fetchesCurrency
-    )
+    public function __construct(CanCreateBooking $canCreateBooking, CreatesBooking $createsBooking, GeneratesBookingMarking $generatesBookingMarking, FetchesCompany $fetchesCompany)
     {
         $this->canCreateBooking = $canCreateBooking;
         $this->createsBooking = $createsBooking;
         $this->generatesBookingMarking = $generatesBookingMarking;
         $this->fetchesCompany = $fetchesCompany;
-        $this->fetchesCompanyBank = $fetchesCompanyBank;
-        $this->fetchesCurrency = $fetchesCurrency;
     }
 
+
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
-            DB::beginTransaction();
-            $booking_object = new BookingObject(
-                $request->input('company_id'),
-                $request->input('transferable_bank_id'),
-                $this->generatesBookingMarking->execute(),
-                $request->input('reference'),
-                number_format( (float) $request->input('fix_amount'), 5, '.', ''),
-                $request->input('fix_currency_id'),
-                $request->input('convertible_currency_id'),
-                $request->input('conversion_currency_id')
-            );
-            $this->canCreateBooking->passes($booking_object);
+        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
 
-            $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
-            $transferable_bank = $this->fetchesCompanyBank->execute(['id' => $request->input('transferable_bank_id')]);
-            $fix_currency =  $this->fetchesCurrency->execute(['id' => $request->input('fix_currency_id')]);
-            $convertible_currency =  $this->fetchesCurrency->execute(['id' => $request->input('convertible_currency_id')]);
-            $conversion_currency =  $this->fetchesCurrency->execute(['id' => $request->input('conversion_currency_id')]);
+        $object = new BookingObject($request->input('service_id'), $request->input('transferable_bank_id'), $this->generatesBookingMarking->execute(), number_format( floatval(str_replace(',', '', $request->input('fix_amount'))), 5, '.', ''), $request->input('type') === 1 ? $request->input('convertible_currency_id') : 1, $request->input('convertible_currency_id'), 1);
 
-            $booking = $this->createsBooking->execute($booking_object);
+        $this->canCreateBooking->passes($object);
 
-            DB::commit();
+        $booking = $this->createsBooking->execute($company, $object);
 
-            return $this->resourceResponse(new BookingResource($booking));
-
-        } catch (\Exception $exception) {
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->resourceResponse(new BookingResource($booking));
 
     }
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
new file mode 100644
index 00000000..ab741b6b
--- /dev/null
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingOutstanding;
+use App\Classes\Modules\Bookings\Services\FetchesBookingQuotation;
+use App\Classes\Modules\Companies\Services\FetchesCompanyPaymentAttemptLimit;
+use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Http\Resources\TransactionResource;
+use App\Models\Booking;
+use Carbon\Carbon;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateBookingPaymentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Create Payment Attempt',
+            'message' => 'You have successfully created a payment attempt'
+        ];
+    }
+
+    /** @var FetchesBookingQuotation */
+    private $fetchBookingQuotation;
+
+    /** @var FetchesCompanyPaymentAttemptLimit */
+    private $fetchesCompanyPaymentAttemptLimit;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var CalculatesBookingOutstanding */
+    private $calculatesBookingOutstanding;
+
+    /**
+     * CreateBookingPaymentLogic constructor.
+     * @param FetchesBookingQuotation $fetchBookingQuotation
+     * @param FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CreatesTransaction $createsTransaction
+     * @param CalculatesBookingOutstanding $calculatesBookingOutstanding
+     */
+    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CalculatesBookingOutstanding $calculatesBookingOutstanding)
+    {
+        $this->fetchBookingQuotation = $fetchBookingQuotation;
+        $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsTransaction = $createsTransaction;
+        $this->calculatesBookingOutstanding = $calculatesBookingOutstanding;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $booking = Booking::find($request->route('id'));
+
+        $conversionObject = new CurrencyConversionObject(floatval(str_replace(',', '', $request->input('amount'))), $booking->convertible_currency_id, $booking->service_id,  $booking->fix_currency_id === 1 ? 0:1, PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')]);
+
+        $outstanding = $this->calculatesBookingOutstanding->execute($booking);
+
+        if($conversionObject->getAmount() > $outstanding) throw new MalformedRequestException('Your payment must not be greater than '. $outstanding .'.');
+
+        $configurations = $this->fetchBookingQuotation->execute($booking->company, $conversionObject);
+
+        $paymentAttemptLimit = $this->fetchesCompanyPaymentAttemptLimit->execute($booking->company);
+
+        $billNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
+
+        $object = new TransactionObject($billNumber, TransactionType::PAYMENT, 1, $booking->company->id,
+            $configurations->getConfigurations()->getBankId(), $configurations->getConversionObject()->getPaymentMethod(),
+            $configurations->getTotal(), $configurations->getForeignTotal(), 1,
+            $configurations->getConversionObject()->getCurrencyId(), $configurations->getConfigurations()->getRate(),
+            $configurations->getTax(), $configurations->getServiceCharge(), Carbon::now()->addMinutes($paymentAttemptLimit), ApprovalStatus::PENDING_SUBMISSION);
+
+        $transaction = $this->createsTransaction->execute($booking, $object);
+
+        return $this->resourceResponse(new TransactionResource($transaction));
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreatePaymentVerificationDocumentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreatePaymentVerificationDocumentLogic.php
new file mode 100644
index 00000000..bfd0229d
--- /dev/null
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreatePaymentVerificationDocumentLogic.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyStatus;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\CompanyType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Models\Company;
+use App\Models\Document;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreatePaymentVerificationDocumentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Payment Proof Document',
+            'message' => 'You have successfully submitted your payment proof document'
+        ];
+    }
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFile;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /**
+     * CreatePaymentVerificationDocumentLogic constructor.
+     * @param FetchesTransaction $fetchesTransaction
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFile
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     */
+    public function __construct(FetchesTransaction $fetchesTransaction, CreatesDocument $createsDocument, CreatesFiles $createsFile, UpdatesTransactionStatus $updatesTransactionStatus)
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->createsDocument = $createsDocument;
+        $this->createsFile = $createsFile;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('payment_id')]);
+
+        $object = new DocumentObject(DocumentType::CUSTOMER_PAYMENT_PROOF, $request->input('files'), '', ApprovalStatus::PENDING_VERIFICATION, 'payments');
+
+        /** @var Document $document */
+        $document = $this->createsDocument->execute($transaction, $object);
+
+        $this->createsFile->execute($document, $object);
+
+        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::PENDING_VERIFICATION);
+        return $this->response([]);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/DeleteBookingLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/DeleteBookingLogic.php
index fc4b447b..bb653d21 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/DeleteBookingLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/DeleteBookingLogic.php
@@ -2,24 +2,21 @@
 
 namespace App\Classes\Modules\Bookings\ControllersLogic;
 
-use App\Classes\Modules\Segments\Services\UpdatesSegment;
-use App\Classes\Modules\Segments\Standards\Rules\CanUpdateSegment;
 use App\Http\Resources\BookingResource;
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 
 use App\Classes\Modules\Bookings\Services\FetchesBooking;
 
 use App\Classes\Modules\Bookings\Standards\Rules\CanDeleteBooking;
 use App\Classes\Modules\Bookings\Services\DeletesBooking;
-use App\Classes\Modules\Bookings\DataTransferObjects\SegmentObject;
 
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class DeleteBookingLogic extends AbstractControllersLogic
+class DeleteBookingLogic extends AbstractControllerLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingLogic.php
new file mode 100644
index 00000000..d9857548
--- /dev/null
+++ b/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingLogic.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Bookings\Services\FetchesBooking;
+use App\Classes\Modules\Bookings\Standards\Rules\CanFetchBooking;
+use App\Http\Resources\BookingResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchBookingLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Address',
+            'message' => 'You have successfully retrieved a Address'
+        ];
+    }
+
+    /** @var CanFetchBooking */
+    private $canFetchBooking;
+
+    /** @var FetchesBooking */
+    private $fetchesBooking;
+
+    /**
+     * FetchBookingLogic constructor.
+     * @param CanFetchBooking $canFetchBooking
+     * @param FetchesBooking $fetchesBooking
+     */
+    public function __construct(CanFetchBooking $canFetchBooking, FetchesBooking $fetchesBooking)
+    {
+        $this->canFetchBooking = $canFetchBooking;
+        $this->fetchesBooking = $fetchesBooking;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $this->canFetchBooking->passes();
+
+        $query = $this->fetchesBooking->execute(['marking' => $request->route('marking'), 'with_transactions' => true]);
+
+        return $this->resourceResponse(new BookingResource($query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingPaymentQuotationLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingPaymentQuotationLogic.php
new file mode 100644
index 00000000..c20450d8
--- /dev/null
+++ b/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingPaymentQuotationLogic.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingOutstanding;
+use App\Classes\Modules\Bookings\Services\FetchesBookingQuotation;
+use App\Classes\Modules\Bookings\Services\GeneratesBookingQuotation;
+use App\Classes\Modules\Companies\Services\FetchesCompanyPaymentAttemptLimit;
+use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Models\Booking;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchBookingPaymentQuotationLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Fetch Currency Conversion',
+            'message' => 'You have successfully retrieved a currency conversion'
+        ];
+    }
+
+    /** @var FetchesBookingQuotation */
+    private $fetchBookingQuotation;
+
+    /** @var GeneratesBookingQuotation */
+    private $generatesBookingQuotation;
+
+    /** @var FetchesCompanyPaymentAttemptLimit */
+    private $fetchesCompanyPaymentAttemptLimit;
+
+    /** @var CalculatesBookingOutstanding */
+    private $calculatesBookingOutstanding;
+
+    /**
+     * FetchBookingPaymentQuotationLogic constructor.
+     * @param FetchesBookingQuotation $fetchBookingQuotation
+     * @param GeneratesBookingQuotation $generatesBookingQuotation
+     * @param FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit
+     * @param CalculatesBookingOutstanding $calculatesBookingOutstanding
+     */
+    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, GeneratesBookingQuotation $generatesBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, CalculatesBookingOutstanding $calculatesBookingOutstanding)
+    {
+        $this->fetchBookingQuotation = $fetchBookingQuotation;
+        $this->generatesBookingQuotation = $generatesBookingQuotation;
+        $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit;
+        $this->calculatesBookingOutstanding = $calculatesBookingOutstanding;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $booking = Booking::find($request->route('id'));
+
+        $conversionObject = new CurrencyConversionObject(floatval(str_replace(',', '', $request->input('amount'))), $booking->convertible_currency_id, $booking->service_id,  $booking->fix_currency_id === 1 ? 0:1, PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')]);
+
+        $outstanding = $this->calculatesBookingOutstanding->execute($booking);
+        if($conversionObject->getAmount() > $outstanding) throw new MalformedRequestException('Your payment must not be greater than '.$booking->fixedCurrency->short_code.' '. number_format((float)$outstanding, 2, '.', ','));
+
+        return $this->response(['data' => $this->generatesBookingQuotation->execute(
+            $this->fetchBookingQuotation->execute($booking->company, $conversionObject),
+            $this->fetchesCompanyPaymentAttemptLimit->execute($booking->company)
+        )]);
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/ListBookingsLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/ListBookingsLogic.php
index 21ea2a37..23a21700 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/ListBookingsLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/ListBookingsLogic.php
@@ -3,7 +3,7 @@
 
 namespace App\Classes\Modules\Bookings\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Bookings\Services\ListsBookings;
 use App\Classes\Modules\Bookings\Standards\Rules\CanListBookings;
 use App\Http\Resources\BookingResource;
@@ -11,7 +11,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class ListBookingsLogic extends AbstractControllersLogic
+class ListBookingsLogic extends AbstractControllerLogic
 {
     /**
      * @return array
@@ -42,16 +42,11 @@ class ListBookingsLogic extends AbstractControllersLogic
 
     public function logic(Request $request) : JsonResponse
     {
-        try  {
-            $this->canListBookings->passes();
+        $this->canListBookings->passes();
 
-            $query = $this->listsBookings->execute($this->listsBookings->deserializeFilters($request->input('filters')));
+        $query = $this->listsBookings->execute($this->listsBookings->deserializeFilters($request->input('filters')));
 
-            return $this->collectionResponse(BookingResource::collection($query));
-
-        } catch (\Exception $exception) {
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->collectionResponse(BookingResource::collection($query));
 
     }
 
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingLogic.php
index f38788bb..5db55b0d 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingLogic.php
@@ -4,7 +4,7 @@ namespace App\Classes\Modules\Bookings\ControllersLogic;
 
 use App\Http\Resources\BookingResource;
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 
 use App\Classes\Modules\Bookings\Services\FetchesBooking;
 
@@ -17,7 +17,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class UpdateBookingLogic extends AbstractControllersLogic
+class UpdateBookingLogic extends AbstractControllerLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Bookings/DataTransferObjects/BookingObject.php b/app/Classes/Modules/Bookings/DataTransferObjects/BookingObject.php
index cb6239c5..21b248b6 100644
--- a/app/Classes/Modules/Bookings/DataTransferObjects/BookingObject.php
+++ b/app/Classes/Modules/Bookings/DataTransferObjects/BookingObject.php
@@ -2,112 +2,108 @@
 
 namespace App\Classes\Modules\Bookings\DataTransferObjects;
 
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
 
 class BookingObject implements DataTransferObject
 {
-    private $company_id;
-    private $transferable_bank_id;
+
+    /** @var int */
+    private $serviceId;
+
+    /** @var int */
+    private $transferableBankId;
+
+    /** @var string  */
     private $marking;
-    private $reference;
-    private $fix_amount;
-    private $fix_currency_id;
-    private $convertible_currency_id;
-    private $conversion_currency_id;
+
+    /** @var float */
+    private $fixAmount;
+
+    /** @var int */
+    private $fixCurrencyId;
+
+    /** @var int */
+    private $convertibleCurrencyId;
+
+    /** @var int */
+    private $conversionCurrencyId;
 
     /**
      * BookingObject constructor.
-     * @param int|null $company_id
-     * @param int|null $transferable_bank_id
-     * @param string|null $marking
-     * @param string|null $reference
-     * @param float|null $fix_amount
-     * @param int|null $fix_currency_id
-     * @param int|null $convertible_currency_id
-     * @param int|null $conversion_currency_id
+     * @param int $serviceId
+     * @param int $transferableBankId
+     * @param string $marking
+     * @param float $fixAmount
+     * @param int $fixCurrencyId
+     * @param int $convertibleCurrencyId
+     * @param int $conversionCurrencyId
      */
-    public function __construct(
-        ?int $company_id,
-        ?int $transferable_bank_id,
-        ?string $marking,
-        ?string $reference,
-        ?float $fix_amount,
-        ?int $fix_currency_id,
-        ?int $convertible_currency_id,
-        ?int $conversion_currency_id
-    )
+    public function __construct(int $serviceId, int $transferableBankId, string $marking, float $fixAmount, int $fixCurrencyId, int $convertibleCurrencyId, int $conversionCurrencyId)
     {
-        $this->company_id = $company_id;
-        $this->transferable_bank_id = $transferable_bank_id;
+        $this->serviceId = $serviceId;
+        $this->transferableBankId = $transferableBankId;
         $this->marking = $marking;
-        $this->reference = $reference;
-        $this->fix_amount = $fix_amount;
-        $this->fix_currency_id = $fix_currency_id;
-        $this->convertible_currency_id = $convertible_currency_id;
-        $this->conversion_currency_id = $conversion_currency_id;
+        $this->fixAmount = $fixAmount;
+        $this->fixCurrencyId = $fixCurrencyId;
+        $this->convertibleCurrencyId = $convertibleCurrencyId;
+        $this->conversionCurrencyId = $conversionCurrencyId;
     }
 
     /**
      * @return int
      */
-    public function getCompanyId(): ?int
+    public function getServiceId(): int
     {
-        return $this->company_id;
+        return $this->serviceId;
     }
 
     /**
      * @return int
      */
-    public function getTransferableBankId(): ?int
+    public function getTransferableBankId(): int
     {
-        return $this->transferable_bank_id;
+        return $this->transferableBankId;
     }
 
     /**
      * @return string
      */
-    public function getMarking(): ?string
+    public function getMarking(): string
     {
         return $this->marking;
     }
 
-    /**
-     * @return string
-     */
-    public function getReference(): ?string
-    {
-        return $this->reference;
-    }
-
     /**
      * @return float
      */
-    public function getFixAmount(): ?float
+    public function getFixAmount(): float
     {
-        return $this->fix_amount;
+        return $this->fixAmount;
     }
 
     /**
      * @return int
      */
-    public function getFixCurrencyId(): ?int
+    public function getFixCurrencyId(): int
     {
-        return $this->fix_currency_id;
+        return $this->fixCurrencyId;
     }
 
     /**
      * @return int
      */
-    public function getConvertibleCurrencyId(): ?int
+    public function getConvertibleCurrencyId(): int
     {
-        return $this->convertible_currency_id;
+        return $this->convertibleCurrencyId;
     }
 
     /**
      * @return int
      */
-    public function getConversionCurrencyId(): ?int
+    public function getConversionCurrencyId(): int
     {
-        return $this->conversion_currency_id;
+        return $this->conversionCurrencyId;
     }
+
+
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/DataTransferObjects/CalculationObject.php b/app/Classes/Modules/Bookings/DataTransferObjects/CalculationObject.php
new file mode 100644
index 00000000..aeeba8f7
--- /dev/null
+++ b/app/Classes/Modules/Bookings/DataTransferObjects/CalculationObject.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyServiceConfigurationsObject;
+use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject;
+
+class CalculationObject implements DataTransferObject
+{
+
+    /** @var CurrencyConversionObject */
+    private $conversionObject;
+
+    /** @var CompanyServiceConfigurationsObject */
+    private $configurations;
+
+    /**
+     * CalculationObject constructor.
+     * @param CurrencyConversionObject $conversionObject
+     * @param CompanyServiceConfigurationsObject $configurations
+     */
+    public function __construct(CurrencyConversionObject $conversionObject, CompanyServiceConfigurationsObject $configurations)
+    {
+        $this->conversionObject = $conversionObject;
+        $this->configurations = $configurations;
+    }
+
+    /**
+     * @return CurrencyConversionObject
+     */
+    public function getConversionObject(): CurrencyConversionObject
+    {
+        return $this->conversionObject;
+    }
+
+
+    /**
+     * @return CompanyServiceConfigurationsObject
+     */
+    public function getConfigurations(): CompanyServiceConfigurationsObject
+    {
+        return $this->configurations;
+    }
+
+    public function getConvertibleTotal(){
+        return $this->getConversionObject()->getType() === 1 ? $this->getConversionObject()->getAmount() : $this->getConversionTotal();
+    }
+
+    /**
+     * @return float
+     */
+    public function getConversionTotal(): float {
+        $rate = $this->getConversionObject()->getType() === 1 ? (1/$this->getConfigurations()->getRate()) : $this->getConfigurations()->getRate();
+        return $this->getConversionObject()->getAmount() * $rate;
+    }
+
+    /**
+     * @return float
+     */
+    public function getLocalTotal(){
+        return $this->getConversionObject()->getType() === 1 ?  $this->getConversionTotal() : $this->getConversionObject()->getAmount();
+    }
+
+    /**
+     * @return float
+     */
+    public function getForeignTotal(){
+        return $this->getConversionObject()->getType() === 1 ?   $this->getConversionObject()->getAmount() : $this->getConversionTotal();
+    }
+
+    /**
+     * @return float
+     */
+    public function getServiceCharge(): float {
+        return ($this->getLocalTotal()/100) * $this->getConfigurations()->getServiceCharge() < $this->getConfigurations()->getMinimumCharge() ? $this->getConfigurations()->getMinimumCharge() : ($this->getLocalTotal()/100) * $this->getConfigurations()->getServiceCharge();
+    }
+
+    public function getSubTotal(): float {
+        return $this->getLocalTotal() + $this->getServiceCharge();
+    }
+
+    /**
+     * @return float
+     */
+    public function getTax(): float {
+        return ($this->getSubTotal()/100) * $this->getConfigurations()->getTax();
+    }
+
+    public function getTotal(): float {
+        return $this->getSubTotal() + $this->getTax();
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Services/CalculatesBookingFloatingAmount.php b/app/Classes/Modules/Bookings/Services/CalculatesBookingFloatingAmount.php
new file mode 100644
index 00000000..cc5acc1d
--- /dev/null
+++ b/app/Classes/Modules/Bookings/Services/CalculatesBookingFloatingAmount.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Services;
+
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Booking;
+use Carbon\Carbon;
+
+class CalculatesBookingFloatingAmount
+{
+
+    public function execute(Booking $booking, int $type){
+        return $type === 1 ?
+            $booking->transactions()->selectRaw('sum(amount - service_charge - tax) as sub_total')
+                ->where('type', TransactionType::PAYMENT)
+                ->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION])
+                ->whereDate('expires_on', '>', Carbon::now())->get()->sum('sub_total') :
+            $booking->transactions()->where('type', TransactionType::PAYMENT)
+                ->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION])
+                ->whereDate('expires_on', '>', Carbon::now())->sum('original_amount');
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Services/CalculatesBookingOutstanding.php b/app/Classes/Modules/Bookings/Services/CalculatesBookingOutstanding.php
new file mode 100644
index 00000000..b1aae605
--- /dev/null
+++ b/app/Classes/Modules/Bookings/Services/CalculatesBookingOutstanding.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Services;
+
+
+use App\Models\Booking;
+
+class CalculatesBookingOutstanding
+{
+
+    /** @var CalculatesBookingPaidAmount */
+    private $calculatesBookingPaidAmount;
+
+    /** @var CalculatesBookingFloatingAmount */
+    private $calculatesBookingFloatingAmount;
+
+    /**
+     * CalculatesBookingOutstanding constructor.
+     * @param CalculatesBookingPaidAmount $calculatesBookingPaidAmount
+     * @param CalculatesBookingFloatingAmount $calculatesBookingFloatingAmount
+     */
+    public function __construct(CalculatesBookingPaidAmount $calculatesBookingPaidAmount, CalculatesBookingFloatingAmount $calculatesBookingFloatingAmount)
+    {
+        $this->calculatesBookingPaidAmount = $calculatesBookingPaidAmount;
+        $this->calculatesBookingFloatingAmount = $calculatesBookingFloatingAmount;
+    }
+
+
+    public function execute(Booking $booking){
+        return $booking->fix_amount - $this->calculatesBookingFloatingAmount->execute($booking, $booking->fix_currency_id) - $this->calculatesBookingPaidAmount->execute($booking, $booking->fix_currency_id);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Services/CalculatesBookingPaidAmount.php b/app/Classes/Modules/Bookings/Services/CalculatesBookingPaidAmount.php
new file mode 100644
index 00000000..1dd5a847
--- /dev/null
+++ b/app/Classes/Modules/Bookings/Services/CalculatesBookingPaidAmount.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Services;
+
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Booking;
+use Carbon\Carbon;
+
+class CalculatesBookingPaidAmount
+{
+
+    public function execute(Booking $booking, int $type){
+        return $type === 1 ?
+            $booking->transactions()->selectRaw('sum(amount - service_charge - tax) as sub_total')
+                ->where('type', TransactionType::PAYMENT)
+                ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get()->sum('sub_total') :
+            $booking->transactions()->where('type', TransactionType::PAYMENT)
+                ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('original_amount');
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Services/CreatesBooking.php b/app/Classes/Modules/Bookings/Services/CreatesBooking.php
index 676451fd..51c6da78 100644
--- a/app/Classes/Modules/Bookings/Services/CreatesBooking.php
+++ b/app/Classes/Modules/Bookings/Services/CreatesBooking.php
@@ -3,26 +3,30 @@
 namespace App\Classes\Modules\Bookings\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
 use App\Classes\Modules\Bookings\DataTransferObjects\BookingObject;
 use App\Models\Booking;
+use App\Models\Company;
 
-class CreatesBooking extends AbstractUpdateRecord
+class CreatesBooking extends AbstractUpdateRelationshipRecord
 {
     /**
+     * @param Company $company
      * @param BookingObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(BookingObject $object) {
+    public function execute(Company $company, BookingObject $object) {
+
         $model = new Booking();
-        $model->company_id = $object->getCompanyId();
-        $model->transferable_bank_id = $object->getTransferableBankId();
+        $model->service_id = $object->getServiceId();
+        $model->bank_id = $object->getTransferableBankId();
         $model->marking = $object->getMarking();
-        $model->reference = $object->getReference();
         $model->fix_amount = $object->getFixAmount();
         $model->fix_currency_id = $object->getFixCurrencyId();
         $model->convertible_currency_id = $object->getConvertibleCurrencyId();
         $model->conversion_currency_id = $object->getConversionCurrencyId();
-        return $this->handler($model);
+
+        return $this->handler($company->bookings(), $model);
     }
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Services/DeletesBooking.php b/app/Classes/Modules/Bookings/Services/DeletesBooking.php
index b189c382..7e4d4842 100644
--- a/app/Classes/Modules/Bookings/Services/DeletesBooking.php
+++ b/app/Classes/Modules/Bookings/Services/DeletesBooking.php
@@ -8,6 +8,11 @@ use App\Models\Booking;
 class DeletesBooking extends AbstractDeleteRecord
 {
 
+    /**
+     * @param Booking $model
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
     public function execute(Booking $model) {
         return $this->handler($model);
     }
diff --git a/app/Classes/Modules/Bookings/Services/FetchesBookingQuotation.php b/app/Classes/Modules/Bookings/Services/FetchesBookingQuotation.php
new file mode 100644
index 00000000..17d776fd
--- /dev/null
+++ b/app/Classes/Modules/Bookings/Services/FetchesBookingQuotation.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Services;
+
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Modules\Bookings\DataTransferObjects\CalculationObject;
+use App\Classes\Modules\Companies\Services\FetchesCompanyServiceSettings;
+use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject;
+use App\Classes\Modules\Currencies\Services\FetchesCurrency;
+use App\Models\Company;
+use App\Models\Currency;
+
+class FetchesBookingQuotation
+{
+
+    /** @var FetchesCompanyServiceSettings */
+    private $fetchesCompanyServiceSettings;
+
+    /** @var FetchesCurrency */
+    private $fetchesCurrency;
+
+    /**
+     * FetchesBookingQuotation constructor.
+     * @param FetchesCompanyServiceSettings $fetchesCompanyServiceSettings
+     * @param FetchesCurrency $fetchesCurrency
+     */
+    public function __construct(FetchesCompanyServiceSettings $fetchesCompanyServiceSettings, FetchesCurrency $fetchesCurrency)
+    {
+        $this->fetchesCompanyServiceSettings = $fetchesCompanyServiceSettings;
+        $this->fetchesCurrency = $fetchesCurrency;
+    }
+
+
+    /**
+     * @param Company $company
+     * @param CurrencyConversionObject $conversionObject
+     * @return CalculationObject
+     * @throws MalformedRequestException
+     */
+    public function execute(Company $company, CurrencyConversionObject $conversionObject){
+        if($conversionObject->getAmount() <= 0) throw new MalformedRequestException('Your transfer must be greater than zero.');
+
+        $configurations = $this->fetchesCompanyServiceSettings->execute($company, $conversionObject);
+
+        /** @var Currency $currency */
+        $currency = $this->fetchesCurrency->execute(['id' => $conversionObject->getCurrencyId()]);
+        if($conversionObject->getAmount() > $configurations->getMaxLimit()) throw new MalformedRequestException('Your transfer can\'t be greater than '.number_format( floatval(str_replace(',', '', $configurations->getMaxLimit())), 2, '.', ',').' '.$currency->short_code);
+
+        $calculationObject = new CalculationObject($conversionObject, $configurations);
+
+        return $calculationObject;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Services/GeneratesBookingMarking.php b/app/Classes/Modules/Bookings/Services/GeneratesBookingMarking.php
index 0e920ab8..3e58e945 100644
--- a/app/Classes/Modules/Bookings/Services/GeneratesBookingMarking.php
+++ b/app/Classes/Modules/Bookings/Services/GeneratesBookingMarking.php
@@ -24,7 +24,7 @@ class GeneratesBookingMarking
      */
     public function execute(): int {
 
-        $marking = mt_rand(100000001, 999999999);
+        $marking = mt_rand(20000, 99999);
         return !$this->bookingMarkingExists->execute($marking) ? $marking : self::execute();
     }
 
diff --git a/app/Classes/Modules/Bookings/Services/GeneratesBookingQuotation.php b/app/Classes/Modules/Bookings/Services/GeneratesBookingQuotation.php
new file mode 100644
index 00000000..0b631b54
--- /dev/null
+++ b/app/Classes/Modules/Bookings/Services/GeneratesBookingQuotation.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Services;
+
+
+use App\Classes\Modules\Bookings\DataTransferObjects\CalculationObject;
+use App\Http\Resources\BankResource;
+use App\Models\Bank;
+use Carbon\Carbon;
+
+class GeneratesBookingQuotation
+{
+
+    public function execute(CalculationObject $calculationObject, ?int $paymentAttemptLimit = 0){
+        return [
+            'bank' => new BankResource(Bank::find($calculationObject->getConfigurations()->getBankId())),
+            'rate' => $calculationObject->getConfigurations()->getRate(),
+            'local_total' => $calculationObject->getLocalTotal(),
+            'foreign_total' => $calculationObject->getForeignTotal(),
+            'conversion_amount' => $calculationObject->getConversionTotal(),
+            'service_charge' => $calculationObject->getServiceCharge(),
+            'tax_total' => $calculationObject->getTax(),
+            'tax' => $calculationObject->getConfigurations()->getTax(),
+            'sub_total' => $calculationObject->getSubTotal(),
+            'total' => $calculationObject->getTotal(),
+            'date' => Carbon::now()->timezone('Asia/Singapore')->format('h:i a, jS M, Y \G\M\T T'),
+            'payment_attempt_limit' => $paymentAttemptLimit
+        ];
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Services/ListsBookings.php b/app/Classes/Modules/Bookings/Services/ListsBookings.php
index f2aa1f1c..fb1ef526 100644
--- a/app/Classes/Modules/Bookings/Services/ListsBookings.php
+++ b/app/Classes/Modules/Bookings/Services/ListsBookings.php
@@ -22,10 +22,10 @@ class ListsBookings extends AbstractListRecord
     }
 
     /**
-     * @return Booking
+     * @return Builder
      */
     public function getRepository(): Builder
     {
-        return $this->repository;
+        return $this->repository->newQuery();
     }
 }
diff --git a/app/Classes/Modules/Bookings/Services/UpdatesBooking.php b/app/Classes/Modules/Bookings/Services/UpdatesBooking.php
index b5350aa3..37ca5b7c 100644
--- a/app/Classes/Modules/Bookings/Services/UpdatesBooking.php
+++ b/app/Classes/Modules/Bookings/Services/UpdatesBooking.php
@@ -10,6 +10,7 @@ class UpdatesBooking extends AbstractUpdateRecord
 {
 
     /**
+     * @param Booking $model
      * @param BookingObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
diff --git a/app/Classes/Modules/Bookings/Standards/Rules/CanCreateBooking.php b/app/Classes/Modules/Bookings/Standards/Rules/CanCreateBooking.php
index 22dadccf..7871acfe 100644
--- a/app/Classes/Modules/Bookings/Standards/Rules/CanCreateBooking.php
+++ b/app/Classes/Modules/Bookings/Standards/Rules/CanCreateBooking.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Bookings\Standards\Rules;
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Bookings\DataTransferObjects\SegmentObject;
+use App\Classes\Modules\Bookings\DataTransferObjects\BookingObject;
 use App\Classes\Modules\Bookings\Standards\Validators\BookingValidation;
 
 class CanCreateBooking extends AbstractRule
@@ -27,16 +27,11 @@ class CanCreateBooking extends AbstractRule
      */
     protected function authorized(): bool
     {
-        // TODO  Set Authorization rules
-        if (!\Auth::user()->can('add booking')) {
-            return false;
-        }
-
         return true;
     }
 
     /**
-     * @param SegmentObject $object
+     * @param BookingObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
@@ -46,7 +41,7 @@ class CanCreateBooking extends AbstractRule
     }
 
     /**
-     * @param SegmentObject $object
+     * @param BookingObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/CurrencyRates/Standards/Rules/CanFetchCurrencyRate.php b/app/Classes/Modules/Bookings/Standards/Rules/CanFetchBooking.php
similarity index 62%
rename from app/Classes/Modules/CurrencyRates/Standards/Rules/CanFetchCurrencyRate.php
rename to app/Classes/Modules/Bookings/Standards/Rules/CanFetchBooking.php
index db751d2f..c6f17684 100644
--- a/app/Classes/Modules/CurrencyRates/Standards/Rules/CanFetchCurrencyRate.php
+++ b/app/Classes/Modules/Bookings/Standards/Rules/CanFetchBooking.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Classes\Modules\CurrencyRates\Standards\Rules;
+namespace App\Classes\Modules\Bookings\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\CurrencyRates\DataTransferObjects\CurrencyRateObject;
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
 
-class CanFetchCurrencyRate extends AbstractRule
+class CanFetchBooking extends AbstractRule
 {
 
 
@@ -21,7 +21,7 @@ class CanFetchCurrencyRate extends AbstractRule
     }
 
     /**
-     * @param CurrencyRateObject $object
+     * @param AddressObject $object
      * @return bool
      */
     protected function validators($object): bool
@@ -32,7 +32,7 @@ class CanFetchCurrencyRate extends AbstractRule
 
 
     /**
-     * @param CurrencyRateObject $object
+     * @param AddressObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/Bookings/Standards/Rules/CanUpdateBooking.php b/app/Classes/Modules/Bookings/Standards/Rules/CanUpdateBooking.php
index 9df3e108..bf5c022c 100644
--- a/app/Classes/Modules/Bookings/Standards/Rules/CanUpdateBooking.php
+++ b/app/Classes/Modules/Bookings/Standards/Rules/CanUpdateBooking.php
@@ -4,7 +4,6 @@ namespace App\Classes\Modules\Bookings\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Bookings\DataTransferObjects\BookingObject;
 use App\Classes\Modules\Bookings\Standards\Validators\BookingValidation;
 
 class CanUpdateBooking extends AbstractRule
diff --git a/app/Classes/Modules/Bookings/Standards/Validators/BookingValidation.php b/app/Classes/Modules/Bookings/Standards/Validators/BookingValidation.php
index 1bc628d0..362e3315 100644
--- a/app/Classes/Modules/Bookings/Standards/Validators/BookingValidation.php
+++ b/app/Classes/Modules/Bookings/Standards/Validators/BookingValidation.php
@@ -14,10 +14,9 @@ class BookingValidation extends AbstractValidation
     protected function data($object): array 
     {
         return [
-            'company_id' => $object->getCompanyId(),
+            'service_id' => $object->getServiceId(),
             'transferable_bank_id' => $object->getTransferableBankId(),
             'marking' => $object->getMarking(),
-            'reference' => $object->getReference(),
             'fix_amount' => $object->getFixAmount(),
             'fix_currency_id' => $object->getFixCurrencyId(),
             'convertible_currency_id' => $object->getConvertibleCurrencyId(),
@@ -31,10 +30,9 @@ class BookingValidation extends AbstractValidation
     protected function rules(): array 
     {
         return [
-            'company_id' => 'required',
+            'service_id' => 'required',
             'transferable_bank_id' => 'required',
             'marking' => 'required',
-            'reference' => 'required',
             'fix_amount' => 'required',
             'fix_currency_id' => 'required',
             'convertible_currency_id' => 'required',
diff --git a/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php b/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php
new file mode 100644
index 00000000..d5e052a9
--- /dev/null
+++ b/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+use App\Classes\Modules\Companies\Services\UpdatesCompanyStatus;
+use App\Classes\Modules\Documents\Services\RejectsDocument;
+use App\Classes\Modules\Documents\Standards\Rules\CanApproveDocument;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Http\Resources\DocumentResource;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Documents\Services\FetchesDocument;
+
+use App\Classes\Modules\Documents\Services\ApprovesDocument;
+
+use App\Models\Document;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Approve Document',
+            'message' => 'You have successfully approved the Document'
+        ];
+    }
+
+    /** @var CanApproveDocument*/
+    private $canApproveDocument;
+
+    /** @var ApprovesDocument */
+    private $approvesDocument;
+
+    /** @var RejectsDocument */
+    private $rejectsDocument;
+
+    /** @var FetchesDocument */
+    private $fetchesDocument;
+
+    /** @var UpdatesCompanyStatus */
+    private $updatesCompanyStatus;
+
+    /**
+     * ApproveIdentificationDocumentLogic constructor.
+     * @param CanApproveDocument $canApproveDocument
+     * @param ApprovesDocument $approvesDocument
+     * @param RejectsDocument $rejectsDocument
+     * @param FetchesDocument $fetchesDocument
+     * @param UpdatesCompanyStatus $updatesCompanyStatus
+     */
+    public function __construct(CanApproveDocument $canApproveDocument, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, UpdatesCompanyStatus $updatesCompanyStatus)
+    {
+        $this->canApproveDocument = $canApproveDocument;
+        $this->approvesDocument = $approvesDocument;
+        $this->rejectsDocument = $rejectsDocument;
+        $this->fetchesDocument = $fetchesDocument;
+        $this->updatesCompanyStatus = $updatesCompanyStatus;
+    }
+
+    /**
+     * @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
+    {
+
+        $status = $request->route('status');
+
+        /** @var Document $document */
+        $document = $this->fetchesDocument->execute(['id' => $request->route('document_id')]);
+
+        $this->canApproveDocument->passes();
+
+        $document = $status === 'approve' ? $this->approvesDocument->execute($document) : $this->rejectsDocument->execute($document);
+
+        $this->updatesCompanyStatus->execute($document->owner, $status === 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
+
+        return $this->resourceResponse(new DocumentResource($document));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/ControllersLogic/AssignCompanyToSegmentLogic.php b/app/Classes/Modules/Companies/ControllersLogic/AssignCompanyToSegmentLogic.php
new file mode 100644
index 00000000..17a6c900
--- /dev/null
+++ b/app/Classes/Modules/Companies/ControllersLogic/AssignCompanyToSegmentLogic.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Processors\AssignSegmentProcessor;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Http\Resources\CompanyResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class AssignCompanyToSegmentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Assign Company To Segment',
+            'message' => 'You have successfully assigned Company to segment'
+        ];
+    }
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var AssignSegmentProcessor */
+    private $assignCompanyToSegmentProcessor;
+
+    /**
+     * AssignCompanyToSegmentLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param AssignSegmentProcessor $assignCompanyToSegmentProcessor
+     */
+    public function __construct(FetchesCompany $fetchesCompany, AssignSegmentProcessor $assignCompanyToSegmentProcessor)
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->assignCompanyToSegmentProcessor = $assignCompanyToSegmentProcessor;
+    }
+
+    /**
+     * @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
+    {
+
+        $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+
+        $this->assignCompanyToSegmentProcessor->execute($company, $request->input('segment_id'));
+
+        return $this->resourceResponse(new CompanyResource($company));
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/ControllersLogic/CreateCompanyLogic.php b/app/Classes/Modules/Companies/ControllersLogic/CreateCompanyLogic.php
index 62292083..019fe833 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/CreateCompanyLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/CreateCompanyLogic.php
@@ -3,15 +3,25 @@
 namespace App\Classes\Modules\Companies\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\CompanyType;
 use App\Http\Resources\CompanyResource;
-use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class CreateCompanyLogic extends AbstractControllersLogic
+class CreateCompanyLogic extends AbstractControllerLogic
 {
+    /**
+     * CreateCompanyLogic constructor.
+     * @param CreateCompanyProcessor $createCompanyProcessor
+     */
+    public function __construct(CreateCompanyProcessor $createCompanyProcessor)
+    {
+        $this->createCompanyProcessor = $createCompanyProcessor;
+    }
 
     /**
      * @return array
@@ -26,30 +36,18 @@ class CreateCompanyLogic extends AbstractControllersLogic
     /** @var CreateCompanyProcessor */
     private $createCompanyProcessor;
 
-    /**
-     * CreateCompanyLogic constructor.
-     * @param CreateCompanyProcessor $createCompanyProcessor
-     */
-    public function __construct(CreateCompanyProcessor $createCompanyProcessor)
-    {
-        $this->createCompanyProcessor = $createCompanyProcessor;
-    }
 
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
-
-            return $this->resourceResponse(new CompanyResource($this->createCompanyProcessor->execute($request)));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
+        $company = $this->createCompanyProcessor->execute($request, BusinessType::CURRENCY_VENDOR, CompanyType::COMPANY_BUSINESS, ApprovalStatus::APPROVED);
+        return $this->resourceResponse(new CompanyResource($company));
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/ControllersLogic/CreateIdentificationDocumentLogic.php b/app/Classes/Modules/Companies/ControllersLogic/CreateIdentificationDocumentLogic.php
new file mode 100644
index 00000000..bbf91ea7
--- /dev/null
+++ b/app/Classes/Modules/Companies/ControllersLogic/CreateIdentificationDocumentLogic.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyStatus;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\CompanyType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Models\Company;
+use App\Models\Document;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateIdentificationDocumentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Identification Document',
+            'message' => 'You have successfully created a new identification document'
+        ];
+    }
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFile;
+
+    /** @var UpdatesCompanyStatus */
+    private $updatesCompanyStatus;
+
+
+    /**
+     * CreateIdentificationDocumentLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFile
+     * @param UpdatesCompanyStatus $updatesCompanyStatus
+     */
+    public function __construct(FetchesCompany $fetchesCompany, CreatesDocument $createsDocument, CreatesFiles $createsFile, UpdatesCompanyStatus $updatesCompanyStatus)
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->createsDocument = $createsDocument;
+        $this->createsFile = $createsFile;
+        $this->updatesCompanyStatus = $updatesCompanyStatus;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        /** @var Company $company */
+        $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+        $object = new DocumentObject($company->type === CompanyType::COMPANY_BUSINESS ?
+            DocumentType::SSM_REGISTRATION : DocumentType::IDENTITY_CARD, $request->input('files'),
+            $request->input('identification_no'), ApprovalStatus::PENDING_VERIFICATION, 'identifications');
+
+        /** @var Document $document */
+        $document = $this->createsDocument->execute($company, $object);
+        $this->createsFile->execute($document, $object);
+
+        $this->updatesCompanyStatus->execute($company, ApprovalStatus::PENDING_VERIFICATION);
+
+        return $this->response([]);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/ControllersLogic/DeleteCompanyLogic.php b/app/Classes/Modules/Companies/ControllersLogic/DeleteCompanyLogic.php
index aa4ea625..ac5dabb0 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/DeleteCompanyLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/DeleteCompanyLogic.php
@@ -3,15 +3,14 @@
 namespace App\Classes\Modules\Companies\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Services\DeletesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Standards\Rules\CanDeleteCompany;
-use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class DeleteCompanyLogic extends AbstractControllersLogic
+class DeleteCompanyLogic extends AbstractControllerLogic
 {
     /**
      * @return array
@@ -31,7 +30,7 @@ class DeleteCompanyLogic extends AbstractControllersLogic
     private $deletesCompany;
 
     /** @var FetchesCompany */
-        private $fetchesCompany;
+    private $fetchesCompany;
 
     /**
      * DeleteCompanyLogic constructor.
@@ -50,23 +49,20 @@ class DeleteCompanyLogic extends AbstractControllersLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
 
-            $this->canDeleteCompany->passes();
+        $this->canDeleteCompany->passes();
 
-            $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+        $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
 
-            $this->deletesCompany->execute($query);
+        $this->deletesCompany->execute($query);
 
-            return $this->response([]);
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->response([]);
 
     }
 
diff --git a/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyBookingQuotationLogic.php b/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyBookingQuotationLogic.php
new file mode 100644
index 00000000..37225631
--- /dev/null
+++ b/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyBookingQuotationLogic.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\RequestValidationException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Bookings\Services\FetchesBookingQuotation;
+use App\Classes\Modules\Bookings\Services\GeneratesBookingQuotation;
+use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject;
+use App\Classes\Modules\Currencies\Services\FetchesCurrency;
+use App\Models\Company;
+use App\Models\Currency;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchCompanyBookingQuotationLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Fetch Currency Conversion',
+            'message' => 'You have successfully retrieved a currency conversion'
+        ];
+    }
+
+
+    /** @var FetchesBookingQuotation */
+    private $fetchBookingQuotation;
+
+    /** @var GeneratesBookingQuotation */
+    private $generatesBookingQuotation;
+
+    /** @var FetchesCurrency */
+    private $fetchesCurrency;
+
+    /**
+     * FetchCompanyBookingQuotationLogic constructor.
+     * @param FetchesBookingQuotation $fetchBookingQuotation
+     * @param GeneratesBookingQuotation $generatesBookingQuotation
+     * @param FetchesCurrency $fetchesCurrency
+     */
+    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, GeneratesBookingQuotation $generatesBookingQuotation, FetchesCurrency $fetchesCurrency)
+    {
+        $this->fetchBookingQuotation = $fetchBookingQuotation;
+        $this->generatesBookingQuotation = $generatesBookingQuotation;
+        $this->fetchesCurrency = $fetchesCurrency;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws MalformedRequestException
+     * @throws RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        /** @var Company $company */
+        $company = Company::find($request->route('id'));
+
+        $conversionObject = new CurrencyConversionObject(floatval(str_replace(',', '', $request->input('amount'))), $request->input('currency_id'), $request->input('service_id'), $request->input('type'));
+
+        $calculationObject = $this->fetchBookingQuotation->execute($company, $conversionObject);
+
+        /** @var Currency $currency */
+        $currency = $this->fetchesCurrency->execute(['id' => $conversionObject->getCurrencyId()]);
+        if($calculationObject->getConvertibleTotal() < $calculationObject->getConfigurations()->getMinLimit()) throw new RequestValidationException('Your transfer is below the minimum amount allowed of '.$calculationObject->getConfigurations()->getMinLimit().' '.$currency->short_code);
+
+        //TODO  add po limit validation
+        return $this->response(['data' => $this->generatesBookingQuotation->execute($calculationObject)]);
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyLogic.php b/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyLogic.php
index b64ac700..5406d682 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyLogic.php
@@ -3,16 +3,15 @@
 namespace App\Classes\Modules\Companies\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Standards\Rules\CanFetchCompany;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
 use App\Http\Resources\CompanyResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class FetchCompanyLogic extends AbstractControllersLogic
+class FetchCompanyLogic extends AbstractControllerLogic
 {
 
     /**
@@ -46,21 +45,16 @@ class FetchCompanyLogic extends AbstractControllersLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
+        $this->canFetchCompany->passes();
 
-            $this->canFetchCompany->passes();
+        $query = $this->fetchesCompany->execute(['id' => $request->route('id'), 'with_bookings' => true]);
 
-            $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
-
-            return $this->resourceResponse(new CompanyResource($query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->resourceResponse(new CompanyResource($query));
 
     }
 
diff --git a/app/Classes/Modules/Companies/ControllersLogic/ListCompaniesLogic.php b/app/Classes/Modules/Companies/ControllersLogic/ListCompaniesLogic.php
index dbfd108c..80b15c1c 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/ListCompaniesLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/ListCompaniesLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Companies\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Services\ListsCompanies;
 use App\Classes\Modules\Companies\Standards\Rules\CanListCompanies;
 use App\Http\Resources\CompanyResource;
@@ -11,7 +11,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class ListCompaniesLogic extends AbstractControllersLogic
+class ListCompaniesLogic extends AbstractControllerLogic
 {
 
     /**
@@ -45,19 +45,16 @@ class ListCompaniesLogic extends AbstractControllersLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
-            $this->canListCompanies->passes();
-            
-            $query = $this->listsCompanies->execute($this->listsCompanies->deserializeFilters($request->input('filters')));
-            return $this->collectionResponse(CompanyResource::collection($query));
+        $this->canListCompanies->passes();
 
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        $query = $this->listsCompanies->execute($this->listsCompanies->deserializeFilters($request->input('filters')));
+        return $this->collectionResponse(CompanyResource::collection($query));
 
     }
 
diff --git a/app/Classes/Modules/Companies/ControllersLogic/RemoveCompanyFromSegmentLogic.php b/app/Classes/Modules/Companies/ControllersLogic/RemoveCompanyFromSegmentLogic.php
new file mode 100644
index 00000000..10623311
--- /dev/null
+++ b/app/Classes/Modules/Companies/ControllersLogic/RemoveCompanyFromSegmentLogic.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Services\RemovesCompanyFromSegment;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Http\Resources\CompanyResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RemoveCompanyFromSegmentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Detach Company From Segment',
+            'message' => 'You have successfully detached Company from segment'
+        ];
+    }
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var RemovesCompanyFromSegment */
+    private $removesCompanyFromSegment;
+
+    /**
+     * RemoveCompanyFromSegmentLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param FetchesSegment $fetchesSegment
+     * @param RemovesCompanyFromSegment $removesCompanyFromSegment
+     */
+    public function __construct(FetchesCompany $fetchesCompany, FetchesSegment $fetchesSegment, RemovesCompanyFromSegment $removesCompanyFromSegment)
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->removesCompanyFromSegment = $removesCompanyFromSegment;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+
+        $segment = $this->fetchesSegment->execute(['id' => $request->route('segment_id')]);
+
+        $this->removesCompanyFromSegment->execute($company, $segment);
+
+        return $this->resourceResponse(new CompanyResource($company));
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyLogic.php b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyLogic.php
index 597d2ede..c435dab4 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Companies\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Services\UpdatesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
@@ -13,7 +13,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class UpdateCompanyLogic extends AbstractControllersLogic
+class UpdateCompanyLogic extends AbstractControllerLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Companies/ControllersLogic/UpdateSupplierCurrenciesLogic.php b/app/Classes/Modules/Companies/ControllersLogic/UpdateSupplierCurrenciesLogic.php
new file mode 100644
index 00000000..1f7f6853
--- /dev/null
+++ b/app/Classes/Modules/Companies/ControllersLogic/UpdateSupplierCurrenciesLogic.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\CreatesConstant;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\Modules\Segments\Services\UpdatesConstant;
+use App\Classes\Modules\Segments\Standards\Rules\CanCreateConstant;
+use App\Classes\Modules\Segments\Standards\Rules\CanUpdateConstant;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\ConstantResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateSupplierCurrenciesLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Supplier',
+            'message' => 'You have successfully updated the Supplier'
+        ];
+    }
+
+    /** @var CanCreateConstant */
+    private $canCreateConstant;
+
+    /** @var CanUpdateConstant */
+    private $canUpdateConstant;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /** @var UpdatesConstant */
+    private $updatesConstant;
+
+    /** @var CreatesConstant */
+    private $createsConstant;
+
+
+    /**
+     * UpdateSupplierCurrenciesLogic constructor.
+     * @param CanCreateConstant $canCreateConstant
+     * @param CanUpdateConstant $canUpdateConstant
+     * @param FetchesSegment $fetchesSegment
+     * @param FetchesConstant $fetchesConstant
+     * @param UpdatesConstant $updatesConstant
+     * @param CreatesConstant $createsConstant
+     */
+    public function __construct(CanCreateConstant $canCreateConstant, CanUpdateConstant $canUpdateConstant, FetchesSegment $fetchesSegment, FetchesConstant $fetchesConstant, UpdatesConstant $updatesConstant, CreatesConstant $createsConstant)
+    {
+        $this->canCreateConstant = $canCreateConstant;
+        $this->canUpdateConstant = $canUpdateConstant;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->fetchesConstant = $fetchesConstant;
+        $this->updatesConstant = $updatesConstant;
+        $this->createsConstant = $createsConstant;
+    }
+
+    /**
+     * @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
+    {
+
+        $supplierId = $request->route('id');
+
+        $object = new ConstantObject('Supplier\'s Currencies',SegmentConstants::SUPPLIER_CURRENCIES,
+            [
+                'id' => $supplierId, 'currencies' => $request->input('currencies')
+            ]
+        );
+
+        try {
+            $constant = $this->fetchesConstant->execute(['supplier_currencies' => $supplierId]);
+            $this->canUpdateConstant->passes($object);
+            $this->updatesConstant->execute($constant, $object);
+
+        } catch (\Exception $exception) {
+            $this->canCreateConstant->passes($object);
+            $segment = $this->fetchesSegment->execute(['type' => SegmentConstants::STANDARD_SEGMENT]);
+            $constant = $this->createsConstant->execute($segment, $object);
+        }
+
+        return $this->resourceResponse(new ConstantResource($constant));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/DataTransferObjects/CompanyObject.php b/app/Classes/Modules/Companies/DataTransferObjects/CompanyObject.php
index da9905e9..09b0e153 100644
--- a/app/Classes/Modules/Companies/DataTransferObjects/CompanyObject.php
+++ b/app/Classes/Modules/Companies/DataTransferObjects/CompanyObject.php
@@ -2,40 +2,48 @@
 
 namespace App\Classes\Modules\Companies\DataTransferObjects;
 
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BusinessType;
 
 class CompanyObject implements DataTransferObject
 {
-    /** @var string|null */
+    /** @var string */
     private $name;
 
-    /** @var string|null */
+    /** @var string */
     private $reference;
 
-    /** @var int */
+    /** @var int|null */
+    private $businessType;
+
+    /** @var int|null */
     private $type;
 
+    /** @var int|null */
+    private $status;
+
     /**
      * CompanyObject constructor.
-     * @param string|null $name
-     * @param string|null $reference
-     * @param string|null $type
+     * @param string $name
+     * @param string $reference
+     * @param int|null $businessType
+     * @param int|null $type
+     * @param int|null $status
      */
-    public function __construct(
-        ?string $name, 
-        ?string $reference, 
-        ?string $type
-    )
+    public function __construct(string $name, string $reference, ?int $businessType = BusinessType::IMPORTER, ?int $type = BusinessType::IMPORTER, ?int $status = ApprovalStatus::PENDING_SUBMISSION)
     {
         $this->name = $name;
         $this->reference = $reference;
+        $this->businessType = $businessType;
         $this->type = $type;
+        $this->status = $status;
     }
 
     /**
      * @return string
      */
-    public function getName(): ?string
+    public function getName(): string
     {
         return $this->name;
     }
@@ -43,7 +51,7 @@ class CompanyObject implements DataTransferObject
     /**
      * @return string
      */
-    public function getReference(): ?string
+    public function getReference(): string
     {
         return $this->reference;
     }
@@ -51,8 +59,28 @@ class CompanyObject implements DataTransferObject
     /**
      * @return int
      */
-    public function getType(): ?int
+    public function getBusinessType(): int
+    {
+        return $this->businessType;
+    }
+
+    /**
+     * @return int
+     */
+    public function getType(): int
     {
         return $this->type;
     }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+
+
+
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/DataTransferObjects/CompanyServiceConfigurationsObject.php b/app/Classes/Modules/Companies/DataTransferObjects/CompanyServiceConfigurationsObject.php
new file mode 100644
index 00000000..ab47b73d
--- /dev/null
+++ b/app/Classes/Modules/Companies/DataTransferObjects/CompanyServiceConfigurationsObject.php
@@ -0,0 +1,203 @@
+<?php
+
+namespace App\Classes\Modules\Companies\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class CompanyServiceConfigurationsObject implements DataTransferObject
+{
+
+    /** @var boolean */
+    private $isBillable;
+
+    /** @var int */
+    private $bankId;
+
+    /** @var int */
+    private $poLimit;
+
+    /** @var float */
+    private $tax;
+
+    /** @var float */
+    private $serviceCharge;
+
+    /** @var float */
+    private $minimumCharge;
+
+    /** @var float */
+    private $maxLimit;
+
+    /** @var float */
+    private $minLimit;
+
+    /** @var float */
+    private $rate;
+
+    /**
+     * CompanyServiceConfigurationsObject constructor.
+     * @param bool $isBillable
+     * @param int $bankId
+     * @param int $poLimit
+     * @param float $tax
+     * @param float $serviceCharge
+     * @param float $minimumCharge
+     * @param float $maxLimit
+     * @param float $minLimit
+     * @param float $rate
+     */
+    public function __construct(bool $isBillable, int $bankId, int $poLimit, float $tax, float $serviceCharge, float $minimumCharge, float $maxLimit, float $minLimit, float $rate)
+    {
+        $this->isBillable = $isBillable;
+        $this->bankId = $bankId;
+        $this->poLimit = $poLimit;
+        $this->tax = $tax;
+        $this->serviceCharge = $serviceCharge;
+        $this->minimumCharge = $minimumCharge;
+        $this->maxLimit = $maxLimit;
+        $this->minLimit = $minLimit;
+        $this->rate = $rate;
+    }
+
+
+    /**
+     * @param int $poLimit
+     */
+    public function setPoLimit(int $poLimit): void
+    {
+        $this->poLimit = $poLimit;
+    }
+
+    /**
+     * @param int $bankId
+     */
+    public function setBankId(int $bankId): void
+    {
+        $this->bankId = $bankId;
+    }
+
+
+
+    /**
+     * @param float $tax
+     */
+    public function setTax(float $tax): void
+    {
+        $this->tax = $tax;
+    }
+
+    /**
+     * @param float $serviceCharge
+     */
+    public function setServiceCharge(float $serviceCharge): void
+    {
+        $this->serviceCharge = $serviceCharge;
+    }
+
+    /**
+     * @param float $minimumCharge
+     */
+    public function setMinimumCharge(float $minimumCharge): void
+    {
+        $this->minimumCharge = $minimumCharge;
+    }
+
+    /**
+     * @param float $maxLimit
+     */
+    public function setMaxLimit(float $maxLimit): void
+    {
+        $this->maxLimit = $maxLimit;
+    }
+
+    /**
+     * @param float $minLimit
+     */
+    public function setMinLimit(float $minLimit): void
+    {
+        $this->minLimit = $minLimit;
+    }
+
+    /**
+     * @param float $rate
+     */
+    public function setRate(float $rate): void
+    {
+        $this->rate = $rate;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isBillable(): bool
+    {
+        return $this->isBillable;
+    }
+
+    /**
+     * @return int
+     */
+    public function getBankId(): int
+    {
+        return $this->bankId;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPoLimit(): int
+    {
+        return $this->poLimit;
+    }
+
+    /**
+     * @return float
+     */
+    public function getTax(): float
+    {
+        return $this->tax;
+    }
+
+    /**
+     * @return float
+     */
+    public function getServiceCharge(): float
+    {
+        return $this->serviceCharge;
+    }
+
+    /**
+     * @return float
+     */
+    public function getMinimumCharge(): float
+    {
+        return $this->minimumCharge;
+    }
+
+    /**
+     * @return float
+     */
+    public function getMaxLimit(): float
+    {
+        return $this->maxLimit;
+    }
+
+    /**
+     * @return float
+     */
+    public function getMinLimit(): float
+    {
+        return $this->minLimit;
+    }
+
+    /**
+     * @return float
+     */
+    public function getRate(): float
+    {
+        return $this->rate;
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/DataTransferObjects/ConnectionObject.php b/app/Classes/Modules/Companies/DataTransferObjects/ConnectionObject.php
deleted file mode 100644
index 078378b4..00000000
--- a/app/Classes/Modules/Companies/DataTransferObjects/ConnectionObject.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\DataTransferObjects;
-
-
-use App\Models\CompanyModule;
-
-class ConnectionObject
-{
-
-    /** @var CompanyModule */
-    private $inviter;
-
-    /** @var CompanyModule */
-    private $invitee;
-
-    /**
-     * ConnectionObject constructor.
-     * @param CompanyModule $inviter
-     * @param CompanyModule $invitee
-     */
-    public function __construct(CompanyModule $inviter, CompanyModule $invitee)
-    {
-        $this->inviter = $inviter;
-        $this->invitee = $invitee;
-    }
-
-    /**
-     * @return CompanyModule
-     */
-    public function getInviter(): CompanyModule
-    {
-        return $this->inviter;
-    }
-
-    /**
-     * @return CompanyModule
-     */
-    public function getInvitee(): CompanyModule
-    {
-        return $this->invitee;
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/DataTransferObjects/EmployeeObject.php b/app/Classes/Modules/Companies/DataTransferObjects/EmployeeObject.php
deleted file mode 100644
index 816a2de5..00000000
--- a/app/Classes/Modules/Companies/DataTransferObjects/EmployeeObject.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\DataTransferObjects;
-
-use App\Classes\Interfaces\DataTransferObject;
-use App\Models\CompanyModule;
-use App\Models\User;
-
-class EmployeeObject implements DataTransferObject
-{
-    /** @var CompanyModule */
-    private $companyModule;
-
-    /** @var User */
-    private $user;
-
-    /** @var int */
-    private $role;
-
-    /**
-     * EmployeeObject constructor.
-     * @param CompanyModule $companyModule
-     * @param User $user
-     * @param int $role
-     */
-    public function __construct(CompanyModule $companyModule, User $user, int $role)
-    {
-        $this->companyModule = $companyModule;
-        $this->user = $user;
-        $this->role = $role;
-    }
-
-    /**
-     * @return CompanyModule
-     */
-    public function getCompanyModule(): CompanyModule
-    {
-        return $this->companyModule;
-    }
-
-    /**
-     * @return User
-     */
-    public function getUser(): User
-    {
-        return $this->user;
-    }
-
-    /**
-     * @return int
-     */
-    public function getRole(): int
-    {
-        return $this->role;
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/DataTransferObjects/EmploymentObject.php b/app/Classes/Modules/Companies/DataTransferObjects/EmploymentObject.php
new file mode 100644
index 00000000..8a6781a0
--- /dev/null
+++ b/app/Classes/Modules/Companies/DataTransferObjects/EmploymentObject.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Classes\Modules\Companies\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Company;
+use App\Models\User;
+
+class EmploymentObject implements DataTransferObject
+{    
+    /** @var Company */
+    private $company;
+
+    /** @var User */
+    private $user;
+
+    /** @var int|null */
+    private $status;
+
+    /**
+     * EmploymentObject constructor.
+     * @param Company $company
+     * @param User $user
+     * @param int|null $status
+     */
+    public function __construct(Company $company, User $user, ?int $status = ApprovalStatus::APPROVED)
+    {
+        $this->company = $company;
+        $this->user = $user;
+        $this->status = $status;
+    }
+
+    /**
+     * @return Company
+     */
+    public function getCompany(): Company
+    {
+        return $this->company;
+    }
+
+    /**
+     * @return User
+     */
+    public function getUser(): User
+    {
+        return $this->user;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/DataTransferObjects/ModuleObject.php b/app/Classes/Modules/Companies/DataTransferObjects/ModuleObject.php
deleted file mode 100644
index 732799a3..00000000
--- a/app/Classes/Modules/Companies/DataTransferObjects/ModuleObject.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\DataTransferObjects;
-
-
-use App\Models\Company;
-
-class ModuleObject
-{
-
-    /** @var Company */
-    private $company;
-
-    /** @var int */
-    private $type;
-
-    /**
-     * ModuleObject constructor.
-     * @param Company $company
-     * @param int $type
-     */
-    public function __construct(Company $company, int $type)
-    {
-        $this->company = $company;
-        $this->type = $type;
-    }
-
-    /**
-     * @return Company
-     */
-    public function getCompany(): Company
-    {
-        return $this->company;
-    }
-
-    /**
-     * @return int
-     */
-    public function getType(): int
-    {
-        return $this->type;
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Processors/AssignEmployeeProcessor.php b/app/Classes/Modules/Companies/Processors/AssignEmployeeProcessor.php
new file mode 100644
index 00000000..e583833d
--- /dev/null
+++ b/app/Classes/Modules/Companies/Processors/AssignEmployeeProcessor.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Processors;
+
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Classes\Modules\Companies\Services\AssignsEmployee;
+use App\Classes\Modules\Companies\Services\CreatesCompany;
+use App\Classes\Modules\Companies\Standards\Rules\CanCreateCompany;
+use App\Classes\Modules\Companies\Standards\Rules\CanAssignEmployee;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use Illuminate\Http\Request;
+use Illuminate\Database\Eloquent\Model;
+
+class AssignEmployeeProcessor
+{
+
+    /** @var CanAssignEmployee */
+    private $canAssignEmployee;
+
+    /** @var AssignsEmployee */
+    private $assignsEmployee;
+
+    /**
+     * AssignEmployeeProcessor constructor.
+     * @param CanAssignEmployee $canAssignEmployee
+     * @param AssignsEmployee $assignsEmployee
+     */
+    public function __construct(CanAssignEmployee $canAssignEmployee, AssignsEmployee $assignsEmployee)
+    {
+        $this->canAssignEmployee = $canAssignEmployee;
+        $this->assignsEmployee = $assignsEmployee;
+    }
+
+    /**
+     * @param EmploymentObject $object
+     * @return Model
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(EmploymentObject $object): Model {
+
+        $this->canAssignEmployee->passes($object);
+
+        return $this->assignsEmployee->execute($object);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Processors/AssignSegmentProcessor.php b/app/Classes/Modules/Companies/Processors/AssignSegmentProcessor.php
new file mode 100644
index 00000000..66cfb08e
--- /dev/null
+++ b/app/Classes/Modules/Companies/Processors/AssignSegmentProcessor.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Processors;
+
+use App\Classes\Modules\Companies\Services\AssignsCompanyToSegment;
+use App\Classes\Modules\Companies\Standards\Rules\CanAssignSegment;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Models\Company;
+use Illuminate\Database\Eloquent\Model;
+
+class AssignSegmentProcessor
+{
+
+    /** @var CanAssignSegment */
+    private $canAssignSegment;
+
+    /** @var AssignsCompanyToSegment */
+    private $assignsSegment;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /**
+     * AssignCompanyToSegmentProcessor constructor.
+     * @param CanAssignSegment $canAssignSegment
+     * @param AssignsCompanyToSegment $assignsSegment
+     * @param FetchesSegment $fetchesSegment
+     */
+    public function __construct(CanAssignSegment $canAssignSegment, AssignsCompanyToSegment $assignsSegment, FetchesSegment $fetchesSegment)
+    {
+        $this->canAssignSegment = $canAssignSegment;
+        $this->assignsSegment = $assignsSegment;
+        $this->fetchesSegment = $fetchesSegment;
+    }
+
+
+    /**
+     * @param Company $company
+     * @param int|null $segmentId
+     * @return Model
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(Company $company, ?int $segmentId = SegmentConstants::STANDARD_SEGMENT): Model {
+
+        $segment = $this->fetchesSegment->execute(['id' => $segmentId]);
+
+        $this->canAssignSegment->passes();
+
+        return $this->assignsSegment->execute($company, $segment);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php b/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php
new file mode 100644
index 00000000..4e188015
--- /dev/null
+++ b/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Processors;
+
+use App\Classes\General\Services\GeneratesInitials;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Classes\Modules\Companies\Services\CreatesCompany;
+use App\Classes\Modules\Companies\Standards\Rules\CanCreateCompany;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\CompanyType;
+use Illuminate\Http\Request;
+use Illuminate\Database\Eloquent\Model;
+
+class CreateCompanyProcessor
+{
+
+    /** @var CanCreateCompany */
+    private $canCreateCompany;
+
+    /** @var CreatesCompany */
+    private $createsCompany;
+
+    /**
+     * CreateUserProcessor constructor.
+     * @param CanCreateCompany $canCreateCompany
+     * @param CreatesCompany $createsCompany
+     */
+    public function __construct(CanCreateCompany $canCreateCompany, CreatesCompany $createsCompany)
+    {
+        $this->canCreateCompany = $canCreateCompany;
+        $this->createsCompany = $createsCompany;
+    }
+
+
+    /**
+     * @param Request $request
+     * @param int $businessType
+     * @param int|null $companyType
+     * @param int|null $status
+     * @return Model
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(Request $request, int $businessType = BusinessType::IMPORTER, ?int $companyType = CompanyType::COMPANY_BUSINESS, ?int $status = ApprovalStatus::PENDING_SUBMISSION): Model {
+
+        $company_object = new CompanyObject(
+            $companyType === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name'),
+            mt_rand(1000, 9999).(new GeneratesInitials())->name($request->input('company_name'))->length(3)->generate(),
+            $businessType, $companyType, $status);
+
+        $this->canCreateCompany->passes($company_object);
+
+        return $this->createsCompany->execute($company_object);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Services/AddCurrenciesResourceToSupplierCompany.php b/app/Classes/Modules/Companies/Services/AddCurrenciesResourceToSupplierCompany.php
new file mode 100644
index 00000000..dea32a07
--- /dev/null
+++ b/app/Classes/Modules/Companies/Services/AddCurrenciesResourceToSupplierCompany.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\CompanyResource;
+use App\Http\Resources\CurrencyResource;
+use App\Models\Currency;
+use App\Models\SegmentConstant;
+
+class AddCurrenciesResourceToSupplierCompany
+{
+
+    public function execute(CompanyResource $company){
+
+        if($company->business_type === BusinessType::CURRENCY_VENDOR){
+            $segment = SegmentConstant::where('reference', SegmentConstants::SUPPLIER_CURRENCIES)->where('detail->id', $company->id)->first();
+
+            return ['currencies' => CurrencyResource::collection($segment ? Currency::whereIn('id', $segment->detail->currencies)->get() : [])];
+        }
+
+        return [];
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Services/AssignsCompanyToSegment.php b/app/Classes/Modules/Companies/Services/AssignsCompanyToSegment.php
new file mode 100644
index 00000000..81b6e964
--- /dev/null
+++ b/app/Classes/Modules/Companies/Services/AssignsCompanyToSegment.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Company;
+use App\Models\Segment;
+use Illuminate\Database\QueryException;
+
+class AssignsCompanyToSegment extends AbstractUpdateRecord
+{
+    /**
+     * @param Company $company
+     * @param Segment $segment
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws MalformedRequestException
+     */
+    public function execute(Company $company, Segment $segment)
+    {
+        try {
+
+            $company->segments()->attach($segment);
+
+            return $company;
+
+        } catch (QueryException $exception){
+            throw new MalformedRequestException($exception);
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Services/AssignsEmployee.php b/app/Classes/Modules/Companies/Services/AssignsEmployee.php
new file mode 100644
index 00000000..229bcbd4
--- /dev/null
+++ b/app/Classes/Modules/Companies/Services/AssignsEmployee.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Models\User;
+use Illuminate\Database\QueryException;
+
+class AssignsEmployee extends AbstractUpdateRecord
+{
+    /**
+     * @param EmploymentObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws MalformedRequestException
+     */
+    public function execute(EmploymentObject $object)
+    {
+        try {
+
+            $object->getCompany()->employees()->attach($object->getUser(), ['status' => $object->getStatus()]);
+
+            return $object->getCompany();
+
+        } catch (QueryException $exception){
+            throw new MalformedRequestException($exception);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Services/CreatesCompany.php b/app/Classes/Modules/Companies/Services/CreatesCompany.php
index 722a9de6..cbe22161 100644
--- a/app/Classes/Modules/Companies/Services/CreatesCompany.php
+++ b/app/Classes/Modules/Companies/Services/CreatesCompany.php
@@ -20,6 +20,7 @@ class CreatesCompany extends AbstractUpdateRecord
         $model->name = $object->getName();
         $model->reference = $object->getReference();
         $model->type = $object->getType();
+        $model->business_type = $object->getBusinessType();
 
         return $this->handler($model);
     }
diff --git a/app/Classes/Modules/Companies/Services/DeletesCompany.php b/app/Classes/Modules/Companies/Services/DeletesCompany.php
new file mode 100644
index 00000000..963e6fd0
--- /dev/null
+++ b/app/Classes/Modules/Companies/Services/DeletesCompany.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Models\Bank;
+use App\Models\Company;
+
+class DeletesCompany extends AbstractDeleteRecord
+{
+
+    /**
+     * @param Company $model
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Company $model) {
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Services/FetchesCompanyPaymentAttemptLimit.php b/app/Classes/Modules/Companies/Services/FetchesCompanyPaymentAttemptLimit.php
new file mode 100644
index 00000000..cf43840b
--- /dev/null
+++ b/app/Classes/Modules/Companies/Services/FetchesCompanyPaymentAttemptLimit.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Models\Company;
+
+class FetchesCompanyPaymentAttemptLimit
+{
+
+    /**
+     * @param Company $company
+     * @return mixed
+     */
+    public function execute(Company $company){
+        return $company->segments()->with([
+            'constants' => function ($query) {
+                $query->where('reference', SegmentConstants::PAYMENT_ATTEMPT_DURATION_LIMIT);
+            }])->get()->pluck('constants')->flatten()->pluck('detail')->max('minutes');
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Services/FetchesCompanyServiceSettings.php b/app/Classes/Modules/Companies/Services/FetchesCompanyServiceSettings.php
new file mode 100644
index 00000000..a3827892
--- /dev/null
+++ b/app/Classes/Modules/Companies/Services/FetchesCompanyServiceSettings.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+
+use App\Classes\General\Helper;
+use App\Classes\Modules\Bookings\DataTransferObjects\CalculationObject;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyServiceConfigurationsObject;
+use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Models\Company;
+use App\Models\Currency;
+use App\Models\ServiceType;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
+
+class FetchesCompanyServiceSettings
+{
+
+
+    /**
+     * @param Company $company
+     * @param CurrencyConversionObject $object
+     * @return CompanyServiceConfigurationsObject
+     */
+    public function execute(Company $company, CurrencyConversionObject $object){
+        /** @var ServiceType $service */
+        $service = $company->services()->where('id', $object->getServiceId())->first();
+
+        $constants= $service->constants()->whereIn('segment_id', $company->segments->pluck('id'))->get();
+
+        $standardConfigurations = $constants->firstWhere('reference', SegmentConstants::SERVICE_TYPE);
+
+        $rate = Currency::find($object->getCurrencyId())->rates->where('payment_method_type', $object->getPaymentMethod())
+            ->where('service_id', $object->getServiceId())->first();
+
+        $currency = collect($standardConfigurations->detail->currencies)->firstWhere('id','=', $object->getCurrencyId());
+
+        $standardConfigurations = new CompanyServiceConfigurationsObject($standardConfigurations->detail->is_billable, $standardConfigurations->detail->bank_id, $standardConfigurations->detail->po_limit->value, $standardConfigurations->detail->tax->value,
+            $standardConfigurations->detail->service_charge->value, $standardConfigurations->detail->minimum_charge->value,
+            $currency->max_limit->value, $currency->min_limit->value, $rate->selling);
+
+        if($this->hasCustomOptions($constants)){
+            $customOptions = $this->getServiceCustomOptions($constants, $object, $standardConfigurations, $object->getPaymentMethod())->sortByDesc(function($option) use($object) {
+                return (new CalculationObject($object, $option))->getTotal();
+            })->first();
+
+            return $customOptions;
+        };
+
+        return $standardConfigurations;
+    }
+
+    /**
+     * @param $constants
+     * @param CurrencyConversionObject $object
+     * @param CompanyServiceConfigurationsObject $standardConfigurations
+     * @return mixed
+     */
+    private function getServiceCustomOptions($constants, CurrencyConversionObject $object, CompanyServiceConfigurationsObject $standardConfigurations){
+        return $constants->where('reference', SegmentConstants::CUSTOM_SERVICE_TYPE)->map(function($constant) use($object, $standardConfigurations) {
+
+            $customOptions = clone $standardConfigurations;
+
+            $methods = collect(Helper::getClassMethodsArray(CompanyServiceConfigurationsObject::class))->filter(function($value){ return substr( $value, 0, 3) === "get"; });
+
+            $methods->map(function($methodName) use ($constant, $object, $customOptions) {
+                $option = Helper::getPropertyName($methodName);
+
+                $setMethod = 'set'.Str::studly($option);
+
+                if(in_array($option, ['min_limit', 'max_limit', 'rate']) && !empty($constant->detail->currencies)) {
+
+                    $currency = collect($constant->detail->currencies)->firstWhere('id','=', $object->getCurrencyId());
+
+                    if($currency) {
+                        if($option === 'rate') {
+                            return $customOptions->$setMethod(collect($currency->rates)->firstWhere('payment_type','=', $object->getPaymentMethod())->selling->value);
+                        }
+
+                        return $customOptions->$setMethod($currency->$option->value);
+                    }
+
+                };
+
+                if(property_exists($constant->detail, $option)) {
+
+                    if($option === 'bank') return $customOptions->$setMethod($constant->detail->bank_id);
+
+                    return $customOptions->$setMethod($constant->detail->$option->value);
+                }
+            });
+
+            return $customOptions;
+
+        });
+
+    }
+
+    private function hasCustomOptions(Collection $constants){
+        return $constants->contains(function($value){
+            return $value->reference === SegmentConstants::CUSTOM_SERVICE_TYPE;
+        });
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Services/FetchesCompanyServices.php b/app/Classes/Modules/Companies/Services/FetchesCompanyServices.php
new file mode 100644
index 00000000..d78fca75
--- /dev/null
+++ b/app/Classes/Modules/Companies/Services/FetchesCompanyServices.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+
+use App\Http\Resources\CurrencyResource;
+use App\Models\Currency;
+use Illuminate\Support\Collection;
+
+class FetchesCompanyServices
+{
+
+    public function getServices(Collection $services){
+        return $services->map(function($service){
+            $currencies = collect($service->getConfigurations()->detail->currencies)->pluck('id');
+            if(!empty($service->getCustomOptions())){
+                $currencies = $currencies->merge(collect($service->getCustomOptions())->flatMap(function($configurations){
+                    return collect($configurations->getConfigurationValue('currencies'))->pluck('id');
+                }));
+            }
+
+            return [
+                'id' => $service->getService()->id,
+                'name' => $service->getService()->name,
+                'currencies' => CurrencyResource::collection(Currency::whereIn('id', $currencies->filter()->unique()->toArray())->get())
+            ];
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Services/RemovesCompanyFromSegment.php b/app/Classes/Modules/Companies/Services/RemovesCompanyFromSegment.php
new file mode 100644
index 00000000..d234bcb5
--- /dev/null
+++ b/app/Classes/Modules/Companies/Services/RemovesCompanyFromSegment.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Company;
+use App\Models\Segment;
+use Illuminate\Database\QueryException;
+
+class RemovesCompanyFromSegment extends AbstractUpdateRecord
+{
+    /**
+     * @param Company $company
+     * @param Segment $segment
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws MalformedRequestException
+     */
+    public function execute(Company $company, Segment $segment)
+    {
+        try {
+
+            $company->segments()->detach($segment);
+
+            return $company;
+
+        } catch (QueryException $exception){
+            throw new MalformedRequestException($exception);
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Services/UpdatesCompany.php b/app/Classes/Modules/Companies/Services/UpdatesCompany.php
index 876221d1..f89bbca8 100644
--- a/app/Classes/Modules/Companies/Services/UpdatesCompany.php
+++ b/app/Classes/Modules/Companies/Services/UpdatesCompany.php
@@ -10,6 +10,7 @@ class UpdatesCompany extends AbstractUpdateRecord
 {
 
     /**
+     * @param Company $model
      * @param CompanyObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
diff --git a/app/Classes/Modules/Companies/Services/UpdatesCompanyStatus.php b/app/Classes/Modules/Companies/Services/UpdatesCompanyStatus.php
new file mode 100644
index 00000000..f0c0968b
--- /dev/null
+++ b/app/Classes/Modules/Companies/Services/UpdatesCompanyStatus.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Models\Company;
+
+class UpdatesCompanyStatus extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Company $model
+     * @param int $status
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Company $model, int $status)
+    {
+
+        $model->status = $status;
+        return $this->handler($model);
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/CompanyEmployees/Standards/Rules/CanCreateCompanyEmployee.php b/app/Classes/Modules/Companies/Standards/Rules/CanAssignEmployee.php
similarity index 71%
rename from app/Classes/Modules/CompanyEmployees/Standards/Rules/CanCreateCompanyEmployee.php
rename to app/Classes/Modules/Companies/Standards/Rules/CanAssignEmployee.php
index d5d66023..f34f83ff 100644
--- a/app/Classes/Modules/CompanyEmployees/Standards/Rules/CanCreateCompanyEmployee.php
+++ b/app/Classes/Modules/Companies/Standards/Rules/CanAssignEmployee.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Classes\Modules\CompanyEmployees\Standards\Rules;
+namespace App\Classes\Modules\Companies\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\CompanyEmployees\DataTransferObjects\CompanyEmployeeObject;
-use App\Classes\Modules\CompanyEmployees\Standards\Validators\CompanyEmployeeValidation;
+use App\Classes\Modules\Companies\Standards\Validators\CompanyEmployeeValidation;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
 
-class CanCreateCompanyEmployee extends AbstractRule
+class CanAssignEmployee extends AbstractRule
 {
 
     /** @var CompanyEmployeeValidation */
@@ -33,7 +33,7 @@ class CanCreateCompanyEmployee extends AbstractRule
     }
 
     /**
-     * @param CompanyEmployeeObject $object
+     * @param EmploymentObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
@@ -43,7 +43,7 @@ class CanCreateCompanyEmployee extends AbstractRule
     }
 
     /**
-     * @param CompanyEmployeeObject $object
+     * @param EmploymentObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/Companies/Standards/Rules/CanAssignSegment.php b/app/Classes/Modules/Companies/Standards/Rules/CanAssignSegment.php
new file mode 100644
index 00000000..36fd2a41
--- /dev/null
+++ b/app/Classes/Modules/Companies/Standards/Rules/CanAssignSegment.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\SegmentConstants\DataTransferObjects\SegmentConstantObject;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+
+class CanAssignSegment extends AbstractRule
+{
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param ConstantObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param ConstantObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Standards/Rules/CanCreateCompany.php b/app/Classes/Modules/Companies/Standards/Rules/CanCreateCompany.php
index d185ec79..75015ff0 100644
--- a/app/Classes/Modules/Companies/Standards/Rules/CanCreateCompany.php
+++ b/app/Classes/Modules/Companies/Standards/Rules/CanCreateCompany.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Companies\Standards\Rules;
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Companies\DataTransferObjects\UserObject;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
 use App\Classes\Modules\Companies\Standards\Validators\CompanyValidation;
 
 class CanCreateCompany extends AbstractRule
@@ -31,7 +31,7 @@ class CanCreateCompany extends AbstractRule
     }
 
     /**
-     * @param UserObject $object
+     * @param CompanyObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
@@ -41,7 +41,7 @@ class CanCreateCompany extends AbstractRule
     }
 
     /**
-     * @param UserObject $object
+     * @param CompanyObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/Companies/Standards/Rules/CanCreateIdentificationDocument.php b/app/Classes/Modules/Companies/Standards/Rules/CanCreateIdentificationDocument.php
new file mode 100644
index 00000000..3182408a
--- /dev/null
+++ b/app/Classes/Modules/Companies/Standards/Rules/CanCreateIdentificationDocument.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Documents\Standards\Validators\DocumentValidation;
+
+class CanCreateIdentificationDocument extends AbstractRule
+{
+
+    /** @var DocumentValidation */
+    private $documentValidation;
+
+    /**
+     * CanCreateAddress constructor.
+     * @param DocumentValidation $documentValidation
+     */
+    public function __construct(DocumentValidation $documentValidation)
+    {
+        $this->documentValidation = $documentValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param DocumentObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->documentValidation->validate($object);
+    }
+
+    /**
+     * @param DocumentObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Standards/Rules/CanUpdateCompany.php b/app/Classes/Modules/Companies/Standards/Rules/CanUpdateCompany.php
index bf16fef8..c7bd1f70 100644
--- a/app/Classes/Modules/Companies/Standards/Rules/CanUpdateCompany.php
+++ b/app/Classes/Modules/Companies/Standards/Rules/CanUpdateCompany.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Companies\Standards\Rules;
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Companies\DataTransferObjects\UserObject;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
 use App\Classes\Modules\Companies\Standards\Validators\CompanyValidation;
 
 class CanUpdateCompany extends AbstractRule
@@ -31,7 +31,7 @@ class CanUpdateCompany extends AbstractRule
     }
 
     /**
-     * @param UserObject $object
+     * @param CompanyObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
@@ -41,7 +41,7 @@ class CanUpdateCompany extends AbstractRule
     }
 
     /**
-     * @param UserObject $object
+     * @param CompanyObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/CompanyEmployees/Standards/Validators/CompanyEmployeeValidation.php b/app/Classes/Modules/Companies/Standards/Validators/CompanyEmployeeValidation.php
similarity index 65%
rename from app/Classes/Modules/CompanyEmployees/Standards/Validators/CompanyEmployeeValidation.php
rename to app/Classes/Modules/Companies/Standards/Validators/CompanyEmployeeValidation.php
index 2de1f504..f396ac41 100644
--- a/app/Classes/Modules/CompanyEmployees/Standards/Validators/CompanyEmployeeValidation.php
+++ b/app/Classes/Modules/Companies/Standards/Validators/CompanyEmployeeValidation.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace App\Classes\Modules\CompanyEmployees\Standards\Validators;
+namespace App\Classes\Modules\Companies\Standards\Validators;
 
 use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\CompanyEmployees\DataTransferObjects\CompanyEmployeeObject;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
 
 class CompanyEmployeeValidation extends AbstractValidation
 {
     /**
-     * @param CompanyEmployeeObject $object
+     * @param EmploymentObject $object
      * @return array
      */
     protected function data($object): array 
     {
         return [
-            'company_id' => $object->getCompanyId(),
-            'user_id' => $object->getUserId(),
+            'company_id' => $object->getCompany()->id,
+            'user_id' => $object->getUser()->id,
         ];
     }
 
diff --git a/app/Classes/Modules/Companies/Standards/Validators/CompanyValidation.php b/app/Classes/Modules/Companies/Standards/Validators/CompanyValidation.php
index 027d3287..efc47355 100644
--- a/app/Classes/Modules/Companies/Standards/Validators/CompanyValidation.php
+++ b/app/Classes/Modules/Companies/Standards/Validators/CompanyValidation.php
@@ -16,7 +16,7 @@ class CompanyValidation extends AbstractValidation
         return [
             'company_name' => $object->getName(),
             'company_reference' => $object->getReference(),
-            'type' => $object->getType()
+            'type' => $object->getBusinessType()
         ];
     }
 
diff --git a/app/Classes/Modules/CompanyBanks/ControllersLogic/CreateCompanyBankLogic.php b/app/Classes/Modules/CompanyBanks/ControllersLogic/CreateCompanyBankLogic.php
deleted file mode 100644
index c6188a90..00000000
--- a/app/Classes/Modules/CompanyBanks/ControllersLogic/CreateCompanyBankLogic.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CompanyBanks\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-
-use App\Classes\Modules\CompanyBanks\Standards\Rules\CanCreateCompanyBank;
-use App\Classes\Modules\CompanyBanks\Services\CreatesCompanyBank;
-use App\Classes\Modules\CompanyBanks\DataTransferObjects\CompanyBankObject;
-use App\Http\Resources\CompanyBankResource;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class CreateCompanyBankLogic extends AbstractControllersLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Company Bank',
-            'message' => 'You have successfully created a new Company Bank'
-        ];
-    }
-
-    /** @var CanCreateCompanyBank */
-    private $canCreateCompanyBank;
-
-    /** @var CreatesCompanyBank */
-    private $createsCompanyBank;
-
-
-    /**
-     * CreateCompanyBankLogic constructor.
-     * @param CanCreateCompanyBank $canCreateCompanyBank
-     * @param CreatesCompanyBank $createsCompanyBank
-     */
-    public function __construct(
-        CanCreateCompanyBank $canCreateCompanyBank, 
-        CreatesCompanyBank $createsCompanyBank
-    )
-    {
-        $this->canCreateCompanyBank = $canCreateCompanyBank;
-        $this->createsCompanyBank = $createsCompanyBank;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            DB::beginTransaction();
-
-            $company_bank_object = new CompanyBankObject(
-                $request->input('country_id'),
-                $request->input('company_id'),
-                $request->input('bank_name'),
-                $request->input('holder_name'),
-                $request->input('account_no'),
-                $request->input('type'),
-                $request->input('default')
-            );
-            $this->canCreateCompanyBank->passes($company_bank_object);
-            $company_bank_query = $this->createsCompanyBank->execute($company_bank_object);
-
-            DB::commit();
-
-            return $this->resourceResponse(new CompanyBankResource($company_bank_query));
-
-        } catch (\Exception $exception) {
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CompanyBanks/ControllersLogic/DeleteCompanyBankLogic.php b/app/Classes/Modules/CompanyBanks/ControllersLogic/DeleteCompanyBankLogic.php
deleted file mode 100644
index 4c33e308..00000000
--- a/app/Classes/Modules/CompanyBanks/ControllersLogic/DeleteCompanyBankLogic.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CompanyBanks\ControllersLogic;
-
-use App\Http\Resources\CompanyBankResource;
-
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-
-use App\Classes\Modules\CompanyBanks\Services\FetchesCompanyBank;
-
-use App\Classes\Modules\CompanyBanks\Standards\Rules\CanDeleteCompanyBank;
-use App\Classes\Modules\CompanyBanks\Services\DeletesCompanyBank;
-use App\Classes\Modules\CompanyBanks\DataTransferObjects\SegmentObject;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class DeleteCompanyBankLogic extends AbstractControllersLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Delete Company Bank',
-            'message' => 'You have successfully deleted the Company Bank'
-        ];
-    }
-
-    /** @var CanDeleteCompanyBank */
-    private $canDeleteCompanyBank;
-
-    /** @var DeletesCompanyBank */
-    private $deletesCompanyBank;
-
-    /** @var FetchesCompanyBank */
-    private $fetchesCompanyBank;
-
-
-    /**
-     * DeleteCompanyBankLogic constructor.
-     * @param CanDeleteCompanyBank $canDeleteCompanyBank
-     * @param DeletesCompanyBank $deletesCompanyBank
-     * @param FetchesCompanyBank $fetchesCompanyBank
-     */
-    public function __construct(
-        CanDeleteCompanyBank $canDeleteCompanyBank, 
-        DeletesCompanyBank $deletesCompanyBank, 
-        FetchesCompanyBank $fetchesCompanyBank
-    )
-    {
-        $this->canDeleteCompanyBank = $canDeleteCompanyBank;
-        $this->deletesCompanyBank = $deletesCompanyBank;
-        $this->fetchesCompanyBank = $fetchesCompanyBank;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            DB::beginTransaction();
-
-            $company_bank_query = $this->fetchesCompanyBank->execute(['id' => $request->route('id')]);
-            $this->canDeleteCompanyBank->passes();
-            $this->deletesCompanyBank->execute($company_bank_query);
-            
-            DB::commit();
-
-            return $this->resourceResponse(new CompanyBankResource($company_bank_query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CompanyBanks/ControllersLogic/UpdateCompanyBankLogic.php b/app/Classes/Modules/CompanyBanks/ControllersLogic/UpdateCompanyBankLogic.php
deleted file mode 100644
index b2b78ee5..00000000
--- a/app/Classes/Modules/CompanyBanks/ControllersLogic/UpdateCompanyBankLogic.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CompanyBanks\ControllersLogic;
-
-use App\Http\Resources\CompanyBankResource;
-
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-
-use App\Classes\Modules\CompanyBanks\Services\FetchesCompanyBank;
-
-use App\Classes\Modules\CompanyBanks\Standards\Rules\CanUpdateCompanyBank;
-use App\Classes\Modules\CompanyBanks\Services\UpdatesCompanyBank;
-use App\Classes\Modules\CompanyBanks\DataTransferObjects\CompanyBankObject;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class UpdateCompanyBankLogic extends AbstractControllersLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Company Bank',
-            'message' => 'You have successfully updated the Company Bank'
-        ];
-    }
-
-    /** @var CanUpdateCompanyBank */
-    private $canUpdateCompanyBank;
-
-    /** @var UpdatesCompanyBank */
-    private $updatesCompanyBank;
-
-    /** @var FetchesCompanyBank */
-    private $fetchesCompanyBank;
-
-
-    /**
-     * UpdateCompanyBankLogic constructor.
-     * @param CanUpdateCompanyBank $canUpdateCompanyBank
-     * @param UpdatesCompanyBank $updatesCompanyBank
-     * @param FetchesCompanyBank $fetchesCompanyBank
-     */
-    public function __construct(
-        CanUpdateCompanyBank $canUpdateCompanyBank, 
-        UpdatesCompanyBank $updatesCompanyBank, 
-        FetchesCompanyBank $fetchesCompanyBank
-    )
-    {
-        $this->canUpdateCompanyBank = $canUpdateCompanyBank;
-        $this->updatesCompanyBank = $updatesCompanyBank;
-        $this->fetchesCompanyBank = $fetchesCompanyBank;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            DB::beginTransaction();
-
-            $company_bank_query = $this->fetchesCompanyBank->execute(['id' => $request->route('id')]);
-
-            $company_bank_object = new CompanyBankObject(
-                $company_bank_query->country_id,
-                $company_bank_query->company_id,
-                $request->input('bank_name'),
-                $request->input('holder_name'),
-                $request->input('account_no'),
-                $company_bank_query->type,
-                $company_bank_query->default
-            );
-            $this->canUpdateCompanyBank->passes($company_bank_object);
-            $company_bank_query = $this->updatesCompanyBank->execute($company_bank_query, $company_bank_object);
-           
-            DB::commit();
-
-            return $this->resourceResponse(new CompanyBankResource($company_bank_query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CompanyBanks/ControllersLogic/UpdateToDefaultCompanyBankLogic.php b/app/Classes/Modules/CompanyBanks/ControllersLogic/UpdateToDefaultCompanyBankLogic.php
deleted file mode 100644
index 7b262260..00000000
--- a/app/Classes/Modules/CompanyBanks/ControllersLogic/UpdateToDefaultCompanyBankLogic.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CompanyBanks\ControllersLogic;
-
-use App\Http\Resources\CompanyBankResource;
-
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-
-use App\Classes\Modules\CompanyBanks\Services\FetchesCompanyBank;
-use App\Classes\Modules\CompanyBanks\Services\ListsCompanyBank;
-
-use App\Classes\Modules\CompanyBanks\Standards\Rules\CanUpdateCompanyBank;
-use App\Classes\Modules\CompanyBanks\Services\UpdatesToNonDefaultCompanyBank;
-use App\Classes\Modules\CompanyBanks\Services\UpdatesToDefaultCompanyBank;
-
-use App\Classes\Modules\CompanyBanks\DataTransferObjects\CompanyBankObject;
-use App\Classes\ValueObjects\Constants\DefaultType;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class UpdateToDefaultCompanyBankLogic extends AbstractControllersLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Company Bank',
-            'message' => 'You have successfully updated the Company Bank'
-        ];
-    }
-
-    /** @var CanUpdateCompanyBank */
-    private $canUpdateCompanyBank;
-
-    /** @var UpdatesToNonDefaultCompanyBank */
-    private $updatesToNonDefaultCompanyBank;
-
-    /** @var UpdatesToDefaultCompanyBank */
-    private $updatesToDefaultCompanyBank;
-
-    /** @var ListsCompanyBank */
-    private $listsCompanyBank;
-
-    /** @var FetchesCompanyBank */
-    private $fetchesCompanyBank;
-
-    /**
-     * UpdateToDefaultCompanyBankLogic constructor.
-     * @param CanUpdateCompanyBank $canUpdateCompanyBank
-     * @param UpdatesToDefaultCompanyBank $updatesToDefaultCompanyBank
-     * @param FetchesCompanyBank $fetchesCompanyBank
-     */
-    public function __construct(
-        CanUpdateCompanyBank $canUpdateCompanyBank, 
-        UpdatesToNonDefaultCompanyBank $updatesToNonDefaultCompanyBank, 
-        UpdatesToDefaultCompanyBank $updatesToDefaultCompanyBank, 
-        ListsCompanyBank $listsCompanyBank,
-        FetchesCompanyBank $fetchesCompanyBank
-    )
-    {
-        $this->canUpdateCompanyBank = $canUpdateCompanyBank;
-        $this->updatesToNonDefaultCompanyBank = $updatesToNonDefaultCompanyBank;
-        $this->updatesToDefaultCompanyBank = $updatesToDefaultCompanyBank;
-        $this->listsCompanyBank = $listsCompanyBank;
-        $this->fetchesCompanyBank = $fetchesCompanyBank;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorExceptionn
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            DB::beginTransaction();
-
-            $company_bank_query = $this->fetchesCompanyBank->execute(['id' => $request->route('id')]);
-
-            $default_list_company_bank = $this->listsCompanyBank->execute([
-                'not_id' => $company_bank_query->id,
-                'company_id' => $company_bank_query->company_id,
-                'default_type' => DefaultType::DEFAULT
-            ]);
-
-            foreach ($default_list_company_bank as $key => $row) {
-                $this->updatesToNonDefaultCompanyBank->execute($row);
-            }
-
-            $company_bank_object = new CompanyBankObject(
-                $company_bank_query->country_id,
-                $company_bank_query->company_id,
-                $request->input('bank_name'),
-                $request->input('holder_name'),
-                $request->input('account_no'),
-                $company_bank_query->type,
-                $company_bank_query->default
-            );
-            $this->canUpdateCompanyBank->passes($company_bank_object);
-
-            $company_bank_query = $this->updatesToDefaultCompanyBank->execute($company_bank_query);
-           
-            DB::commit();
-
-            return $this->resourceResponse(new CompanyBankResource($company_bank_query));
-
-        } catch (\Exception $exception){
-            dd($exception);
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CompanyBanks/DataTransferObjects/CompanyBankObject.php b/app/Classes/Modules/CompanyBanks/DataTransferObjects/CompanyBankObject.php
deleted file mode 100644
index 38e441bd..00000000
--- a/app/Classes/Modules/CompanyBanks/DataTransferObjects/CompanyBankObject.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CompanyBanks\DataTransferObjects;
-
-use App\Classes\Interfaces\DataTransferObject;
-
-class CompanyBankObject implements DataTransferObject
-{
-    /** @var string|null */
-    private $country_id;
-    private $company_id;
-    private $bank_name;
-    private $holder_name;
-    private $account_no;
-    private $type;
-    private $default;
-
-    /**
-     * CompanyBankObject constructor.
-     * @param int|null $country_id
-     * @param int|null $company_id
-     * @param string|null $bank_name
-     * @param string|null $holder_name
-     * @param string|null $account_no
-     * @param int|null $type
-     * @param int|null $default
-     */
-    public function __construct(
-        ?int $country_id,
-        ?int $company_id,
-        ?string $bank_name,
-        ?string $holder_name,
-        ?string $account_no,
-        ?int $type,
-        ?int $default
-    )
-    {
-        $this->country_id = $country_id;
-        $this->company_id = $company_id;
-        $this->bank_name = $bank_name;
-        $this->holder_name = $holder_name;
-        $this->account_no = $account_no;
-        $this->type = $type;
-        $this->default = $default;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCountryId(): ?int
-    {
-        return $this->country_id;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCompanyId(): ?int
-    {
-        return $this->company_id;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBankName(): ?string
-    {
-        return $this->bank_name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getHolderName(): ?string
-    {
-        return $this->holder_name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAccountNo(): ?string
-    {
-        return $this->account_no;
-    }
-
-    /**
-     * @return int
-     */
-    public function getType(): ?int
-    {
-        return $this->type;
-    }
-
-    /**
-     * @return int
-     */
-    public function getDefault(): ?int
-    {
-        return $this->default;
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CompanyBanks/Services/DeletesCompanyBank.php b/app/Classes/Modules/CompanyBanks/Services/DeletesCompanyBank.php
deleted file mode 100644
index 906ba1ae..00000000
--- a/app/Classes/Modules/CompanyBanks/Services/DeletesCompanyBank.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CompanyBanks\Services;
-
-use App\Classes\General\Eloquent\AbstractDeleteRecord;
-use App\Models\CompanyBank;
-
-class DeletesCompanyBank extends AbstractDeleteRecord
-{
-
-    public function execute(CompanyBank $model) {
-        return $this->handler($model);
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CompanyBanks/Services/UpdatesToDefaultCompanyBank.php b/app/Classes/Modules/CompanyBanks/Services/UpdatesToDefaultCompanyBank.php
deleted file mode 100644
index 1b2e6545..00000000
--- a/app/Classes/Modules/CompanyBanks/Services/UpdatesToDefaultCompanyBank.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CompanyBanks\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\ValueObjects\Constants\DefaultType;
-use App\Models\CompanyBank;
-
-class UpdatesToDefaultCompanyBank extends AbstractUpdateRecord
-{
-
-    /**
-     * @param CompanyBankObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(CompanyBank $model) 
-    {
-        $model->default = DefaultType::DEFAULT;
-
-        return $this->handler($model);
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CompanyBanks/Services/UpdatesToNonDefaultCompanyBank.php b/app/Classes/Modules/CompanyBanks/Services/UpdatesToNonDefaultCompanyBank.php
deleted file mode 100644
index 1554d423..00000000
--- a/app/Classes/Modules/CompanyBanks/Services/UpdatesToNonDefaultCompanyBank.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CompanyBanks\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\ValueObjects\Constants\DefaultType;
-use App\Models\CompanyBank;
-
-class UpdatesToNonDefaultCompanyBank extends AbstractUpdateRecord
-{
-
-    /**
-     * @param CompanyBankObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(CompanyBank $model) 
-    {
-        $model->default = DefaultType::NONDEFAULT;
-
-        return $this->handler($model);
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CompanyBanks/Standards/Rules/CanCreateCompanyBank.php b/app/Classes/Modules/CompanyBanks/Standards/Rules/CanCreateCompanyBank.php
deleted file mode 100644
index 751c3a63..00000000
--- a/app/Classes/Modules/CompanyBanks/Standards/Rules/CanCreateCompanyBank.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CompanyBanks\Standards\Rules;
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\CompanyBanks\DataTransferObjects\SegmentObject;
-use App\Classes\Modules\CompanyBanks\Standards\Validators\CompanyBankValidation;
-
-class CanCreateCompanyBank extends AbstractRule
-{
-
-    /** @var CompanyBankValidation */
-    private $companyBankValidation;
-
-    /**
-     * CanCreateCompanyBank constructor.
-     * @param CompanyBankValidation $companyBankValidation
-     */
-    public function __construct(CompanyBankValidation $companyBankValidation)
-    {
-        $this->companyBankValidation = $companyBankValidation;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-        if (!\Auth::user()->can('add company_bank')) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * @param SegmentObject $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->companyBankValidation->validate($object);
-    }
-
-    /**
-     * @param SegmentObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CompanyBanks/Standards/Rules/CanUpdateCompanyBank.php b/app/Classes/Modules/CompanyBanks/Standards/Rules/CanUpdateCompanyBank.php
deleted file mode 100644
index 9a8d9a21..00000000
--- a/app/Classes/Modules/CompanyBanks/Standards/Rules/CanUpdateCompanyBank.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CompanyBanks\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\CompanyBanks\DataTransferObjects\CompanybankObject;
-use App\Classes\Modules\CompanyBanks\Standards\Validators\CompanybankValidation;
-
-class CanUpdateCompanyBank extends AbstractRule
-{
-
-    /** @var CompanyBankValidation */
-    private $CompanyBankValidation;
-
-
-    /**
-     * CanUpdateCompanyBank constructor.
-     * @param CompanybankValidation $CompanyBankValidation
-     */
-    public function __construct(CompanyBankValidation $CompanyBankValidation)
-    {
-        $this->CompanyBankValidation = $CompanyBankValidation;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-
-        if (!\Auth::user()->can('edit company_bank')) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * @param CompanyBankValidation $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->CompanyBankValidation->validate($object);
-    }
-
-    /**
-     * @param CompanyBankValidation $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CompanyEmployees/DataTransferObjects/CompanyEmployeeObject.php b/app/Classes/Modules/CompanyEmployees/DataTransferObjects/CompanyEmployeeObject.php
deleted file mode 100644
index 9bb6732b..00000000
--- a/app/Classes/Modules/CompanyEmployees/DataTransferObjects/CompanyEmployeeObject.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CompanyEmployees\DataTransferObjects;
-
-use App\Classes\Interfaces\DataTransferObject;
-
-class CompanyEmployeeObject implements DataTransferObject
-{    
-    /** @var int|null */
-    private $company_id;
-
-    /** @var int|null */
-    private $user_id;
-
-
-    /**
-     * CompanyEmployeeObject constructor.
-     * @param int|null $company_id
-     * @param int|null $user_id
-     */
-    public function __construct(
-        ?int $company_id, 
-        ?int $user_id
-    )
-    {
-        $this->company_id = $company_id;
-        $this->user_id = $user_id;
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getCompanyId(): ?int
-    {
-        return $this->company_id;
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getUserId(): ?int
-    {
-        return $this->user_id;
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CompanyEmployees/Services/CreatesCompanyEmployee.php b/app/Classes/Modules/CompanyEmployees/Services/CreatesCompanyEmployee.php
deleted file mode 100644
index ea0d75fc..00000000
--- a/app/Classes/Modules/CompanyEmployees/Services/CreatesCompanyEmployee.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CompanyEmployees\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\CompanyEmployees\DataTransferObjects\CompanyEmployeeObject;
-use App\Models\User;
-
-class CreatesCompanyEmployee extends AbstractUpdateRecord
-{
-    /**
-     * @param CompanyEmployeeObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(User $model, CompanyEmployeeObject $object) 
-    {
-        $model->company()->sync($object->getCompanyId());
-        return $model;
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/Contacts/DataTransferObjects/ContactObject.php b/app/Classes/Modules/Contacts/DataTransferObjects/ContactObject.php
index 3f2dae9f..f408d8cc 100644
--- a/app/Classes/Modules/Contacts/DataTransferObjects/ContactObject.php
+++ b/app/Classes/Modules/Contacts/DataTransferObjects/ContactObject.php
@@ -2,17 +2,15 @@
 
 namespace App\Classes\Modules\Contacts\DataTransferObjects;
 
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\ValueObjects\Constants\Countries;
 
 class ContactObject implements DataTransferObject
 {
-    /** @var int|null */
-    private $country_id;
+    /** @var int */
+    private $companyId;
 
-    /** @var int|null */
-    private $company_id;
-
-    /** @var string|null */
+    /** @var string */
     private $reference;
 
     /** @var string|null */
@@ -24,59 +22,46 @@ class ContactObject implements DataTransferObject
     /** @var string|null */
     private $wechat_id;
 
+    /** @var int|null */
+    private $countryId;
 
     /**
      * ContactObject constructor.
-     * @param int|null $country_id
-     * @param int|null $company_id
-     * @param null|string $reference
+     * @param int $companyId
+     * @param string $reference
      * @param null|string $phone
      * @param null|string $email
      * @param null|string $wechat_id
+     * @param int|null $countryId
      */
-    public function __construct(
-        ?int $country_id, 
-        ?int $company_id, 
-        ?string $reference, 
-        ?string $phone,
-        ?string $email,
-        ?string $wechat_id
-    )
+    public function __construct(int $companyId, string $reference, ?string $phone, ?string $email, ?string $wechat_id, ?int $countryId = Countries::MALAYSIA)
     {
-        $this->country_id = $country_id;
-        $this->company_id = $company_id;
+        $this->companyId = $companyId;
         $this->reference = $reference;
         $this->phone = $phone;
         $this->email = $email;
         $this->wechat_id = $wechat_id;
+        $this->countryId = $countryId;
     }
 
     /**
-     * @return int|null
+     * @return int
      */
-    public function getCountryId(): ?int
+    public function getCompanyId(): int
     {
-        return $this->country_id;
+        return $this->companyId;
     }
 
     /**
-     * @return int|null
+     * @return string
      */
-    public function getCompanyId(): ?int
-    {
-        return $this->company_id;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getReference(): ?string
+    public function getReference(): string
     {
         return $this->reference;
     }
 
     /**
-     * @return string|null
+     * @return null|string
      */
     public function getPhone(): ?string
     {
@@ -84,7 +69,7 @@ class ContactObject implements DataTransferObject
     }
 
     /**
-     * @return string|null
+     * @return null|string
      */
     public function getEmail(): ?string
     {
@@ -92,10 +77,22 @@ class ContactObject implements DataTransferObject
     }
 
     /**
-     * @return string|null
+     * @return null|string
      */
-    public function getWeChatId(): ?string
+    public function getWechatId(): ?string
     {
         return $this->wechat_id;
     }
+
+    /**
+     * @return int
+     */
+    public function getCountryId(): int
+    {
+        return $this->countryId;
+    }
+
+
+
+
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Contacts/Processors/CreateContactProcessor.php b/app/Classes/Modules/Contacts/Processors/CreateContactProcessor.php
new file mode 100644
index 00000000..0c1bccdb
--- /dev/null
+++ b/app/Classes/Modules/Contacts/Processors/CreateContactProcessor.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Contacts\Processors;
+
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Services\CreatesContact;
+use App\Classes\Modules\Contacts\Standards\Rules\CanCreateContact;
+use App\Models\Company;
+use Illuminate\Http\Request;
+use Illuminate\Database\Eloquent\Model;
+
+class CreateContactProcessor
+{
+
+    /** @var CanCreateContact */
+    private $canCreateContact;
+
+    /** @var CreatesContact */
+    private $createsContact;
+
+    /**
+     * CreateContactProcessor constructor.
+     * @param CanCreateContact $canCreateContact
+     * @param CreatesContact $createsContact
+     */
+    public function __construct(CanCreateContact $canCreateContact, CreatesContact $createsContact)
+    {
+        $this->canCreateContact = $canCreateContact;
+        $this->createsContact = $createsContact;
+    }
+
+    /**
+     * @param Request $request
+     * @param Company $company
+     * @return Model
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(Request $request, Company $company): Model {
+
+        $contact_object = new ContactObject($company->id, $request->input('name'),
+            $request->input('phone'), $request->input('contact_email'), $request->input('wechat_id'));
+
+        $this->canCreateContact->passes($contact_object);
+
+        return $this->createsContact->execute($contact_object);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Countries/ControllersLogic/ListCountriesLogic.php b/app/Classes/Modules/Countries/ControllersLogic/ListCountriesLogic.php
new file mode 100644
index 00000000..227d002d
--- /dev/null
+++ b/app/Classes/Modules/Countries/ControllersLogic/ListCountriesLogic.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Classes\Modules\Countries\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListCountriesLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Countries',
+            'message' => 'You have successfully retrieved a list of Countries'
+        ];
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        return $this->response(['data' => countries()]);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Countries/DataTransferObjects/CountryObject.php b/app/Classes/Modules/Countries/DataTransferObjects/CountryObject.php
new file mode 100644
index 00000000..157aebbc
--- /dev/null
+++ b/app/Classes/Modules/Countries/DataTransferObjects/CountryObject.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Classes\Modules\Countries\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use Rinvex\Country\Country;
+
+class CountryObject implements DataTransferObject
+{
+
+    /** @var Country */
+    private $country;
+
+    /**
+     * CountryObject constructor.
+     * @param Country $country
+     */
+    public function __construct(Country $country)
+    {
+        $this->country = $country;
+    }
+
+    /**
+     * @return Country
+     */
+    public function getCountry(): Country
+    {
+        return $this->country;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->getCountry()->getName();
+    }
+
+    /**
+     * @return string
+     */
+    public function getShortCode(): string
+    {
+        return $this->getCountry()->getIsoAlpha2();
+    }
+
+    /**
+     * @return int
+     */
+    public function getPhoneCode(): int
+    {
+        return $this->getCountry()->getCallingCode();
+    }
+
+    /**
+     * @return string
+     */
+    public function getSvg(): string
+    {
+        return $this->getCountry()->getFlag();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Countries/Services/CreatesCountry.php b/app/Classes/Modules/Countries/Services/CreatesCountry.php
new file mode 100644
index 00000000..91116396
--- /dev/null
+++ b/app/Classes/Modules/Countries/Services/CreatesCountry.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\Countries\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Countries\DataTransferObjects\CountryObject;
+use App\Models\Country;
+
+class CreatesCountry extends AbstractUpdateRecord
+{
+    /**
+     * @param CountryObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(CountryObject $object) {
+
+        $model = new Country();
+
+        return $model->firstOrCreate([
+            'name' => $object->getName(),
+            'short_code' => $object->getShortCode(),
+            'phone_code' => $object->getPhoneCode(),
+        ]);
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Countries/Services/FetchesCountry.php b/app/Classes/Modules/Countries/Services/FetchesCountry.php
new file mode 100644
index 00000000..7a877108
--- /dev/null
+++ b/app/Classes/Modules/Countries/Services/FetchesCountry.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\Countries\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use App\Models\Country;
+use Illuminate\Database\Eloquent\Builder;
+
+class FetchesCountry extends AbstractFetchRecord
+{
+
+    /** @var Country */
+    private $repository;
+
+
+    /**
+     * FetchesCurrency constructor.
+     * @param Country $repository
+     */
+    public function __construct(Country $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Currencies/ControllersLogic/CreateCurrencyLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/CreateCurrencyLogic.php
index 06e49e16..6fc8c43c 100644
--- a/app/Classes/Modules/Currencies/ControllersLogic/CreateCurrencyLogic.php
+++ b/app/Classes/Modules/Currencies/ControllersLogic/CreateCurrencyLogic.php
@@ -2,31 +2,48 @@
 
 namespace App\Classes\Modules\Currencies\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ResourceConflictException;
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 
+use App\Classes\Modules\Countries\DataTransferObjects\CountryObject;
+use App\Classes\Modules\Countries\Services\CreatesCountry;
+use App\Classes\Modules\Countries\Services\FetchesCountry;
+use App\Classes\Modules\Currencies\Services\FetchesCurrency;
 use App\Classes\Modules\Currencies\Standards\Rules\CanCreateCurrency;
 use App\Classes\Modules\Currencies\Services\CreatesCurrency;
 use App\Classes\Modules\Currencies\Services\CreatesCurrencyLog;
 use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyObject;
 use App\Http\Resources\CurrencyResource;
 
-use ErrorException;
+use App\Models\Country;
+use App\Models\Currency;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 
-class CreateCurrencyLogic extends AbstractControllersLogic
+class CreateCurrencyLogic extends AbstractControllerLogic
 {
+
     /**
      * @return array
      */
     protected function notification():array {
         return [
-            'title' => 'Created Currency',
+            'title' => 'Create Currency',
             'message' => 'You have successfully created a new Currency'
         ];
     }
 
+    /** @var FetchesCountry */
+    private $fetchesCountry;
+
+    /** @var FetchesCurrency */
+    private $fetchesCurrency;
+
+    /** @var CreatesCountry */
+    private $createsCountry;
+
     /** @var CanCreateCurrency */
     private $canCreateCurrency;
 
@@ -37,17 +54,19 @@ class CreateCurrencyLogic extends AbstractControllersLogic
     private $createsCurrencyLog;
 
     /**
-     * CreateSegmentLogic constructor.
+     * CreateCurrencyLogic constructor.
+     * @param FetchesCountry $fetchesCountry
+     * @param FetchesCurrency $fetchesCurrency
+     * @param CreatesCountry $createsCountry
      * @param CanCreateCurrency $canCreateCurrency
      * @param CreatesCurrency $createsCurrency
      * @param CreatesCurrencyLog $createsCurrencyLog
      */
-    public function __construct(
-        CanCreateCurrency $canCreateCurrency, 
-        CreatesCurrency $createsCurrency,
-        CreatesCurrencyLog $createsCurrencyLog
-    )
+    public function __construct(FetchesCountry $fetchesCountry, FetchesCurrency $fetchesCurrency, CreatesCountry $createsCountry, CanCreateCurrency $canCreateCurrency, CreatesCurrency $createsCurrency, CreatesCurrencyLog $createsCurrencyLog)
     {
+        $this->fetchesCountry = $fetchesCountry;
+        $this->fetchesCurrency = $fetchesCurrency;
+        $this->createsCountry = $createsCountry;
         $this->canCreateCurrency = $canCreateCurrency;
         $this->createsCurrency = $createsCurrency;
         $this->createsCurrencyLog = $createsCurrencyLog;
@@ -56,31 +75,34 @@ class CreateCurrencyLogic extends AbstractControllersLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws MalformedRequestException
+     * @throws ResourceConflictException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
+
+        $countryObject = Country($request->input('country_short_code'));
+
+        /** @var Country $country */
+        $country = $this->createsCountry->execute(new CountryObject($countryObject));
+
+        $currencyInfo = $countryObject->getCurrency();
+        $currencyObject = new CurrencyObject($currencyInfo['iso_4217_name'], $currencyInfo['iso_4217_code']);
+
+        $this->canCreateCurrency->passes($currencyObject);
+
         try {
-            DB::beginTransaction();
-
-            $currency_object = new CurrencyObject(
-                $request->input('country_id'),
-                $request->input('name'),
-                $request->input('short_code'),
-                $request->input('symbol')
-            );
-            $this->canCreateCurrency->passes($currency_object);
-            $currency_query = $this->createsCurrency->execute($currency_object);
-
-            $currency_log_query = $this->createsCurrencyLog->execute($currency_query);
-
-            DB::commit();
-
-            return $this->resourceResponse(new CurrencyResource($currency_query));
-
-        } catch (\Exception $exception) {
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
+            $this->fetchesCurrency->execute(['country_id' => $country->id, 'short_code' => $currencyObject->getShortCode()]);
+            throw new ResourceConflictException('Duplicated Currency. This currency already exists in the system');
+        } catch (ResourceNotFoundException $exception){
+            /** @var Currency $currency */
+            $currency = $this->createsCurrency->execute($country, $currencyObject);
+            $this->createsCurrencyLog->execute($currency);
         }
 
+        return $this->resourceResponse(new CurrencyResource($currency));
+
     }
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Currencies/ControllersLogic/DeleteCurrencyLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/DeleteCurrencyLogic.php
index c08279db..ed8e3745 100644
--- a/app/Classes/Modules/Currencies/ControllersLogic/DeleteCurrencyLogic.php
+++ b/app/Classes/Modules/Currencies/ControllersLogic/DeleteCurrencyLogic.php
@@ -4,20 +4,19 @@ namespace App\Classes\Modules\Currencies\ControllersLogic;
 
 use App\Http\Resources\CurrencyResource;
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 
 use App\Classes\Modules\Currencies\Services\FetchesCurrency;
 
 use App\Classes\Modules\Currencies\Standards\Rules\CanDeleteCurrency;
 use App\Classes\Modules\Currencies\Services\DeletesCurrency;
-use App\Classes\Modules\Currencies\DataTransferObjects\SegmentObject;
 
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class DeleteCurrencyLogic extends AbstractControllersLogic
+class DeleteCurrencyLogic extends AbstractControllerLogic
 {
 
     /**
@@ -60,24 +59,19 @@ class DeleteCurrencyLogic extends AbstractControllersLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
-            DB::beginTransaction();
+        $this->canDeleteCurrency->passes();
 
-            $currency_query = $this->fetchesCurrency->execute(['id' => $request->route('id')]);
-            $this->canDeleteCurrency->passes();
-            $this->deletesCurrency->execute($currency_query);
-            
-            DB::commit();
+        $currency_query = $this->fetchesCurrency->execute(['id' => $request->route('id')]);
 
-            return $this->resourceResponse(new CurrencyResource($currency_query));
+        $this->deletesCurrency->execute($currency_query);
 
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->response([]);
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Currencies/ControllersLogic/FetchSystemPrimaryCurrencyLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/FetchSystemPrimaryCurrencyLogic.php
new file mode 100644
index 00000000..b9c7a75b
--- /dev/null
+++ b/app/Classes/Modules/Currencies/ControllersLogic/FetchSystemPrimaryCurrencyLogic.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Classes\Modules\Currencies\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Currencies\Services\FetchesCurrency;
+use App\Classes\Modules\Currencies\Standards\Rules\CanFetchCurrency;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\CurrencyResource;
+use App\Models\Currency;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchSystemPrimaryCurrencyLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Fetch System\'s primary currency',
+            'message' => 'You have successfully retrieved a Currency'
+        ];
+    }
+
+
+    /** @var CanFetchCurrency */
+    private $canFetchCurrency;
+
+    /** @var FetchesConstant*/
+    private $fetchesConstant;
+
+    /** @var FetchesCurrency */
+    private $fetchesCurrency;
+
+    /**
+     * FetchSystemPrimaryCurrencyLogic constructor.
+     * @param CanFetchCurrency $canFetchCurrency
+     * @param FetchesConstant $fetchesConstant
+     * @param FetchesCurrency $fetchesCurrency
+     */
+    public function __construct(CanFetchCurrency $canFetchCurrency, FetchesConstant $fetchesConstant, FetchesCurrency $fetchesCurrency)
+    {
+        $this->canFetchCurrency = $canFetchCurrency;
+        $this->fetchesConstant = $fetchesConstant;
+        $this->fetchesCurrency = $fetchesCurrency;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $this->canFetchCurrency->passes();
+
+        $constant = $this->fetchesConstant->execute(['reference' => SegmentConstants::SYSTEM_PRIMARY_CURRENCY]);
+
+        /** @var Currency $currency */
+        $currency = $this->fetchesCurrency->execute(['id' => $constant->detail->id]);
+
+        return $this->resourceResponse(new CurrencyResource($currency));
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Currencies/ControllersLogic/ListCurrencyLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/ListCurrencyLogic.php
index 8efab677..e23f99db 100644
--- a/app/Classes/Modules/Currencies/ControllersLogic/ListCurrencyLogic.php
+++ b/app/Classes/Modules/Currencies/ControllersLogic/ListCurrencyLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Currencies\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Currencies\Services\ListsCurrency;
 use App\Classes\Modules\Currencies\Standards\Rules\CanListCurrency;
 use App\Http\Resources\CurrencyResource;
@@ -11,7 +11,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class ListCurrencyLogic extends AbstractControllersLogic
+class ListCurrencyLogic extends AbstractControllerLogic
 {
 
     /**
@@ -45,21 +45,17 @@ class ListCurrencyLogic extends AbstractControllersLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
-            $this->canListCurrency->passes();
+        $this->canListCurrency->passes();
 
-            $query = $this->listsCurrency->execute();
+        $query = $this->listsCurrency->execute($this->listsCurrency->deserializeFilters($request->input('filters')));
 
-            return $this->collectionResponse(CurrencyResource::collection($query));
-
-        } catch (\Exception $exception){
-            dd($exception);
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->collectionResponse(CurrencyResource::collection($query));
 
     }
 
diff --git a/app/Classes/Modules/Currencies/ControllersLogic/RateCalculateCurrencyLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/RateCalculateCurrencyLogic.php
index 35686210..ea3b0c64 100644
--- a/app/Classes/Modules/Currencies/ControllersLogic/RateCalculateCurrencyLogic.php
+++ b/app/Classes/Modules/Currencies/ControllersLogic/RateCalculateCurrencyLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Currencies\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Currencies\Services\FetchesCurrency;
 use App\Classes\Modules\Currencies\Services\RateCalculatesCurrency;
 
@@ -12,7 +12,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class RateCalculateCurrencyLogic extends AbstractControllersLogic
+class RateCalculateCurrencyLogic extends AbstractControllerLogic
 {
 
     /**
@@ -32,7 +32,6 @@ class RateCalculateCurrencyLogic extends AbstractControllersLogic
     private $rateCalculatesCurrency;
 
     /**
-     * @param CanListStandardSegmentConstants $canListStandardSegmentConstants
      * @param FetchesCurrency $fetchesCurrency
      * @param RateCalculatesCurrency $rateCalculatesCurrency
      */
@@ -45,21 +44,16 @@ class RateCalculateCurrencyLogic extends AbstractControllersLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
-            $amount = $request->input('amount');
-            $conversion_currency = $this->fetchesCurrency->execute(['id' => $request->input('conversion_currency_id')]);
-            $convertable_currency = $this->fetchesCurrency->execute(['id' => $request->input('convertable_currency_id')]);
-            $convert_amount = $this->rateCalculatesCurrency->execute($conversion_currency, $convertable_currency, $amount);
 
-            return $this->resourceResponse(new RateCalculateCurrencyResource($conversion_currency, $convertable_currency, $amount));
+        $amount = $request->input('amount');
+        $conversion_currency = $this->fetchesCurrency->execute(['id' => $request->input('conversion_currency_id')]);
+        $convertable_currency = $this->fetchesCurrency->execute(['id' => $request->input('convertable_currency_id')]);
+        $this->rateCalculatesCurrency->execute($conversion_currency, $convertable_currency, $amount);
 
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->resourceResponse(new RateCalculateCurrencyResource($conversion_currency, $convertable_currency, $amount));
 
     }
 
diff --git a/app/Classes/Modules/CurrencyRates/ControllersLogic/CalculateCurrencyRateLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/Rates/CalculateRateLogic.php
similarity index 50%
rename from app/Classes/Modules/CurrencyRates/ControllersLogic/CalculateCurrencyRateLogic.php
rename to app/Classes/Modules/Currencies/ControllersLogic/Rates/CalculateRateLogic.php
index ed2481fc..023c5df9 100644
--- a/app/Classes/Modules/CurrencyRates/ControllersLogic/CalculateCurrencyRateLogic.php
+++ b/app/Classes/Modules/Currencies/ControllersLogic/Rates/CalculateRateLogic.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace App\Classes\Modules\CurrencyRates\ControllersLogic;
+namespace App\Classes\Modules\Currencies\ControllersLogic\Rates;
 
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-use App\Classes\Modules\CurrencyRates\Services\FetchesCurrencyRate;
-use App\Classes\Modules\CurrencyRates\Services\CalculatesCurrencyRate;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Currencies\Services\Rates\FetchesRate;
+use App\Classes\Modules\Currencies\Services\Rates\CalculatesRate;
 
 use App\Http\Resources\CalculateCurrencyRateResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class CalculateCurrencyRateLogic extends AbstractControllersLogic
+class CalculateRateLogic extends AbstractControllerLogic
 {
 
     /**
@@ -25,21 +25,20 @@ class CalculateCurrencyRateLogic extends AbstractControllersLogic
         ];
     }
 
-    /** @var FetchesCurrencyRate */
-    private $fetchesCurrencyRate;
+    /** @var FetchesRate */
+    private $fetchesRate;
 
-    /** @var CalculatesCurrencyRate */
-    private $calculatesCurrencyRate;
+    /** @var CalculatesRate */
+    private $calculatesRate;
 
     /**
-     * @param CanListStandardSegmentConstants $canListStandardSegmentConstants
-     * @param FetchesCurrencyRate $fetchesCurrencyRate
-     * @param CalculatesCurrencyRate $calculatesCurrencyRate
+     * @param FetchesRate $fetchesRate
+     * @param CalculatesRate $calculatesRate
      */
-    public function __construct(FetchesCurrencyRate $fetchesCurrencyRate, CalculatesCurrencyRate $calculatesCurrencyRate)
+    public function __construct(FetchesRate $fetchesRate, CalculatesRate $calculatesRate)
     {
-        $this->fetchesCurrencyRate = $fetchesCurrencyRate;
-        $this->calculatesCurrencyRate = $calculatesCurrencyRate;
+        $this->fetchesRate = $fetchesRate;
+        $this->calculatesRate = $calculatesRate;
     }
 
     /**
@@ -51,18 +50,18 @@ class CalculateCurrencyRateLogic extends AbstractControllersLogic
     {
         try {
             $amount = $request->input('amount');
-            $conversion_currency_rate = $this->fetchesCurrencyRate->execute(
+            $conversion_currency_rate = $this->fetchesRate->execute(
                 [
                     'id' => $request->input('conversion_currency_rate_id'),
                 ]
             );
-            $convertable_currency_rate = $this->fetchesCurrencyRate->execute(
+            $convertable_currency_rate = $this->fetchesRate->execute(
                 [
                     'id' => $request->input('convertable_currency_rate_id')
                 ]
             );
 
-            $convert_amount = $this->calculatesCurrencyRate->execute($conversion_currency_rate, $convertable_currency_rate, $amount);
+            $convert_amount = $this->calculatesRate->execute($conversion_currency_rate, $convertable_currency_rate, $amount);
 
             return $this->resourceResponse(new CalculateCurrencyRateResource($conversion_currency_rate, $convertable_currency_rate, $convert_amount));
 
diff --git a/app/Classes/Modules/Currencies/ControllersLogic/Rates/CreateRateLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/Rates/CreateRateLogic.php
new file mode 100644
index 00000000..3d697b8b
--- /dev/null
+++ b/app/Classes/Modules/Currencies/ControllersLogic/Rates/CreateRateLogic.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Classes\Modules\Currencies\ControllersLogic\Rates;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Currencies\Services\FetchesCurrency;
+
+use App\Classes\Modules\Currencies\Services\Rates\CreatesRateLog;
+use App\Classes\Modules\Currencies\Standards\Rules\Rates\CanCreateRate;
+use App\Classes\Modules\Currencies\Services\Rates\CreatesRate;
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
+
+use App\Http\Resources\CurrencyRateResource;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class CreateRateLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Currency Rate',
+            'message' => 'You have successfully created a new Currency Rate'
+        ];
+    }
+
+    /** @var CanCreateRate */
+    private $canCreateRate;
+
+    /** @var CreatesRate */
+    private $createsRate;
+
+    /** @var CreatesRateLog */
+    private $createsRateLog;
+
+    /** @var FetchesCurrency */
+    private $fetchesCurrency;
+
+    /**
+     * CreateRateLogic constructor.
+     * @param CanCreateRate $canCreateRate
+     * @param CreatesRate $createsRate
+     * @param CreatesRateLog $createsRateLog
+     * @param FetchesCurrency $fetchesCurrency
+     */
+    public function __construct(
+        CanCreateRate $canCreateRate,
+        CreatesRate $createsRate,
+        CreatesRateLog $createsRateLog,
+        FetchesCurrency $fetchesCurrency
+    )
+    {
+        $this->canCreateRate = $canCreateRate;
+        $this->createsRate = $createsRate;
+        $this->createsRateLog = $createsRateLog;
+        $this->fetchesCurrency = $fetchesCurrency;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+            DB::beginTransaction();
+
+            $currency_rate_object = new RateObject(
+                $request->input('currency_id'),
+                number_format( (float) $request->input('selling'), 5, '.', ''),
+                $request->input('payment_method_type')
+            );
+
+            $this->canCreateRate->passes($currency_rate_object);
+
+            $currency_rate_query = $this->createsRate->execute($currency_rate_object);
+
+            $this->createsRateLog->execute($currency_rate_query);
+
+            DB::commit();
+
+            return $this->resourceResponse(new CurrencyRateResource($currency_rate_query));
+
+        } catch (\Exception $exception) {
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Currencies/ControllersLogic/Rates/DeleteRateLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/Rates/DeleteRateLogic.php
new file mode 100644
index 00000000..2cacb51d
--- /dev/null
+++ b/app/Classes/Modules/Currencies/ControllersLogic/Rates/DeleteRateLogic.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Classes\Modules\Currencies\ControllersLogic\Rates;
+
+use App\Classes\Modules\Currencies\Services\Rates\DeletesRate;
+use App\Http\Resources\CurrencyRateResource;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Currencies\Services\Rates\FetchesRate;
+
+use App\Classes\Modules\Currencies\Standards\Rules\Rates\CanDeleteRate;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class DeleteRateLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Delete Currency Rate',
+            'message' => 'You have successfully deleted the Currency Rate'
+        ];
+    }
+
+    /** @var CanDeleteRate */
+    private $canDeleteRate;
+
+    /** @var DeletesRate */
+    private $deletesRate;
+
+    /** @var FetchesRate */
+    private $fetchesRate;
+
+
+    /**
+     * DeleteRateRateLogic constructor.
+     * @param CanDeleteRate $canDeleteRate
+     * @param DeletesRate $deletesRate
+     * @param FetchesRate $fetchesRate
+     */
+    public function __construct(
+        CanDeleteRate $canDeleteRate,
+        DeletesRate $deletesRate,
+        FetchesRate $fetchesRate
+    )
+    {
+        $this->canDeleteRate = $canDeleteRate;
+        $this->deletesRate = $deletesRate;
+        $this->fetchesRate = $fetchesRate;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+            DB::beginTransaction();
+
+            $currency_rate = $this->fetchesRate->execute(['id' => $request->route('id')]);
+            $this->canDeleteRate->passes();
+            $this->deletesRate->execute($currency_rate);
+            
+            DB::commit();
+
+            return $this->resourceResponse(new CurrencyRateResource($currency_rate));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Currencies/ControllersLogic/Rates/FetchRateLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/Rates/FetchRateLogic.php
new file mode 100644
index 00000000..e691885e
--- /dev/null
+++ b/app/Classes/Modules/Currencies/ControllersLogic/Rates/FetchRateLogic.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Classes\Modules\Currencies\ControllersLogic\Rates;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Currencies\Services\Rates\FetchesRate;
+use App\Classes\Modules\Currencies\Standards\Rules\Rates\CanFetchRate;
+use App\Http\Resources\CurrencyRateResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchRateLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Currency Rate',
+            'message' => 'You have successfully retrieved a Currency Rate'
+        ];
+    }
+
+    /** @var CanFetchRate */
+    private $canFetchRate;
+
+    /** @var FetchesRate */
+    private $fetchesRate;
+
+    /**
+     * FetchRateControllersLogic constructor.
+     * @param CanFetchRate $canFetchRate
+     * @param FetchesRate $fetchesRate
+     */
+    public function __construct(CanFetchRate $canFetchRate, FetchesRate $fetchesRate)
+    {
+        $this->canFetchRate = $canFetchRate;
+        $this->fetchesRate = $fetchesRate;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $this->canFetchRate->passes();
+
+            $query = $this->fetchesRate->execute(['id' => $request->route('id')]);
+
+            return $this->resourceResponse(new CurrencyRateResource($query));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/CurrencyRates/ControllersLogic/ListCurrencyRatesLogicLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/Rates/ListRatesLogic.php
similarity index 52%
rename from app/Classes/Modules/CurrencyRates/ControllersLogic/ListCurrencyRatesLogicLogic.php
rename to app/Classes/Modules/Currencies/ControllersLogic/Rates/ListRatesLogic.php
index 94c9312c..c62ec605 100644
--- a/app/Classes/Modules/CurrencyRates/ControllersLogic/ListCurrencyRatesLogicLogic.php
+++ b/app/Classes/Modules/Currencies/ControllersLogic/Rates/ListRatesLogic.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Classes\Modules\CurrencyRates\ControllersLogic;
+namespace App\Classes\Modules\Currencies\ControllersLogic\Rates;
 
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-use App\Classes\Modules\CurrencyRates\Services\ListsCurrencyRates;
-use App\Classes\Modules\CurrencyRates\Standards\Rules\CanListCurrencyRates;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Currencies\Services\Rates\ListsRates;
+use App\Classes\Modules\Currencies\Standards\Rules\Rates\CanListRates;
 use App\Http\Resources\CurrencyRateResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class ListCurrencyRatesLogic extends AbstractControllersLogic
+class ListRatesLogic extends AbstractControllerLogic
 {
 
     /**
@@ -24,21 +24,21 @@ class ListCurrencyRatesLogic extends AbstractControllersLogic
         ];
     }
 
-    /** @var CanListCurrencyRates */
-    private $canListCurrencyRates;
+    /** @var CanListRates */
+    private $canListRates;
 
-    /** @var ListsCurrencyRates */
-    private $listsCurrencyRates;
+    /** @var ListsRates */
+    private $listsRates;
 
     /**
-     * ListCurrencyRatesLogic constructor.
-     * @param CanListCurrencyRates $canListCurrencyRates
-     * @param ListsCurrencyRates $listsCurrencyRates
+     * ListRatesLogic constructor.
+     * @param CanListRates $canListRates
+     * @param ListsRates $listsRates
      */
-    public function __construct(CanListCurrencyRates $canListCurrencyRates, ListsCurrencyRates $listsCurrencyRates)
+    public function __construct(CanListRates $canListRates, ListsRates $listsRates)
     {
-        $this->canListCurrencyRates = $canListCurrencyRates;
-        $this->listsCurrencyRates = $listsCurrencyRates;
+        $this->canListRates = $canListRates;
+        $this->listsRates = $listsRates;
     }
 
 
@@ -50,9 +50,9 @@ class ListCurrencyRatesLogic extends AbstractControllersLogic
     public function logic(Request $request) : JsonResponse
     {
         try {
-            $this->canListCurrencyRates->passes();
+            $this->canListRates->passes();
 
-            $query = $this->listsCurrencyRates->execute(
+            $query = $this->listsRates->execute(
                 [
                     'currency_id' => $request->input('currency_id'),
                     'payment_method_type' => $request->input('payment_method_type')
diff --git a/app/Classes/Modules/Currencies/ControllersLogic/Rates/UpdateRateLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/Rates/UpdateRateLogic.php
new file mode 100644
index 00000000..8aa61056
--- /dev/null
+++ b/app/Classes/Modules/Currencies/ControllersLogic/Rates/UpdateRateLogic.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Classes\Modules\Currencies\ControllersLogic\Rates;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Currencies\Services\Rates\CreatesRateLog;
+use App\Classes\Modules\Currencies\Services\Rates\FetchesRate;
+
+use App\Classes\Modules\Currencies\Standards\Rules\Rates\CanUpdateRate;
+
+use App\Classes\Modules\Currencies\Services\Rates\UpdatesRate;
+
+
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
+use App\Http\Resources\CurrencyRateResource;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class UpdateRateLogic extends AbstractControllerLogic
+{
+
+    /** @var CanUpdateRate */
+    private $canUpdateRate;
+    /** @var UpdatesRate */
+    private $updatesRate;
+    /** @var CreatesRateLog */
+    private $createsRateLog;
+    /** @var FetchesRate */
+    private $fetchesRate;
+
+    /**
+     * UpdateStandardRateLogic constructor.
+     * @param CanUpdateRate $canUpdateRate
+     * @param UpdatesRate $updatesRate
+     * @param CreatesRateLog $createsRateLog
+     * @param FetchesRate $fetchesRate
+     */
+    public function __construct(
+        CanUpdateRate $canUpdateRate,
+        UpdatesRate $updatesRate,
+        CreatesRateLog $createsRateLog,
+        FetchesRate $fetchesRate
+    )
+    {
+        $this->canUpdateRate = $canUpdateRate;
+        $this->updatesRate = $updatesRate;
+        $this->createsRateLog = $createsRateLog;
+        $this->fetchesRate = $fetchesRate;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+            DB::beginTransaction();
+
+            $currency_rate_query = $this->fetchesRate->execute(['id' => $request->route('id')]);
+
+            $currency_object_object = new RateObject(
+                $currency_rate_query->currency_id,
+                 $request->input('selling', $currency_rate_query->selling),
+                $currency_rate_query->payment_method_type
+            );
+
+            $this->canUpdateRate->passes($currency_object_object);
+            $currency_rate_query = $this->updatesRate->execute($currency_rate_query, $currency_object_object);
+
+            $this->createsRateLog->execute($currency_rate_query);
+
+            DB::commit();
+
+            return $this->resourceResponse(new CurrencyRateResource($currency_rate_query));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+    }
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Currency Rate',
+            'message' => 'You have successfully updated the Currency Rate'
+        ];
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Currencies/DataTransferObjects/CurrencyConversionObject.php b/app/Classes/Modules/Currencies/DataTransferObjects/CurrencyConversionObject.php
new file mode 100644
index 00000000..c4e91b1e
--- /dev/null
+++ b/app/Classes/Modules/Currencies/DataTransferObjects/CurrencyConversionObject.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Classes\Modules\Currencies\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+
+class CurrencyConversionObject implements DataTransferObject
+{
+
+    /** @var float */
+    private $amount;
+
+    /** @var int */
+    private $currencyId;
+
+    /** @var int */
+    private $serviceId;
+
+    /** @var int */
+    private $type;
+
+    /** @var int|null */
+    private $paymentMethod;
+
+    /**
+     * CurrencyConversionObject constructor.
+     * @param float $amount
+     * @param int $currencyId
+     * @param int $serviceId
+     * @param int $type
+     * @param int|null $paymentMethod
+     */
+    public function __construct(float $amount, int $currencyId, int $serviceId, int $type, ?int $paymentMethod = PaymentMethodType::CASH)
+    {
+        $this->amount = $amount;
+        $this->currencyId = $currencyId;
+        $this->serviceId = $serviceId;
+        $this->type = $type;
+        $this->paymentMethod = $paymentMethod;
+    }
+
+    /**
+     * @return float
+     */
+    public function getAmount(): float
+    {
+        return $this->amount;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCurrencyId(): int
+    {
+        return $this->currencyId;
+    }
+
+    /**
+     * @return int
+     */
+    public function getServiceId(): int
+    {
+        return $this->serviceId;
+    }
+
+    /**
+     * @return int
+     */
+    public function getType(): int
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getPaymentMethod(): ?int
+    {
+        return $this->paymentMethod;
+    }
+
+
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Currencies/DataTransferObjects/CurrencyObject.php b/app/Classes/Modules/Currencies/DataTransferObjects/CurrencyObject.php
index 78460524..8e8e23d6 100644
--- a/app/Classes/Modules/Currencies/DataTransferObjects/CurrencyObject.php
+++ b/app/Classes/Modules/Currencies/DataTransferObjects/CurrencyObject.php
@@ -2,49 +2,36 @@
 
 namespace App\Classes\Modules\Currencies\DataTransferObjects;
 
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
 
 class CurrencyObject implements DataTransferObject
 {
-    /** @var string|null */
-    private $country_id;
+    /** @var string */
     private $name;
-    private $short_code;
-    private $symbol;
 
+    /** @var string  */
+    private $short_code;
+
+    /** @var string|null  */
+    private $symbol;
 
     /**
      * CurrencyObject constructor.
-     * @param int|null $country_id
-     * @param null|string $name
-     * @param null|string $short_code
+     * @param string $name
+     * @param string $short_code
      * @param null|string $symbol
      */
-    public function __construct(
-        ?int $country_id,
-        ?string $name,
-        ?string $short_code,
-        ?string $symbol
-    )
+    public function __construct(string $name, string $short_code, ?string $symbol = null)
     {
-        $this->country_id = $country_id;
         $this->name = $name;
         $this->short_code = $short_code;
         $this->symbol = $symbol;
     }
 
-    /**
-     * @return int
-     */
-    public function getCountryId(): ?int
-    {
-        return $this->country_id;
-    }
-
     /**
      * @return string
      */
-    public function getName(): ?string
+    public function getName(): string
     {
         return $this->name;
     }
@@ -52,16 +39,20 @@ class CurrencyObject implements DataTransferObject
     /**
      * @return string
      */
-    public function getShortCode(): ?string
+    public function getShortCode(): string
     {
         return $this->short_code;
     }
 
     /**
-     * @return string
+     * @return null|string
      */
     public function getSymbol(): ?string
     {
         return $this->symbol;
     }
+
+
+
+
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Currencies/DataTransferObjects/RateObject.php b/app/Classes/Modules/Currencies/DataTransferObjects/RateObject.php
new file mode 100644
index 00000000..cde9dea9
--- /dev/null
+++ b/app/Classes/Modules/Currencies/DataTransferObjects/RateObject.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Classes\Modules\Currencies\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+
+class RateObject implements DataTransferObject
+{
+
+    /** @var array */
+    private $selling;
+
+    /** @var array */
+    private $payment_method_type;
+
+    /**
+     * RateObject constructor.
+     * @param array $selling
+     * @param string $payment_method_type
+     */
+    public function __construct(array $selling, string $payment_method_type)
+    {
+        $this->selling = $selling;
+        $this->payment_method_type = $payment_method_type;
+    }
+
+    /**
+     * @return array
+     */
+    public function getSelling(): array
+    {
+        return $this->selling;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPaymentMethodType(): int
+    {
+        return PaymentMethodType::PAYMENT_METHODS[$this->payment_method_type];
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Currencies/Services/CreatesCurrency.php b/app/Classes/Modules/Currencies/Services/CreatesCurrency.php
index 1f4f9cb6..d11667fd 100644
--- a/app/Classes/Modules/Currencies/Services/CreatesCurrency.php
+++ b/app/Classes/Modules/Currencies/Services/CreatesCurrency.php
@@ -2,24 +2,27 @@
 
 namespace App\Classes\Modules\Currencies\Services;
 
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
 use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyObject;
+use App\Models\Country;
 use App\Models\Currency;
 
-class CreatesCurrency extends AbstractUpdateRecord
+class CreatesCurrency extends AbstractUpdateRelationshipRecord
 {
     /**
+     * @param Country $country
      * @param CurrencyObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(CurrencyObject $object) {
+    public function execute(Country $country, CurrencyObject $object) {
+
         $model = new Currency();
-        $model->country_id = $object->getCountryId();
         $model->name = $object->getName();
         $model->short_code = $object->getShortCode();
         $model->symbol = $object->getSymbol();
-        return $this->handler($model);
+
+        return $this->handler($country->currencies(), $model);
 
     }
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Currencies/Services/CreatesCurrencyLog.php b/app/Classes/Modules/Currencies/Services/CreatesCurrencyLog.php
index a5de84ab..cf2541c5 100644
--- a/app/Classes/Modules/Currencies/Services/CreatesCurrencyLog.php
+++ b/app/Classes/Modules/Currencies/Services/CreatesCurrencyLog.php
@@ -16,8 +16,7 @@ class CreatesCurrencyLog extends AbstractUpdateRecord
     public function execute(Currency $object) {
         $model = new CurrencyLog();
         $model->currency_id = $object->id;
-        $model->selling = $object->selling;
-        $model->created_by = \Auth::user()->id;
+        $model->created_by = Auth()->user()->id;
         return $this->handler($model);
 
     }
diff --git a/app/Classes/Modules/Currencies/Services/DeletesCurrency.php b/app/Classes/Modules/Currencies/Services/DeletesCurrency.php
index 13606c86..3e4dd087 100644
--- a/app/Classes/Modules/Currencies/Services/DeletesCurrency.php
+++ b/app/Classes/Modules/Currencies/Services/DeletesCurrency.php
@@ -8,6 +8,11 @@ use App\Models\Currency;
 class DeletesCurrency extends AbstractDeleteRecord
 {
 
+    /**
+     * @param Currency $model
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
     public function execute(Currency $model) {
         return $this->handler($model);
     }
diff --git a/app/Classes/Modules/CurrencyRates/Services/CalculatesCurrencyRate.php b/app/Classes/Modules/Currencies/Services/Rates/CalculatesRate.php
similarity index 68%
rename from app/Classes/Modules/CurrencyRates/Services/CalculatesCurrencyRate.php
rename to app/Classes/Modules/Currencies/Services/Rates/CalculatesRate.php
index 31396eeb..0751db76 100644
--- a/app/Classes/Modules/CurrencyRates/Services/CalculatesCurrencyRate.php
+++ b/app/Classes/Modules/Currencies/Services/Rates/CalculatesRate.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace App\Classes\Modules\CurrencyRates\Services;
+namespace App\Classes\Modules\Currencies\Services\Rates;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Models\CurrencyRate;
 
-class CalculatesCurrencyRate extends AbstractUpdateRecord
+class CalculatesRate extends AbstractUpdateRecord
 {
 
-    public function execute(CurrencyRate $conversion_currency_rate, CurrencyRate $convertable_currency_rate, $amount) 
+    public function execute(CurrencyRate $conversion_currency_rate, CurrencyRate $convertable_currency_rate, $amount)
     {
         return $convert_amount = ($conversion_currency_rate->selling / $convertable_currency_rate->selling) * $amount;
     }
     
-    public function execute_rate(CurrencyRate $conversion_currency_rate, CurrencyRate $convertable_currency_rate) 
+    public function execute_rate(CurrencyRate $conversion_currency_rate, CurrencyRate $convertable_currency_rate)
     {
         return $convert_rate = ($conversion_currency_rate->selling / $convertable_currency_rate->selling);
     }
diff --git a/app/Classes/Modules/Currencies/Services/Rates/CreatesRate.php b/app/Classes/Modules/Currencies/Services/Rates/CreatesRate.php
new file mode 100644
index 00000000..dce10b28
--- /dev/null
+++ b/app/Classes/Modules/Currencies/Services/Rates/CreatesRate.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes\Modules\Currencies\Services\Rates;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
+use App\Models\Currency;
+use App\Models\CurrencyRate;
+
+class CreatesRate extends AbstractUpdateRelationshipRecord
+{
+
+    /**
+     * @param Currency $currency
+     * @param RateObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Currency $currency, RateObject $object)
+    {
+        $model = new CurrencyRate();
+        $model->selling = $object->getSelling();
+        $model->payment_method_type = $object->getPaymentMethodType();
+        $model->service_id = $object->getServiceId();
+
+        return $this->handler($currency->rates(), $model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/CurrencyRates/Services/CreatesCurrencyRateLog.php b/app/Classes/Modules/Currencies/Services/Rates/CreatesRateLog.php
similarity index 79%
rename from app/Classes/Modules/CurrencyRates/Services/CreatesCurrencyRateLog.php
rename to app/Classes/Modules/Currencies/Services/Rates/CreatesRateLog.php
index 1d120a05..b8bf8275 100644
--- a/app/Classes/Modules/CurrencyRates/Services/CreatesCurrencyRateLog.php
+++ b/app/Classes/Modules/Currencies/Services/Rates/CreatesRateLog.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Classes\Modules\Currencies\Services;
+namespace App\Classes\Modules\Currencies\Services\Rates;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Models\CurrencyRate;
 use App\Models\CurrencyRateLog;
 
-class CreatesCurrencyRateLog extends AbstractUpdateRecord
+class CreatesRateLog extends AbstractUpdateRecord
 {
     /**
-     * @param Currency $object
+     * @param CurrencyRate $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
diff --git a/app/Classes/Modules/Currencies/Services/Rates/CreatesRates.php b/app/Classes/Modules/Currencies/Services/Rates/CreatesRates.php
new file mode 100644
index 00000000..f28cd97f
--- /dev/null
+++ b/app/Classes/Modules/Currencies/Services/Rates/CreatesRates.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Currencies\Services\Rates;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
+use App\Models\Currency;
+use App\Models\CurrencyRate;
+
+class CreatesRates extends AbstractUpdateRelationshipRecord
+{
+
+
+    /**
+     * @param Currency $currency
+     * @param array $rates
+     * @return mixed
+     */
+    public function execute(Currency $currency, array $rates)
+    {
+        return $currency->update($rates)->save();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Currencies/Services/Rates/DeletesRate.php b/app/Classes/Modules/Currencies/Services/Rates/DeletesRate.php
new file mode 100644
index 00000000..30437c7e
--- /dev/null
+++ b/app/Classes/Modules/Currencies/Services/Rates/DeletesRate.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Currencies\Services\Rates;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Models\CurrencyRate;
+
+class DeletesRate extends AbstractDeleteRecord
+{
+
+    /**
+     * @param CurrencyRate $model
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(CurrencyRate $model) {
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/CurrencyRates/Services/FetchesCurrencyRate.php b/app/Classes/Modules/Currencies/Services/Rates/FetchesRate.php
similarity index 77%
rename from app/Classes/Modules/CurrencyRates/Services/FetchesCurrencyRate.php
rename to app/Classes/Modules/Currencies/Services/Rates/FetchesRate.php
index 7254387c..f8c2a4cd 100644
--- a/app/Classes/Modules/CurrencyRates/Services/FetchesCurrencyRate.php
+++ b/app/Classes/Modules/Currencies/Services/Rates/FetchesRate.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace App\Classes\Modules\CurrencyRates\Services;
+namespace App\Classes\Modules\Currencies\Services\Rates;
 
 
 use App\Classes\General\Eloquent\AbstractFetchRecord;
 use Illuminate\Database\Eloquent\Builder;
 use App\Models\CurrencyRate;
 
-class FetchesCurrencyRate extends AbstractFetchRecord
+class FetchesRate extends AbstractFetchRecord
 {
 
     /** @var CurrencyRate */
     private $repository;
 
     /**
-     * FetchesCurrencyRate constructor.
+     * FetchesRate constructor.
      * @param CurrencyRate $repository
      */
     public function __construct(CurrencyRate $repository)
diff --git a/app/Classes/Modules/CurrencyRates/Services/ListsCurrencyRates.php b/app/Classes/Modules/Currencies/Services/Rates/ListsRates.php
similarity index 77%
rename from app/Classes/Modules/CurrencyRates/Services/ListsCurrencyRates.php
rename to app/Classes/Modules/Currencies/Services/Rates/ListsRates.php
index bbb25984..b7d4579c 100644
--- a/app/Classes/Modules/CurrencyRates/Services/ListsCurrencyRates.php
+++ b/app/Classes/Modules/Currencies/Services/Rates/ListsRates.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace App\Classes\Modules\CurrencyRates\Services;
+namespace App\Classes\Modules\Currencies\Services\Rates;
 
 
 use App\Classes\General\Eloquent\AbstractListRecord;
 use Illuminate\Database\Eloquent\Builder;
 use App\Models\CurrencyRate;
 
-class ListsCurrencyRates extends AbstractListRecord
+class ListsRates extends AbstractListRecord
 {
 
     /** @var CurrencyRate */
     private $repository;
 
     /**
-     * ListsCurrencyRates constructor.
+     * ListsRates constructor.
      * @param CurrencyRate $repository
      */
     public function __construct(CurrencyRate $repository)
diff --git a/app/Classes/Modules/CurrencyRates/Services/UpdatesCurrencyRate.php b/app/Classes/Modules/Currencies/Services/Rates/UpdatesRate.php
similarity index 51%
rename from app/Classes/Modules/CurrencyRates/Services/UpdatesCurrencyRate.php
rename to app/Classes/Modules/Currencies/Services/Rates/UpdatesRate.php
index dc252f98..f38f202a 100644
--- a/app/Classes/Modules/CurrencyRates/Services/UpdatesCurrencyRate.php
+++ b/app/Classes/Modules/Currencies/Services/Rates/UpdatesRate.php
@@ -1,20 +1,21 @@
 <?php
 
-namespace App\Classes\Modules\CurrencyRates\Services;
+namespace App\Classes\Modules\Currencies\Services\Rates;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\CurrencyRates\DataTransferObjects\CurrencyRateObject;
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
 use App\Models\CurrencyRate;
 
-class UpdatesCurrencyRate extends AbstractUpdateRecord
+class UpdatesRate extends AbstractUpdateRecord
 {
 
     /**
-     * @param CurrencyRateObject $object
+     * @param CurrencyRate $model
+     * @param RateObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(CurrencyRate $model, CurrencyRateObject $object) 
+    public function execute(CurrencyRate $model, RateObject $object)
     {
         $model->selling = $object->getSelling();
 
diff --git a/app/Classes/Modules/Currencies/Standards/Rules/CanCreateCurrency.php b/app/Classes/Modules/Currencies/Standards/Rules/CanCreateCurrency.php
index 42da8a25..873e03ce 100644
--- a/app/Classes/Modules/Currencies/Standards/Rules/CanCreateCurrency.php
+++ b/app/Classes/Modules/Currencies/Standards/Rules/CanCreateCurrency.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Currencies\Standards\Rules;
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Currencies\DataTransferObjects\SegmentObject;
+use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyObject;
 use App\Classes\Modules\Currencies\Standards\Validators\CurrencyValidation;
 
 class CanCreateCurrency extends AbstractRule
@@ -27,15 +27,11 @@ class CanCreateCurrency extends AbstractRule
     protected function authorized(): bool
     {
         // TODO  Set Authorization rules
-        if (!\Auth::user()->can('add currency')) {
-            return false;
-        }
-
         return true;
     }
 
     /**
-     * @param SegmentObject $object
+     * @param CurrencyObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
@@ -45,7 +41,7 @@ class CanCreateCurrency extends AbstractRule
     }
 
     /**
-     * @param SegmentObject $object
+     * @param CurrencyObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/Currencies/Standards/Rules/CanDeleteCurrency.php b/app/Classes/Modules/Currencies/Standards/Rules/CanDeleteCurrency.php
index bfeb6885..60820e79 100644
--- a/app/Classes/Modules/Currencies/Standards/Rules/CanDeleteCurrency.php
+++ b/app/Classes/Modules/Currencies/Standards/Rules/CanDeleteCurrency.php
@@ -13,13 +13,7 @@ class CanDeleteCurrency extends AbstractRule
     protected function authorized(): bool
     {
         // TODO  Set Authorization rules
-
-        if (!\Auth::user()->can('delete currency')) {
-            return false;
-        }
-
         return true;
-
     }
 
     /**
diff --git a/app/Classes/Modules/Currencies/Standards/Rules/CanFetchCurrency.php b/app/Classes/Modules/Currencies/Standards/Rules/CanFetchCurrency.php
new file mode 100644
index 00000000..624809ed
--- /dev/null
+++ b/app/Classes/Modules/Currencies/Standards/Rules/CanFetchCurrency.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Currencies\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyObject;
+
+class CanFetchCurrency extends AbstractRule
+{
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param CurrencyObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param CurrencyObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Currencies/Standards/Rules/CanListCurrency.php b/app/Classes/Modules/Currencies/Standards/Rules/CanListCurrency.php
index 6593f566..38a74f65 100644
--- a/app/Classes/Modules/Currencies/Standards/Rules/CanListCurrency.php
+++ b/app/Classes/Modules/Currencies/Standards/Rules/CanListCurrency.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Currencies\Standards\Rules;
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Segments\DataTransferObjects\CurrencyObject;
+use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyObject;
 
 class CanListCurrency extends AbstractRule
 {
@@ -14,10 +14,6 @@ class CanListCurrency extends AbstractRule
     {
         // TODO  Set Authorization rules
 
-        if (!\Auth::user()->can('view currency')) {
-            return false;
-        }
-
         return true;
 
     }
diff --git a/app/Classes/Modules/Currencies/Standards/Rules/CanUpdateCurrency.php b/app/Classes/Modules/Currencies/Standards/Rules/CanUpdateCurrency.php
index 639070f0..d7e2ca93 100644
--- a/app/Classes/Modules/Currencies/Standards/Rules/CanUpdateCurrency.php
+++ b/app/Classes/Modules/Currencies/Standards/Rules/CanUpdateCurrency.php
@@ -10,7 +10,7 @@ use App\Classes\Modules\Currencies\Standards\Validators\CurrencyValidation;
 class CanUpdateCurrency extends AbstractRule
 {
 
-    /** @var currencyValidation */
+    /** @var CurrencyValidation */
     private $currencyValidation;
 
 
@@ -29,16 +29,11 @@ class CanUpdateCurrency extends AbstractRule
     protected function authorized(): bool
     {
         // TODO  Set Authorization rules
-
-        if (!\Auth::user()->can('edit currency')) {
-            return false;
-        }
-
         return true;
     }
 
     /**
-     * @param CurrencyValidation $object
+     * @param CurrencyObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
@@ -48,7 +43,7 @@ class CanUpdateCurrency extends AbstractRule
     }
 
     /**
-     * @param CurrencyValidation $object
+     * @param CurrencyObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/Currencies/Standards/Rules/Rates/CanCreateRate.php b/app/Classes/Modules/Currencies/Standards/Rules/Rates/CanCreateRate.php
new file mode 100644
index 00000000..842a548b
--- /dev/null
+++ b/app/Classes/Modules/Currencies/Standards/Rules/Rates/CanCreateRate.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\Currencies\Standards\Rules\Rates;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Currencies\Standards\Validators\Rates\RateValidation;
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
+
+class CanCreateRate extends AbstractRule
+{
+
+    /** @var RateValidation */
+    private $rateValidation;
+
+    /**
+     * CanCreateRate constructor.
+     * @param RateValidation $rateValidation
+     */
+    public function __construct(RateValidation $rateValidation)
+    {
+        $this->rateValidation = $rateValidation;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        if (!\Auth::user()->can('add currency_rate')) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param RateObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->rateValidation->validate($object, 'POST');
+    }
+
+    /**
+     * @param RateObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/CurrencyRates/Standards/Rules/CanDeleteCurrencyRate.php b/app/Classes/Modules/Currencies/Standards/Rules/Rates/CanDeleteRate.php
similarity index 67%
rename from app/Classes/Modules/CurrencyRates/Standards/Rules/CanDeleteCurrencyRate.php
rename to app/Classes/Modules/Currencies/Standards/Rules/Rates/CanDeleteRate.php
index 33e47744..4ebefb9e 100644
--- a/app/Classes/Modules/CurrencyRates/Standards/Rules/CanDeleteCurrencyRate.php
+++ b/app/Classes/Modules/Currencies/Standards/Rules/Rates/CanDeleteRate.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Classes\Modules\CurrencyRates\Standards\Rules;
+namespace App\Classes\Modules\Currencies\Standards\Rules\Rates;
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\CurrencyRates\DataTransferObjects\CurrencyRateObject;
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
 
-class CanDeleteCurrencyRate extends AbstractRule
+class CanDeleteRate extends AbstractRule
 {
     /**
      * @return bool
@@ -23,7 +23,7 @@ class CanDeleteCurrencyRate extends AbstractRule
     }
 
     /**
-     * @param CurrencyRateObject $object
+     * @param RateObject $object
      * @return bool
      */
     protected function validators($object): bool
@@ -34,7 +34,7 @@ class CanDeleteCurrencyRate extends AbstractRule
 
 
     /**
-     * @param CurrencyRateObject $object
+     * @param RateObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/CompanyBanks/Standards/Rules/CanDeleteCompanyBank.php b/app/Classes/Modules/Currencies/Standards/Rules/Rates/CanFetchRate.php
similarity index 55%
rename from app/Classes/Modules/CompanyBanks/Standards/Rules/CanDeleteCompanyBank.php
rename to app/Classes/Modules/Currencies/Standards/Rules/Rates/CanFetchRate.php
index 64db417c..4006e36f 100644
--- a/app/Classes/Modules/CompanyBanks/Standards/Rules/CanDeleteCompanyBank.php
+++ b/app/Classes/Modules/Currencies/Standards/Rules/Rates/CanFetchRate.php
@@ -1,29 +1,27 @@
 <?php
 
-namespace App\Classes\Modules\CompanyBanks\Standards\Rules;
+namespace App\Classes\Modules\Currencies\Standards\Rules\Rates;
+
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\CompanyBanks\DataTransferObjects\CompanyBankObject;
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
 
-class CanDeleteCompanyBank extends AbstractRule
+class CanFetchRate extends AbstractRule
 {
+
+
     /**
      * @return bool
      */
     protected function authorized(): bool
     {
         // TODO  Set Authorization rules
-
-        if (!\Auth::user()->can('delete company_bank')) {
-            return false;
-        }
-
         return true;
 
     }
 
     /**
-     * @param CompanyBankObject $object
+     * @param RateObject $object
      * @return bool
      */
     protected function validators($object): bool
@@ -34,7 +32,7 @@ class CanDeleteCompanyBank extends AbstractRule
 
 
     /**
-     * @param CompanyBankObject $object
+     * @param RateObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/CurrencyRates/Standards/Rules/CanListCurrencyRates.php b/app/Classes/Modules/Currencies/Standards/Rules/Rates/CanListRates.php
similarity index 67%
rename from app/Classes/Modules/CurrencyRates/Standards/Rules/CanListCurrencyRates.php
rename to app/Classes/Modules/Currencies/Standards/Rules/Rates/CanListRates.php
index 31364e37..496ba1e5 100644
--- a/app/Classes/Modules/CurrencyRates/Standards/Rules/CanListCurrencyRates.php
+++ b/app/Classes/Modules/Currencies/Standards/Rules/Rates/CanListRates.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Classes\Modules\CurrencyRates\Standards\Rules;
+namespace App\Classes\Modules\Currencies\Standards\Rules\Rates;
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\CurrencyRates\DataTransferObjects\CurrencyRateObject;
+use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyObject;
 
-class CanListCurrencyRates extends AbstractRule
+class CanListRates extends AbstractRule
 {
     /**
      * @return bool
@@ -23,7 +23,7 @@ class CanListCurrencyRates extends AbstractRule
     }
 
     /**
-     * @param SegmentObject $object
+     * @param CurrencyObject $object
      * @return bool
      */
     protected function validators($object): bool
@@ -34,7 +34,7 @@ class CanListCurrencyRates extends AbstractRule
 
 
     /**
-     * @param SegmentObject $object
+     * @param CurrencyObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/Currencies/Standards/Rules/Rates/CanUpdateRate.php b/app/Classes/Modules/Currencies/Standards/Rules/Rates/CanUpdateRate.php
new file mode 100644
index 00000000..59564725
--- /dev/null
+++ b/app/Classes/Modules/Currencies/Standards/Rules/Rates/CanUpdateRate.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Classes\Modules\Currencies\Standards\Rules\Rates;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Currencies\Standards\Validators\Rates\RateValidation;
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
+
+class CanUpdateRate extends AbstractRule
+{
+
+    /** @var RateValidation */
+    private $rateValidation;
+
+    /**
+     * CanUpdateRate constructor.
+     * @param RateValidation $rateValidation
+     */
+    public function __construct(RateValidation $rateValidation)
+    {
+        $this->rateValidation = $rateValidation;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+
+        if (!\Auth::user()->can('view currency_rate')) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param RateObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->rateValidation->validate($object, 'PUT');
+    }
+
+    /**
+     * @param RateObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Currencies/Standards/Validators/CurrencyValidation.php b/app/Classes/Modules/Currencies/Standards/Validators/CurrencyValidation.php
index 15ab0f89..fd3b8ce5 100644
--- a/app/Classes/Modules/Currencies/Standards/Validators/CurrencyValidation.php
+++ b/app/Classes/Modules/Currencies/Standards/Validators/CurrencyValidation.php
@@ -14,10 +14,8 @@ class CurrencyValidation extends AbstractValidation
     protected function data($object): array 
     {
         return [
-            'country_id' => $object->getCountryId(),
             'name' => $object->getName(),
-            'short_code' => $object->getShortCode(),
-            'symbol' => $object->getSymbol(),
+            'short_code' => $object->getShortCode()
         ];
     }
 
@@ -27,10 +25,8 @@ class CurrencyValidation extends AbstractValidation
     protected function rules(): array 
     {
         return [
-            'country_id' => 'required',
             'name' => 'required',
-            'short_code' => 'required',
-            'short_code' => 'required',
+            'short_code' => 'required'
         ];
     }
 
diff --git a/app/Classes/Modules/CurrencyRates/Standards/Validators/CurrencyRateValidation.php b/app/Classes/Modules/Currencies/Standards/Validators/RateValidation.php
similarity index 76%
rename from app/Classes/Modules/CurrencyRates/Standards/Validators/CurrencyRateValidation.php
rename to app/Classes/Modules/Currencies/Standards/Validators/RateValidation.php
index 3f57ba03..3372c28f 100644
--- a/app/Classes/Modules/CurrencyRates/Standards/Validators/CurrencyRateValidation.php
+++ b/app/Classes/Modules/Currencies/Standards/Validators/RateValidation.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Classes\Modules\CurrencyRates\Standards\Validators;
+namespace App\Classes\Modules\Currencies\Standards\Validators;
 
 
 use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\CurrencyRates\DataTransferObjects\CurrencyRateObject;
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
 
-class CurrencyRateValidation extends AbstractValidation
+class RateValidation extends AbstractValidation
 {
     /**
-     * @param CurrencyRateObject $object
+     * @param RateObject $object
      * @return array
      */
     protected function data($object): array {
@@ -24,6 +24,7 @@ class CurrencyRateValidation extends AbstractValidation
     }
 
     /**
+     * @param null|string $type
      * @return array
      */
     protected function rules(?string $type = 'POST'): array {
diff --git a/app/Classes/Modules/CurrencyRates/ControllersLogic/CreateCurrencyRateLogic.php b/app/Classes/Modules/CurrencyRates/ControllersLogic/CreateCurrencyRateLogic.php
deleted file mode 100644
index 999856c1..00000000
--- a/app/Classes/Modules/CurrencyRates/ControllersLogic/CreateCurrencyRateLogic.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CurrencyRates\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-
-use App\Classes\Modules\Currencies\Services\FetchesCurrency;
-
-use App\Classes\Modules\CurrencyRates\Standards\Rules\CanCreateCurrencyRate;
-use App\Classes\Modules\CurrencyRates\Services\CreatesCurrencyRate;
-use App\Classes\Modules\Currencies\Services\CreatesCurrencyRateLog;
-use App\Classes\Modules\CurrencyRates\DataTransferObjects\CurrencyRateObject;
-
-use App\Http\Resources\CurrencyRateResource;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class CreateCurrencyRateLogic extends AbstractControllersLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Currency Rate',
-            'message' => 'You have successfully created a new Currency Rate'
-        ];
-    }
-
-    /** @var CanCreateCurrencyRate */
-    private $canCreateCurrencyRate;
-
-    /** @var CreatesCurrencyRate */
-    private $createsCurrencyRate;
-
-    /** @var CreatesCurrencyRateLog */
-    private $createsCurrencyRateLog;
-
-    /** @var FetchesCurrency */
-    private $fetchesCurrency;
-
-    /**
-     * CreateCurrencyRateLogic constructor.
-     * @param CanCreateCurrencyRate $canCreateCurrencyRate
-     * @param CreatesCurrencyRate $createsCurrencyRate
-     * @param FetchesCurrency $fetchesCurrency
-     */
-    public function __construct(
-        CanCreateCurrencyRate $canCreateCurrencyRate, 
-        CreatesCurrencyRate $createsCurrencyRate, 
-        CreatesCurrencyRateLog $createsCurrencyRateLog,
-        FetchesCurrency $fetchesCurrency
-    )
-    {
-        $this->canCreateCurrencyRate = $canCreateCurrencyRate;
-        $this->createsCurrencyRate = $createsCurrencyRate;
-        $this->createsCurrencyRateLog = $createsCurrencyRateLog;
-        $this->fetchesCurrency = $fetchesCurrency;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            DB::beginTransaction();
-            
-            $currency_query = $this->fetchesCurrency->execute([
-                'id' => $request->input('currency_id', 1),
-            ]);
-
-            $currency_rate_object = new CurrencyRateObject(
-                $request->input('currency_id'),
-                number_format( (float) $request->input('selling'), 5, '.', ''),
-                $request->input('payment_method_type')
-            );
-
-            $this->canCreateCurrencyRate->passes($currency_rate_object);
-            $currency_rate_query = $this->createsCurrencyRate->execute($currency_rate_object);
-            
-            $currency_rate_log_query = $this->createsCurrencyRateLog->execute($currency_rate_query);
-
-            DB::commit();
-
-            return $this->resourceResponse(new CurrencyRateResource($currency_rate_query));
-
-        } catch (\Exception $exception) {
-            dd($exception);
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CurrencyRates/ControllersLogic/DeleteCurrencyRateLogic.php b/app/Classes/Modules/CurrencyRates/ControllersLogic/DeleteCurrencyRateLogic.php
deleted file mode 100644
index ee6200bc..00000000
--- a/app/Classes/Modules/CurrencyRates/ControllersLogic/DeleteCurrencyRateLogic.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CurrencyRates\ControllersLogic;
-
-use App\Http\Resources\CurrencyRateResource;
-
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-
-use App\Classes\Modules\CurrencyRates\Services\FetchesCurrencyRate;
-
-use App\Classes\Modules\CurrencyRates\Standards\Rules\CanDeleteCurrencyRate;
-use App\Classes\Modules\CurrencyRates\Services\DeletesCurrencyRate;
-use App\Classes\Modules\CurrencyRates\DataTransferObjects\SegmentObject;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class DeleteCurrencyRateLogic extends AbstractControllersLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Delete Currency Rate',
-            'message' => 'You have successfully deleted the Currency Rate'
-        ];
-    }
-
-    /** @var CanDeleteCurrencyRate */
-    private $canDeleteCurrencyRate;
-
-    /** @var DeletesCurrencyRate */
-    private $deletesCurrencyRate;
-
-    /** @var FetchesCurrencyRate */
-    private $fetchesCurrencyRate;
-
-
-    /**
-     * DeleteCurrencyRateRateLogic constructor.
-     * @param CanDeleteCurrencyRate $canDeleteCurrencyRate
-     * @param DeletesCurrencyRate $deletesCurrencyRate
-     * @param FetchesCurrencyRate $fetchesCurrencyRate
-     */
-    public function __construct(
-        CanDeleteCurrencyRate $canDeleteCurrencyRate, 
-        DeletesCurrencyRate $deletesCurrencyRate, 
-        FetchesCurrencyRate $fetchesCurrencyRate
-    )
-    {
-        $this->canDeleteCurrencyRate = $canDeleteCurrencyRate;
-        $this->deletesCurrencyRate = $deletesCurrencyRate;
-        $this->fetchesCurrencyRate = $fetchesCurrencyRate;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            DB::beginTransaction();
-
-            $currency_rate = $this->fetchesCurrencyRate->execute(['id' => $request->route('id')]);
-            $this->canDeleteCurrencyRate->passes();
-            $this->deletesCurrencyRate->execute($currency_rate);
-            
-            DB::commit();
-
-            return $this->resourceResponse(new CurrencyRateResource($currency_rate));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CurrencyRates/ControllersLogic/FetchCurrencyRateLogic.php b/app/Classes/Modules/CurrencyRates/ControllersLogic/FetchCurrencyRateLogic.php
deleted file mode 100644
index 6dd31699..00000000
--- a/app/Classes/Modules/CurrencyRates/ControllersLogic/FetchCurrencyRateLogic.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CurrencyRates\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-use App\Classes\Modules\CurrencyRates\Services\FetchesCurrencyRate;
-use App\Classes\Modules\CurrencyRates\Standards\Rules\CanFetchCurrencyRate;
-use App\Classes\Modules\CurrencyRates\DataTransferObjects\CurrencyRateObject;
-use App\Http\Resources\CurrencyRateResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class FetchCurrencyRateLogic extends AbstractControllersLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Currency Rate',
-            'message' => 'You have successfully retrieved a Currency Rate'
-        ];
-    }
-
-    /** @var CanFetchCurrencyRate */
-    private $canFetchCurrencyRate;
-
-    /** @var FetchesCurrencyRate */
-    private $fetchesCurrencyRate;
-
-    /**
-     * FetchCurrencyRateControllersLogic constructor.
-     * @param CanFetchCurrencyRate $canFetchCurrencyRate
-     * @param FetchesCurrencyRate $fetchesCurrencyRate
-     */
-    public function __construct(CanFetchCurrencyRate $canFetchCurrencyRate, FetchesCurrencyRate $fetchesCurrencyRate)
-    {
-        $this->canFetchCurrencyRate = $canFetchCurrencyRate;
-        $this->fetchesCurrencyRate = $fetchesCurrencyRate;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-
-            $this->canFetchCurrencyRate->passes();
-
-            $query = $this->fetchesCurrencyRate->execute(['id' => $request->route('id')]);
-
-            return $this->resourceResponse(new CurrencyRateResource($query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CurrencyRates/ControllersLogic/UpdateCurrencyRateLogic.php b/app/Classes/Modules/CurrencyRates/ControllersLogic/UpdateCurrencyRateLogic.php
deleted file mode 100644
index eeb19ccd..00000000
--- a/app/Classes/Modules/CurrencyRates/ControllersLogic/UpdateCurrencyRateLogic.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CurrencyRates\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-
-use App\Classes\Modules\CurrencyRates\Services\FetchesCurrencyRate;
-
-use App\Classes\Modules\CurrencyRates\Standards\Rules\CanUpdateCurrencyRate;
-
-use App\Classes\Modules\CurrencyRates\Services\UpdatesCurrencyRate;
-use App\Classes\Modules\Currencies\Services\CreatesCurrencyRateLog;
-
-use App\Classes\Modules\CurrencyRates\DataTransferObjects\CurrencyRateObject;
-
-use App\Http\Resources\CurrencyRateResource;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class UpdateCurrencyRateLogic extends AbstractControllersLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Currency Rate',
-            'message' => 'You have successfully updated the Currency Rate'
-        ];
-    }
-
-    /** @var CanUpdateCurrencyRate */
-    private $canUpdateCurrencyRate;
-
-    /** @var UpdatesCurrencyRate */
-    private $updatesCurrencyRate;
-
-    /** @var CreatesCurrencyRateLog */
-    private $createsCurrencyRateLog;
-
-    /** @var FetchesCurrencyRate */
-    private $fetchesCurrencyRate;
-
-    /**
-     * UpdateStandardCurrencyRateLogic constructor.
-     * @param CanUpdateCurrencyRate $canUpdateCurrencyRate
-     * @param UpdatesCurrencyRate $updatesCurrencyRate
-     * @param FetchesCurrencyRate $fetchesCurrencyRate
-     */
-    public function __construct(
-        CanUpdateCurrencyRate $canUpdateCurrencyRate, 
-        UpdatesCurrencyRate $updatesCurrencyRate, 
-        CreatesCurrencyRateLog $createsCurrencyRateLog,
-        FetchesCurrencyRate $fetchesCurrencyRate
-    )
-    {
-        $this->canUpdateCurrencyRate = $canUpdateCurrencyRate;
-        $this->updatesCurrencyRate = $updatesCurrencyRate;
-        $this->createsCurrencyRateLog = $createsCurrencyRateLog;
-        $this->fetchesCurrencyRate = $fetchesCurrencyRate;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            DB::beginTransaction();
-
-            $currency_rate_query = $this->fetchesCurrencyRate->execute(['id' => $request->route('id')]);
-
-            $currency_object_object = new CurrencyRateObject(
-                $currency_rate_query->currency_id,
-                 $request->input('selling', $currency_rate_query->selling),
-                $currency_rate_query->payment_method_type
-            );
-
-            $this->canUpdateCurrencyRate->passes($currency_object_object);
-            $currency_rate_query = $this->updatesCurrencyRate->execute($currency_rate_query, $currency_object_object);
-            
-            $currency_rate_log_query = $this->createsCurrencyRateLog->execute($currency_rate_query);
-
-            DB::commit();
-
-            return $this->resourceResponse(new CurrencyRateResource($currency_rate_query));
-
-        } catch (\Exception $exception){
-            dd($exception);
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CurrencyRates/DataTransferObjects/CurrencyRateObject.php b/app/Classes/Modules/CurrencyRates/DataTransferObjects/CurrencyRateObject.php
deleted file mode 100644
index bd58dec9..00000000
--- a/app/Classes/Modules/CurrencyRates/DataTransferObjects/CurrencyRateObject.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CurrencyRates\DataTransferObjects;
-
-use App\Classes\Interfaces\DataTransferObject;
-
-class CurrencyRateObject implements DataTransferObject
-{
-    /** @var int|null */
-    private $currency_id;
-
-    /** @var string|null */
-    private $selling;
-
-    /** @var string|null */
-    private $payment_method_type;
-
-    /**
-     * CurrencyRateObject constructor.
-     * @param int|null $currency_id
-     * @param string|null $selling
-     * @param string|null $payment_method_type
-     */
-    public function __construct(
-        ?int $currency_id, 
-        ?string $selling, 
-        ?string $payment_method_type
-    )
-    {
-        $this->currency_id = $currency_id;
-        $this->selling = $selling;
-        $this->payment_method_type = $payment_method_type;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCurrencyId(): ?int
-    {
-        return $this->currency_id;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSelling(): ?string
-    {
-        return $this->selling;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPaymentMethodType(): ?string
-    {
-        return $this->payment_method_type;
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CurrencyRates/Services/CreatesCurrencyRate.php b/app/Classes/Modules/CurrencyRates/Services/CreatesCurrencyRate.php
deleted file mode 100644
index 9de33ca7..00000000
--- a/app/Classes/Modules/CurrencyRates/Services/CreatesCurrencyRate.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CurrencyRates\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\CurrencyRates\DataTransferObjects\CurrencyRateObject;
-use App\Models\CurrencyRate;
-
-class CreatesCurrencyRate extends AbstractUpdateRecord
-{
-
-    /**
-     * @param CurrencyRateObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(CurrencyRateObject $object) 
-    {
-        $model = new CurrencyRate();
-        $model->currency_id = $object->getCurrencyId();
-        $model->selling = $object->getSelling();
-        $model->payment_method_type = $object->getPaymentMethodType();
-
-        return $this->handler($model);
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CurrencyRates/Services/DeletesCurrencyRate.php b/app/Classes/Modules/CurrencyRates/Services/DeletesCurrencyRate.php
deleted file mode 100644
index e6167808..00000000
--- a/app/Classes/Modules/CurrencyRates/Services/DeletesCurrencyRate.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CurrencyRates\Services;
-
-use App\Classes\General\Eloquent\AbstractDeleteRecord;
-use App\Models\CurrencyRate;
-
-class DeletesCurrencyRAte extends AbstractDeleteRecord
-{
-
-    public function execute(CurrencyRate $model) {
-        return $this->handler($model);
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CurrencyRates/Standards/Rules/CanCreateCurrencyRate.php b/app/Classes/Modules/CurrencyRates/Standards/Rules/CanCreateCurrencyRate.php
deleted file mode 100644
index 56ad219a..00000000
--- a/app/Classes/Modules/CurrencyRates/Standards/Rules/CanCreateCurrencyRate.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CurrencyRates\Standards\Rules;
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\CurrencyRates\DataTransferObjects\SegmentObject;
-use App\Classes\Modules\CurrencyRates\Standards\Validators\CurrencyRateValidation;
-
-class CanCreateCurrencyRate extends AbstractRule
-{
-
-    /** @var CurrencyRateValidation */
-    private $currencyRateValidation;
-
-    /**
-     * CanCreateCurrencyRate constructor.
-     * @param CurrencyRateValidation $CurrencyRateValidation
-     */
-    public function __construct(CurrencyRateValidation $currencyRateValidation)
-    {
-        $this->currencyRateValidation = $currencyRateValidation;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-        if (!\Auth::user()->can('add currency_rate')) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * @param SegmentObject $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->currencyRateValidation->validate($object, 'POST');
-    }
-
-    /**
-     * @param SegmentObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/CurrencyRates/Standards/Rules/CanUpdateCurrencyRate.php b/app/Classes/Modules/CurrencyRates/Standards/Rules/CanUpdateCurrencyRate.php
deleted file mode 100644
index 8dcb1982..00000000
--- a/app/Classes/Modules/CurrencyRates/Standards/Rules/CanUpdateCurrencyRate.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\CurrencyRates\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\CurrencyRates\DataTransferObjects\SegmentCompanyObject;
-use App\Classes\Modules\CurrencyRates\Standards\Validators\CurrencyRateValidation;
-
-class CanUpdateCurrencyRate extends AbstractRule
-{
-
-    /** @var CurrencyRateValidation */
-    private $currencyRateValidation;
-
-    /**
-     * CanUpdateCurrencyRate constructor.
-     * @param CurrencyRateValidation $CurrencyRateValidation
-     */
-    public function __construct(CurrencyRateValidation $currencyRateValidation)
-    {
-        $this->currencyRateValidation = $currencyRateValidation;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-
-        if (!\Auth::user()->can('view currency_rate')) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * @param CurrencyRateValidation $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->currencyRateValidation->validate($object, 'PUT');
-    }
-
-    /**
-     * @param CurrencyRateValidation $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/ControllersLogic/ApproveDocumentLogic.php b/app/Classes/Modules/Documents/ControllersLogic/ApproveDocumentLogic.php
index ab3f33c1..c15ab3ac 100644
--- a/app/Classes/Modules/Documents/ControllersLogic/ApproveDocumentLogic.php
+++ b/app/Classes/Modules/Documents/ControllersLogic/ApproveDocumentLogic.php
@@ -2,24 +2,19 @@
 
 namespace App\Classes\Modules\Documents\ControllersLogic;
 
+use App\Classes\Modules\Documents\Standards\Rules\CanApproveDocument;
 use App\Http\Resources\DocumentResource;
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 
 use App\Classes\Modules\Documents\Services\FetchesDocument;
 
-use App\Classes\Modules\Documents\Standards\Rules\CanUpdateDocument;
 use App\Classes\Modules\Documents\Services\ApprovesDocument;
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 
-use App\Classes\ValueObjects\Constants\ObjectStatus;
-
-use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 
-class ApproveDocumentLogic extends AbstractControllersLogic
+class ApproveDocumentLogic extends AbstractControllerLogic
 {
 
     /**
@@ -32,8 +27,8 @@ class ApproveDocumentLogic extends AbstractControllersLogic
         ];
     }
 
-    /** @var CanUpdateDocument */
-    private $canUpdateDocument;
+    /** @var CanApproveDocument*/
+    private $canApproveDocument;
 
     /** @var ApprovesDocument */
     private $approvesDocument;
@@ -43,18 +38,14 @@ class ApproveDocumentLogic extends AbstractControllersLogic
 
 
     /**
-     * ApproveDocumentLogic constructor.
-     * @param CanUpdateDocument $canUpdateDocument
+     * RejectDocumentLogic constructor.
+     * @param CanApproveDocument $canApproveDocument
      * @param ApprovesDocument $approvesDocument
      * @param FetchesDocument $fetchesDocument
      */
-    public function __construct(
-        canUpdateDocument $canUpdateDocument, 
-        ApprovesDocument $approvesDocument, 
-        FetchesDocument $fetchesDocument
-    )
+    public function __construct(CanApproveDocument $canApproveDocument, ApprovesDocument $approvesDocument, FetchesDocument $fetchesDocument)
     {
-        $this->canUpdateDocument = $canUpdateDocument;
+        $this->canApproveDocument = $canApproveDocument;
         $this->approvesDocument = $approvesDocument;
         $this->fetchesDocument = $fetchesDocument;
     }
@@ -62,37 +53,21 @@ class ApproveDocumentLogic extends AbstractControllersLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
-            DB::beginTransaction();
 
-            $document_query = $this->fetchesDocument->execute(['id' => $request->route('id')]);
+        $document = $this->fetchesDocument->execute(['id' => $request->route('id')]);
 
-            $document_object = new DocumentObject(
-                $document_query->owner_id,
-                $document_query->owner_type,
-                $document_query->document_type,
-                $document_query->reference,
-                ObjectStatus::ACTIVE,
-                \Auth::user()->id,
-                $document_query->issued_date,
-                $document_query->expired_date,
-                $document_query->approved_date
-            );
-            $this->canUpdateDocument->passes($document_object);
-            $document_query = $this->approvesDocument->execute($document_query, $document_object);
-           
-            DB::commit();
+        $this->canApproveDocument->passes();
 
-            return $this->resourceResponse(new DocumentResource($document_query));
+        $document_query = $this->approvesDocument->execute($document);
+
+        return $this->resourceResponse(new DocumentResource($document_query));
 
-        } catch (\Exception $exception){
-            dd($exception);
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/ControllersLogic/ListDocumentLogic.php b/app/Classes/Modules/Documents/ControllersLogic/ListDocumentLogic.php
index 37bdf2f5..02bdac9d 100644
--- a/app/Classes/Modules/Documents/ControllersLogic/ListDocumentLogic.php
+++ b/app/Classes/Modules/Documents/ControllersLogic/ListDocumentLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Documents\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Documents\Services\ListsDocuments;
 use App\Classes\Modules\Documents\Standards\Rules\CanListDocuments;
 use App\Http\Resources\DocumentResource;
@@ -11,7 +11,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class ListDocumentLogic extends AbstractControllersLogic
+class ListDocumentLogic extends AbstractControllerLogic
 {
 
     /**
@@ -30,9 +30,8 @@ class ListDocumentLogic extends AbstractControllersLogic
     /** @var ListsDocuments */
     private $listsDocuments;
 
-
     /**
-     * ListDocumentLogic constructor.
+     * ListStandardSegmentLogic constructor.
      * @param CanListDocuments $canListDocuments
      * @param ListsDocuments $listsDocuments
      */
@@ -46,37 +45,18 @@ class ListDocumentLogic extends AbstractControllersLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
 
-            $document_type = $request->input('document_type');
-            $reference = $request->input('reference');
-            $status = $request->input('status');
+        $this->canListDocuments->passes();
 
-            $data = [];
+        $query = $this->listsDocuments->execute($this->listsDocuments->deserializeFilters($request->input('filters')));
 
-            if ($document_type) {
-                $data['document_type'] = $document_type;
-            }
-            if ($reference) {
-                $data['reference'] = $reference;
-            }
-            if ($status) {
-                $data['status'] = $status;
-            }
-
-            $this->canListDocuments->passes();
-
-            $query = $this->listsDocuments->execute($data);
-            
-            return $this->collectionResponse(DocumentResource::collection($query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->collectionResponse(DocumentResource::collection($query));
 
     }
 
diff --git a/app/Classes/Modules/Documents/ControllersLogic/RejectDocumentLogic.php b/app/Classes/Modules/Documents/ControllersLogic/RejectDocumentLogic.php
new file mode 100644
index 00000000..c8f0cf8c
--- /dev/null
+++ b/app/Classes/Modules/Documents/ControllersLogic/RejectDocumentLogic.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Classes\Modules\Documents\ControllersLogic;
+
+use App\Classes\Modules\Documents\Services\RejectsDocument;
+use App\Classes\Modules\Documents\Standards\Rules\CanApproveDocument;
+use App\Http\Resources\DocumentResource;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Documents\Services\FetchesDocument;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RejectDocumentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Reject Document',
+            'message' => 'You have successfully rejected the Document'
+        ];
+    }
+
+    /** @var CanApproveDocument*/
+    private $canApproveDocument;
+
+    /** @var RejectsDocument */
+    private $rejectsDocument;
+
+    /** @var FetchesDocument */
+    private $fetchesDocument;
+
+    /**
+     * RejectDocumentLogic constructor.
+     * @param CanApproveDocument $canApproveDocument
+     * @param RejectsDocument $rejectsDocument
+     * @param FetchesDocument $fetchesDocument
+     */
+    public function __construct(CanApproveDocument $canApproveDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument)
+    {
+        $this->canApproveDocument = $canApproveDocument;
+        $this->rejectsDocument = $rejectsDocument;
+        $this->fetchesDocument = $fetchesDocument;
+    }
+
+    /**
+     * @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
+    {
+
+        $document = $this->fetchesDocument->execute(['id' => $request->route('id')]);
+
+        $this->canApproveDocument->passes();
+
+        $document_query = $this->rejectsDocument->execute($document);
+
+        return $this->resourceResponse(new DocumentResource($document_query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/ControllersLogic/RenderDocumentLogic.php b/app/Classes/Modules/Documents/ControllersLogic/RenderDocumentLogic.php
new file mode 100644
index 00000000..7ef87960
--- /dev/null
+++ b/app/Classes/Modules/Documents/ControllersLogic/RenderDocumentLogic.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Classes\Modules\Documents\ControllersLogic;
+
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\RequestValidationException;
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Documents\Standards\Rules\CanRenderDocument;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Tymon\JWTAuth\JWT;
+
+class RenderDocumentLogic extends AbstractControllerLogic
+{
+
+    protected function notification(): array {
+        return [
+            'title' => '',
+            'message' => ''
+        ];
+    }
+
+    /** @var CanRenderDocument */
+    private $canRenderDocument;
+
+    /** @var JWT */
+    private $manager;
+
+    /**
+     * RenderDocumentLogic constructor.
+     * @param CanRenderDocument $canRenderDocument
+     * @param JWT $manager
+     */
+    public function __construct(CanRenderDocument $canRenderDocument, JWT $manager)
+    {
+        $this->canRenderDocument = $canRenderDocument;
+        $this->manager = $manager;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws AccessForbiddenException
+     * @throws RequestValidationException
+     * @throws ResourceNotFoundException
+     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $file = $request->route('fileName');
+
+        $this->canRenderDocument->passes();
+
+        if(!Storage::disk('documents')->exists($file))
+        {
+            throw new ResourceNotFoundException();
+        }
+        return $this->response(['src' => Storage::disk('documents')->get($file)]);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/DataTransferObjects/DocumentObject.php b/app/Classes/Modules/Documents/DataTransferObjects/DocumentObject.php
index e4932b42..8f73dc1b 100644
--- a/app/Classes/Modules/Documents/DataTransferObjects/DocumentObject.php
+++ b/app/Classes/Modules/Documents/DataTransferObjects/DocumentObject.php
@@ -2,141 +2,79 @@
 
 namespace App\Classes\Modules\Documents\DataTransferObjects;
 
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\Modules\Documents\Services\ConvertsBase64ToFile;
 
 class DocumentObject implements DataTransferObject
 {
-    /** @var int|null */
-    private $owner_id;
 
-    /** @var int|null */
-    private $owner_type;
-
-    /** @var string|null */
+    /** @var string */
     private $document_type;
 
-    /** @var string|null */
+    /** @var array */
+    private $files;
+
+    /** @var string */
     private $reference;
 
-    /** @var int|null */
+    /** @var int */
     private $status;
 
-    /** @var int|null */
-    private $approved_by;
-
-    /** @var timestamp|null */
-    private $issued_date;
-
-    /** @var timestamp|null */
-    private $expired_date;
-
-    /** @var timestamp|null */
-    private $approved_date;
+    /** @var string|null */
+    private $path;
 
     /**
-     * CompanyObject constructor.
-     * @param int|null $owner_id
-     * @param int|null $owner_type
-     * @param null|string $document_type
-     * @param string|null $reference
-     * @param int|null $status
-     * @param int|null $approved_by
-     * @param timestamp|null $issued_date
-     * @param timestamp|null $expired_date
-     * @param timestamp|null $approved_date
+     * DocumentObject constructor.
+     * @param string $document_type
+     * @param array $files
+     * @param string $reference
+     * @param int $status
+     * @param null|string $path
      */
-    public function __construct(
-        ?int $owner_id, 
-        ?int $owner_type, 
-        ?string $document_type, 
-        ?string $reference,
-        ?int $status,
-        ?int $approved_by,
-        ?timestamp $issued_date,
-        ?timestamp $expired_date,
-        ?timestamp $approved_date
-    )
+    public function __construct(string $document_type, array $files, string $reference, int $status, ?string $path = '')
     {
-        $this->owner_id = $owner_id;
-        $this->owner_type = $owner_type;
         $this->document_type = $document_type;
+        $this->files = $files;
         $this->reference = $reference;
         $this->status = $status;
-        $this->approved_by = $approved_by;
-        $this->issued_date = $issued_date;
-        $this->expired_date = $expired_date;
-        $this->approved_date = $approved_date;
+        $this->path = $path;
     }
 
-    /**
-     * @return int|null
-     */
-    public function getOwnerId(): ?int
-    {
-        return $this->owner_id;
-    }
 
     /**
-     * @return int|null
+     * @return string
      */
-    public function getOwnerType(): ?int
-    {
-        return $this->owner_type;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getDocumentType(): ?string
+    public function getDocumentType(): string
     {
         return $this->document_type;
     }
 
     /**
-     * @return string|null
+     * @return string
      */
-    public function getReference(): ?string
+    public function getReference(): string
     {
         return $this->reference;
     }
 
     /**
-     * @return int|null
+     * @return int
      */
-    public function getStatus(): ?int
+    public function getStatus(): int
     {
         return $this->status;
     }
 
-    /**
-     * @return int|null
-     */
-    public function getApprovedBy(): ?int
-    {
-        return $this->approved_by;
-    }
 
     /**
-     * @return timestamp|null
+     * @return array
+     * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function getIssuedDate(): ?timestamp
+    public function getFiles(): array
     {
-        return $this->issued_date;
+        return (new ConvertsBase64ToFile($this->path))->convert($this->files);
     }
 
-    /**
-     * @return timestamp|null
-     */
-    public function getExpiredDate(): ?timestamp
-    {
-        return $this->expired_date;
-    }
 
-    /**
-     * @return timestamp|null
-     */
-    public function getApprovedDate(): ?timestamp
-    {
-        return $this->approved_date;
-    }
+
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/DataTransferObjects/FileObject.php b/app/Classes/Modules/Documents/DataTransferObjects/FileObject.php
index e4d205a5..ed289eac 100644
--- a/app/Classes/Modules/Documents/DataTransferObjects/FileObject.php
+++ b/app/Classes/Modules/Documents/DataTransferObjects/FileObject.php
@@ -2,58 +2,85 @@
 
 namespace App\Classes\Modules\Documents\DataTransferObjects;
 
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\ValueObjects\Constants\FileType;
+use Illuminate\Support\Str;
+use Intervention\Image\ImageManager;
 
 class FileObject implements DataTransferObject
 {
-    /** @var int|null */
-    private $document_id;
-
-    /** @var text|null */
-    private $file;
-
-    /** @var string|null */
-    private $file_type;
+    /** @var string */
+    private $data;
 
     /**
-     * CompanyObject constructor.
-     * @param int|null $document_id
-     * @param null|string $file
-     * @param string|null $file_type
+     * FileInfoObject constructor.
+     * @param string $data
      */
-    public function __construct(
-        ?int $document_id, 
-        ?string $file, 
-        ?string $file_type 
-    )
+    public function __construct(string $data)
     {
-        $this->document_id = $document_id;
-        $this->file = $file;
-        $this->file_type = $file_type;
+        $this->data = $data;
     }
 
     /**
-     * @return int|null
+     * @return \Intervention\Image\Image|string
+     * @throws MalformedRequestException
      */
-    public function getDocumentId(): ?int
+    public function getData()
     {
-        return $this->document_id;
+        return $this->getExtension() === 'pdf' ? $this->data : (new imageManager())->make($this->data);
     }
 
     /**
-     * @return string|null
+     * @return string
      */
-    public function getFile(): ?string
+    public function getFileName(): string
     {
-        return $this->file;
+        return (string) Str::uuid();
     }
 
     /**
-     * @return string|null
+     * @return string
      */
-    public function getFileType(): ?string
+    public function getMimeType(): string
     {
-        return $this->file_type;
+        return finfo_file(finfo_open(), $this->data, FILEINFO_MIME_TYPE);
     }
 
+    /**
+     * @return string
+     * @throws MalformedRequestException
+     */
+    public function getExtension(): string
+    {
+        if(array_key_exists($this->getMimeType(), FileType::EXTENSION)){
+            return FileType::EXTENSION[$this->getMimeType()];
+        }
+
+        throw new MalformedRequestException('Failed to save file due to Unknown file extension');
+    }
+
+    /**
+     * @return string
+     * @throws MalformedRequestException
+     */
+    public function getDecodedData(): string
+    {
+        return $this->getExtension() === 'pdf' ?
+            base64_decode((explode('base64,', $this->getData()))[1]):
+            $this->getData()->encode('data-url')->encoded;
+    }
+
+    /**
+     * @param string $data
+     */
+    public function setData(string $data): void
+    {
+        $this->data = $data;
+    }
+
+
+
+
+
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/Services/ApprovesDocument.php b/app/Classes/Modules/Documents/Services/ApprovesDocument.php
index 206d9efd..9458774e 100644
--- a/app/Classes/Modules/Documents/Services/ApprovesDocument.php
+++ b/app/Classes/Modules/Documents/Services/ApprovesDocument.php
@@ -3,21 +3,24 @@
 namespace App\Classes\Modules\Documents\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Models\Document;
+use Carbon\Carbon;
 
 class ApprovesDocument extends AbstractUpdateRecord
 {
 
     /**
-     * @param DocumentObject $object
+     * @param Document $model
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Document $model, DocumentObject $object) 
+    public function execute(Document $model)
     {
-        $model->status = $object->getStatus();
-        $model->approved_by = $object->getApprovedBy();
+        $model->status = ApprovalStatus::APPROVED;
+        $model->approver = Auth()->user()->id;
+        $model->approval_date = Carbon::now();
+
         return $this->handler($model);
     }
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/Services/Convert64ToFile.php b/app/Classes/Modules/Documents/Services/Convert64ToFile.php
deleted file mode 100644
index 611e6a47..00000000
--- a/app/Classes/Modules/Documents/Services/Convert64ToFile.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Documents\Services;
-
-use Illuminate\Support\Str;
-use Image;
-
-class Convert64ToFile
-{
-    /**
-     * @param array|null file_set
-     * @return array|bool
-     */
-    public function convert($file_set = [], $path = 'file')
-    {
-        $file_info = [];
-        $folder_path = $this->generateFolder($path);
-
-        foreach ($file_set as $key => $row) {
-
-            $file_data = $row;
-            $filename = (string) Str::uuid();
-
-            $f = finfo_open();
-            $mime_type = finfo_file($f, $file_data, FILEINFO_MIME_TYPE);
-            
-            $extension = '';
-            switch ($mime_type) {
-                case 'image/gif':
-                    $extension = 'gif';
-                    break;
-                case 'image/png':
-                    $extension = 'png';
-                    break;
-                case 'image/jpeg':
-                    $extension = 'jpg';
-                    break;
-                case 'application/pdf':
-                    $extension = 'pdf';
-                    break;
-            }
-
-            if (empty($extension)) {
-                return false;
-            }
-
-            $filename_with_ext = $filename . '.' . $extension;
-
-            if ($extension != 'pdf') {
-                $img = Image::make($file_data)->save($folder_path . '/' . $filename_with_ext);
-                $file = $this->generateImages($path, $filename_with_ext, $filename, $extension);
-            }
-            else {
-                $file_data = explode('base64,', $file_data);
-                $file_data = base64_decode($file_data[1]);
-                $file = $this->generatePdf($path, $file_data, $filename, $extension);
-            }
-
-            $file_info[] = [
-                'path' => $path,
-                'filename' => $filename_with_ext,
-                'mime_type' => $mime_type,
-                'extension' => $extension,
-                'file_info' => empty($file) ? [] : $file,
-            ];
-        }
-
-        return $file_info;
-    }
-
-    /**
-     * @param string|null path
-     * @param string|null pdfdata
-     * @param string|null filename
-     * @param string|null extension
-     */
-    public static function generatePdf($path = '', $pdfdata = '', $filename = '', $extension = '')
-    {
-        $file_info = [];
-        $file = \File::put(storage_path($path) . '/' . $filename . '.' . $extension, $pdfdata);
-        $file_info['original']['file'] =  'storage/' . $path . '/' . $filename . '.' . $extension;
-        $file_info['large']['file'] =  'storage/' . $path . '/' . $filename . '.' . $extension;
-        $file_info['medium']['file'] =  'storage/' . $path . '/' . $filename . '.' . $extension;
-        $file_info['small']['file'] =  'storage/' . $path . '/' . $filename . '.' . $extension;
-        
-        return $file_info;
-    }
-
-    /**
-     * @param string|null path
-     * @param string|null file
-     * @param string|null filename
-     * @param string|null extension
-     */
-    public function generateImages($path = '', $file = '', $filename = '', $extension = '')
-    {
-        $file_info = [];
-        
-        $img = Image::make(storage_path($path) . '/' . $file);
-        $file_info['original']['file'] = 'storage/' . $path . '/' . $file;
-        $file_info['original']['width'] = $img->width();
-        $file_info['original']['height'] = $img->height();
-
-        $img->widen(800, function ($constraint) {
-            $constraint->upsize();
-        })->heighten(800, function ($constraint) {
-            $constraint->upsize();
-        });
-        $img->save(storage_path($path) . '/' . $filename . '_' . 'l.' . $extension);
-        $file_info['large']['file'] = 'storage/' . $path . '/' . $filename . '_' . 'l.' . $extension;
-        $file_info['large']['width'] = $img->width();
-        $file_info['large']['height'] = $img->height();
-
-        $img->widen(480, function ($constraint) {
-            $constraint->upsize();
-        })->heighten(480, function ($constraint) {
-            $constraint->upsize();
-        });
-        $img->save(storage_path($path) . '/' . $filename . '_' . 'm.' . $extension);
-        $file_info['medium']['file'] = 'storage/' . $path . '/' . $filename . '_' . 'm.' . $extension;
-        $file_info['medium']['width'] = $img->width();
-        $file_info['medium']['height'] = $img->height();
-
-        $img->widen(320, function ($constraint) {
-            $constraint->upsize();
-        })->heighten(320, function ($constraint) {
-            $constraint->upsize();
-        });
-        $img->save(storage_path($path) . '/' . $filename . '_' . 's.' . $extension);
-        $file_info['small']['file'] = 'storage/' . $path . '/' . $filename . '_' . 's.' . $extension;
-        $file_info['small']['width'] = $img->width();
-        $file_info['small']['height'] = $img->height();
-
-        return $file_info;
-    }
-
-    /**
-     * @param string|null set_path
-     */
-    public  function generateFolder($set_path = '')
-    {
-        $folder = storage_path($set_path);
-
-        \File::isDirectory($folder) or \File::makeDirectory($folder, 0777, true, true); //check folder is exist
-        return $folder;
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/Services/ConvertsBase64ToFile.php b/app/Classes/Modules/Documents/Services/ConvertsBase64ToFile.php
new file mode 100644
index 00000000..51df8bb8
--- /dev/null
+++ b/app/Classes/Modules/Documents/Services/ConvertsBase64ToFile.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace App\Classes\Modules\Documents\Services;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Modules\Documents\DataTransferObjects\FileObject;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Storage;
+
+class ConvertsBase64ToFile
+{
+
+    /** @var string|null */
+    private $path;
+
+    /** @var array */
+    private $filesInfo;
+
+    /**
+     * ConvertsBase64ToFile constructor.
+     * @param null|string $path
+     */
+    public function __construct(?string $path = '')
+    {
+        $this->path = $path ? $path.'/': '';
+        $this->filesInfo = [];
+
+        File::isDirectory(storage_path($this->path)) or
+        File::makeDirectory(storage_path($this->path), 0700, true, true);
+    }
+
+
+    /**
+     * @param array $files
+     * @return array
+     * @throws MalformedRequestException
+     */
+    public function convert($files = []){
+        foreach ($files as $file) {
+            $object = new FileObject($file);
+            $object->getExtension() === 'pdf' ? $this->generatePDF($object) : $this->generateImage($object);
+
+        }
+
+        return $this->filesInfo;
+
+    }
+
+    /**
+     * @param FileObject $file
+     * @throws MalformedRequestException
+     */
+    private function generatePDF(FileObject $file){
+
+        $filePath = $this->generateFile($file);
+        $this->updateFiles($file, [ 'original' => [ 'file' => $filePath ] ]);
+    }
+
+    /**
+     * @param FileObject $file
+     * @throws MalformedRequestException
+     */
+    private function generateImage(FileObject $file){
+
+        $fileInfo = [];
+
+        foreach (['original' => null, 'large' => 800, 'medium' => 480, 'small' => 320] as $size => $value) {
+            $suffix = $size !== 'original' ? '_'.$size : '';
+
+            if($size !== 'original') {
+                $thumbnail = $file->getData()->widen($value, function ($constraint) {
+
+                    $constraint->upsize();
+
+                })->heighten($value, function ($constraint) {
+
+                    $constraint->upsize();
+
+                });
+
+                $file->setData($thumbnail->encode('data-url')->encoded);
+            }
+
+
+            $filePath = $this->generateFile($file, $suffix);
+
+            $fileInfo[] = [ $size => [ 'file' => $filePath, 'width' => $file->getData()->width(), 'height' => $file->getData()->height() ]];
+
+
+        }
+
+        $this->updateFiles($file, $fileInfo);
+
+    }
+
+    /**
+     * @param FileObject $file
+     * @param string $suffix
+     * @return string
+     * @throws MalformedRequestException
+     */
+    private function generateFile(FileObject $file, string $suffix = '') {
+
+        $filePath = $this->path.$file->getFileName().$suffix.'.'.$file->getExtension();
+
+        Storage::disk('documents')->put($filePath, $file->getDecodedData());
+
+        return $filePath;
+
+    }
+
+    /**
+     * @param FileObject $file
+     * @param array $fileInfo
+     * @throws MalformedRequestException
+     */
+    private function updateFiles(FileObject $file, array $fileInfo){
+        $this->filesInfo[] = json_encode([
+            'path' => $this->path,
+            'filename' => $file->getFileName().'.'.$file->getExtension(),
+            'mime_type' => $file->getMimeType(),
+            'extension' => $file->getExtension(),
+            'file_info' => $fileInfo
+        ]);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/Services/CreatesDocument.php b/app/Classes/Modules/Documents/Services/CreatesDocument.php
index 33f4523c..16e7d094 100644
--- a/app/Classes/Modules/Documents/Services/CreatesDocument.php
+++ b/app/Classes/Modules/Documents/Services/CreatesDocument.php
@@ -2,26 +2,25 @@
 
 namespace App\Classes\Modules\Documents\Services;
 
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\General\Interfaces\Documentable;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Models\Document;
 
-class CreatesDocument extends AbstractUpdateRecord
+class CreatesDocument extends AbstractUpdateRelationshipRecord
 {
     /**
+     * @param Documentable $documentable
      * @param DocumentObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(DocumentObject $object) 
+    public function execute(Documentable $documentable, DocumentObject $object)
     {
         $model = new Document();
-        $model->owner_id = $object->getOwnerId();
-        $model->owner_type = $object->getOwnerType();
         $model->document_type = $object->getDocumentType();
         $model->reference = $object->getReference();
-        $model->status = $object->getStatus();
-        
-        return $this->handler($model);
+
+        return $this->handler($documentable->documents(), $model);
     }
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/Services/CreatesFile.php b/app/Classes/Modules/Documents/Services/CreatesFile.php
deleted file mode 100644
index ac87eb72..00000000
--- a/app/Classes/Modules/Documents/Services/CreatesFile.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Documents\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Documents\DataTransferObjects\FileObject;
-use App\Models\File;
-
-class CreatesFile extends AbstractUpdateRecord
-{
-    /**
-     * @param FileObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(FileObject $object) 
-    {
-        $model = new File();
-        $model->document_id = $object->getDocumentId();
-        $model->file = $object->getFile();
-        $model->file_type = $object->getFileType();
-        
-        return $this->handler($model);
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/Services/CreatesFiles.php b/app/Classes/Modules/Documents/Services/CreatesFiles.php
new file mode 100644
index 00000000..30c85a13
--- /dev/null
+++ b/app/Classes/Modules/Documents/Services/CreatesFiles.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Documents\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Models\Document;
+use App\Models\File;
+
+class CreatesFiles extends AbstractUpdateRelationshipRecord
+{
+    /**
+     * @param Document $document
+     * @param DocumentObject $object
+     * @return array
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Document $document, DocumentObject $object)
+    {
+        $models = [];
+
+        foreach ($object->getFiles() as $file) {
+
+            $model = new File(['file' => $file]);
+            $models[] = $this->handler($document->files(), $model);
+
+        }
+
+        return $models;
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/Services/FetchesDocument.php b/app/Classes/Modules/Documents/Services/FetchesDocument.php
index 40dbb1c8..1aa12c87 100644
--- a/app/Classes/Modules/Documents/Services/FetchesDocument.php
+++ b/app/Classes/Modules/Documents/Services/FetchesDocument.php
@@ -13,9 +13,8 @@ class FetchesDocument extends AbstractFetchRecord
     /** @var Document */
     private $repository;
 
-
     /**
-     * FetchesDocument constructor.
+     * FetchesUser constructor.
      * @param Document $repository
      */
     public function __construct(Document $repository)
diff --git a/app/Classes/Modules/Documents/Services/RejectsDocument.php b/app/Classes/Modules/Documents/Services/RejectsDocument.php
new file mode 100644
index 00000000..4a7c7bfa
--- /dev/null
+++ b/app/Classes/Modules/Documents/Services/RejectsDocument.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Classes\Modules\Documents\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Document;
+use Carbon\Carbon;
+
+class RejectsDocument extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Document $model
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Document $model)
+    {
+        $model->status = ApprovalStatus::REJECTED;
+        $model->approver = Auth()->user()->id;
+        $model->approval_date = Carbon::now();
+
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/Standards/Rules/CanApproveDocument.php b/app/Classes/Modules/Documents/Standards/Rules/CanApproveDocument.php
new file mode 100644
index 00000000..544b605c
--- /dev/null
+++ b/app/Classes/Modules/Documents/Standards/Rules/CanApproveDocument.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Classes\Modules\Documents\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+
+class CanApproveDocument extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/Standards/Rules/CanCreateDocument.php b/app/Classes/Modules/Documents/Standards/Rules/CanCreateDocument.php
index ed5263a5..abac99e3 100644
--- a/app/Classes/Modules/Documents/Standards/Rules/CanCreateDocument.php
+++ b/app/Classes/Modules/Documents/Standards/Rules/CanCreateDocument.php
@@ -13,9 +13,8 @@ class CanCreateDocument extends AbstractRule
     /** @var DocumentValidation */
     private $documentValidation;
 
-
     /**
-     * CanCreateDocument constructor.
+     * CanCreateAddress constructor.
      * @param DocumentValidation $documentValidation
      */
     public function __construct(DocumentValidation $documentValidation)
diff --git a/app/Classes/Modules/Documents/Standards/Rules/CanRenderDocument.php b/app/Classes/Modules/Documents/Standards/Rules/CanRenderDocument.php
new file mode 100644
index 00000000..0275d6f9
--- /dev/null
+++ b/app/Classes/Modules/Documents/Standards/Rules/CanRenderDocument.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Classes\Modules\Documents\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+
+class CanRenderDocument extends AbstractRule
+{
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+
+    /**
+     * @param $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+    }
+
+
+    /**
+     * @param $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/Standards/Rules/CanUpdateDocument.php b/app/Classes/Modules/Documents/Standards/Rules/CanUpdateDocument.php
index dc0a2bfc..f07fb166 100644
--- a/app/Classes/Modules/Documents/Standards/Rules/CanUpdateDocument.php
+++ b/app/Classes/Modules/Documents/Standards/Rules/CanUpdateDocument.php
@@ -13,9 +13,8 @@ class CanUpdateDocument extends AbstractRule
     /** @var DocumentValidation */
     private $documentValidation;
 
-
     /**
-     * CanUpdateDocument constructor.
+     * CanCreateAddress constructor.
      * @param DocumentValidation $documentValidation
      */
     public function __construct(DocumentValidation $documentValidation)
diff --git a/app/Classes/Modules/Documents/Standards/Validators/DocumentValidation.php b/app/Classes/Modules/Documents/Standards/Validators/DocumentValidation.php
index 9ff7ef03..634887f6 100644
--- a/app/Classes/Modules/Documents/Standards/Validators/DocumentValidation.php
+++ b/app/Classes/Modules/Documents/Standards/Validators/DocumentValidation.php
@@ -14,15 +14,9 @@ class DocumentValidation extends AbstractValidation
     protected function data($object): array 
     {
         return [
-            'owner_id' => $object->getOwnerId(),
-            'owner_type' => $object->getOwnerType(),
             'document_type' => $object->getDocumentType(),
             'reference' => $object->getReference(),
             'status' => $object->getStatus(),
-            'approved_by' => $object->getApprovedBy(),
-            'issued_date' => $object->getIssuedDate(),
-            'expired_date' => $object->getExpiredDate(),
-            'approved_date' => $object->getApprovedDate()
         ];
     }
 
@@ -32,14 +26,9 @@ class DocumentValidation extends AbstractValidation
     protected function rules(): array 
     {
         return [
-            'owner_id' => 'required',
-            'owner_type' => 'required',
             'document_type' => 'required',
             'reference' => 'required',
-            'status' => '',
-            'issued_date' => '',
-            'expired_date' => '',
-            'approved_date' => '',
+            'status' => 'required'
         ];
     }
 
diff --git a/app/Classes/Modules/Receipts/ControllersLogic/CreateReceiptLogic.php b/app/Classes/Modules/Receipts/ControllersLogic/CreateReceiptLogic.php
index fd4cd12c..6c9e935f 100644
--- a/app/Classes/Modules/Receipts/ControllersLogic/CreateReceiptLogic.php
+++ b/app/Classes/Modules/Receipts/ControllersLogic/CreateReceiptLogic.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Receipts\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 
 use App\Classes\Modules\Receipts\Standards\Rules\CanCreateReceipt;
 use App\Classes\Modules\Receipts\Standards\Rules\CanCreateReceiptDetail;
@@ -26,7 +26,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class CreateReceiptLogic extends AbstractControllersLogic
+class CreateReceiptLogic extends AbstractControllerLogic
 {
 
 
@@ -60,11 +60,18 @@ class CreateReceiptLogic extends AbstractControllersLogic
     private $createsReceiptDetail;
     
     private $fetchesTransaction;
+
     /**
      * CreateWalletLogic constructor.
-     * @param CreatesWallet $createsWallet
-     * @param GeneratesWalletCode $generatesWalletCode
-     * @param CanCreateCompanyWallet $canCreateCompanyWallet
+     * @param GeneratesReceiptBillNo $generatesReceiptBillNo
+     * @param CanCreateReceipt $canCreateReceipt
+     * @param FetchesCurrency $fetchesCurrency
+     * @param RateCalculatesCurrency $rateCalculatesCurrency
+     * @param FetchesCompany $fetchesCompany
+     * @param CreatesReceipt $createsReceipt
+     * @param CanCreateReceiptDetail $canCreateReceiptDetail
+     * @param CreatesReceiptDetail $createsReceiptDetail
+     * @param FetchesTransaction $fetchesTransaction
      */
     public function __construct(
             GeneratesReceiptBillNo $generatesReceiptBillNo, CanCreateReceipt $canCreateReceipt,
diff --git a/app/Classes/Modules/Receipts/DataTransferObjects/ReceiptDetailObject.php b/app/Classes/Modules/Receipts/DataTransferObjects/ReceiptDetailObject.php
index 6cf2b16e..4b234773 100644
--- a/app/Classes/Modules/Receipts/DataTransferObjects/ReceiptDetailObject.php
+++ b/app/Classes/Modules/Receipts/DataTransferObjects/ReceiptDetailObject.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Receipts\DataTransferObjects;
 
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
 
 class ReceiptDetailObject implements DataTransferObject
 {
diff --git a/app/Classes/Modules/Receipts/DataTransferObjects/ReceiptObject.php b/app/Classes/Modules/Receipts/DataTransferObjects/ReceiptObject.php
index d8e66907..91107fc3 100644
--- a/app/Classes/Modules/Receipts/DataTransferObjects/ReceiptObject.php
+++ b/app/Classes/Modules/Receipts/DataTransferObjects/ReceiptObject.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Receipts\DataTransferObjects;
 
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
 
 class ReceiptObject implements DataTransferObject
 {
diff --git a/app/Classes/Modules/Receipts/Services/CreatesReceipt.php b/app/Classes/Modules/Receipts/Services/CreatesReceipt.php
index 2892ae62..c93d10d4 100644
--- a/app/Classes/Modules/Receipts/Services/CreatesReceipt.php
+++ b/app/Classes/Modules/Receipts/Services/CreatesReceipt.php
@@ -9,7 +9,7 @@ use App\Models\Receipt;
 class CreatesReceipt extends AbstractUpdateRecord
 {
     /**
-     * @param WalletObject $object
+     * @param ReceiptObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
diff --git a/app/Classes/Modules/Receipts/Services/CreatesReceiptDetail.php b/app/Classes/Modules/Receipts/Services/CreatesReceiptDetail.php
index 4a3f1c62..dbee82eb 100644
--- a/app/Classes/Modules/Receipts/Services/CreatesReceiptDetail.php
+++ b/app/Classes/Modules/Receipts/Services/CreatesReceiptDetail.php
@@ -9,7 +9,7 @@ use App\Models\ReceiptDetail;
 class CreatesReceiptDetail extends AbstractUpdateRecord
 {
     /**
-     * @param WalletObject $object
+     * @param ReceiptDetailObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
diff --git a/app/Classes/Modules/Receipts/Standards/Rules/CanCreateReceipt.php b/app/Classes/Modules/Receipts/Standards/Rules/CanCreateReceipt.php
index 58321a3f..ea6b4f02 100644
--- a/app/Classes/Modules/Receipts/Standards/Rules/CanCreateReceipt.php
+++ b/app/Classes/Modules/Receipts/Standards/Rules/CanCreateReceipt.php
@@ -4,12 +4,13 @@ namespace App\Classes\Modules\Receipts\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Receipts\DataTransferObjects\ReceiptObject;
 use App\Classes\Modules\Receipts\Standards\Validators\ReceiptValidation;
 
 class CanCreateReceipt extends AbstractRule
 {
 
-    /** @var WalletTransactionValidation */
+    /** @var ReceiptValidation */
     private $receiptValidation;
 
   
@@ -29,7 +30,7 @@ class CanCreateReceipt extends AbstractRule
     }
 
     /**
-     * @param CompanyWalletValidation $object
+     * @param ReceiptObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
@@ -39,7 +40,7 @@ class CanCreateReceipt extends AbstractRule
     }
 
     /**
-     * @param SegmentCompanyValidation $object
+     * @param ReceiptObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/Receipts/Standards/Rules/CanCreateReceiptDetail.php b/app/Classes/Modules/Receipts/Standards/Rules/CanCreateReceiptDetail.php
index edc788e4..71466752 100644
--- a/app/Classes/Modules/Receipts/Standards/Rules/CanCreateReceiptDetail.php
+++ b/app/Classes/Modules/Receipts/Standards/Rules/CanCreateReceiptDetail.php
@@ -4,12 +4,13 @@ namespace App\Classes\Modules\Receipts\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Receipts\DataTransferObjects\ReceiptDetailObject;
 use App\Classes\Modules\Receipts\Standards\Validators\ReceiptDetailValidation;
 
 class CanCreateReceiptDetail extends AbstractRule
 {
 
-    /** @var WalletTransactionValidation */
+    /** @var ReceiptDetailValidation */
     private $receiptDetailValidation;
 
   
@@ -29,7 +30,7 @@ class CanCreateReceiptDetail extends AbstractRule
     }
 
     /**
-     * @param CompanyWalletValidation $object
+     * @param ReceiptDetailObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
@@ -39,7 +40,7 @@ class CanCreateReceiptDetail extends AbstractRule
     }
 
     /**
-     * @param SegmentCompanyValidation $object
+     * @param ReceiptDetailObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/Receipts/Standards/Validators/ReceiptDetailValidation.php b/app/Classes/Modules/Receipts/Standards/Validators/ReceiptDetailValidation.php
index b970549f..8feac483 100644
--- a/app/Classes/Modules/Receipts/Standards/Validators/ReceiptDetailValidation.php
+++ b/app/Classes/Modules/Receipts/Standards/Validators/ReceiptDetailValidation.php
@@ -3,7 +3,6 @@
 namespace App\Classes\Modules\Receipts\Standards\Validators;
 
 use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\Receipts\DataTransferObjects\ReceiptDetailObject;
 
 class ReceiptDetailValidation extends AbstractValidation
 {
diff --git a/app/Classes/Modules/Receipts/Standards/Validators/ReceiptValidation.php b/app/Classes/Modules/Receipts/Standards/Validators/ReceiptValidation.php
index a1c98a3f..f0ab7bbe 100644
--- a/app/Classes/Modules/Receipts/Standards/Validators/ReceiptValidation.php
+++ b/app/Classes/Modules/Receipts/Standards/Validators/ReceiptValidation.php
@@ -3,7 +3,6 @@
 namespace App\Classes\Modules\Receipts\Standards\Validators;
 
 use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\Receipts\DataTransferObjects\ReceiptObject;
 
 class ReceiptValidation extends AbstractValidation
 {
diff --git a/app/Classes/Modules/SegmentCompanies/DataTransferObjects/SegmentCompanyObject.php b/app/Classes/Modules/SegmentCompanies/DataTransferObjects/SegmentCompanyObject.php
deleted file mode 100644
index fc7c5386..00000000
--- a/app/Classes/Modules/SegmentCompanies/DataTransferObjects/SegmentCompanyObject.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\SegmentCompanies\DataTransferObjects;
-
-use App\Classes\Interfaces\DataTransferObject;
-
-class SegmentCompanyObject implements DataTransferObject
-{    
-    /** @var int|null */
-    private $segment_id;
-
-    /** @var int|null */
-    private $company_id;
-
-
-    /**
-     * SegmentCompanyObject constructor.
-     * @param int|null $segment_id
-     * @param int|null $company_id
-     */
-    public function __construct(
-        ?int $segment_id, 
-        ?int $company_id
-    )
-    {
-        $this->segment_id = $segment_id;
-        $this->company_id = $company_id;
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getSegmentId(): ?int
-    {
-        return $this->segment_id;
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getCompanyId(): ?int
-    {
-        return $this->company_id;
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/SegmentCompanies/Services/CreatesSegmentCompany.php b/app/Classes/Modules/SegmentCompanies/Services/CreatesSegmentCompany.php
deleted file mode 100644
index ae791fca..00000000
--- a/app/Classes/Modules/SegmentCompanies/Services/CreatesSegmentCompany.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\SegmentCompanies\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\SegmentCompanies\DataTransferObjects\SegmentCompanyObject;
-use App\Models\Company;
-
-class CreatesSegmentCompany extends AbstractUpdateRecord
-{
-    /**
-     * @param SegmentCompanyObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Company $model, SegmentCompanyObject $object) 
-    {
-        $model->segment()->sync($object->getSegmentId());
-        return $model;
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/SegmentCompanies/Standards/Rules/CanCreateSegmentCompany.php b/app/Classes/Modules/SegmentCompanies/Standards/Rules/CanCreateSegmentCompany.php
deleted file mode 100644
index 016066e4..00000000
--- a/app/Classes/Modules/SegmentCompanies/Standards/Rules/CanCreateSegmentCompany.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\SegmentCompanies\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\SegmentCompanies\DataTransferObjects\SegmentCompanyObject;
-use App\Classes\Modules\SegmentCompanies\Standards\Validators\SegmentCompanyValidation;
-
-class CanCreateSegmentCompany extends AbstractRule
-{
-
-    /** @var SegmentCompanyValidation */
-    private $segmentCompanyValidation;
-
-
-    /**
-     * CanCreateSegmentCompany constructor.
-     * @param SegmentCompanyValidation $segmentCompanyValidation
-     */
-    public function __construct(SegmentCompanyValidation $segmentCompanyValidation)
-    {
-        $this->segmentCompanyValidation = $segmentCompanyValidation;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-        return true;
-    }
-
-    /**
-     * @param SegmentCompanyValidation $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->segmentCompanyValidation->validate($object);
-    }
-
-    /**
-     * @param SegmentCompanyValidation $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/SegmentCompanies/Standards/Validators/SegmentCompanyValidation.php b/app/Classes/Modules/SegmentCompanies/Standards/Validators/SegmentCompanyValidation.php
deleted file mode 100644
index 2185c519..00000000
--- a/app/Classes/Modules/SegmentCompanies/Standards/Validators/SegmentCompanyValidation.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\SegmentCompanies\Standards\Validators;
-
-use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\SegmentCompanies\DataTransferObjects\CompanyEmployeeObject;
-
-class SegmentCompanyValidation extends AbstractValidation
-{
-    /**
-     * @param CompanyEmployeeObject $object
-     * @return array
-     */
-    protected function data($object): array 
-    {
-        return [
-            'segment_id' => $object->getSegmentId(),
-            'company_id' => $object->getCompanyId(),
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function rules(): array 
-    {
-        return [
-            'segment_id' => 'required',
-            'company_id' => 'required',
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function messages(): array 
-    {
-        return [];
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/SegmentConstants/ControllersLogic/CreateSegmentConstantLogic.php b/app/Classes/Modules/SegmentConstants/ControllersLogic/CreateSegmentConstantLogic.php
deleted file mode 100644
index a0bc7b80..00000000
--- a/app/Classes/Modules/SegmentConstants/ControllersLogic/CreateSegmentConstantLogic.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\SegmentConstants\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-
-use App\Classes\Modules\SegmentConstants\Services\FetchesSegmentConstant;
-use App\Classes\Modules\Segments\Services\FetchesSegment;
-
-use App\Classes\Modules\SegmentConstants\Standards\Rules\CanCreateSegmentConstant;
-
-use App\Classes\Modules\SegmentConstants\Services\CreatesSegmentConstant;
-use App\Classes\Modules\SegmentConstants\DataTransferObjects\SegmentConstantObject;
-
-use App\Http\Resources\SegmentConstantResource;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class CreateSegmentConstantLogic extends AbstractControllersLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Segment Constant',
-            'message' => 'You have successfully created a new Segment Constant'
-        ];
-    }
-
-    /** @var CanCreateSegmentConstant */
-    private $canCreateSegmentConstant;
-
-    /** @var CreatesSegmentConstant */
-    private $createsSegmentConstant;
-
-    /** @var FetchesSegmentConstant */
-    private $fetchesSegmentConstant;
-
-    /** @var FetchesSegment */
-    private $fetchesSegment;
-
-
-    /**
-     * CreateSegmentConstantLogic constructor.
-     * @param CanCreateSegmentConstant $canCreateSegmentConstant
-     * @param CreatesSegmentConstant $createsSegmentConstant
-     * @param FetchesSegmentConstant $fetchesSegmentConstant
-     * @param FetchesSegment $fetchesSegment
-     */
-    public function __construct(
-        CanCreateSegmentConstant $canCreateSegmentConstant, 
-        CreatesSegmentConstant $createsSegmentConstant, 
-        FetchesSegmentConstant $fetchesSegmentConstant,
-        FetchesSegment $fetchesSegment
-    )
-    {
-        $this->canCreateSegmentConstant = $canCreateSegmentConstant;
-        $this->createsSegmentConstant = $createsSegmentConstant;
-        $this->fetchesSegmentConstant = $fetchesSegmentConstant;
-        $this->fetchesSegment = $fetchesSegment;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            DB::beginTransaction();
-
-            $segment_query = $this->fetchesSegment->execute([
-                'id' => $request->input('segment_id'),
-            ]);
-
-            $standard_segment_constant_query = $this->fetchesSegmentConstant->execute([
-                'id' => $request->input('standard_segment_constant_id'),
-            ]); 
-
-            $segment_constant_object = new SegmentConstantObject(
-                $request->input('segment_id'),
-                $standard_segment_constant_query->name,
-                $standard_segment_constant_query->reference,
-                $standard_segment_constant_query->detail->type,
-                $request->input('detail')
-            );
-
-            $this->canCreateSegmentConstant->passes($segment_constant_object);
-            $standard_segment_constant_query = $this->createsSegmentConstant->execute($segment_query, $segment_constant_object);
-           
-            DB::commit();
-
-            return $this->resourceResponse(new SegmentConstantResource($standard_segment_constant_query));
-
-        } catch (\Exception $exception) {
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/SegmentConstants/ControllersLogic/ListStandardSegmentConstantLogic.php b/app/Classes/Modules/SegmentConstants/ControllersLogic/ListStandardSegmentConstantLogic.php
deleted file mode 100644
index 40daa24d..00000000
--- a/app/Classes/Modules/SegmentConstants/ControllersLogic/ListStandardSegmentConstantLogic.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\SegmentConstants\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-use App\Classes\Modules\SegmentConstants\Services\ListsSegmentConstants;
-use App\Classes\Modules\SegmentConstants\Standards\Rules\CanListStandardSegmentConstants;
-use App\Http\Resources\SegmentResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ListStandardSegmentConstantLogic extends AbstractControllersLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Standard Segment Constant',
-            'message' => 'You have successfully retrieved a list of Standard Segment Constant'
-        ];
-    }
-
-    /** @var CanListStandardSegmentConstants */
-    private $canListStandardSegmentConstants;
-
-    /** @var ListsSegmentConstants */
-    private $listsSegmentConstants;
-
-    /**
-     * ListStandardSegmentConstantLogic constructor.
-     * @param CanListStandardSegmentConstants $canListStandardSegmentConstants
-     * @param ListsSegmentConstants $listsSegmentConstants
-     */
-    public function __construct(CanListStandardSegmentConstants $canListStandardSegmentConstants, ListsSegmentConstants $listsSegmentConstants)
-    {
-        $this->canListStandardSegmentConstants = $canListStandardSegmentConstants;
-        $this->listsSegmentConstants = $listsSegmentConstants;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            $this->canListStandardSegmentConstants->passes();
-
-            $query = $this->listsSegmentConstants->execute(
-                [
-                    'segment_id' => 1
-                ]
-            );
-
-            return $this->collectionResponse(SegmentResource::collection($query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/SegmentConstants/ControllersLogic/UpdateSegmentConstantLogic.php b/app/Classes/Modules/SegmentConstants/ControllersLogic/UpdateSegmentConstantLogic.php
deleted file mode 100644
index 2b15bba3..00000000
--- a/app/Classes/Modules/SegmentConstants/ControllersLogic/UpdateSegmentConstantLogic.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\SegmentConstants\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-
-use App\Classes\Modules\SegmentConstants\Services\FetchesSegmentConstant;
-
-use App\Classes\Modules\SegmentConstants\Standards\Rules\CanUpdateSegmentConstant;
-
-use App\Classes\Modules\SegmentConstants\Services\UpdatesSegmentConstant;
-use App\Classes\Modules\SegmentConstants\DataTransferObjects\SegmentConstantObject;
-
-use App\Http\Resources\SegmentConstantResource;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class UpdateSegmentConstantLogic extends AbstractControllersLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Segment Constant',
-            'message' => 'You have successfully updated the Segment Constant'
-        ];
-    }
-
-    /** @var CanUpdateSegmentConstant */
-    private $canUpdateSegmentConstant;
-
-    /** @var UpdatesSegmentConstant */
-    private $updatesSegmentConstant;
-
-    /** @var FetchesSegmentConstant */
-    private $fetchesSegmentConstant;
-
-    /**
-     * UpdateStandardSegmentConstantLogic constructor.
-     * @param CanUpdateSegmentConstant $canUpdateSegmentConstant
-     * @param UpdatesSegmentConstant $updatesSegmentConstant
-     * @param FetchesSegmentConstant $fetchesSegmentConstant
-     */
-    public function __construct(
-        CanUpdateSegmentConstant $canUpdateSegmentConstant, 
-        UpdatesSegmentConstant $updatesSegmentConstant, 
-        FetchesSegmentConstant $fetchesSegmentConstant
-    )
-    {
-        $this->canUpdateSegmentConstant = $canUpdateSegmentConstant;
-        $this->updatesSegmentConstant = $updatesSegmentConstant;
-        $this->fetchesSegmentConstant = $fetchesSegmentConstant;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            DB::beginTransaction();
-
-            $segment_constant_query = $this->fetchesSegmentConstant->execute(['id' => $request->route('id')]);
-
-            $segment_constant_object = new SegmentConstantObject(
-                $segment_constant_query->segment_id,
-                $segment_constant_query->name,
-                $segment_constant_query->reference,
-                $segment_constant_query->detail->type,
-                $request->input('detail')
-            );
-
-            $this->canUpdateSegmentConstant->passes($segment_constant_object);
-            $segment_constant_query = $this->updatesSegmentConstant->execute($segment_constant_query, $segment_constant_object);
-           
-            DB::commit();
-
-            return $this->resourceResponse(new SegmentConstantResource($segment_constant_query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/SegmentConstants/ControllersLogic/UpdateStandardSegmentConstantLogic.php b/app/Classes/Modules/SegmentConstants/ControllersLogic/UpdateStandardSegmentConstantLogic.php
deleted file mode 100644
index fd8f76a4..00000000
--- a/app/Classes/Modules/SegmentConstants/ControllersLogic/UpdateStandardSegmentConstantLogic.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\SegmentConstants\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-
-use App\Classes\Modules\SegmentConstants\Services\FetchesSegmentConstant;
-
-use App\Classes\Modules\SegmentConstants\Standards\Rules\CanUpdateStandardSegmentConstant;
-
-use App\Classes\Modules\SegmentConstants\Services\UpdatesSegmentConstant;
-use App\Classes\Modules\SegmentConstants\DataTransferObjects\SegmentConstantObject;
-
-use App\Http\Resources\SegmentConstantResource;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class UpdateStandardSegmentConstantLogic extends AbstractControllersLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Standard Segment Constant',
-            'message' => 'You have successfully updated the Standard Segment Constant'
-        ];
-    }
-
-    /** @var CanUpdateStandardSegmentConstant */
-    private $canUpdateStandardSegmentConstant;
-
-    /** @var UpdatesSegmentConstantTax */
-    private $updatesSegmentConstant;
-
-    /** @var FetchesSegmentConstant */
-    private $fetchesSegmentConstant;
-
-    /**
-     * UpdateStandardSegmentConstantLogic constructor.
-     * @param CanUpdateStandardSegmentConstant $canUpdateStandardSegmentConstant
-     * @param UpdatesSegmentConstant $updatesSegmentConstant
-     * @param FetchesSegmentConstant $fetchesSegmentConstant
-     */
-    public function __construct(
-        CanUpdateStandardSegmentConstant $canUpdateStandardSegmentConstant, 
-        UpdatesSegmentConstant $updatesSegmentConstant, 
-        FetchesSegmentConstant $fetchesSegmentConstant
-    )
-    {
-        $this->canUpdateStandardSegmentConstant = $canUpdateStandardSegmentConstant;
-        $this->updatesSegmentConstant = $updatesSegmentConstant;
-        $this->fetchesSegmentConstant = $fetchesSegmentConstant;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            DB::beginTransaction();
-
-            $segment_constant_query = $this->fetchesSegmentConstant->execute(['id' => $request->route('id')]);
-
-            $segment_constant_object = new SegmentConstantObject(
-                $segment_constant_query->segment_id,
-                $segment_constant_query->name,
-                $segment_constant_query->reference,
-                $segment_constant_query->detail->type,
-                $request->input('detail')
-            );
-
-            $this->canUpdateStandardSegmentConstant->passes($segment_constant_object);
-            $segment_constant_query = $this->updatesSegmentConstant->execute($segment_constant_query, $segment_constant_object);
-           
-            DB::commit();
-
-            return $this->resourceResponse(new SegmentConstantResource($segment_constant_query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/SegmentConstants/DataTransferObjects/SegmentConstantObject.php b/app/Classes/Modules/SegmentConstants/DataTransferObjects/SegmentConstantObject.php
deleted file mode 100644
index 0d8c6ce8..00000000
--- a/app/Classes/Modules/SegmentConstants/DataTransferObjects/SegmentConstantObject.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\SegmentConstants\DataTransferObjects;
-
-use App\Classes\Interfaces\DataTransferObject;
-
-class SegmentConstantObject implements DataTransferObject
-{
-    /** @var int|null */
-    private $segment_id;
-
-    /** @var string|null */
-    private $name;
-
-    /** @var string|null */
-    private $reference;
-
-    /** @var int */
-    private $type;
-
-    /** @var array */
-    private $detail;
-
-    /**
-     * SegmentConstantObject constructor.
-     * @param int|null $segment_id
-     * @param string|null $name
-     * @param string|null $reference
-     * @param string|null $type
-     * @param array|null $detail
-     */
-    public function __construct(
-        ?int $segment_id, 
-        ?string $name, 
-        ?string $reference, 
-        ?string $type,
-        ?array $detail
-    )
-    {
-        $this->segment_id = $segment_id;
-        $this->name = $name;
-        $this->reference = $reference;
-        $this->type = $type;
-        $this->detail = $detail;
-    }
-
-    /**
-     * @return int
-     */
-    public function getSegmentId(): ?int
-    {
-        return $this->segment_id;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName(): ?string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getReference(): ?string
-    {
-        return $this->reference;
-    }
-
-    /**
-     * @return string
-     */
-    public function getType(): ?string
-    {
-        return $this->type;
-    }
-
-    /**
-     * @return array
-     */
-    public function getDetail(): ?array
-    {
-        return $this->detail;
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/SegmentConstants/Services/CreatesSegmentConstant.php b/app/Classes/Modules/SegmentConstants/Services/CreatesSegmentConstant.php
deleted file mode 100644
index 72d22d90..00000000
--- a/app/Classes/Modules/SegmentConstants/Services/CreatesSegmentConstant.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\SegmentConstants\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\SegmentConstants\DataTransferObjects\SegmentConstantObject;
-use App\Models\SegmentConstant;
-use App\Models\Segment;
-
-class CreatesSegmentConstant extends AbstractUpdateRecord
-{
-    /**
-     * @param SegmentConstantTaxObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Segment $segment, SegmentConstantObject $object) 
-    {
-        $model = new SegmentConstant();
-        $model->segment_id = $object->getSegmentId();
-        $model->name = $object->getName();
-        $model->reference = $object->getReference();
-        $model->detail = json_encode($object->getDetail());
-
-        return $this->handler($model);
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/SegmentConstants/Standards/Rules/CanCreateSegmentConstant.php b/app/Classes/Modules/SegmentConstants/Standards/Rules/CanCreateSegmentConstant.php
deleted file mode 100644
index f8004575..00000000
--- a/app/Classes/Modules/SegmentConstants/Standards/Rules/CanCreateSegmentConstant.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\SegmentConstants\Standards\Rules;
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\SegmentConstants\DataTransferObjects\SegmentObject;
-use App\Classes\Modules\SegmentConstants\Standards\Validators\SegmentConstantValidation;
-
-class CanCreateSegmentConstant extends AbstractRule
-{
-
-    /** @var SegmentConstantValidation */
-    private $segmentConstantValidation;
-
-    /**
-     * CanCreateSegmentConstant constructor.
-     * @param SegmentConstantValidation $segmentConstantValidation
-     */
-    public function __construct(SegmentConstantValidation $segmentConstantValidation)
-    {
-        $this->segmentConstantValidation = $segmentConstantValidation;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-        if (!\Auth::user()->can('add segment_constant')) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * @param SegmentObject $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->segmentConstantValidation->validate($object, 'POST');
-    }
-
-    /**
-     * @param SegmentObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/SegmentConstants/Standards/Rules/CanListStandardSegmentConstants.php b/app/Classes/Modules/SegmentConstants/Standards/Rules/CanListStandardSegmentConstants.php
deleted file mode 100644
index 094cdd48..00000000
--- a/app/Classes/Modules/SegmentConstants/Standards/Rules/CanListStandardSegmentConstants.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\SegmentConstants\Standards\Rules;
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
-
-class CanListStandardSegmentConstants extends AbstractRule
-{
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-
-        if (!\Auth::user()->can('view standard_segment_constant')) {
-            return false;
-        }
-
-        return true;
-
-    }
-
-    /**
-     * @param SegmentObject $object
-     * @return bool
-     */
-    protected function validators($object): bool
-    {
-        return true;
-
-    }
-
-
-    /**
-     * @param SegmentObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/SegmentConstants/Standards/Rules/CanUpdateSegmentConstant.php b/app/Classes/Modules/SegmentConstants/Standards/Rules/CanUpdateSegmentConstant.php
deleted file mode 100644
index 2e1fa8a8..00000000
--- a/app/Classes/Modules/SegmentConstants/Standards/Rules/CanUpdateSegmentConstant.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\SegmentConstants\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\SegmentConstants\DataTransferObjects\SegmentCompanyObject;
-use App\Classes\Modules\SegmentConstants\Standards\Validators\SegmentConstantValidation;
-
-class CanUpdateSegmentConstant extends AbstractRule
-{
-
-    /** @var SegmentConstantValidation */
-    private $segmentConstantValidation;
-
-    /**
-     * CanUpdateSegmentConstant constructor.
-     * @param SegmentConstantValidation $segmentConstantValidation
-     */
-    public function __construct(SegmentConstantValidation $segmentConstantValidation)
-    {
-        $this->segmentConstantValidation = $segmentConstantValidation;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-
-        if (!\Auth::user()->can('view segment_constant')) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * @param SegmentConstantValidation $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->segmentConstantValidation->validate($object, 'PUT');
-    }
-
-    /**
-     * @param SegmentConstantValidation $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/SegmentConstants/Standards/Rules/CanUpdateStandardSegmentConstant.php b/app/Classes/Modules/SegmentConstants/Standards/Rules/CanUpdateStandardSegmentConstant.php
deleted file mode 100644
index 678c7987..00000000
--- a/app/Classes/Modules/SegmentConstants/Standards/Rules/CanUpdateStandardSegmentConstant.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\SegmentConstants\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\SegmentConstants\DataTransferObjects\SegmentCompanyObject;
-use App\Classes\Modules\SegmentConstants\Standards\Validators\SegmentConstantValidation;
-
-class CanUpdateStandardSegmentConstant extends AbstractRule
-{
-
-    /** @var SegmentConstantValidation */
-    private $segmentConstantValidation;
-
-
-    /**
-     * CanUpdateStandardSegmentConstant constructor.
-     * @param SegmentConstantValidation $segmentConstantValidation
-     */
-    public function __construct(SegmentConstantValidation $segmentConstantValidation)
-    {
-        $this->segmentConstantValidation = $segmentConstantValidation;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-
-        if (!\Auth::user()->can('view standard_segment_constant')) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * @param SegmentConstantValidation $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->segmentConstantValidation->validate($object, 'PUT');
-    }
-
-    /**
-     * @param SegmentConstantValidation $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/ControllersLogic/CreateSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/CreateSegmentLogic.php
index c37c876e..32eeb217 100644
--- a/app/Classes/Modules/Segments/ControllersLogic/CreateSegmentLogic.php
+++ b/app/Classes/Modules/Segments/ControllersLogic/CreateSegmentLogic.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Segments\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 
 use App\Classes\Modules\Segments\Standards\Rules\CanCreateSegment;
 use App\Classes\Modules\Segments\Services\CreatesSegment;
@@ -14,8 +14,9 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class CreateSegmentLogic extends AbstractControllersLogic
+class CreateSegmentLogic extends AbstractControllerLogic
 {
+
     /**
      * @return array
      */
@@ -32,15 +33,13 @@ class CreateSegmentLogic extends AbstractControllersLogic
     /** @var CreatesSegment */
     private $createsSegment;
 
+
     /**
      * CreateSegmentLogic constructor.
      * @param CanCreateSegment $canCreateSegment
      * @param CreatesSegment $createsSegment
      */
-    public function __construct(
-        CanCreateSegment $canCreateSegment, 
-        CreatesSegment $createsSegment
-    )
+    public function __construct(CanCreateSegment $canCreateSegment, CreatesSegment $createsSegment)
     {
         $this->canCreateSegment = $canCreateSegment;
         $this->createsSegment = $createsSegment;
@@ -49,27 +48,18 @@ class CreateSegmentLogic extends AbstractControllersLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
-            DB::beginTransaction();
+        $segment_object = new SegmentObject($request->input('name'));
 
-            $segment_object = new SegmentObject(
-                $request->input('name')
-            );
+        $this->canCreateSegment->passes($segment_object);
+        $segment = $this->createsSegment->execute($segment_object);
 
-            $this->canCreateSegment->passes($segment_object);
-            $segment_query = $this->createsSegment->execute($segment_object);
-
-            DB::commit();
-
-            return $this->resourceResponse(new SegmentResource($segment_query));
-
-        } catch (\Exception $exception) {
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->resourceResponse(new SegmentResource($segment));
 
     }
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
index 4e6f9775..ac441bb0 100644
--- a/app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
+++ b/app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
@@ -4,19 +4,17 @@ namespace App\Classes\Modules\Segments\ControllersLogic;
 
 use App\Http\Resources\SegmentResource;
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 
 use App\Classes\Modules\Segments\Services\FetchesSegment;
 
 use App\Classes\Modules\Segments\Standards\Rules\CanDeleteSegment;
 use App\Classes\Modules\Segments\Services\DeletesSegment;
 
-use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 
-class DeleteSegmentLogic extends AbstractControllersLogic
+class DeleteSegmentLogic extends AbstractControllerLogic
 {
 
     /**
@@ -59,25 +57,18 @@ class DeleteSegmentLogic extends AbstractControllersLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
-            DB::beginTransaction();
 
-            $segment_query = $this->fetchesSegment->execute(['id' => $request->route('id')]);
-            $this->canDeleteSegment->passes();
-            $this->deletesSegment->execute($segment_query);
-            
-            DB::commit();
+        $segment_query = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+        $this->canDeleteSegment->passes();
+        $this->deletesSegment->execute($segment_query);
 
-            return $this->resourceResponse(new SegmentResource($segment_query));
-
-        } catch (\Exception $exception){
-            dd($exception);
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->resourceResponse(new SegmentResource($segment_query));
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/ControllersLogic/FetchConstantLogic.php b/app/Classes/Modules/Segments/ControllersLogic/FetchConstantLogic.php
new file mode 100644
index 00000000..6c5c5b0f
--- /dev/null
+++ b/app/Classes/Modules/Segments/ControllersLogic/FetchConstantLogic.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Http\Resources\ConstantResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchConstantLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Fetch Segment Constant',
+            'message' => 'You have successfully retrieved the Segment Constant'
+        ];
+    }
+
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /**
+     * FetchConstantLogic constructor.
+     * @param FetchesConstant $fetchesConstant
+     */
+    public function __construct(FetchesConstant $fetchesConstant)
+    {
+        $this->fetchesConstant = $fetchesConstant;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $constant = $this->fetchesConstant->execute(['segment_id' => $request->route('id'), 'reference' => $request->route('reference')]);
+
+        return $this->resourceResponse(new ConstantResource($constant));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/ControllersLogic/FetchSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/FetchSegmentLogic.php
new file mode 100644
index 00000000..d5c35fdc
--- /dev/null
+++ b/app/Classes/Modules/Segments/ControllersLogic/FetchSegmentLogic.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\Standards\Rules\CanFetchSegment;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Http\Resources\SegmentResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchSegmentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Segment',
+            'message' => 'You have successfully retrieved a segment'
+        ];
+    }
+
+    /** @var CanFetchSegment */
+    private $canFetchSegment;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /**
+     * FetchSegmentLogic constructor.
+     * @param CanFetchSegment $canFetchSegment
+     * @param FetchesSegment $fetchesSegment
+     */
+    public function __construct(CanFetchSegment $canFetchSegment, FetchesSegment $fetchesSegment)
+    {
+        $this->canFetchSegment = $canFetchSegment;
+        $this->fetchesSegment = $fetchesSegment;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canFetchSegment->passes();
+
+        $query = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+        return $this->resourceResponse(new SegmentResource($query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/ControllersLogic/ListSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/ListSegmentLogic.php
new file mode 100644
index 00000000..d8299424
--- /dev/null
+++ b/app/Classes/Modules/Segments/ControllersLogic/ListSegmentLogic.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\Services\ListsSegments;
+use App\Http\Resources\SegmentResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListSegmentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Segment',
+            'message' => 'You have successfully retrieved a list of Segment'
+        ];
+    }
+
+
+    /** @var ListsSegments */
+    private $listsSegments;
+
+    /**
+     * ListSegmentLogic constructor.
+     * @param ListsSegments $listsSegments
+     */
+    public function __construct(ListsSegments $listsSegments)
+    {
+        $this->listsSegments = $listsSegments;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $query = $this->listsSegments->execute($this->listsSegments->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(SegmentResource::collection($query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/ControllersLogic/ListStandardSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/ListStandardSegmentLogic.php
deleted file mode 100644
index 4eb1fdec..00000000
--- a/app/Classes/Modules/Segments/ControllersLogic/ListStandardSegmentLogic.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllersLogic;
-use App\Classes\Modules\Segments\Services\ListsSegments;
-use App\Classes\Modules\Segments\Standards\Rules\CanListStandardSegments;
-use App\Http\Resources\SegmentResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ListStandardSegmentLogic extends AbstractControllersLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Segment',
-            'message' => 'You have successfully retrieved a list of Segment'
-        ];
-    }
-
-    /** @var CanListStandardSegments */
-    private $canListStandardSegments;
-
-    /** @var ListsSegments */
-    private $listsSegments;
-
-    /**
-     * ListStandardSegmentLogic constructor.
-     * @param CanListStandardSegments $canListStandardSegments
-     * @param ListsSegments $listsSegments
-     */
-    public function __construct(CanListStandardSegments $canListStandardSegments, ListsSegments $listsSegments)
-    {
-        $this->canListStandardSegments = $canListStandardSegments;
-        $this->listsSegments = $listsSegments;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            $this->canListStandardSegments->passes();
-
-            $query = $this->listsSegments->execute(['id' => 1]);
-
-            return $this->collectionResponse(SegmentResource::collection($query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php b/app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php
new file mode 100644
index 00000000..dac04ec7
--- /dev/null
+++ b/app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php
@@ -0,0 +1,104 @@
+<?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\Services\CreatesConstant;
+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;
+
+class UpdateConstantLogic  extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Segment Constant',
+            'message' => 'You have successfully updated the Segment Constant'
+        ];
+    }
+
+    /** @var CanUpdateConstant */
+    private $canUpdateConstant;
+
+    /** @var UpdatesConstant */
+    private $updatesConstant;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /** @var CanCreateConstant */
+    private $canCreateConstant;
+
+    /** @var CreatesConstant */
+    private $createsConstant;
+
+
+    /**
+     * UpdateConstantLogic constructor.
+     * @param CanUpdateConstant $canUpdateConstant
+     * @param UpdatesConstant $updatesConstant
+     * @param FetchesSegment $fetchesSegment
+     * @param FetchesConstant $fetchesConstant
+     * @param CanCreateConstant $canCreateConstant
+     * @param CreatesConstant $createsConstant
+     */
+    public function __construct(CanUpdateConstant $canUpdateConstant, UpdatesConstant $updatesConstant, FetchesSegment $fetchesSegment, FetchesConstant $fetchesConstant, CanCreateConstant $canCreateConstant, CreatesConstant $createsConstant)
+    {
+        $this->canUpdateConstant = $canUpdateConstant;
+        $this->updatesConstant = $updatesConstant;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->fetchesConstant = $fetchesConstant;
+        $this->canCreateConstant = $canCreateConstant;
+        $this->createsConstant = $createsConstant;
+    }
+    /**
+     * @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
+    {
+
+        $object = new ConstantObject($request->input('name'), $request->input('reference'), $request->input('detail'));
+
+        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+        try {
+
+            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $object->getReference()]);
+            $this->canUpdateConstant->passes($object);
+
+            /** @var SegmentConstant $constant */
+            $constant = $this->updatesConstant->execute($constant, $object);
+
+        } catch (ResourceNotFoundException $exception){
+
+            $this->canCreateConstant->passes($object);
+
+            /** @var SegmentConstant $constant */
+            $constant = $this->createsConstant->execute($segment, $object);
+
+        }
+
+
+        return $this->resourceResponse(new ConstantResource($constant));
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/ControllersLogic/UpdateSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/UpdateSegmentLogic.php
index 39ebbb30..43eaa54e 100644
--- a/app/Classes/Modules/Segments/ControllersLogic/UpdateSegmentLogic.php
+++ b/app/Classes/Modules/Segments/ControllersLogic/UpdateSegmentLogic.php
@@ -4,7 +4,7 @@ namespace App\Classes\Modules\Segments\ControllersLogic;
 
 use App\Http\Resources\SegmentResource;
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 
 use App\Classes\Modules\Segments\Services\FetchesSegment;
 
@@ -17,7 +17,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class UpdateSegmentLogic extends AbstractControllersLogic
+class UpdateSegmentLogic extends AbstractControllerLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Segments/DataTransferObjects/ConstantObject.php b/app/Classes/Modules/Segments/DataTransferObjects/ConstantObject.php
new file mode 100644
index 00000000..d5373a68
--- /dev/null
+++ b/app/Classes/Modules/Segments/DataTransferObjects/ConstantObject.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\Segments\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class ConstantObject implements DataTransferObject
+{
+
+    /** @var string */
+    private $name;
+
+    /** @var string */
+    private $reference;
+
+    /** @var array */
+    private $detail;
+
+    /**
+     * ConstantObject constructor.
+     * @param string $name
+     * @param string $reference
+     * @param array $detail
+     */
+    public function __construct(string $name, string $reference, array $detail)
+    {
+        $this->name = $name;
+        $this->reference = $reference;
+        $this->detail = $detail;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getReference(): string
+    {
+        return $this->reference;
+    }
+
+    /**
+     * @return array
+     */
+    public function getDetail(): array
+    {
+        return $this->detail;
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/DataTransferObjects/SegmentObject.php b/app/Classes/Modules/Segments/DataTransferObjects/SegmentObject.php
index dc4de3ed..06045943 100644
--- a/app/Classes/Modules/Segments/DataTransferObjects/SegmentObject.php
+++ b/app/Classes/Modules/Segments/DataTransferObjects/SegmentObject.php
@@ -2,29 +2,47 @@
 
 namespace App\Classes\Modules\Segments\DataTransferObjects;
 
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
 
 class SegmentObject implements DataTransferObject
 {
-    /** @var string|null */
+    /** @var string */
     private $name;
 
+    /** @var int|null */
+    private $type;
+
     /**
      * SegmentObject constructor.
-     * @param string|null $name
+     * @param string $name
+     * @param int|null $type
      */
-    public function __construct(
-        ?string $name
-    )
+    public function __construct(string $name, ?int $type = SegmentConstants::STANDARD_SEGMENT)
     {
         $this->name = $name;
+        $this->type = $type;
     }
 
     /**
      * @return string
      */
-    public function getName(): ?string
+    public function getName(): string
     {
         return $this->name;
     }
+
+    /**
+     * @return int
+     */
+    public function getType(): int
+    {
+        return $this->type;
+    }
+
+
+
+
+
+
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Services/ConvertsConstantDetailsToResource.php b/app/Classes/Modules/Segments/Services/ConvertsConstantDetailsToResource.php
new file mode 100644
index 00000000..0e7ece81
--- /dev/null
+++ b/app/Classes/Modules/Segments/Services/ConvertsConstantDetailsToResource.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+
+use App\Classes\Modules\Currencies\Services\FetchesCurrency;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\ConstantResource;
+use App\Http\Resources\CurrencyResource;
+
+class ConvertsConstantDetailsToResource
+{
+
+    /** @var FetchesCurrency */
+    private $fetchesCurrency;
+
+    /**
+     * ConvertsConstantDetailsToResource constructor.
+     * @param FetchesCurrency $fetchesCurrency
+     */
+    public function __construct(FetchesCurrency $fetchesCurrency)
+    {
+        $this->fetchesCurrency = $fetchesCurrency;
+    }
+
+
+    public function execute(ConstantResource $resource){
+
+        if($resource->reference === SegmentConstants::SUPPLIER_CURRENCIES) {
+            return property_exists($resource->detail, 'id') ? new CurrencyResource($this->fetchesCurrency->execute(['id' => $resource->detail->id])) : '';
+        }
+
+        return $resource->detail;
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Services/CreatesConstant.php b/app/Classes/Modules/Segments/Services/CreatesConstant.php
new file mode 100644
index 00000000..b2addae8
--- /dev/null
+++ b/app/Classes/Modules/Segments/Services/CreatesConstant.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Models\SegmentConstant;
+use App\Models\Segment;
+
+class CreatesConstant extends AbstractUpdateRelationshipRecord
+{
+    /**
+     * @param Segment $segment
+     * @param ConstantObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Segment $segment, ConstantObject $object)
+    {
+        $model = new SegmentConstant();
+        $model->name = $object->getName();
+        $model->reference = $object->getReference();
+        $model->detail = json_encode($object->getDetail());
+
+        return $this->handler($segment->constants(), $model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Services/CreatesSegment.php b/app/Classes/Modules/Segments/Services/CreatesSegment.php
index f3dc2a1c..b18a8db5 100644
--- a/app/Classes/Modules/Segments/Services/CreatesSegment.php
+++ b/app/Classes/Modules/Segments/Services/CreatesSegment.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\Segments\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
 use App\Models\Segment;
 
 class CreatesSegment extends AbstractUpdateRecord
@@ -16,6 +17,7 @@ class CreatesSegment extends AbstractUpdateRecord
     public function execute(SegmentObject $object) {
         $model = new Segment();
         $model->name = $object->getName();
+        $model->type = SegmentConstants::CUSTOM_SEGMENT;
 
         return $this->handler($model);
 
diff --git a/app/Classes/Modules/Segments/Services/DeletesSegment.php b/app/Classes/Modules/Segments/Services/DeletesSegment.php
index 88d44d60..9cc78c59 100644
--- a/app/Classes/Modules/Segments/Services/DeletesSegment.php
+++ b/app/Classes/Modules/Segments/Services/DeletesSegment.php
@@ -8,6 +8,11 @@ use App\Models\Segment;
 class DeletesSegment extends AbstractDeleteRecord
 {
 
+    /**
+     * @param Segment $model
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
     public function execute(Segment $model) {
         return $this->handler($model);
     }
diff --git a/app/Classes/Modules/SegmentConstants/Services/FetchesSegmentConstant.php b/app/Classes/Modules/Segments/Services/FetchesConstant.php
similarity index 76%
rename from app/Classes/Modules/SegmentConstants/Services/FetchesSegmentConstant.php
rename to app/Classes/Modules/Segments/Services/FetchesConstant.php
index 003e20ba..bfa1b2cb 100644
--- a/app/Classes/Modules/SegmentConstants/Services/FetchesSegmentConstant.php
+++ b/app/Classes/Modules/Segments/Services/FetchesConstant.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace App\Classes\Modules\SegmentConstants\Services;
+namespace App\Classes\Modules\Segments\Services;
 
 
 use App\Classes\General\Eloquent\AbstractFetchRecord;
 use Illuminate\Database\Eloquent\Builder;
 use App\Models\SegmentConstant;
 
-class FetchesSegmentConstant extends AbstractFetchRecord
+class FetchesConstant extends AbstractFetchRecord
 {
 
     /** @var SegmentConstant */
     private $repository;
 
     /**
-     * FetchesSegmentConstant constructor.
+     * FetchesConstant constructor.
      * @param SegmentConstant $repository
      */
     public function __construct(SegmentConstant $repository)
diff --git a/app/Classes/Modules/SegmentConstants/Services/ListsSegmentConstants.php b/app/Classes/Modules/Segments/Services/ListsConstants.php
similarity index 76%
rename from app/Classes/Modules/SegmentConstants/Services/ListsSegmentConstants.php
rename to app/Classes/Modules/Segments/Services/ListsConstants.php
index 5f959f98..733a6db7 100644
--- a/app/Classes/Modules/SegmentConstants/Services/ListsSegmentConstants.php
+++ b/app/Classes/Modules/Segments/Services/ListsConstants.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace App\Classes\Modules\SegmentConstants\Services;
+namespace App\Classes\Modules\Segments\Services;
 
 
 use App\Classes\General\Eloquent\AbstractListRecord;
 use Illuminate\Database\Eloquent\Builder;
 use App\Models\SegmentConstant;
 
-class ListsSegmentConstants extends AbstractListRecord
+class ListsConstants extends AbstractListRecord
 {
 
     /** @var SegmentConstant */
     private $repository;
 
     /**
-     * ListsSegmentConstants constructor.
+     * ListsConstants constructor.
      * @param SegmentConstant $repository
      */
     public function __construct(SegmentConstant $repository)
diff --git a/app/Classes/Modules/SegmentConstants/Services/UpdatesSegmentConstant.php b/app/Classes/Modules/Segments/Services/UpdatesConstant.php
similarity index 57%
rename from app/Classes/Modules/SegmentConstants/Services/UpdatesSegmentConstant.php
rename to app/Classes/Modules/Segments/Services/UpdatesConstant.php
index 6041d8c5..13fb22c1 100644
--- a/app/Classes/Modules/SegmentConstants/Services/UpdatesSegmentConstant.php
+++ b/app/Classes/Modules/Segments/Services/UpdatesConstant.php
@@ -1,20 +1,21 @@
 <?php
 
-namespace App\Classes\Modules\SegmentConstants\Services;
+namespace App\Classes\Modules\Segments\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\SegmentConstants\DataTransferObjects\SegmentConstantObject;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
 use App\Models\SegmentConstant;
 
-class UpdatesSegmentConstant extends AbstractUpdateRecord
+class UpdatesConstant extends AbstractUpdateRecord
 {
 
     /**
-     * @param SegmentConstantObject $object
+     * @param SegmentConstant $model
+     * @param ConstantObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(SegmentConstant $model, SegmentConstantObject $object) 
+    public function execute(SegmentConstant $model, ConstantObject $object)
     {
         $model->name = $object->getName();
         $model->reference = $object->getReference();
diff --git a/app/Classes/Modules/Segments/Services/UpdatesSegment.php b/app/Classes/Modules/Segments/Services/UpdatesSegment.php
index fed1fb2d..17f13efb 100644
--- a/app/Classes/Modules/Segments/Services/UpdatesSegment.php
+++ b/app/Classes/Modules/Segments/Services/UpdatesSegment.php
@@ -10,6 +10,7 @@ class UpdatesSegment extends AbstractUpdateRecord
 {
 
     /**
+     * @param Segment $model
      * @param SegmentObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanCreateConstant.php b/app/Classes/Modules/Segments/Standards/Rules/CanCreateConstant.php
new file mode 100644
index 00000000..55f9c61a
--- /dev/null
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanCreateConstant.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Standards\Validators\ConstantValidation;
+
+class CanCreateConstant extends AbstractRule
+{
+
+    /** @var ConstantValidation */
+    private $constantValidation;
+
+    /**
+     * CanCreateConstant constructor.
+     * @param ConstantValidation $constantValidation
+     */
+    public function __construct(ConstantValidation $constantValidation)
+    {
+        $this->constantValidation = $constantValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+
+    }
+
+    /**
+     * @param ConstantObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->constantValidation->validate($object, 'POST');
+    }
+
+    /**
+     * @param ConstantObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanFetchSegment.php b/app/Classes/Modules/Segments/Standards/Rules/CanFetchSegment.php
new file mode 100644
index 00000000..e6756305
--- /dev/null
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanFetchSegment.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+
+class CanFetchSegment extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param CompanyObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param CompanyObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanListStandardSegments.php b/app/Classes/Modules/Segments/Standards/Rules/CanListSegments.php
similarity index 76%
rename from app/Classes/Modules/Segments/Standards/Rules/CanListStandardSegments.php
rename to app/Classes/Modules/Segments/Standards/Rules/CanListSegments.php
index 7f71182e..9d01231d 100644
--- a/app/Classes/Modules/Segments/Standards/Rules/CanListStandardSegments.php
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanListSegments.php
@@ -5,21 +5,14 @@ namespace App\Classes\Modules\Segments\Standards\Rules;
 use App\Classes\General\Abstracts\AbstractRule;
 use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
 
-class CanListStandardSegments extends AbstractRule
+class CanListSegments extends AbstractRule
 {
     /**
      * @return bool
      */
     protected function authorized(): bool
     {
-        // TODO  Set Authorization rules
-
-        if (!\Auth::user()->can('view standard_segment')) {
-            return false;
-        }
-
         return true;
-
     }
 
     /**
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanUpdateConstant.php b/app/Classes/Modules/Segments/Standards/Rules/CanUpdateConstant.php
new file mode 100644
index 00000000..650b249c
--- /dev/null
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanUpdateConstant.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Standards\Validators\ConstantValidation;
+
+class CanUpdateConstant extends AbstractRule
+{
+
+    /** @var ConstantValidation */
+    private $ConstantValidation;
+
+    /**
+     * CanUpdateConstant constructor.
+     * @param ConstantValidation $ConstantValidation
+     */
+    public function __construct(ConstantValidation $ConstantValidation)
+    {
+        $this->ConstantValidation = $ConstantValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param ConstantObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->ConstantValidation->validate($object, 'PUT');
+    }
+
+    /**
+     * @param ConstantObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanUpdateSegment.php b/app/Classes/Modules/Segments/Standards/Rules/CanUpdateSegment.php
index 026ca4c6..58a8c0ca 100644
--- a/app/Classes/Modules/Segments/Standards/Rules/CanUpdateSegment.php
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanUpdateSegment.php
@@ -38,7 +38,7 @@ class CanUpdateSegment extends AbstractRule
     }
 
     /**
-     * @param SegmentValidation $object
+     * @param SegmentObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
@@ -48,7 +48,7 @@ class CanUpdateSegment extends AbstractRule
     }
 
     /**
-     * @param SegmentValidation $object
+     * @param SegmentObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/SegmentConstants/Standards/Validators/SegmentConstantValidation.php b/app/Classes/Modules/Segments/Standards/Validators/ConstantValidation.php
similarity index 55%
rename from app/Classes/Modules/SegmentConstants/Standards/Validators/SegmentConstantValidation.php
rename to app/Classes/Modules/Segments/Standards/Validators/ConstantValidation.php
index 38035944..d5ac8819 100644
--- a/app/Classes/Modules/SegmentConstants/Standards/Validators/SegmentConstantValidation.php
+++ b/app/Classes/Modules/Segments/Standards/Validators/ConstantValidation.php
@@ -1,24 +1,22 @@
 <?php
 
-namespace App\Classes\Modules\SegmentConstants\Standards\Validators;
+namespace App\Classes\Modules\Segments\Standards\Validators;
 
 
 use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\SegmentConstants\DataTransferObjects\SegmentConstantObject;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
 
-class SegmentConstantValidation extends AbstractValidation
+class ConstantValidation extends AbstractValidation
 {
     /**
-     * @param SegmentConstantObject $object
+     * @param ConstantObject $object
      * @return array
      */
     protected function data($object): array {
 
         $data = [
-            'segment_id'=> $object->getSegmentId(),
             'name' => $object->getName(),
             'reference' => $object->getReference(),
-            'type' => $object->getType(),
             'detail' => $object->getDetail()
         ];
 
@@ -28,12 +26,10 @@ class SegmentConstantValidation extends AbstractValidation
     /**
      * @return array
      */
-    protected function rules(?string $type = 'POST'): array {
+    protected function rules(): array {
         return [
-            'segment_id' => $type == 'POST' ? 'required' : '',
             'name' => 'required',
             'reference' => 'required',
-            'type' => 'required',
             'detail' => 'required'
         ];
     }
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/CreateServiceTypeLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/CreateServiceTypeLogic.php
new file mode 100644
index 00000000..07672f85
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/CreateServiceTypeLogic.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\CreatesConstant;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceDetailObject;
+use App\Classes\Modules\ServiceTypes\Services\CreatesServiceType;
+use App\Classes\Modules\ServiceTypes\Services\CreatesServiceTypeConstantDetails;
+use App\Classes\Modules\ServiceTypes\Services\UpdatesServiceCurrencyRates;
+use App\Classes\Modules\ServiceTypes\Standards\Rules\CanCreateServiceType;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\ServiceTypeResource;
+use App\Models\ServiceType;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateServiceTypeLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Service Type',
+            'message' => 'You have successfully created a new Service Type'
+        ];
+    }
+
+    /** @var CanCreateServiceType */
+    private $canCreateServiceType;
+
+    /** @var CreatesServiceType */
+    private $createsServiceType;
+
+    /** @var CreatesServiceTypeConstantDetails */
+    private $createsServiceTypeConstantDetails;
+
+    /** @var UpdatesServiceCurrencyRates */
+    private $updatesServiceCurrencyRates;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var CreatesConstant */
+    private $createsConstant;
+
+
+    /**
+     * CreateServiceTypeLogic constructor.
+     * @param CanCreateServiceType $canCreateServiceType
+     * @param CreatesServiceType $createsServiceType
+     * @param CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails
+     * @param UpdatesServiceCurrencyRates $updatesServiceCurrencyRates
+     * @param FetchesSegment $fetchesSegment
+     * @param CreatesConstant $createsConstant
+     */
+    public function __construct(CanCreateServiceType $canCreateServiceType, CreatesServiceType $createsServiceType, CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails, UpdatesServiceCurrencyRates $updatesServiceCurrencyRates, FetchesSegment $fetchesSegment, CreatesConstant $createsConstant)
+    {
+        $this->canCreateServiceType = $canCreateServiceType;
+        $this->createsServiceType = $createsServiceType;
+        $this->createsServiceTypeConstantDetails = $createsServiceTypeConstantDetails;
+        $this->updatesServiceCurrencyRates = $updatesServiceCurrencyRates;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->createsConstant = $createsConstant;
+    }
+
+    /**
+     * @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
+    {
+
+        $object = new ServiceTypeObject($request->input('name'));
+
+        $this->canCreateServiceType->passes($object);
+
+        /** @var ServiceType $service */
+        $service = $this->createsServiceType->execute($object);
+
+        $object = new ServiceDetailObject($service->id, (int) $request->input('configurations.bank_id'),
+            $request->input('configurations.service_charge'), $request->input('configurations.minimum_charge'), $request->input('configurations.tax'),
+            $request->input('configurations.po_limit'), $request->input('configurations.currencies'), false, $request->input('configurations.billable'));
+
+        $this->updatesServiceCurrencyRates->execute($service, $object->getCurrencies());
+
+        $constantObject = new ConstantObject('Service Type', SegmentConstants::SERVICE_TYPE, $this->createsServiceTypeConstantDetails->execute($object));
+
+        $this->createsConstant->execute($this->fetchesSegment->execute(['type' => SegmentConstants::STANDARD_SEGMENT]), $constantObject);
+
+
+        return $this->resourceResponse(new ServiceTypeResource($service));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/DeleteServiceTypeLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/DeleteServiceTypeLogic.php
new file mode 100644
index 00000000..c45c49d9
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/DeleteServiceTypeLogic.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\ServiceTypes\Services\DeletesServiceType;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceType;
+use App\Classes\Modules\ServiceTypes\Standards\Rules\CanDeleteServiceType;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteServiceTypeLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Deleted Service Type',
+            'message' => 'You have successfully deleted a Service Type'
+        ];
+    }
+
+
+    /** @var CanDeleteServiceType */
+    private $canDeleteServiceType;
+
+    /** @var DeletesServiceType */
+    private $deletesServiceType;
+
+    /** @var FetchesServiceType */
+        private $fetchesServiceType;
+
+    /**
+     * DeleteServiceTypeLogic constructor.
+     * @param CanDeleteServiceType $canDeleteServiceType
+     * @param DeletesServiceType $deletesServiceType
+     * @param FetchesServiceType $fetchesServiceType
+     */
+    public function __construct(CanDeleteServiceType $canDeleteServiceType, DeletesServiceType $deletesServiceType, FetchesServiceType $fetchesServiceType)
+    {
+        $this->canDeleteServiceType = $canDeleteServiceType;
+        $this->deletesServiceType = $deletesServiceType;
+        $this->fetchesServiceType = $fetchesServiceType;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $this->canDeleteServiceType->passes();
+
+        $query = $this->fetchesServiceType->execute(['id' => $request->route('id')]);
+
+        $this->deletesServiceType->execute($query);
+
+        return $this->response([]);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/FetchServiceTypeLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/FetchServiceTypeLogic.php
new file mode 100644
index 00000000..f7835d34
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/FetchServiceTypeLogic.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceType;
+use App\Classes\Modules\ServiceTypes\Standards\Rules\CanFetchServiceType;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Http\Resources\ServiceTypeResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchServiceTypeLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Service Type',
+            'message' => 'You have successfully retrieved a Service Type'
+        ];
+    }
+
+    /** @var CanFetchServiceType */
+    private $canFetchServiceType;
+
+    /** @var FetchesServiceType */
+    private $fetchesServiceType;
+
+    /**
+     * FetchServiceTypeLogic constructor.
+     * @param CanFetchServiceType $canFetchServiceType
+     * @param FetchesServiceType $fetchesServiceType
+     */
+    public function __construct(CanFetchServiceType $canFetchServiceType, FetchesServiceType $fetchesServiceType)
+    {
+        $this->canFetchServiceType = $canFetchServiceType;
+        $this->fetchesServiceType = $fetchesServiceType;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canFetchServiceType->passes();
+
+        $query = $this->fetchesServiceType->execute(['id' => $request->route('id')]);
+
+        return $this->resourceResponse(new ServiceTypeResource($query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/ListServiceTypesLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/ListServiceTypesLogic.php
new file mode 100644
index 00000000..10b390ae
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/ListServiceTypesLogic.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\ServiceTypes\Services\ListsServiceTypes;
+use App\Classes\Modules\ServiceTypes\Standards\Rules\CanListServiceTypes;
+use App\Http\Resources\ServiceTypeResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListServiceTypesLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Service Types',
+            'message' => 'You have successfully retrieved a list of Service Types'
+        ];
+    }
+
+    /** @var CanListServiceTypes */
+    private $canListServiceTypes;
+
+    /** @var ListsServiceTypes */
+    private $listsServiceTypes;
+
+    /**
+     * ListServiceTypesControllerLogic constructor.
+     * @param CanListServiceTypes $canListServiceTypes
+     * @param ListsServiceTypes $listsServiceTypes
+     */
+    public function __construct(CanListServiceTypes $canListServiceTypes, ListsServiceTypes $listsServiceTypes)
+    {
+        $this->canListServiceTypes = $canListServiceTypes;
+        $this->listsServiceTypes = $listsServiceTypes;
+    }
+
+
+    /**
+     * @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
+    {
+        $this->canListServiceTypes->passes();
+
+        $query = $this->listsServiceTypes->execute($this->listsServiceTypes->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(ServiceTypeResource::collection($query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateCustomServiceConstantLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateCustomServiceConstantLogic.php
new file mode 100644
index 00000000..e08ef598
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateCustomServiceConstantLogic.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\CreatesConstant;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\Modules\Segments\Services\UpdatesConstant;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceDetailObject;
+use App\Classes\Modules\ServiceTypes\Services\CreatesServiceTypeConstantDetails;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceType;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\CustomServiceTypeResource;
+use App\Models\Segment;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCustomServiceConstantLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Segment Service',
+            'message' => 'You have successfully update a segments service configuration'
+        ];
+    }
+
+    /** @var FetchesServiceType */
+    private $fetchesServiceType;
+
+    /** @var CreatesServiceTypeConstantDetails */
+    private $createsServiceTypeConstantDetails;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /** @var UpdatesConstant */
+    private $updatesConstant;
+
+    /** @var CreatesConstant */
+    private $createsConstant;
+
+    /**
+     * UpdateCustomServiceConstantLogic constructor.
+     * @param FetchesServiceType $fetchesServiceType
+     * @param CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails
+     * @param FetchesSegment $fetchesSegment
+     * @param FetchesConstant $fetchesConstant
+     * @param UpdatesConstant $updatesConstant
+     * @param CreatesConstant $createsConstant
+     */
+    public function __construct(FetchesServiceType $fetchesServiceType, CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails, FetchesSegment $fetchesSegment, FetchesConstant $fetchesConstant, UpdatesConstant $updatesConstant, CreatesConstant $createsConstant)
+    {
+        $this->fetchesServiceType = $fetchesServiceType;
+        $this->createsServiceTypeConstantDetails = $createsServiceTypeConstantDetails;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->fetchesConstant = $fetchesConstant;
+        $this->updatesConstant = $updatesConstant;
+        $this->createsConstant = $createsConstant;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $service = $this->fetchesServiceType->execute(['id' => $request->input('id')]);
+
+        $customFields = $request->input('custom_fields');
+
+        $object = new ServiceDetailObject($service->id, $customFields['bank_id'], $customFields['service_charge'],
+            $customFields['minimum_charge'], $customFields['tax'], $customFields['po_limit'], $request->input('configurations.currencies'),
+            $request->input('configurations.active'), true);
+
+        $constantObject = new ConstantObject('Custom Service Type', SegmentConstants::CUSTOM_SERVICE_TYPE, $this->createsServiceTypeConstantDetails->execute($object, true));
+
+        /** @var Segment $segment */
+        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+        try {
+
+            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'custom_service_type' => $object->getId()]);
+
+            $this->updatesConstant->execute($constant, $constantObject);
+
+        } catch (ResourceNotFoundException $exception){
+
+            $constant = $this->createsConstant->execute($segment, $constantObject);
+        }
+
+
+        return $this->resourceResponse(new CustomServiceTypeResource($constant));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeLogic.php
new file mode 100644
index 00000000..51b88051
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeLogic.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\Modules\Segments\Services\UpdatesConstant;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceDetailObject;
+use App\Classes\Modules\ServiceTypes\Services\CreatesServiceTypeConstantDetails;
+use App\Classes\Modules\ServiceTypes\Services\UpdatesServiceCurrencyRates;
+use App\Classes\Modules\ServiceTypes\Services\UpdatesServiceType;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceType;
+use App\Classes\Modules\ServiceTypes\Standards\Rules\CanUpdateServiceType;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\ServiceTypeResource;
+use App\Models\ServiceType;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateServiceTypeLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Service Type',
+            'message' => 'You have successfully updated the Service Type'
+        ];
+    }
+
+    /** @var CanUpdateServiceType */
+    private $canUpdateServiceType;
+
+    /** @var UpdatesServiceType */
+    private $updatesServiceType;
+
+    /** @var FetchesServiceType */
+    private $fetchesServiceType;
+
+    /** @var CreatesServiceTypeConstantDetails */
+    private $createsServiceTypeConstantDetails;
+
+    /** @var UpdatesServiceCurrencyRates */
+    private $updatesServiceCurrencyRates;
+
+    /** @var UpdatesConstant */
+    private $updatesConstant;
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+
+    /**
+     * UpdateServiceTypeLogic constructor.
+     * @param CanUpdateServiceType $canUpdateServiceType
+     * @param UpdatesServiceType $updatesServiceType
+     * @param FetchesServiceType $fetchesServiceType
+     * @param CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails
+     * @param UpdatesServiceCurrencyRates $updatesServiceCurrencyRates
+     * @param UpdatesConstant $updatesConstant
+     * @param FetchesConstant $fetchesConstant
+     */
+    public function __construct(CanUpdateServiceType $canUpdateServiceType, UpdatesServiceType $updatesServiceType, FetchesServiceType $fetchesServiceType, CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails, UpdatesServiceCurrencyRates $updatesServiceCurrencyRates, UpdatesConstant $updatesConstant, FetchesConstant $fetchesConstant)
+    {
+        $this->canUpdateServiceType = $canUpdateServiceType;
+        $this->updatesServiceType = $updatesServiceType;
+        $this->fetchesServiceType = $fetchesServiceType;
+        $this->createsServiceTypeConstantDetails = $createsServiceTypeConstantDetails;
+        $this->updatesServiceCurrencyRates = $updatesServiceCurrencyRates;
+        $this->updatesConstant = $updatesConstant;
+        $this->fetchesConstant = $fetchesConstant;
+    }
+
+    /**
+     * @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
+    {
+        $object = new ServiceTypeObject($request->input('name'));
+
+        $this->canUpdateServiceType->passes($object);
+
+        $service = $this->fetchesServiceType->execute(['id' => $request->route('id')]);
+
+        /** @var ServiceType $service */
+        $service = $this->updatesServiceType->execute($service, $object);
+
+        $object = new ServiceDetailObject($service->id, (int) $request->input('configurations.bank_id'),
+            $request->input('configurations.service_charge'), $request->input('configurations.minimum_charge'), $request->input('configurations.tax'),
+            $request->input('configurations.po_limit'), $request->input('configurations.currencies'), $request->input('configurations.active'), $request->input('configurations.billable'));
+
+        $this->updatesServiceCurrencyRates->execute($service, $object->getCurrencies());
+
+        $constantObject = new ConstantObject('Service Type', SegmentConstants::SERVICE_TYPE, $this->createsServiceTypeConstantDetails->execute($object));
+
+        $this->updatesConstant->execute($this->fetchesConstant->execute(['service_type' => $service->id]), $constantObject);
+
+        return $this->resourceResponse(new ServiceTypeResource($service));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeStatusLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeStatusLogic.php
new file mode 100644
index 00000000..f1d75665
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeStatusLogic.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceType;
+use App\Classes\Modules\ServiceTypes\Services\UpdatesServiceTypeStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateServiceTypeStatusLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Service Type',
+            'message' => 'You have successfully updated a Service Type status'
+        ];
+    }
+
+    /** @var FetchesServiceType */
+    private $fetchesServiceType;
+
+    /** @var UpdatesServiceTypeStatus */
+    private $updatesServiceTypeStatus;
+
+    /**
+     * UpdateServiceTypeStatusLogic constructor.
+     * @param FetchesServiceType $fetchesServiceType
+     * @param UpdatesServiceTypeStatus $updatesServiceTypeStatus
+     */
+    public function __construct(FetchesServiceType $fetchesServiceType, UpdatesServiceTypeStatus $updatesServiceTypeStatus)
+    {
+        $this->fetchesServiceType = $fetchesServiceType;
+        $this->updatesServiceTypeStatus = $updatesServiceTypeStatus;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+
+        $query = $this->fetchesServiceType->execute(['id' => $request->route('id')]);
+
+        $this->updatesServiceTypeStatus->execute($query, $request->route('status') === 'active' ? ApprovalStatus::APPROVED : ApprovalStatus::SUSPENDED);
+
+        return $this->response([]);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/DataTransferObjects/CustomConfigurationsObject.php b/app/Classes/Modules/ServiceTypes/DataTransferObjects/CustomConfigurationsObject.php
new file mode 100644
index 00000000..b14caa8c
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/DataTransferObjects/CustomConfigurationsObject.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\DataTransferObjects;
+
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceCurrenciesConfigurations;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Models\SegmentConstant;
+use Illuminate\Support\Collection;
+
+class CustomConfigurationsObject implements DataTransferObject
+{
+
+
+    /** @var SegmentConstant  */
+    private $configurations;
+
+    /** @var SegmentConstant */
+    private $customOptions;
+
+    /**
+     * CustomConfigurationsObject constructor.
+     * @param SegmentConstant $configurations
+     * @param SegmentConstant $customOptions
+     */
+    public function __construct(SegmentConstant $configurations, SegmentConstant $customOptions)
+    {
+        $this->configurations = $configurations;
+        $this->customOptions = $customOptions;
+    }
+
+    /**
+     * @return SegmentConstant
+     */
+    public function getConfigurations(): SegmentConstant
+    {
+        return $this->configurations;
+    }
+
+    /**
+     * @return SegmentConstant
+     */
+    public function getCustomOptions(): SegmentConstant
+    {
+        return $this->customOptions;
+    }
+
+
+    /**
+     * @param string $name
+     * @return mixed
+     */
+    public function getConfigurationValue(string $name) {
+        return property_exists($this->getCustomOptions()->detail, $name) ?
+            $this->getCustomOptions()->detail->$name: $this->configurations->detail->$name;
+    }
+
+
+    /**
+     * @return mixed
+     */
+    public function calculateServiceCharge(){
+        return ($this->getConfigurationValue('service_charge')->value * 0.01) > $this->getConfigurationValue('minimum_charge')->value ?
+            $this->getConfigurationValue('service_charge')->value : $this->getConfigurationValue('minimum_charge')->value;
+    }
+
+    /**
+     * @return float
+     */
+    public function calculateTax(){
+        return $this->getConfigurationValue('tax')->value * 0.01;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceConfigurationsObject.php b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceConfigurationsObject.php
new file mode 100644
index 00000000..95b5fd52
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceConfigurationsObject.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\DataTransferObjects;
+
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceCurrenciesConfigurations;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Models\SegmentConstant;
+use App\Models\ServiceType;
+use Illuminate\Support\Collection;
+
+class ServiceConfigurationsObject implements DataTransferObject
+{
+
+    /** @var ServiceType */
+    private $service;
+
+    /** @var SegmentConstant  */
+    private $configurations;
+
+    /** @var Collection */
+    private $customOptions;
+
+    /**
+     * ServiceConfigurationsObject constructor.
+     * @param ServiceType $service
+     * @param SegmentConstant $configurations
+     * @param Collection $customOptions
+     */
+    public function __construct(ServiceType $service, SegmentConstant $configurations, Collection $customOptions)
+    {
+        $this->service = $service;
+        $this->configurations = $configurations;
+        $this->customOptions = $customOptions;
+    }
+
+    /**
+     * @return ServiceType
+     */
+    public function getService(): ServiceType
+    {
+        return $this->service;
+    }
+
+
+
+    /**
+     * @return SegmentConstant
+     */
+    public function getConfigurations(): SegmentConstant
+    {
+        return $this->configurations;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getCustomOptions(): Collection
+    {
+        return $this->customOptions->map(function($value){
+            return new CustomConfigurationsObject($this->getConfigurations(), $value);
+        });
+    }
+
+    public function getBaseCurrencyRates(){
+        return (App()->make(FetchesServiceCurrenciesConfigurations::class))->execute($this->configurations, SegmentConstants::SERVICE_TYPE);
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceCurrenciesObject.php b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceCurrenciesObject.php
new file mode 100644
index 00000000..fa32e5dd
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceCurrenciesObject.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
+
+class ServiceCurrenciesObject implements DataTransferObject
+{
+
+    /** @var int */
+    private $id;
+
+    /** @var boolean */
+    private $isActive;
+
+    /** @var array */
+    private $maxLimit;
+
+    /** @var array */
+    private $minLimit;
+
+    /** @var array */
+    private $rates;
+
+    /**
+     * ServiceCurrenciesObject constructor.
+     * @param int $id
+     * @param bool $isActive
+     * @param array $maxLimit
+     * @param array $minLimit
+     * @param array $rates
+     */
+    public function __construct(int $id, bool $isActive, array $maxLimit, array $minLimit, array $rates)
+    {
+        $this->id = $id;
+        $this->isActive = $isActive;
+        $this->maxLimit = $maxLimit;
+        $this->minLimit = $minLimit;
+        $this->rates = $rates;
+    }
+
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isActive(): bool
+    {
+        return $this->isActive;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMaxLimit(): array
+    {
+        return $this->maxLimit;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMinLimit(): array
+    {
+        return $this->minLimit;
+    }
+
+
+    /**
+     * @return array
+     */
+    public function getRates(): array
+    {
+        return array_map(function($rate){
+            return new RateObject($rate['selling'], $rate['payment_method']);
+        }, $this->rates);
+    }
+
+
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceDetailObject.php b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceDetailObject.php
new file mode 100644
index 00000000..233d1fb3
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceDetailObject.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class ServiceDetailObject implements DataTransferObject
+{
+
+    /** @var int */
+    private $id;
+
+    /** @var int|null */
+    private $bankId;
+
+    /** @var array|null */
+    private $serviceCharge;
+
+    /** @var array|null */
+    private $minimumCharge;
+
+    /** @var array|null */
+    private $tax;
+
+    /** @var array|null */
+    private $poLimit;
+
+    /** @var array|null */
+    private $currencies;
+
+    /** @var boolean */
+    private $isActive;
+
+    /** @var boolean */
+    private $isBillable;
+
+    /**
+     * ServiceDetailObject constructor.
+     * @param int $id
+     * @param int|null $bankId
+     * @param array|null $serviceCharge
+     * @param array|null $minimumCharge
+     * @param array|null $tax
+     * @param array|null $poLimit
+     * @param array|null $currencies
+     * @param bool $isActive
+     * @param bool $isBillable
+     */
+    public function __construct(int $id, ?int $bankId, ?array $serviceCharge, ?array $minimumCharge, ?array $tax, ?array $poLimit, ?array $currencies, bool $isActive, bool $isBillable)
+    {
+        $this->id = $id;
+        $this->bankId = $bankId;
+        $this->serviceCharge = $serviceCharge;
+        $this->minimumCharge = $minimumCharge;
+        $this->tax = $tax;
+        $this->poLimit = $poLimit;
+        $this->currencies = $currencies;
+        $this->isActive = $isActive;
+        $this->isBillable = $isBillable;
+    }
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getBankId(): ?int
+    {
+        return $this->bankId;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getServiceCharge(): ?array
+    {
+        return $this->serviceCharge;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getMinimumCharge(): ?array
+    {
+        return $this->minimumCharge;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getTax(): ?array
+    {
+        return $this->tax;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getPoLimit(): ?array
+    {
+        return $this->poLimit;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isActive(): bool
+    {
+        return $this->isActive;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isBillable(): bool
+    {
+        return $this->isBillable;
+    }
+
+
+    /**
+     * @return array|null
+     */
+    public function getCurrencies(): ?array
+    {
+        return array_map(function($currency){
+            return new ServiceCurrenciesObject($currency['id'], $currency['active'], $currency['maximum_limit'], $currency['minimum_limit'], $currency['rates']);
+        }, $this->currencies);
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceTypeObject.php b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceTypeObject.php
new file mode 100644
index 00000000..f65b7262
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceTypeObject.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\DataTransferObjects;
+
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class ServiceTypeObject implements DataTransferObject
+{
+
+    /** @var string */
+    private $name;
+
+    /**
+     * ServiceTypeObject constructor.
+     * @param string $name
+     */
+    public function __construct(string $name)
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/CreatesServiceType.php b/app/Classes/Modules/ServiceTypes/Services/CreatesServiceType.php
new file mode 100644
index 00000000..e9c05e94
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/CreatesServiceType.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Models\ServiceType;
+
+class CreatesServiceType extends AbstractUpdateRecord
+{
+
+    public function execute(ServiceTypeObject $object) {
+        $model = new ServiceType();
+        $model->name = $object->getName();
+
+        return $this->handler($model);
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/CreatesServiceTypeConstantDetails.php b/app/Classes/Modules/ServiceTypes/Services/CreatesServiceTypeConstantDetails.php
new file mode 100644
index 00000000..aacf66f1
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/CreatesServiceTypeConstantDetails.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+
+use App\Classes\General\Helper;
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceCurrenciesObject;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceDetailObject;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use Illuminate\Support\Str;
+
+class CreatesServiceTypeConstantDetails
+{
+
+    /** @var array */
+    private $ConstantDetails;
+
+
+    /**
+     * @param ServiceDetailObject $object
+     * @param bool|null $isCustomSegment
+     * @return array
+     */
+    public function execute(ServiceDetailObject $object, ?bool $isCustomSegment = false) {
+
+        foreach (Helper::getClassMethodsArray(ServiceDetailObject::class) as $methodName){
+
+            if(Helper::getPropertyName($methodName) === 'currencies'){
+
+                $this->mapCurrencies($object->$methodName(), $isCustomSegment);
+
+                continue;
+            }
+
+            $this->addToConstantDetails($methodName, $this->cleanValue($object->$methodName()));
+
+        }
+
+        return $this->ConstantDetails;
+
+    }
+
+    /**
+     * @param array $currencies
+     * @param bool $isCustomSegment
+     */
+    private function mapCurrencies(array $currencies, bool $isCustomSegment){
+
+        $isEmpty = true;
+        foreach ($currencies as $currency){
+
+            if(!$currency->isActive()) { continue; }
+
+            $currencyObject = [];
+
+
+            foreach (Helper::getClassMethodsArray(ServiceCurrenciesObject::class) as $methodName){
+
+                if($methodName === 'isActive') continue;
+                if($methodName === 'getRates') {
+                    $currencyObject['rates'] = $this->mapRates($currency->$methodName(), $isCustomSegment);
+                    continue;
+                }
+
+                $value = $this->cleanValue($currency->$methodName());
+
+                if($this->isAddable($value)) {
+                    $isEmpty = false;
+                    $currencyObject[Helper::getPropertyName($methodName)] = $value;
+                }
+
+            }
+
+            $this->addToCurrencyDetails($currencyObject);
+
+        }
+
+        if($isEmpty) $this->ConstantDetails['currencies'] = [];
+
+    }
+
+    private function mapRates(array $rates, bool $isCustomSegment){
+
+        if(!$isCustomSegment) return [];
+
+        $ratesObject = [];
+
+        /** @var RateObject $rate */
+        foreach ($rates as $rate){
+
+            $selling = $this->cleanValue($rate->getSelling());
+
+            if(!$selling['value']) continue;
+
+            $ratesObject[] = [
+                'payment_type' => $rate->getPaymentMethodType(),
+                'payment_method' => PaymentMethodType::PAYMENT_METHODS_ID[$rate->getPaymentMethodType()],
+                'selling' => $rate->getSelling()
+            ];
+
+        }
+        return $ratesObject;
+
+    }
+
+
+    /**
+     * @param string $methodName
+     * @param $value
+     */
+    private function addToConstantDetails(string $methodName, $value){
+        $this->isAddable($value) ? $this->ConstantDetails[Helper::getPropertyName($methodName)] = $value : null;
+    }
+
+    /**
+     * @param $value
+     * @return bool
+     */
+    private function isAddable($value){
+
+        return $value !== '' && $value !== null;
+    }
+
+    private function cleanValue($value){
+
+        if(is_array($value)) {
+            if(array_key_exists('value', $value)) $value['value'] = floatval(str_replace(',', '', $value['value']));
+        }
+
+        return $value;
+    }
+
+    /**
+     * @param array $value
+     */
+    private function addToCurrencyDetails(array $value){
+        $this->ConstantDetails['currencies'][] = $value;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/DeletesServiceType.php b/app/Classes/Modules/ServiceTypes/Services/DeletesServiceType.php
new file mode 100644
index 00000000..3cc4d69d
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/DeletesServiceType.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Models\ServiceType;
+
+class DeletesServiceType extends AbstractDeleteRecord
+{
+
+    public function execute(ServiceType $model) {
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/FetchesServiceConfigurations.php b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceConfigurations.php
new file mode 100644
index 00000000..b4230257
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceConfigurations.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Models\SegmentConstant;
+
+class FetchesServiceConfigurations
+{
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /** @var FetchesServiceCurrenciesConfigurations */
+    private $fetchesServiceCurrenciesConfigurations;
+
+    /**
+     * FetchesServiceConfigurations constructor.
+     * @param FetchesConstant $fetchesConstant
+     * @param FetchesServiceCurrenciesConfigurations $fetchesServiceCurrenciesConfigurations
+     */
+    public function __construct(FetchesConstant $fetchesConstant, FetchesServiceCurrenciesConfigurations $fetchesServiceCurrenciesConfigurations)
+    {
+        $this->fetchesConstant = $fetchesConstant;
+        $this->fetchesServiceCurrenciesConfigurations = $fetchesServiceCurrenciesConfigurations;
+    }
+
+
+    public function execute(SegmentConstant $constant, string $type){
+
+        return array_merge([
+            'active' => (int) $constant->detail->is_active ?? false,
+            'billable' => (int) $constant->detail->is_billable ?? false,
+            'bank_id' => $constant->detail->bank_id ?? '',
+            'currencies' => $this->fetchesServiceCurrenciesConfigurations->execute($constant)
+        ], $this->addConfigurations($constant)->toArray());
+
+    }
+
+    private function addConfigurations(SegmentConstant $constant) {
+
+        $configurations = collect(['service_charge', 'minimum_charge', 'tax', 'po_limit']);
+
+        return $configurations->flatMap(function($configuration) use($constant) {
+            if(!property_exists($constant->detail, $configuration)) return [];
+
+            return [$configuration => [
+                'type' => $constant->detail->$configuration->type,
+                'value' =>  $configuration !== 'po_limit' ? $this->covertToDecimal($constant->detail->$configuration->value) : $constant->detail->$configuration->value
+            ]];
+
+        });
+
+    }
+
+    private function covertToDecimal($value){
+        return number_format((float)$value, 2, '.', '');
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/FetchesServiceCurrenciesConfigurations.php b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceCurrenciesConfigurations.php
new file mode 100644
index 00000000..7d00225a
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceCurrenciesConfigurations.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+
+use App\Classes\Modules\Currencies\Services\FetchesCurrency;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\CurrencyResource;
+use App\Models\SegmentConstant;
+use Illuminate\Database\Eloquent\Collection;
+
+class FetchesServiceCurrenciesConfigurations
+{
+
+    /** @var FetchesCurrency */
+    private $fetchesCurrency;
+
+    /**
+     * FetchesServiceCurrenciesConfigurations constructor.
+     * @param FetchesCurrency $fetchesCurrency
+     */
+    public function __construct(FetchesCurrency $fetchesCurrency)
+    {
+        $this->fetchesCurrency = $fetchesCurrency;
+    }
+
+    public function execute(SegmentConstant $constants){
+
+        $currencies = array_map(function($configuration) use($constants){
+
+            $currency = $this->fetchesCurrency->execute(['id' => $configuration->id]);
+
+            if(! $currency->exists()) return [];
+
+            return json_decode(json_encode([
+                'currency_object' => new CurrencyResource($currency),
+                'id' => $configuration->id,
+                'active' => true,
+                'maximum_limit' => [
+                    'type' => $configuration->max_limit->type,
+                    'value' => number_format((float)$configuration->max_limit->value, 2, '.', ',')
+                ],
+                'minimum_limit' => [
+                    'type' => $configuration->min_limit->type,
+                    'value' => number_format((float)$configuration->min_limit->value, 2, '.', ',')
+                ],
+                'rates' => $constants->reference === SegmentConstants::SERVICE_TYPE ? $this->standardRates($currency->rates->where('service_id', $constants->detail->id)) : $configuration->rates
+            ]));
+
+        }, $constants->detail->currencies);
+
+        return array_filter($currencies);
+
+    }
+
+    private function standardRates(Collection $rates){
+        return $rates->map(function($rate){
+            return [
+                'payment_method' => PaymentMethodType::PAYMENT_METHODS_ID[$rate->payment_method_type],
+                'selling' => [
+                    'type' => 'rate',
+                    'value' => $rate->selling
+                ]
+            ];
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/FetchesServiceType.php b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceType.php
new file mode 100644
index 00000000..7b5899fa
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceType.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\ServiceType;
+
+class FetchesServiceType extends AbstractFetchRecord
+{
+
+    /** @var ServiceType */
+    private $repository;
+
+    /**
+     * FetchesServiceType constructor.
+     * @param ServiceType $repository
+     */
+    public function __construct(ServiceType $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/ListsServiceTypes.php b/app/Classes/Modules/ServiceTypes/Services/ListsServiceTypes.php
new file mode 100644
index 00000000..344d6c4d
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/ListsServiceTypes.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\ServiceType;
+
+class ListsServiceTypes extends AbstractListRecord
+{
+
+    /** @var ServiceType */
+    private $repository;
+
+    /**
+     * ListsServiceTypes constructor.
+     * @param ServiceType $repository
+     */
+    public function __construct(ServiceType $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceCurrencyRates.php b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceCurrencyRates.php
new file mode 100644
index 00000000..019d30b4
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceCurrencyRates.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
+use App\Classes\Modules\Currencies\Services\Rates\CreatesRateLog;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceCurrenciesObject;
+use App\Models\CurrencyRate;
+use App\Models\ServiceType;
+
+class UpdatesServiceCurrencyRates
+{
+
+    /** @var CreatesRateLog */
+    private $createsRateLog;
+
+    /**
+     * UpdatesServiceCurrencyRates constructor.
+     * @param CreatesRateLog $createsRateLog
+     */
+    public function __construct(CreatesRateLog $createsRateLog)
+    {
+        $this->createsRateLog = $createsRateLog;
+    }
+
+
+    /**
+     * @param ServiceType $service
+     * @param array $currencies
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(ServiceType $service, array $currencies){
+
+        /** @var ServiceCurrenciesObject $currency */
+        foreach ($currencies as $currency) {
+
+            /** @var RateObject $rate */
+            foreach ($currency->getRates() as $rate){
+                if($rate->getSelling()['value'] > 0){
+                    /** @var CurrencyRate $query */
+                    $query = $service->rates()->updateOrCreate([
+                        'currency_id' => $currency->getId(),
+                        'payment_method_type' => $rate->getPaymentMethodType()
+                    ], ['selling' => $rate->getSelling()['value']]);
+
+                    $this->createsRateLog->execute($query);
+                }
+
+            }
+
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceType.php b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceType.php
new file mode 100644
index 00000000..06bd1e4f
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceType.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Models\ServiceType;
+
+class UpdatesServiceType extends AbstractUpdateRecord
+{
+
+    public function execute(ServiceType $model, ServiceTypeObject $object) {
+
+        $model->name = $object->getName();
+
+        return $this->handler($model);
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceTypeStatus.php b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceTypeStatus.php
new file mode 100644
index 00000000..065b218e
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceTypeStatus.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Models\ServiceType;
+
+class UpdatesServiceTypeStatus extends AbstractUpdateRecord
+{
+
+    public function execute(ServiceType $model, int $status) {
+
+        $model->status = $status;
+
+        return $this->handler($model);
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Rules/CanCreateServiceType.php b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanCreateServiceType.php
new file mode 100644
index 00000000..0fb57c32
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanCreateServiceType.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Classes\Modules\ServiceTypes\Standards\Validators\ServiceTypeValidation;
+
+class CanCreateServiceType extends AbstractRule
+{
+
+    /** @var ServiceTypeValidation */
+    private $serviceTypeValidation;
+
+    /**
+     * CanCreateServiceType constructor.
+     * @param ServiceTypeValidation $serviceTypeValidation
+     */
+    public function __construct(ServiceTypeValidation $serviceTypeValidation)
+    {
+        $this->serviceTypeValidation = $serviceTypeValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->serviceTypeValidation->validate($object);
+
+    }
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Rules/CanDeleteServiceType.php b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanDeleteServiceType.php
new file mode 100644
index 00000000..1a832257
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanDeleteServiceType.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+
+class CanDeleteServiceType extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Rules/CanFetchServiceType.php b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanFetchServiceType.php
new file mode 100644
index 00000000..e76497c8
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanFetchServiceType.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+
+class CanFetchServiceType extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Rules/CanListServiceTypes.php b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanListServiceTypes.php
new file mode 100644
index 00000000..44dc0e8b
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanListServiceTypes.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+
+class CanListServiceTypes extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Rules/CanUpdateServiceType.php b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanUpdateServiceType.php
new file mode 100644
index 00000000..0e066109
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanUpdateServiceType.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Classes\Modules\ServiceTypes\Standards\Validators\ServiceTypeValidation;
+
+class CanUpdateServiceType extends AbstractRule
+{
+
+    /** @var ServiceTypeValidation */
+    private $serviceTypeValidation;
+
+    /**
+     * CanUpdateServiceType constructor.
+     * @param ServiceTypeValidation $serviceTypeValidation
+     */
+    public function __construct(ServiceTypeValidation $serviceTypeValidation)
+    {
+        $this->serviceTypeValidation = $serviceTypeValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->serviceTypeValidation->validate($object);
+
+    }
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Validators/ServiceTypeValidation.php b/app/Classes/Modules/ServiceTypes/Standards/Validators/ServiceTypeValidation.php
new file mode 100644
index 00000000..86946a39
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Validators/ServiceTypeValidation.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Validators;
+
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+
+class ServiceTypeValidation extends AbstractValidation
+{
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return array
+     */
+    protected function data($object): array {
+        return [
+            'name' => $object->getName()
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array {
+        return [
+            'name' => 'required'
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array {
+        return [];
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateMakePaymentPOTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateMakePaymentPOTransactionLogic.php
index 7f9de898..48616385 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/CreateMakePaymentPOTransactionLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateMakePaymentPOTransactionLogic.php
@@ -2,15 +2,15 @@
 
 namespace App\Classes\Modules\Transactions\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
 
+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\GeneratesTransactionBillNo;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
 use App\Http\Resources\TransactionResource;
 use App\Http\Resources\TransactionDetailResource;
 
@@ -21,8 +21,6 @@ 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\Http\Resources\ReceiptResource;
-use App\Http\Resources\ReceiptDetailResource;
 
 use App\Classes\Modules\Currencies\Services\FetchesCurrency;
 use App\Classes\Modules\Currencies\Services\RateCalculatesCurrency;
@@ -37,8 +35,6 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-use App\Models\TransactionDetail;
-
 class CreateMakePaymentPOTransactionLogic extends AbstractControllerLogic
 {
 
@@ -54,7 +50,7 @@ class CreateMakePaymentPOTransactionLogic extends AbstractControllerLogic
     }
 
     
-    /** @var GeneratesTransactionBillNo */
+    /** @var GeneratesTransactionBillNumber */
     private $generatesTransactionBillNo;
 
     /** @var CanCreateTransaction */
@@ -89,7 +85,7 @@ class CreateMakePaymentPOTransactionLogic extends AbstractControllerLogic
 
     /**
      * CreateWalletLogic constructor.
-     * @param GeneratesTransactionBillNo $generatesTransactionBillNo
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNo
      * @param CanCreateTransaction $canCreateTransaction
      * @param FetchesCurrency $fetchesCurrency
      * @param RateCalculatesCurrency $rateCalculatesCurrency
@@ -97,16 +93,23 @@ class CreateMakePaymentPOTransactionLogic extends AbstractControllerLogic
      * @param CreatesTransaction $createsTransaction
      * @param CanCreateTransactionDetail $canCreateTransactionDetail
      * @param CreatesTransactionDetail $createsTransactionDetail
+     * @param FetchesTransaction $fetchesTransaction
+     * @param FetchesTransactionDetail $fetchesTransactionDetail
+     * @param GeneratesReceiptBillNo $generatesReceiptBillNo
+     * @param CanCreateReceipt $canCreateReceipt
+     * @param CreatesReceipt $createsReceipt
+     * @param CanCreateReceiptDetail $canCreateReceiptDetail
+     * @param CreatesReceiptDetail $createsReceiptDetail
      */
     public function __construct(
-            GeneratesTransactionBillNo $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
+        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;
@@ -137,7 +140,6 @@ class CreateMakePaymentPOTransactionLogic extends AbstractControllerLogic
         try {
 
             DB::beginTransaction();
-            DB::enableQueryLog();
             $json_array = json_decode($request->getContent(), true);
             
             $po_transaction = $this->fetchesTransaction->execute(['id' => $json_array['ref_po']]);
@@ -190,14 +192,13 @@ class CreateMakePaymentPOTransactionLogic extends AbstractControllerLogic
                 $transaction->amount, $transaction->amount
             );
             $this->canCreateReceiptDetail->passes($object_detail);
-            $transaction_detail = $this->createsReceiptDetail->execute($object_detail);
+            $this->createsReceiptDetail->execute($object_detail);
                            
             
             DB::commit();
 
             return $this->resourceResponse($transaction_array);
             
-            return $this->resourceResponse($json_array);
 
         } catch (\Exception $exception) {
             throw new ErrorException($exception->getMessage(), $exception->getCode());
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreatePaymentProofDocumentLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreatePaymentProofDocumentLogic.php
new file mode 100644
index 00000000..da5c23b6
--- /dev/null
+++ b/app/Classes/Modules/Transactions/ControllersLogic/CreatePaymentProofDocumentLogic.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyStatus;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\CompanyType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Models\Company;
+use App\Models\Document;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreatePaymentProofDocumentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Payment Proof Document',
+            'message' => 'You have successfully submitted your payment proof document'
+        ];
+    }
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFile;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /**
+     * CreatePaymentVerificationDocumentLogic constructor.
+     * @param FetchesTransaction $fetchesTransaction
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFile
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     */
+    public function __construct(FetchesTransaction $fetchesTransaction, CreatesDocument $createsDocument, CreatesFiles $createsFile, UpdatesTransactionStatus $updatesTransactionStatus)
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->createsDocument = $createsDocument;
+        $this->createsFile = $createsFile;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
+
+        $object = new DocumentObject(DocumentType::CUSTOMER_PAYMENT_PROOF, $request->input('files'), '', ApprovalStatus::APPROVED, 'china_bank_slip');
+
+        /** @var Document $document */
+        $document = $this->createsDocument->execute($transaction, $object);
+
+        $this->createsFile->execute($document, $object);
+
+        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::COMPLETED);
+        return $this->response([]);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreatePurchaseOrderTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreatePurchaseOrderTransactionLogic.php
new file mode 100644
index 00000000..2ff128e3
--- /dev/null
+++ b/app/Classes/Modules/Transactions/ControllersLogic/CreatePurchaseOrderTransactionLogic.php
@@ -0,0 +1,126 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Bookings\Services\FetchesBooking;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
+use App\Classes\Modules\Transactions\Services\DeletesTransactionDetails;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Transactions\Services\UpdatesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Http\Resources\TransactionResource;
+use App\Models\Booking;
+use App\Models\Transaction;
+use Barryvdh\DomPDF\PDF;
+use Carbon\Carbon;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+
+class CreatePurchaseOrderTransactionLogic extends AbstractControllerLogic
+{
+    /**
+     * CreatePurchaseOrderTransactionLogic constructor.
+     * @param FetchesBooking $fetchesBooking
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param CreatesTransaction $createsTransaction
+     * @param CreatesTransactionDetail $createsTransactionDetail
+     * @param UpdatesTransaction $updatesTransaction
+     * @param DeletesTransactionDetails $deletesTransactionDetails
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     */
+    public function __construct(FetchesBooking $fetchesBooking, UpdatesTransactionStatus $updatesTransactionStatus, CreatesTransaction $createsTransaction, CreatesTransactionDetail $createsTransactionDetail, UpdatesTransaction $updatesTransaction, DeletesTransactionDetails $deletesTransactionDetails, GeneratesTransactionBillNumber $generatesTransactionBillNumber)
+    {
+        $this->fetchesBooking = $fetchesBooking;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->createsTransaction = $createsTransaction;
+        $this->createsTransactionDetail = $createsTransactionDetail;
+        $this->updatesTransaction = $updatesTransaction;
+        $this->deletesTransactionDetails = $deletesTransactionDetails;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+    }
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Purchase Order',
+            'message' => 'You have successfully updated you booking\'s purchase order'
+        ];
+    }
+
+    /** @var FetchesBooking */
+    private $fetchesBooking;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var CreatesTransactionDetail */
+    private $createsTransactionDetail;
+
+    /** @var UpdatesTransaction */
+    private $updatesTransaction;
+
+    /** @var DeletesTransactionDetails */
+    private $deletesTransactionDetails;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        /** @var Booking $booking */
+        $booking = $this->fetchesBooking->execute(['id' => $request->route('id')]);
+
+        /** @var Transaction $transaction */
+        $transaction = $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first();
+
+        $billNumber = $this->generatesTransactionBillNumber->execute('PO-');
+
+        $total = collect($request->input('products'))->sum(function($product){
+            return $product['quantity'] * floatval(str_replace(',', '', $product['unit_price']));
+        });
+
+        $object = new TransactionObject($billNumber, TransactionType::PURCHASE_ORDER, $booking->company->id, 1,
+            1, PaymentMethodType::CASH,
+            $total, $total, $booking->fix_currency_id, $booking->fix_currency_id,
+            1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, $request->input('products'));
+
+        !$transaction ? $transaction = $this->createsTransaction->execute($booking, $object) : $transaction = $this->updatesTransaction->execute($transaction, $object);
+
+        $this->updatesTransactionStatus->execute($transaction, $total === $booking->fix_amount ? ApprovalStatus::PENDING_VERIFICATION : ApprovalStatus::PENDING_SUBMISSION);
+
+        $this->deletesTransactionDetails->execute($transaction);
+
+        foreach ($object->getDetails() as $product){
+            $this->createsTransactionDetail->execute($transaction, $product);
+        }
+
+        return $this->resourceResponse(new TransactionResource($transaction));
+
+    }
+
+
+
+}
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
new file mode 100644
index 00000000..e14b0a67
--- /dev/null
+++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
@@ -0,0 +1,112 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Transaction;
+use Barryvdh\DomPDF\PDF;
+use Carbon\Carbon;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+
+class CreateSupplierTransactionLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Create Supplier Transactions',
+            'message' => 'You have successfully created currency supplier transactions'
+        ];
+    }
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var PDF */
+    private $pdf;
+
+    /**
+     * CreateSupplierTransactionLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param FetchesTransaction $fetchesTransaction
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param CreatesTransaction $createsTransaction
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param PDF $pdf
+     */
+    public function __construct(FetchesCompany $fetchesCompany, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, CreatesTransaction $createsTransaction, GeneratesTransactionBillNumber $generatesTransactionBillNumber, PDF $pdf)
+    {
+
+        $this->fetchesCompany = $fetchesCompany;
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->createsTransaction = $createsTransaction;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->pdf = $pdf;
+    }
+
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $supplier = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+
+        $rate =  $request->input('rate');
+
+        $transactions = collect();
+
+        foreach($request->input('payments') as $payment){
+
+            /** @var Transaction $payment */
+            $payment = $this->fetchesTransaction->execute(['id' => $payment['id']]);
+            $this->updatesTransactionStatus->execute($payment, ApprovalStatus::COMPLETED);
+            $billNumber = $this->generatesTransactionBillNumber->execute('SPLR-');
+            $object = new TransactionObject($billNumber, TransactionType::BILL, $supplier->id, 1,
+                $supplier->banks()->where('default', true)->first()->id, PaymentMethodType::CASH,
+                $payment->amount * (1 / $rate), $payment->original_amount, 1, $payment->original_currency_id,
+                $rate, 0, 0, null, ApprovalStatus::APPROVED);
+
+            $transactions[] = $this->createsTransaction->execute($payment->booking, $object);
+
+        }
+
+        $pdf = $this->pdf->loadView('pages.pdfs.supplier_order', ['transactions' => $transactions, 'supplier' => $supplier]);
+
+        $path = Str::studly($supplier->name).'_'.Carbon::now()->format('Y_m_d_h_s_i').'.pdf';
+
+        Storage::disk('documents')->put('supplier_orders/'.$path, $pdf->output());
+
+        return $this->response([]);
+
+    }
+
+
+
+}
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateTransactionLogic.php
index 5bd0e4c5..02b69481 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/CreateTransactionLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateTransactionLogic.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Transactions\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 
 use App\Classes\Modules\Transactions\Standards\Rules\CanCreateTransaction;
 use App\Classes\Modules\Transactions\Standards\Rules\CanCreateTransactionDetail;
@@ -10,7 +10,7 @@ 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\GeneratesTransactionBillNo;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
 use App\Http\Resources\TransactionResource;
 use App\Http\Resources\TransactionDetailResource;
 
@@ -24,7 +24,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class CreateTransactionLogic extends AbstractControllersLogic
+class CreateTransactionLogic extends AbstractControllerLogic
 {
 
 
@@ -39,7 +39,7 @@ class CreateTransactionLogic extends AbstractControllersLogic
     }
 
     
-    /** @var GeneratesTransactionBillNo */
+    /** @var GeneratesTransactionBillNumber */
     private $generatesTransactionBillNo;
 
     /** @var CanCreateTransaction */
@@ -59,7 +59,7 @@ class CreateTransactionLogic extends AbstractControllersLogic
 
     /**
      * CreateWalletLogic constructor.
-     * @param GeneratesTransactionBillNo $generatesTransactionBillNo
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNo
      * @param CanCreateTransaction $canCreateTransaction
      * @param FetchesCurrency $fetchesCurrency
      * @param RateCalculatesCurrency $rateCalculatesCurrency
@@ -69,10 +69,10 @@ class CreateTransactionLogic extends AbstractControllersLogic
      * @param CreatesTransactionDetail $createsTransactionDetail
      */
     public function __construct(
-            GeneratesTransactionBillNo $generatesTransactionBillNo, CanCreateTransaction $canCreateTransaction,
-            FetchesCurrency $fetchesCurrency,RateCalculatesCurrency $rateCalculatesCurrency, FetchesCompany $fetchesCompany,
-            CreatesTransaction $createsTransaction,
-            CanCreateTransactionDetail $canCreateTransactionDetail, CreatesTransactionDetail $createsTransactionDetail
+        GeneratesTransactionBillNumber $generatesTransactionBillNo, CanCreateTransaction $canCreateTransaction,
+        FetchesCurrency $fetchesCurrency, RateCalculatesCurrency $rateCalculatesCurrency, FetchesCompany $fetchesCompany,
+        CreatesTransaction $createsTransaction,
+        CanCreateTransactionDetail $canCreateTransactionDetail, CreatesTransactionDetail $createsTransactionDetail
     ){
         $this->generatesTransactionBillNo = $generatesTransactionBillNo;
         $this->canCreateTransaction = $canCreateTransaction;
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsLogic.php
new file mode 100644
index 00000000..15cb9bfc
--- /dev/null
+++ b/app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsLogic.php
@@ -0,0 +1,50 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
+use App\Http\Resources\BookingResource;
+use App\Http\Resources\TransactionResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListTransactionsLogic extends AbstractControllerLogic
+{
+    /**
+     * ListTransactionsLogic constructor.
+     * @param ListsTransactions $listsTransactions
+     */
+    public function __construct(ListsTransactions $listsTransactions)
+    {
+        $this->listsTransactions = $listsTransactions;
+    }
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Transactions',
+            'message' => 'You have successfully retrieved a list of transactions'
+        ];
+    }
+
+    /** @var ListsTransactions */
+    private $listsTransactions;
+
+
+
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(TransactionResource::collection($query));
+
+    }
+
+
+
+}
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/SuspendTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/SuspendTransactionLogic.php
new file mode 100644
index 00000000..07050078
--- /dev/null
+++ b/app/Classes/Modules/Transactions/ControllersLogic/SuspendTransactionLogic.php
@@ -0,0 +1,61 @@
+<?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 SuspendTransactionLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Suspend Transaction',
+            'message' => 'You have successfully suspended the payment attempt'
+        ];
+    }
+
+    /** @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
+    {
+
+        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
+
+        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::SUSPENDED);
+
+        return $this->response([]);
+
+    }
+
+
+
+}
diff --git a/app/Classes/Modules/Transactions/DataTransferObjects/TransactionDetailObject.php b/app/Classes/Modules/Transactions/DataTransferObjects/TransactionDetailObject.php
index 81fe6d23..a2e0d7be 100644
--- a/app/Classes/Modules/Transactions/DataTransferObjects/TransactionDetailObject.php
+++ b/app/Classes/Modules/Transactions/DataTransferObjects/TransactionDetailObject.php
@@ -2,112 +2,72 @@
 
 namespace App\Classes\Modules\Transactions\DataTransferObjects;
 
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
 
 class TransactionDetailObject implements DataTransferObject
 {
+    /** @var string */
+    private $code;
 
-    /*
-     * 
-     * $table->string('trans_type1');
-            $table->string('trans_type2');
-            $table->bigInteger('transaction_id')->unsigned();
-            $table->string('product_code');
-            $table->string('product_name');
-            $table->integer('qty')->default(0);
-            $table->decimal('price', 14, 5)->default(0.00);
-            $table->decimal('amount', 14, 5)->default(0.00);
-     */
-    private $trans_type1;
-    
-    private $trans_type2;
-    
-    private $transaction_id;
-    
-    private $product_code;
-    
-    private $product_name;
-    
-    private $qty;
-    
+    /** @var string */
+    private $name;
+
+    /** @var int */
+    private $quantity;
+
+    /** @var float */
     private $price;
-    
-    private $amount;
-    
-    
-    public function __construct(
-        string $trans_type1,string $trans_type2,
-        int $transaction_id, string $product_code, $product_name,
-        int $qty, float $price,float $amount
-    ){
-        $this->trans_type1= $trans_type1;
-        $this->trans_type2 = $trans_type2;
-        $this->transaction_id = $transaction_id;
-        $this->product_code = $product_code;
-        $this->product_name = $product_name;
-        $this->qty = $qty;
+
+    /**
+     * TransactionDetailObject constructor.
+     * @param string $code
+     * @param string $name
+     * @param int $quantity
+     * @param float $price
+     */
+    public function __construct(string $code, string $name, int $quantity, float $price)
+    {
+        $this->code = $code;
+        $this->name = $name;
+        $this->quantity = $quantity;
         $this->price = $price;
-        $this->amount = $amount;
-        
     }
 
-    
     /**
      * @return string
      */
-    public function getTransType1(): string
+    public function getCode(): string
     {
-        return $this->trans_type1;
+        return $this->code;
     }
-    
+
     /**
      * @return string
      */
-    public function getTransType2(): string
+    public function getName(): string
     {
-        return $this->trans_type2;
+        return $this->name;
     }
-    
+
     /**
      * @return int
      */
-    public function getTransactionId(): int
+    public function getQuantity(): int
     {
-        return $this->transaction_id;
+        return $this->quantity;
     }
-    
+
     /**
-     * @return string
+     * @return float
      */
-    public function getProductCode(): string
-    {
-        return $this->product_code;
-    }
-    
-    /**
-     * @return string
-     */
-    public function getProductName(): string
-    {
-        return $this->product_name;
-    }
-    
-    /**
-     * @return int
-     */
-    public function getQty(): int
-    {
-        return $this->qty;
-    }
-    
     public function getPrice(): float
     {
         return $this->price;
     }
-    
+
     public function getAmount(): float
     {
-        return $this->amount;
+        return $this->getQuantity() * $this->getPrice();
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php b/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php
index 22fc241a..204b7a6c 100644
--- a/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php
+++ b/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php
@@ -2,149 +2,231 @@
 
 namespace App\Classes\Modules\Transactions\DataTransferObjects;
 
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Carbon\Carbon;
 
 class TransactionObject implements DataTransferObject
 {
 
-    /*
-     * 
-     * return [
-            'id' => $this->id,
-            'trans_type1' => $this->trans_type1,
-            'trans_type2' => $this->trans_type2,
-            'bill_no' => (int) $this->bill_no,
-            'amount' => (double) $this->amount,
-            'currency_id' => (int) $this->currency_id,
-            'original_amount' => (double) $this->original_amount,
-            'original_currency_id' => (int) $this->original_currency_id,
-            'currency_rate' => (double) $this->currency_rate,
-            'dt_transaction' => $this->dt_transaction,
-            'status' => (int) $this->status,
-            'booking_id' => (int) $this->booking_id,
-            'company_id' => (int) $this->company_id
-        ];
-     */
-    private $trans_type1;
-    
-    private $trans_type2;
-    
-    private $bill_no;
-    
-    private $amount;
-    
-    private $currency_id;
-    
-    private $original_amount;
-    
-    private $original_currency_id;
+    /** @var string */
+    private $billNo;
 
-    private $currency_rate;
-    
-    private $dt_transaction;
-    
+    /** @var string */
+    private $transactionType;
+
+    /** @var int */
+    private $issuer;
+
+    /** @var int */
+    private $receiver;
+
+    /** @var int */
+    private $recipientBankAccountId;
+
+    /** @var int */
+    private $paymentMethod;
+
+    /** @var float */
+    private $amount;
+
+    /** @var  float */
+    private $originalAmount;
+
+    /** @var int */
+    private $currencyId;
+
+    /** @var int */
+    private $originalCurrencyId;
+
+    /** @var float */
+    private $currencyRate;
+
+    /** @var float */
+    private $tax;
+
+    /** @var float */
+    private $serviceCharge;
+
+    /** @var Carbon|null */
+    private $expiresOn;
+
+    /** @var int|null */
     private $status;
-    
-    private $booking_id;
-    
-    private $company_id;
-    
-    public function __construct(
-        int $bill_no,string $trans_type1,string $trans_type2,
-        float $amount, int $currency_id, int $original_amount,
-        int $original_currency_id, float $currency_rate,
-        string $dt_transaction,int $status,int $booking_id,
-        int $company_id
-    ){
-        $this->bill_no = $bill_no;
-        $this->trans_type1= $trans_type1;
-        $this->trans_type2 = $trans_type2;
-        $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;
-        $this->dt_transaction = $dt_transaction;
+
+    /** @var array|null */
+    private $details;
+
+    /**
+     * TransactionObject constructor.
+     * @param string $billNo
+     * @param string $transactionType
+     * @param int $issuer
+     * @param int $receiver
+     * @param int $recipientBankAccountId
+     * @param int $paymentMethod
+     * @param float $amount
+     * @param float $originalAmount
+     * @param int $currencyId
+     * @param int $originalCurrencyId
+     * @param float $currencyRate
+     * @param float $tax
+     * @param float $serviceCharge
+     * @param Carbon|null $expiresOn
+     * @param int|null $status
+     * @param array|null $details
+     */
+    public function __construct(string $billNo, string $transactionType, int $issuer, int $receiver, int $recipientBankAccountId, int $paymentMethod, float $amount, float $originalAmount, int $currencyId, int $originalCurrencyId, float $currencyRate, float $tax, float $serviceCharge, ?Carbon $expiresOn, ?int $status = ApprovalStatus::PENDING_SUBMISSION, ?array $details = [])
+    {
+        $this->billNo = $billNo;
+        $this->transactionType = $transactionType;
+        $this->issuer = $issuer;
+        $this->receiver = $receiver;
+        $this->recipientBankAccountId = $recipientBankAccountId;
+        $this->paymentMethod = $paymentMethod;
+        $this->amount = $amount;
+        $this->originalAmount = $originalAmount;
+        $this->currencyId = $currencyId;
+        $this->originalCurrencyId = $originalCurrencyId;
+        $this->currencyRate = $currencyRate;
+        $this->tax = $tax;
+        $this->serviceCharge = $serviceCharge;
+        $this->expiresOn = $expiresOn;
         $this->status = $status;
-        $this->booking_id = $booking_id;
-        $this->company_id = $company_id;
+        $this->details = $details;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBillNo(): string
+    {
+        return $this->billNo;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTransactionType(): string
+    {
+        return $this->transactionType;
     }
 
-    
     /**
      * @return int
      */
-    public function getBillNo(): int
+    public function getIssuer(): int
     {
-        return $this->bill_no;
+        return $this->issuer;
     }
-    
+
     /**
-     * @return string
+     * @return int
      */
-    public function getTransType1(): string
+    public function getReceiver(): int
     {
-        return $this->trans_type1;
+        return $this->receiver;
     }
-    
+
     /**
-     * @return string
+     * @return int
      */
-    public function getTransType2(): string
+    public function getRecipientBankAccountId(): int
     {
-        return $this->trans_type2;
+        return $this->recipientBankAccountId;
     }
-    
-    
+
+    /**
+     * @return int
+     */
+    public function getPaymentMethod(): int
+    {
+        return $this->paymentMethod;
+    }
+
+    /**
+     * @return float
+     */
     public function getAmount(): float
     {
         return $this->amount;
     }
 
     /**
-     * @return int
+     * @return float
      */
-    public function getCurrency(): int
-    {
-        return $this->currency_id;
-    }
-    
-    
     public function getOriginalAmount(): float
     {
-        return $this->original_amount;
+        return $this->originalAmount;
     }
-    
-    public function getOriginalCurrency(): int
+
+    /**
+     * @return int
+     */
+    public function getCurrencyId(): int
     {
-        return $this->original_currency_id;
+        return $this->currencyId;
     }
-    
+
+    /**
+     * @return int
+     */
+    public function getOriginalCurrencyId(): int
+    {
+        return $this->originalCurrencyId;
+    }
+
+    /**
+     * @return float
+     */
     public function getCurrencyRate(): float
     {
-        return $this->currency_rate;
+        return $this->currencyRate;
     }
-    
+
     /**
-     * @return string
+     * @return float
      */
-    public function getDtTransaction(): string
+    public function getTax(): float
     {
-        return $this->dt_transaction;
+        return $this->tax;
     }
-    
+
+    /**
+     * @return float
+     */
+    public function getServiceCharge(): float
+    {
+        return $this->serviceCharge;
+    }
+
+    /**
+     * @return Carbon|null
+     */
+    public function getExpiresOn(): ?Carbon
+    {
+        return $this->expiresOn;
+    }
+
+    /**
+     * @return int
+     */
     public function getStatus(): int
     {
-        return $this->original_currency_id;
+        return $this->status;
     }
-    
-    public function getBookingId(): int
+
+    /**
+     * @return array
+     */
+    public function getDetails(): array
     {
-        return $this->booking_id;
-    }
-    
-    public function getCompanyId(): int
-    {
-        return $this->company_id;
+        return array_map(function($product){
+            return new TransactionDetailObject($product['stockCode'], $product['description'], $product['quantity'], floatval(str_replace(',', '', $product['unit_price'])));
+        }, $this->details);
     }
+
+
+
+
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Transactions/Services/ChecksIfTransactionBillNoExists.php b/app/Classes/Modules/Transactions/Services/ChecksIfTransactionBillNumberExists.php
similarity index 76%
rename from app/Classes/Modules/Transactions/Services/ChecksIfTransactionBillNoExists.php
rename to app/Classes/Modules/Transactions/Services/ChecksIfTransactionBillNumberExists.php
index 0d933c7d..9b63985f 100644
--- a/app/Classes/Modules/Transactions/Services/ChecksIfTransactionBillNoExists.php
+++ b/app/Classes/Modules/Transactions/Services/ChecksIfTransactionBillNumberExists.php
@@ -5,7 +5,7 @@ namespace App\Classes\Modules\Transactions\Services;
 
 use App\Models\Transaction;
 
-class ChecksIfTransactionBillNoExists
+class ChecksIfTransactionBillNumberExists
 {
 
     private $repository;
@@ -15,7 +15,7 @@ class ChecksIfTransactionBillNoExists
         $this->repository = $repository;
     }
 
-    public function execute(int $bill_no): bool {
+    public function execute(string $bill_no): bool {
         return $this->repository->where('bill_no', $bill_no)->exists();
     }
 
diff --git a/app/Classes/Modules/Transactions/Services/CreatesTransaction.php b/app/Classes/Modules/Transactions/Services/CreatesTransaction.php
index e1bb92a7..ddebf0d5 100644
--- a/app/Classes/Modules/Transactions/Services/CreatesTransaction.php
+++ b/app/Classes/Modules/Transactions/Services/CreatesTransaction.php
@@ -3,33 +3,38 @@
 namespace App\Classes\Modules\Transactions\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Models\Booking;
 use App\Models\Transaction;
 
-class CreatesTransaction extends AbstractUpdateRecord
+class CreatesTransaction extends AbstractUpdateRelationshipRecord
 {
     /**
-     * @param WalletObject $object
+     * @param TransactionObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(TransactionObject $object) {
+    public function execute(Booking $booking, TransactionObject $object) {
         $model = new Transaction();
         $model->bill_no = $object->getBillNo();
-        $model->trans_type1 = $object->getTransType1();
-        $model->trans_type2 = $object->getTransType2();
+        $model->type = $object->getTransactionType();
+        $model->issuer = $object->getIssuer();
+        $model->receiver = $object->getReceiver();
+        $model->recipient_bank_account_id = $object->getRecipientBankAccountId();
+        $model->payment_method = $object->getPaymentMethod();
         $model->amount = $object->getAmount();
-        $model->currency_id = $object->getCurrency();
         $model->original_amount = $object->getOriginalAmount();
-        $model->original_currency_id = $object->getOriginalCurrency();
+        $model->currency_id = $object->getCurrencyId();
+        $model->original_currency_id = $object->getOriginalCurrencyId();
         $model->currency_rate = $object->getCurrencyRate();
-        $model->dt_transaction = $object->getDtTransaction();
+        $model->tax = $object->getTax();
+        $model->service_charge = $object->getServiceCharge();
+        $model->expires_on = $object->getExpiresOn();
         $model->status = $object->getStatus();
-        $model->booking_id = $object->getBookingId();
-        $model->company_id = $object->getCompanyId();
-        
 
-        return $this->handler($model);
+
+        return $this->handler($booking->transactions(), $model);
 
     }
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Transactions/Services/CreatesTransactionDetail.php b/app/Classes/Modules/Transactions/Services/CreatesTransactionDetail.php
index c1e91c7f..0e852ddf 100644
--- a/app/Classes/Modules/Transactions/Services/CreatesTransactionDetail.php
+++ b/app/Classes/Modules/Transactions/Services/CreatesTransactionDetail.php
@@ -3,29 +3,28 @@
 namespace App\Classes\Modules\Transactions\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
+use App\Models\Transaction;
 use App\Models\TransactionDetail;
 
-class CreatesTransactionDetail extends AbstractUpdateRecord
+class CreatesTransactionDetail extends AbstractUpdateRelationshipRecord
 {
     /**
-     * @param WalletObject $object
+     * @param Transaction $transaction
+     * @param TransactionDetailObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(TransactionDetailObject $object) {
+    public function execute(Transaction $transaction, TransactionDetailObject $object) {
         $model = new TransactionDetail();
-        $model->trans_type1 = $object->getTransType1();
-        $model->trans_type2 = $object->getTransType2();
-        $model->transaction_id = $object->getTransactionId();
-        $model->product_code = $object->getProductCode();
-        $model->product_name = $object->getProductName();
-        $model->qty = $object->getQty();
+        $model->product_code = $object->getCode();
+        $model->product_name = $object->getName();
+        $model->quantity = $object->getQuantity();
         $model->price = $object->getPrice();
         $model->amount = $object->getAmount();
-        
 
-        return $this->handler($model);
+        return $this->handler($transaction->transactionDetails(), $model);
 
     }
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Transactions/Services/DeletesTransactionDetails.php b/app/Classes/Modules/Transactions/Services/DeletesTransactionDetails.php
new file mode 100644
index 00000000..42b16d77
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Services/DeletesTransactionDetails.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Models\Transaction;
+
+class DeletesTransactionDetails extends AbstractDeleteRecord
+{
+
+    /**
+     * @param Transaction $model
+     * @return mixed
+     */
+    public function execute(Transaction $model) {
+        return $model->transactionDetails()->delete();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Transactions/Services/FetchesTransactionDetail.php b/app/Classes/Modules/Transactions/Services/FetchesTransactionDetail.php
index 8d77cc85..1f2f8c08 100644
--- a/app/Classes/Modules/Transactions/Services/FetchesTransactionDetail.php
+++ b/app/Classes/Modules/Transactions/Services/FetchesTransactionDetail.php
@@ -16,7 +16,7 @@ class FetchesTransactionDetail extends AbstractFetchRecord
 
     /**
      * FetchesTransaction constructor.
-     * @param Transaction $repository
+     * @param TransactionDetail $repository
      */
     public function __construct(TransactionDetail $repository)
     {
diff --git a/app/Classes/Modules/Transactions/Services/GeneratesTransactionBillNo.php b/app/Classes/Modules/Transactions/Services/GeneratesTransactionBillNo.php
deleted file mode 100644
index fb7c6867..00000000
--- a/app/Classes/Modules/Transactions/Services/GeneratesTransactionBillNo.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\Services;
-
-
-class GeneratesTransactionBillNo
-{
-
-    
-    private $transationBillNoExists;
-
-   
-    public function __construct(ChecksIfTransactionBillNoExists $transationBillNoExists)
-    {
-        $this->transationBillNoExists = $transationBillNoExists;
-    }
-
-
-   
-    public function execute(): int {
-
-        $code = mt_rand(100000001, 999999999);
-        return !$this->transationBillNoExists->execute($code) ? $code : self::execute();
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/Transactions/Services/GeneratesTransactionBillNumber.php b/app/Classes/Modules/Transactions/Services/GeneratesTransactionBillNumber.php
new file mode 100644
index 00000000..6e4e79dd
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Services/GeneratesTransactionBillNumber.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Services;
+
+
+use Carbon\Carbon;
+
+class GeneratesTransactionBillNumber
+{
+
+    /** @var ChecksIfTransactionBillNumberExists */
+    private $checksIfTransactionBillNumberExists;
+
+    /**
+     * GeneratesTransactionBillNo constructor.
+     * @param ChecksIfTransactionBillNumberExists $checksIfTransactionBillNumberExists
+     */
+    public function __construct(ChecksIfTransactionBillNumberExists $checksIfTransactionBillNumberExists)
+    {
+        $this->checksIfTransactionBillNumberExists = $checksIfTransactionBillNumberExists;
+    }
+
+
+    /**
+     * @param string $prefix
+     * @return string
+     */
+    public function execute(string $prefix): string {
+        $date = carbon::now();
+
+        $billNumber = $prefix.$date->format('Y').$date->format('m').$date->format('d').mt_rand(10000, 99999);
+
+        return !$this->checksIfTransactionBillNumberExists->execute($billNumber) ? $billNumber : self::execute($prefix);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Transactions/Services/ListsTransactions.php b/app/Classes/Modules/Transactions/Services/ListsTransactions.php
new file mode 100644
index 00000000..8d77171f
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Services/ListsTransactions.php
@@ -0,0 +1,31 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\Services;
+
+use App\Models\Transaction;
+use Illuminate\Database\Eloquent\Builder;
+use App\Classes\General\Eloquent\AbstractListRecord;
+
+class ListsTransactions extends AbstractListRecord
+{
+    /** @var Transaction */
+    private $repository;
+
+    /**
+     * ListsBookings constructor.
+     * @param Transaction $repository
+     */
+    public function __construct(Transaction $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Transactions/Services/UpdatesTransaction.php b/app/Classes/Modules/Transactions/Services/UpdatesTransaction.php
new file mode 100644
index 00000000..aba7b07a
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Services/UpdatesTransaction.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Models\Booking;
+use App\Models\Transaction;
+
+class UpdatesTransaction extends AbstractUpdateRecord
+{
+    /**
+     * @param Transaction $transaction
+     * @param TransactionObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Transaction $transaction, TransactionObject $object) {
+        $transaction->recipient_bank_account_id = $object->getRecipientBankAccountId();
+        $transaction->payment_method = $object->getPaymentMethod();
+        $transaction->amount = $object->getAmount();
+        $transaction->original_amount = $object->getOriginalAmount();
+        $transaction->currency_id = $object->getCurrencyId();
+        $transaction->original_currency_id = $object->getOriginalCurrencyId();
+        $transaction->currency_rate = $object->getCurrencyRate();
+        $transaction->tax = $object->getTax();
+        $transaction->service_charge = $object->getServiceCharge();
+
+        return $this->handler($transaction);
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Transactions/Services/UpdatesTransactionStatus.php b/app/Classes/Modules/Transactions/Services/UpdatesTransactionStatus.php
new file mode 100644
index 00000000..769f2dc0
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Services/UpdatesTransactionStatus.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Transaction;
+
+class UpdatesTransactionStatus extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Transaction $model
+     * @param int $status
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Transaction $model, int $status)
+    {
+        $model->status = $status;
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Transactions/Standards/Rules/CanCreateTransaction.php b/app/Classes/Modules/Transactions/Standards/Rules/CanCreateTransaction.php
index b81c4a09..39fdd05a 100644
--- a/app/Classes/Modules/Transactions/Standards/Rules/CanCreateTransaction.php
+++ b/app/Classes/Modules/Transactions/Standards/Rules/CanCreateTransaction.php
@@ -4,12 +4,13 @@ namespace App\Classes\Modules\Transactions\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
 use App\Classes\Modules\Transactions\Standards\Validators\TransactionValidation;
 
 class CanCreateTransaction extends AbstractRule
 {
 
-    /** @var WalletTransactionValidation */
+    /** @var TransactionValidation */
     private $transactionValidation;
 
   
@@ -29,7 +30,7 @@ class CanCreateTransaction extends AbstractRule
     }
 
     /**
-     * @param CompanyWalletValidation $object
+     * @param TransactionObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
@@ -39,7 +40,7 @@ class CanCreateTransaction extends AbstractRule
     }
 
     /**
-     * @param SegmentCompanyValidation $object
+     * @param TransactionObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/Transactions/Standards/Rules/CanCreateTransactionDetail.php b/app/Classes/Modules/Transactions/Standards/Rules/CanCreateTransactionDetail.php
index cc2f2f3c..2669ffbf 100644
--- a/app/Classes/Modules/Transactions/Standards/Rules/CanCreateTransactionDetail.php
+++ b/app/Classes/Modules/Transactions/Standards/Rules/CanCreateTransactionDetail.php
@@ -4,12 +4,13 @@ namespace App\Classes\Modules\Transactions\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
 use App\Classes\Modules\Transactions\Standards\Validators\TransactionDetailValidation;
 
 class CanCreateTransactionDetail extends AbstractRule
 {
 
-    /** @var WalletTransactionValidation */
+    /** @var TransactionDetailValidation */
     private $transactionDetailValidation;
 
   
@@ -29,7 +30,7 @@ class CanCreateTransactionDetail extends AbstractRule
     }
 
     /**
-     * @param CompanyWalletValidation $object
+     * @param TransactionDetailObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
@@ -39,7 +40,7 @@ class CanCreateTransactionDetail extends AbstractRule
     }
 
     /**
-     * @param SegmentCompanyValidation $object
+     * @param TransactionDetailObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/Transactions/Standards/Validators/TransactionDetailValidation.php b/app/Classes/Modules/Transactions/Standards/Validators/TransactionDetailValidation.php
index 15e23dcd..35357060 100644
--- a/app/Classes/Modules/Transactions/Standards/Validators/TransactionDetailValidation.php
+++ b/app/Classes/Modules/Transactions/Standards/Validators/TransactionDetailValidation.php
@@ -3,7 +3,6 @@
 namespace App\Classes\Modules\Transactions\Standards\Validators;
 
 use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
 
 class TransactionDetailValidation extends AbstractValidation
 {
diff --git a/app/Classes/Modules/Transactions/Standards/Validators/TransactionValidation.php b/app/Classes/Modules/Transactions/Standards/Validators/TransactionValidation.php
index 3249f8a1..62443c3d 100644
--- a/app/Classes/Modules/Transactions/Standards/Validators/TransactionValidation.php
+++ b/app/Classes/Modules/Transactions/Standards/Validators/TransactionValidation.php
@@ -3,7 +3,6 @@
 namespace App\Classes\Modules\Transactions\Standards\Validators;
 
 use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
 
 class TransactionValidation extends AbstractValidation
 {
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php
index 77ecdbc9..efcff6b3 100644
--- a/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php
+++ b/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php
@@ -2,11 +2,12 @@
 
 namespace App\Classes\Modules\Wallets\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+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 ErrorException;
@@ -14,7 +15,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class CreateWalletLogic extends AbstractControllersLogic
+class CreateWalletLogic extends AbstractControllerLogic
 {
 
 
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletTransactionLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletTransactionLogic.php
index 71713444..6fe72a52 100644
--- a/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletTransactionLogic.php
+++ b/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletTransactionLogic.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Wallets\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllersLogic;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 
 use App\Classes\Modules\Wallets\Standards\Rules\CanCreateWalletTransaction;
 use App\Classes\Modules\Wallets\DataTransferObjects\WalletTransactionObject;
@@ -27,9 +27,9 @@ 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\CompanyEmployees\Standards\Rules\CanCreateCompanyEmployee;
-use App\Classes\Modules\CompanyEmployees\Services\CreatesCompanyEmployee;
-use App\Classes\Modules\CompanyEmployees\DataTransferObjects\CompanyEmployeeObject;
+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;
@@ -40,7 +40,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class CreateWalletTransactionLogic extends AbstractControllersLogic
+class CreateWalletTransactionLogic extends AbstractControllerLogic
 {
 
 
diff --git a/app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php b/app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php
index 29924744..6f4fcd83 100644
--- a/app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php
+++ b/app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Wallets\DataTransferObjects;
 
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
 
 class WalletObject implements DataTransferObject
 {
diff --git a/app/Classes/Modules/Wallets/DataTransferObjects/WalletTransactionObject.php b/app/Classes/Modules/Wallets/DataTransferObjects/WalletTransactionObject.php
index 7fdfecbd..234c8f57 100644
--- a/app/Classes/Modules/Wallets/DataTransferObjects/WalletTransactionObject.php
+++ b/app/Classes/Modules/Wallets/DataTransferObjects/WalletTransactionObject.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Wallets\DataTransferObjects;
 
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
 
 class WalletTransactionObject implements DataTransferObject
 {
diff --git a/app/Classes/Modules/Wallets/Services/CreatesWalletTransaction.php b/app/Classes/Modules/Wallets/Services/CreatesWalletTransaction.php
index 06877e6a..0b40879c 100644
--- a/app/Classes/Modules/Wallets/Services/CreatesWalletTransaction.php
+++ b/app/Classes/Modules/Wallets/Services/CreatesWalletTransaction.php
@@ -9,7 +9,7 @@ use App\Models\WalletTransaction;
 class CreatesWalletTransaction extends AbstractUpdateRecord
 {
     /**
-     * @param WalletObject $object
+     * @param WalletTransactionObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
diff --git a/app/Classes/Modules/Wallets/Services/FetchesWallet.php b/app/Classes/Modules/Wallets/Services/FetchesWallet.php
index 1c7800ac..c3542bb7 100644
--- a/app/Classes/Modules/Wallets/Services/FetchesWallet.php
+++ b/app/Classes/Modules/Wallets/Services/FetchesWallet.php
@@ -10,7 +10,7 @@ use App\Models\Wallet;
 class FetchesWallet extends AbstractFetchRecord
 {
 
-    /** @var Currency */
+    /** @var Wallet */
     private $repository;
 
 
diff --git a/app/Classes/Modules/Wallets/Standards/Rules/CanCreateCompanyWallet.php b/app/Classes/Modules/Wallets/Standards/Rules/CanCreateCompanyWallet.php
index e2569918..0f1dd065 100644
--- a/app/Classes/Modules/Wallets/Standards/Rules/CanCreateCompanyWallet.php
+++ b/app/Classes/Modules/Wallets/Standards/Rules/CanCreateCompanyWallet.php
@@ -4,7 +4,8 @@ namespace App\Classes\Modules\Wallets\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\SegmentCompanies\Standards\Validators\CompanyWalletValidation;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Standards\Validators\CompanyWalletValidation;
 
 class CanCreateCompanyWallet extends AbstractRule
 {
@@ -32,7 +33,7 @@ class CanCreateCompanyWallet extends AbstractRule
     }
 
     /**
-     * @param CompanyWalletValidation $object
+     * @param WalletObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
@@ -43,7 +44,7 @@ class CanCreateCompanyWallet extends AbstractRule
 
 
     /**
-     * @param $object
+     * @param WalletObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/Wallets/Standards/Rules/CanCreateWalletTransaction.php b/app/Classes/Modules/Wallets/Standards/Rules/CanCreateWalletTransaction.php
index 43f0118f..8beafb37 100644
--- a/app/Classes/Modules/Wallets/Standards/Rules/CanCreateWalletTransaction.php
+++ b/app/Classes/Modules/Wallets/Standards/Rules/CanCreateWalletTransaction.php
@@ -4,6 +4,7 @@ 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
@@ -29,7 +30,7 @@ class CanCreateWalletTransaction extends AbstractRule
     }
 
     /**
-     * @param CompanyWalletValidation $object
+     * @param WalletTransactionObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
@@ -39,7 +40,7 @@ class CanCreateWalletTransaction extends AbstractRule
     }
 
     /**
-     * @param SegmentCompanyValidation $object
+     * @param WalletTransactionObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/Wallets/Standards/Validators/WalletTransactionValidation.php b/app/Classes/Modules/Wallets/Standards/Validators/WalletTransactionValidation.php
index 925261ad..8944795c 100644
--- a/app/Classes/Modules/Wallets/Standards/Validators/WalletTransactionValidation.php
+++ b/app/Classes/Modules/Wallets/Standards/Validators/WalletTransactionValidation.php
@@ -3,8 +3,6 @@
 namespace App\Classes\Modules\Wallets\Standards\Validators;
 
 use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletTransactionObject;
 
 class WalletTransactionValidation extends AbstractValidation
 {
diff --git a/app/Classes/Notifications/ResetPasswordEmail.php b/app/Classes/Notifications/ResetPasswordEmail.php
new file mode 100644
index 00000000..f7a84ab8
--- /dev/null
+++ b/app/Classes/Notifications/ResetPasswordEmail.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Classes\Notifications;
+
+
+use App\Models\PasswordReset;
+use App\Models\User;
+use Illuminate\Notifications\Messages\MailMessage;
+
+class ResetPasswordEmail extends AbstractEmail
+{
+
+    /** @var User */
+    private $user;
+
+    /** @var PasswordReset */
+    private $attempt;
+
+    /**
+     * SendResetPasswordEmail constructor.
+     * @param User $user
+     * @param PasswordReset $attempt
+     */
+    public function __construct(User $user, PasswordReset $attempt)
+    {
+        $this->user = $user;
+        $this->attempt = $attempt;
+    }
+
+    public function toMail()
+    {
+        return (new MailMessage)
+            ->subject('Reset Password')
+            ->view('emails.account.reset_password', ['user' => $this->user, 'attempt' => $this->attempt]);
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Notifications/UserVerificationEmail.php b/app/Classes/Notifications/UserVerificationEmail.php
new file mode 100644
index 00000000..c718d5da
--- /dev/null
+++ b/app/Classes/Notifications/UserVerificationEmail.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Classes\Notifications;
+
+
+use App\Models\User;
+use App\Models\UserEmailVerification;
+use Illuminate\Notifications\Messages\MailMessage;
+
+class UserVerificationEmail extends AbstractEmail
+{
+
+    /** @var User */
+    private $user;
+
+    /** @var UserEmailVerification */
+    private $attempt;
+
+    /**
+     * UserVerificationEmail constructor.
+     * @param User $user
+     * @param UserEmailVerification $attempt
+     */
+    public function __construct(User $user, UserEmailVerification $attempt)
+    {
+        $this->user = $user;
+        $this->attempt = $attempt;
+    }
+
+
+    public function toMail()
+    {
+        return (new MailMessage)
+            ->subject('Email Verification')
+            ->view('emails.accounts.user_verification', ['user' => $this->user, 'attempt' => $this->attempt]);
+    }
+
+
+}
diff --git a/app/Classes/ValueObjects/Constants/ApprovalStatus.php b/app/Classes/ValueObjects/Constants/ApprovalStatus.php
index fcc5e568..2f6a7a4a 100644
--- a/app/Classes/ValueObjects/Constants/ApprovalStatus.php
+++ b/app/Classes/ValueObjects/Constants/ApprovalStatus.php
@@ -4,19 +4,18 @@ namespace App\Classes\ValueObjects\Constants;
 
 final class ApprovalStatus {
 
-    public const PENDING_VERIFICATION = 0;
+    public const PENDING_SUBMISSION = 0;
 
-    public const ACTIVE = 1;
+    public const PENDING_VERIFICATION = 1;
 
-    public const SUSPENDED = 2;
+    public const APPROVED = 2;
 
-    public const REJECTED = 3;
+    public const COMPLETED = 3;
 
-    public const STATUS = [
-        0 => 'Pending Verification',
-        1 => 'Active',
-        2 => 'Suspended',
-        3 => 'Rejected'
-    ];
+    public const REJECTED = 4;
+
+    public const SUSPENDED = 5;
+
+    public const EXPIRED = 6;
 
 }
diff --git a/app/Classes/ValueObjects/Constants/CompanyBankType.php b/app/Classes/ValueObjects/Constants/BankAccountType.php
similarity index 78%
rename from app/Classes/ValueObjects/Constants/CompanyBankType.php
rename to app/Classes/ValueObjects/Constants/BankAccountType.php
index 34019c40..13a36fde 100644
--- a/app/Classes/ValueObjects/Constants/CompanyBankType.php
+++ b/app/Classes/ValueObjects/Constants/BankAccountType.php
@@ -2,7 +2,10 @@
 
 namespace App\Classes\ValueObjects\Constants;
 
-final class CompanyBankType {
+final class BankAccountType {
+
     public const PERSONAL = 1;
+
     public const EXTERNAL = 2;
+
 }
diff --git a/app/Classes/ValueObjects/Constants/BusinessType.php b/app/Classes/ValueObjects/Constants/BusinessType.php
index 4f9029c9..d24b975d 100644
--- a/app/Classes/ValueObjects/Constants/BusinessType.php
+++ b/app/Classes/ValueObjects/Constants/BusinessType.php
@@ -3,7 +3,11 @@
 namespace App\Classes\ValueObjects\Constants;
 
 final class BusinessType {
-    public const IMPORTER = 1;
-    public const FREIGHT_FORARDER = 2;
+
+    public const FREIGHT_FORWARDER = 1;
+
+    public const IMPORTER = 2;
+
     public const CURRENCY_VENDOR = 3;
+
 }
diff --git a/app/Classes/ValueObjects/Constants/CompanyType.php b/app/Classes/ValueObjects/Constants/CompanyType.php
index e1a763bb..61918925 100644
--- a/app/Classes/ValueObjects/Constants/CompanyType.php
+++ b/app/Classes/ValueObjects/Constants/CompanyType.php
@@ -3,6 +3,9 @@
 namespace App\Classes\ValueObjects\Constants;
 
 final class CompanyType {
-    public const PUBLIC_COMPANY = 1;
-    public const PERSONAL_COMPANY = 2;
+
+    public const PERSONAL_BUSINESS = 0;
+
+    public const COMPANY_BUSINESS = 1;
+
 }
diff --git a/app/Classes/ValueObjects/Constants/Countries.php b/app/Classes/ValueObjects/Constants/Countries.php
new file mode 100644
index 00000000..5b2e8ca7
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/Countries.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class Countries {
+
+    public const MALAYSIA = 1;
+
+    public const CHINA = 2;
+
+}
diff --git a/app/Classes/ValueObjects/Constants/DefaultType.php b/app/Classes/ValueObjects/Constants/DefaultType.php
deleted file mode 100644
index 27d6ce92..00000000
--- a/app/Classes/ValueObjects/Constants/DefaultType.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-final class DefaultType {
-    public const NONDEFAULT = 0;
-    public const DEFAULT = 1;
-}
diff --git a/app/Classes/ValueObjects/Constants/DocumentType.php b/app/Classes/ValueObjects/Constants/DocumentType.php
index 4b82f8c4..6a9a348c 100644
--- a/app/Classes/ValueObjects/Constants/DocumentType.php
+++ b/app/Classes/ValueObjects/Constants/DocumentType.php
@@ -3,6 +3,17 @@
 namespace App\Classes\ValueObjects\Constants;
 
 final class DocumentType {
-    public const COMPANY_PUBLIC_SMS_REGISTER = 'COMPANY_PUBLIC_SMS_REGISTER';
-    public const COMPANY_PERSONAL_IC = 'COMPANY_PERSONAL_IC';
+
+    public const PROFILE_PICTURE = 'PROFILE_PICTURE';
+
+    public const SSM_REGISTRATION = 'SSM_REGISTRATION';
+    public const IDENTITY_CARD = 'IDENTITY_CARD';
+    public const IDENTIFICATION_DOCUMENTS = [self::IDENTITY_CARD, self::SSM_REGISTRATION];
+
+    public const CUSTOMER_PAYMENT_PROOF = 'CUSTOMER_PAYMENT_PROOF';
+    public const CURRENCY_VENDOR_PAYMENT_PROOF = 'CURRENCY_VENDOR_PAYMENT_PROOF';
+
+    public const WALLET_TOP_UP_PAYMENT_PROOF = 'WALLET_TOP_UP_PAYMENT_PROOF';
+    public const WALLET_REFUND_PAYMENT_PROOF = 'WALLET_REFUND_PAYMENT_PROOF';
+
 }
diff --git a/app/Classes/ValueObjects/Constants/FileType.php b/app/Classes/ValueObjects/Constants/FileType.php
index 2f214778..8564643c 100644
--- a/app/Classes/ValueObjects/Constants/FileType.php
+++ b/app/Classes/ValueObjects/Constants/FileType.php
@@ -2,7 +2,23 @@
 
 namespace App\Classes\ValueObjects\Constants;
 
-final class FileType {
-    public const COMPANY_PUBLIC_SMS_REGISTER = 'COMPANY_PUBLIC_SMS_REGISTER';
-    public const COMPANY_PERSONAL_IC = 'COMPANY_PERSONAL_IC';
-}
+
+class FileType
+{
+
+    public const GIF = 'image/gif';
+
+    public const PNG = 'image/png';
+
+    public const JPEG = 'image/jpeg';
+
+    public const PDF = 'application/pdf';
+
+    public const EXTENSION = [
+        'image/gif' => 'gif',
+        'image/png' => 'png',
+        'image/jpeg' => 'jpeg',
+        'application/pdf' => 'pdf',
+    ];
+
+}
\ No newline at end of file
diff --git a/app/Classes/ValueObjects/Constants/HttpStatus.php b/app/Classes/ValueObjects/Constants/HttpStatus.php
index 9a95658a..d2f831f3 100644
--- a/app/Classes/ValueObjects/Constants/HttpStatus.php
+++ b/app/Classes/ValueObjects/Constants/HttpStatus.php
@@ -3,6 +3,7 @@
 namespace App\Classes\ValueObjects\Constants;
 
 final class HttpStatus {
+
     public const OK_WITH_MESSAGE = 200;
 
     public const RESOURCE_CREATED = 201;
@@ -26,4 +27,5 @@ final class HttpStatus {
     public const VALIDATION_FAILED = 422;
 
     public const SERVER_ERROR = 500;
+
 }
diff --git a/app/Classes/ValueObjects/Constants/Notifications.php b/app/Classes/ValueObjects/Constants/Notifications.php
new file mode 100644
index 00000000..5ffc79de
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/Notifications.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+
+class Notifications
+{
+
+    public const UNDEFINED = [
+        'title' => 'Unknown Action',
+        'message' => 'unknown message..'
+    ];
+
+}
\ No newline at end of file
diff --git a/app/Classes/ValueObjects/Constants/ObjectStatus.php b/app/Classes/ValueObjects/Constants/ObjectStatus.php
deleted file mode 100644
index 18dcaa58..00000000
--- a/app/Classes/ValueObjects/Constants/ObjectStatus.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-final class ObjectStatus {
-    public const ACTIVE = 1;
-    public const PENDING = 9;
-}
diff --git a/app/Classes/ValueObjects/Constants/OwnerType.php b/app/Classes/ValueObjects/Constants/OwnerType.php
index 4e87348a..86e11f81 100644
--- a/app/Classes/ValueObjects/Constants/OwnerType.php
+++ b/app/Classes/ValueObjects/Constants/OwnerType.php
@@ -3,5 +3,15 @@
 namespace App\Classes\ValueObjects\Constants;
 
 final class OwnerType {
-    public const COMPANY = 1;
+
+    public const USER = 1;
+
+    public const COMPANY = 2;
+
+    public const BOOKING = 3;
+
+    public const TRANSACTION = 4;
+
+    public const WALLET_TRANSACTION = 5;
+
 }
diff --git a/app/Classes/ValueObjects/Constants/PaymentMethodType.php b/app/Classes/ValueObjects/Constants/PaymentMethodType.php
index 8c95650b..4efec990 100644
--- a/app/Classes/ValueObjects/Constants/PaymentMethodType.php
+++ b/app/Classes/ValueObjects/Constants/PaymentMethodType.php
@@ -3,7 +3,31 @@
 namespace App\Classes\ValueObjects\Constants;
 
 final class PaymentMethodType {
+
     public const CASH = 1;
+
     public const CHEQUE = 2;
-    public const PA = 3;
+
+    public const BA = 3;
+
+    public const WALLET = 4;
+
+    public const PAYMENT_GATEWAY = 5;
+
+    public const PAYMENT_METHODS = [
+        'cash' => self::CASH,
+        'cheque' => self::CHEQUE,
+        'ba' => self::BA,
+        'wallet' => self::WALLET,
+        'payment gateway' => self::PAYMENT_GATEWAY,
+    ];
+
+    public const PAYMENT_METHODS_ID = [
+        self::CASH => 'cash',
+        self::CHEQUE => 'cheque',
+        self::BA => 'ba',
+        self::WALLET => 'wallet',
+        self::PAYMENT_GATEWAY => 'payment gateway'
+    ];
+
 }
diff --git a/app/Classes/ValueObjects/Constants/RoleTypes.php b/app/Classes/ValueObjects/Constants/RoleTypes.php
new file mode 100644
index 00000000..3027bcb1
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/RoleTypes.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+
+final class RoleTypes
+{
+
+    public const SHADOW_ADMIN = 0;
+
+    public const SUPER_ADMIN = 1;
+
+    public const ADMIN = 2;
+
+    public const ADMIN_ROLES = [self::SHADOW_ADMIN, self::SUPER_ADMIN, self::ADMIN];
+
+    public const USER = 3;
+
+}
\ No newline at end of file
diff --git a/app/Classes/ValueObjects/Constants/Roles.php b/app/Classes/ValueObjects/Constants/Roles.php
deleted file mode 100644
index a4da942f..00000000
--- a/app/Classes/ValueObjects/Constants/Roles.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-
-final class Roles
-{
-    public const USER = 0;
-
-    public const ADMIN = 1;
-
-    public const SUPER_ADMIN = 2;
-
-    public const ROLES_NAMES = [
-        0 => 'User',
-        1 => 'Admin',
-        2 => 'Super Admin',
-    ];
-
-}
\ No newline at end of file
diff --git a/app/Classes/ValueObjects/Constants/SegmentConstants.php b/app/Classes/ValueObjects/Constants/SegmentConstants.php
new file mode 100644
index 00000000..80e9cb71
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/SegmentConstants.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+
+class SegmentConstants
+{
+
+    public const STANDARD_SEGMENT = 1;
+
+    public const CUSTOM_SEGMENT = 2;
+
+    public const SYSTEM_PRIMARY_CURRENCY = 'SYSTEM_PRIMARY_CURRENCY';
+
+    public const SUPPLIER_CURRENCIES = 'SUPPLIER_CURRENCIES';
+
+    public const PAYMENT_ATTEMPT_DURATION_LIMIT = 'PAYMENT_ATTEMPT_DURATION_LIMIT';
+
+    public const SERVICE_TYPE = 'SERVICE_TYPE';
+
+    public const CUSTOM_SERVICE_TYPE = 'CUSTOM_SERVICE_TYPE';
+
+}
\ No newline at end of file
diff --git a/app/Classes/ValueObjects/Constants/TransactionStatus.php b/app/Classes/ValueObjects/Constants/TransactionStatus.php
new file mode 100644
index 00000000..d0264fa2
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/TransactionStatus.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class TransactionStatus {
+
+    public const PENDING_PAYMENT = 0;
+
+    public const PENDING_APPROVAL = 1;
+
+    public const APPROVED = 2;
+
+    public const COMPLETED = 3;
+
+    public const REJECTED = 4;
+
+    public const EXPIRED = 5;
+
+}
diff --git a/app/Classes/ValueObjects/Constants/TransactionType.php b/app/Classes/ValueObjects/Constants/TransactionType.php
new file mode 100644
index 00000000..c1b1c350
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/TransactionType.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class TransactionType {
+
+    public const PAYMENT_ATTEMPT = 0;
+
+    public const PAYMENT = 1;
+
+    public const INVOICE = 2;
+
+    public const BILL = 3;
+
+    public const PERFORMA = 4;
+
+    public const TOP_UP = 5;
+
+    public const REFUND = 6;
+
+    public const PURCHASE_ORDER = 7;
+
+}
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 8ca61ac2..4ee36f96 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -2,6 +2,7 @@
 
 namespace App\Exceptions;
 
+use App\Classes\ValueObjects\Constants\HttpStatus;
 use App\Classes\ValueObjects\Response\ApiResponseObject;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
diff --git a/app/Http/Controllers/Accounts/CreateCustomerController.php b/app/Http/Controllers/Accounts/CreateCustomerController.php
new file mode 100644
index 00000000..b39c3723
--- /dev/null
+++ b/app/Http/Controllers/Accounts/CreateCustomerController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Accounts;
+
+use App\Classes\Modules\Accounts\ControllersLogic\CreateCustomerLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateCustomerController
+{
+    /**
+     * @param Request $request
+     * @param CreateCustomerLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateCustomerLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Accounts/FetchUserController.php b/app/Http/Controllers/Accounts/FetchUserController.php
new file mode 100644
index 00000000..acc62672
--- /dev/null
+++ b/app/Http/Controllers/Accounts/FetchUserController.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers\Accounts;
+
+
+use App\Classes\Modules\Accounts\ControllersLogic\FetchUserLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchUserController
+{
+
+    /**
+     * @param Request $request
+     * @param FetchUserLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchUserLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Accounts/ListUsersController.php b/app/Http/Controllers/Accounts/ListUsersController.php
index c63d898a..4cf01a43 100644
--- a/app/Http/Controllers/Accounts/ListUsersController.php
+++ b/app/Http/Controllers/Accounts/ListUsersController.php
@@ -4,25 +4,17 @@ namespace App\Http\Controllers\Accounts;
 
 
 use App\Classes\Modules\Accounts\ControllersLogic\ListUsersLogic;
-use App\Classes\Modules\Accounts\Services\ListsUsers;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 class ListUsersController
 {
-    /** @var ListsUsers */
-    private $listsUsers;
 
     /**
-     * ListUsersController constructor.
-     * @param ListsUsers $listsUsers
+     * @param Request $request
+     * @param ListUsersLogic $logic
+     * @return JsonResponse
      */
-    public function __construct(ListsUsers $listsUsers)
-    {
-        $this->listsUsers = $listsUsers;
-    }
-
-
     public function list(Request $request, ListUsersLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
diff --git a/app/Http/Controllers/Accounts/RefreshAuthenticationTokenController.php b/app/Http/Controllers/Accounts/RefreshAuthenticationTokenController.php
new file mode 100644
index 00000000..ca783070
--- /dev/null
+++ b/app/Http/Controllers/Accounts/RefreshAuthenticationTokenController.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Controllers\Accounts;
+
+use App\Classes\Modules\Accounts\ControllersLogic\RefreshAuthenticationTokenLogic ;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RefreshAuthenticationTokenController
+{
+
+    /**
+     * @param Request $request
+     * @param RefreshAuthenticationTokenLogic  $logic
+     * @return JsonResponse
+     */
+    public function refresh(Request $request, RefreshAuthenticationTokenLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
diff --git a/app/Http/Controllers/Accounts/RegistrationStep2Controller.php b/app/Http/Controllers/Accounts/RegistrationStep2Controller.php
deleted file mode 100644
index 2b2aa9ec..00000000
--- a/app/Http/Controllers/Accounts/RegistrationStep2Controller.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Accounts;
-
-use App\Classes\Modules\Accounts\ControllersLogic\RegistrationStep2Logic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class RegistrationStep2Controller
-{
-    /**
-     * @param Request $request
-     * @param RegistrationStep2Logic $logic
-     * @return JsonResponse
-     */
-    public function create(Request $request, RegistrationStep2Logic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-}
\ No newline at end of file
diff --git a/app/Http/Controllers/Accounts/ResendEmailVerificationController.php b/app/Http/Controllers/Accounts/ResendEmailVerificationController.php
new file mode 100644
index 00000000..224e794d
--- /dev/null
+++ b/app/Http/Controllers/Accounts/ResendEmailVerificationController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Accounts;
+
+use App\Classes\Modules\Accounts\ControllersLogic\ResendEmailVerificationLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ResendEmailVerificationController
+{
+
+    /**
+     * @param Request $request
+     * @param ResendEmailVerificationLogic $logic
+     * @return JsonResponse
+     */
+    public function resend(Request $request, ResendEmailVerificationLogic $logic): JsonResponse  {
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Accounts/CreateUserController.php b/app/Http/Controllers/Accounts/UserAuthenticationLogoutController.php
similarity index 55%
rename from app/Http/Controllers/Accounts/CreateUserController.php
rename to app/Http/Controllers/Accounts/UserAuthenticationLogoutController.php
index e68becc5..9d574a21 100644
--- a/app/Http/Controllers/Accounts/CreateUserController.php
+++ b/app/Http/Controllers/Accounts/UserAuthenticationLogoutController.php
@@ -2,18 +2,20 @@
 
 namespace App\Http\Controllers\Accounts;
 
-use App\Classes\Modules\Accounts\ControllersLogic\CreateUserLogic;
+use App\Classes\Modules\Accounts\ControllersLogic\LogoutUserLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class CreateUserController
+class UserAuthenticationLogoutController
 {
+
     /**
      * @param Request $request
-     * @param CreateUserLogic $logic
+     * @param LogoutUserLogic $logic
      * @return JsonResponse
      */
-    public function create(Request $request, CreateUserLogic $logic): JsonResponse {
+    public function logout(Request $request, LogoutUserLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
-}
\ No newline at end of file
+
+}
diff --git a/app/Http/Controllers/Accounts/UserEmailVerificationController.php b/app/Http/Controllers/Accounts/UserEmailVerificationController.php
new file mode 100644
index 00000000..aee42b67
--- /dev/null
+++ b/app/Http/Controllers/Accounts/UserEmailVerificationController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Accounts;
+
+use App\Classes\Modules\Accounts\ControllersLogic\UserEmailVerificationLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UserEmailVerificationController
+{
+
+    /**
+     * @param Request $request
+     * @param UserEmailVerificationLogic $logic
+     * @return JsonResponse
+     */
+    public function verify(Request $request, UserEmailVerificationLogic $logic): JsonResponse  {
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Addresses/ListDistrictsController.php b/app/Http/Controllers/Addresses/ListDistrictsController.php
new file mode 100644
index 00000000..26780cca
--- /dev/null
+++ b/app/Http/Controllers/Addresses/ListDistrictsController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Addresses;
+
+use App\Classes\Modules\Addresses\ControllersLogic\ListDistrictsLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListDistrictsController
+{
+    /**
+     * @param Request $request
+     * @param ListDistrictsLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListDistrictsLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Banks/CreateBankController.php b/app/Http/Controllers/Banks/CreateBankController.php
new file mode 100644
index 00000000..79046096
--- /dev/null
+++ b/app/Http/Controllers/Banks/CreateBankController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Banks;
+
+use App\Classes\Modules\Banks\ControllersLogic\CreateBankLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateBankController
+{
+    /**
+     * @param Request $request
+     * @param CreateBankLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateBankLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Banks/DeleteBankController.php b/app/Http/Controllers/Banks/DeleteBankController.php
new file mode 100644
index 00000000..626842fc
--- /dev/null
+++ b/app/Http/Controllers/Banks/DeleteBankController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Banks;
+
+use App\Classes\Modules\Banks\ControllersLogic\DeleteBankLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteBankController
+{
+    /**
+     * @param Request $request
+     * @param DeleteBankLogic $logic
+     * @return JsonResponse
+     */
+    public function delete(Request $request, DeleteBankLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Banks/ListBanksController.php b/app/Http/Controllers/Banks/ListBanksController.php
new file mode 100644
index 00000000..b8708529
--- /dev/null
+++ b/app/Http/Controllers/Banks/ListBanksController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Banks;
+
+use App\Classes\Modules\Banks\ControllersLogic\ListBanksLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListBanksController
+{
+    /**
+     * @param Request $request
+     * @param ListBanksLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListBanksLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Banks/SetBankToDefaultController.php b/app/Http/Controllers/Banks/SetBankToDefaultController.php
new file mode 100644
index 00000000..6d8688b0
--- /dev/null
+++ b/app/Http/Controllers/Banks/SetBankToDefaultController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Banks;
+
+use App\Classes\Modules\Banks\ControllersLogic\SetBankToDefaultLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class SetBankToDefaultController
+{
+    /**
+     * @param Request $request
+     * @param SetBankToDefaultLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, SetBankToDefaultLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Banks/UpdateBankController.php b/app/Http/Controllers/Banks/UpdateBankController.php
new file mode 100644
index 00000000..ddfb2ead
--- /dev/null
+++ b/app/Http/Controllers/Banks/UpdateBankController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Banks;
+
+use App\Classes\Modules\Banks\ControllersLogic\UpdateBankLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateBankController
+{
+    /**
+     * @param Request $request
+     * @param UpdateBankLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateBankLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Bookings/ApprovePaymentController.php b/app/Http/Controllers/Bookings/ApprovePaymentController.php
new file mode 100644
index 00000000..0c104594
--- /dev/null
+++ b/app/Http/Controllers/Bookings/ApprovePaymentController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\ApprovePaymentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ApprovePaymentController
+{
+    /**
+     * @param Request $request
+     * @param ApprovePaymentLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, ApprovePaymentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Bookings/ApprovePaymentVerificationController.php b/app/Http/Controllers/Bookings/ApprovePaymentVerificationController.php
new file mode 100644
index 00000000..4c336bc2
--- /dev/null
+++ b/app/Http/Controllers/Bookings/ApprovePaymentVerificationController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\ApprovePaymentVerificationLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ApprovePaymentVerificationController
+{
+    /**
+     * @param Request $request
+     * @param ApprovePaymentVerificationLogic $logic
+     * @return JsonResponse
+     */
+    public function approve(Request $request, ApprovePaymentVerificationLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Bookings/ApprovePurchaseOrderController.php b/app/Http/Controllers/Bookings/ApprovePurchaseOrderController.php
new file mode 100644
index 00000000..f72d56f4
--- /dev/null
+++ b/app/Http/Controllers/Bookings/ApprovePurchaseOrderController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\ApprovePurchaseOrderLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ApprovePurchaseOrderController
+{
+    /**
+     * @param Request $request
+     * @param ApprovePurchaseOrderLogic $logic
+     * @return JsonResponse
+     */
+    public function approve(Request $request, ApprovePurchaseOrderLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Bookings/CreateBookingPaymentController.php b/app/Http/Controllers/Bookings/CreateBookingPaymentController.php
new file mode 100644
index 00000000..e47932a6
--- /dev/null
+++ b/app/Http/Controllers/Bookings/CreateBookingPaymentController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\CreateBookingPaymentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateBookingPaymentController
+{
+    /**
+     * @param Request $request
+     * @param CreateBookingPaymentLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateBookingPaymentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Bookings/CreatePaymentVerificationController.php b/app/Http/Controllers/Bookings/CreatePaymentVerificationController.php
new file mode 100644
index 00000000..3c813bdd
--- /dev/null
+++ b/app/Http/Controllers/Bookings/CreatePaymentVerificationController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\CreatePaymentVerificationDocumentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreatePaymentVerificationController
+{
+    /**
+     * @param Request $request
+     * @param CreatePaymentVerificationDocumentLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreatePaymentVerificationDocumentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Bookings/FetchBookingController.php b/app/Http/Controllers/Bookings/FetchBookingController.php
new file mode 100644
index 00000000..06b7433d
--- /dev/null
+++ b/app/Http/Controllers/Bookings/FetchBookingController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\FetchBookingLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchBookingController
+{
+    /**
+     * @param Request $request
+     * @param FetchBookingLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchBookingLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Bookings/FetchBookingPaymentQuotationController.php b/app/Http/Controllers/Bookings/FetchBookingPaymentQuotationController.php
new file mode 100644
index 00000000..f96cb5a3
--- /dev/null
+++ b/app/Http/Controllers/Bookings/FetchBookingPaymentQuotationController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\FetchBookingPaymentQuotationLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchBookingPaymentQuotationController
+{
+    /**
+     * @param Request $request
+     * @param FetchBookingPaymentQuotationLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchBookingPaymentQuotationLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Bookings/ListBookingsController.php b/app/Http/Controllers/Bookings/ListBookingsController.php
index 8096b029..42d5fb6d 100644
--- a/app/Http/Controllers/Bookings/ListBookingsController.php
+++ b/app/Http/Controllers/Bookings/ListBookingsController.php
@@ -3,7 +3,6 @@
 
 namespace App\Http\Controllers\Bookings;
 
-use App\Classes\Modules\Addresses\ControllersLogic\ListAddressesLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use App\Classes\Modules\Bookings\ControllersLogic\ListBookingsLogic;
@@ -13,9 +12,9 @@ class ListBookingsController
 {
     /**
      * @param Request $request
+     * @param ListBookingsLogic $logic
      * @return JsonResponse
-     * @param ListBookingsLogic
-    */
+     */
 
     public function list(Request $request, ListBookingsLogic $logic) : JsonResponse {
         return $logic->execute($request);
diff --git a/app/Http/Controllers/Companies/ApproveIdentificationDocumentController.php b/app/Http/Controllers/Companies/ApproveIdentificationDocumentController.php
new file mode 100644
index 00000000..719350c3
--- /dev/null
+++ b/app/Http/Controllers/Companies/ApproveIdentificationDocumentController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Companies\ControllersLogic\ApproveIdentificationDocumentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ApproveIdentificationDocumentController
+{
+    /**
+     * @param Request $request
+     * @param ApproveIdentificationDocumentLogic $logic
+     * @return JsonResponse
+     */
+    public function approve(Request $request, ApproveIdentificationDocumentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Companies/AssignCompanyToSegmentController.php b/app/Http/Controllers/Companies/AssignCompanyToSegmentController.php
new file mode 100644
index 00000000..a5981771
--- /dev/null
+++ b/app/Http/Controllers/Companies/AssignCompanyToSegmentController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Companies\ControllersLogic\AssignCompanyToSegmentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class AssignCompanyToSegmentController
+{
+    /**
+     * @param Request $request
+     * @param AssignCompanyToSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function assign(Request $request, AssignCompanyToSegmentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Companies/CreateIdentificationDocumentController.php b/app/Http/Controllers/Companies/CreateIdentificationDocumentController.php
new file mode 100644
index 00000000..dd8ca321
--- /dev/null
+++ b/app/Http/Controllers/Companies/CreateIdentificationDocumentController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Companies\ControllersLogic\CreateIdentificationDocumentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateIdentificationDocumentController
+{
+    /**
+     * @param Request $request
+     * @param CreateIdentificationDocumentLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateIdentificationDocumentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Companies/FetchCompanyBookingQuotationController.php b/app/Http/Controllers/Companies/FetchCompanyBookingQuotationController.php
new file mode 100644
index 00000000..e2fd37b4
--- /dev/null
+++ b/app/Http/Controllers/Companies/FetchCompanyBookingQuotationController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Companies\ControllersLogic\FetchCompanyBookingQuotationLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchCompanyBookingQuotationController
+{
+    /**
+     * @param Request $request
+     * @param FetchCompanyBookingQuotationLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchCompanyBookingQuotationLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Companies/RemoveCompanyFromSegmentController.php b/app/Http/Controllers/Companies/RemoveCompanyFromSegmentController.php
new file mode 100644
index 00000000..604f8ee6
--- /dev/null
+++ b/app/Http/Controllers/Companies/RemoveCompanyFromSegmentController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Companies\ControllersLogic\RemoveCompanyFromSegmentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RemoveCompanyFromSegmentController
+{
+    /**
+     * @param Request $request
+     * @param RemoveCompanyFromSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function detach(Request $request, RemoveCompanyFromSegmentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Companies/UpdateSupplierCurrenciesController.php b/app/Http/Controllers/Companies/UpdateSupplierCurrenciesController.php
new file mode 100644
index 00000000..f58f3997
--- /dev/null
+++ b/app/Http/Controllers/Companies/UpdateSupplierCurrenciesController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Companies\ControllersLogic\UpdateSupplierCurrenciesLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateSupplierCurrenciesController
+{
+    /**
+     * @param Request $request
+     * @param UpdateSupplierCurrenciesLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateSupplierCurrenciesLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/CompanyBanks/CreateCompanyBankController.php b/app/Http/Controllers/CompanyBanks/CreateCompanyBankController.php
deleted file mode 100644
index 0bc71813..00000000
--- a/app/Http/Controllers/CompanyBanks/CreateCompanyBankController.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\CompanyBanks;
-
-use App\Classes\Modules\CompanyBanks\ControllersLogic\CreateCompanyBankLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class CreateCompanyBankController
-{
-    /**
-     * @param Request $request
-     * @param CreateCompanyBankLogic $logic
-     * @return JsonResponse
-     */
-    public function create(Request $request, CreateCompanyBankLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-}
\ No newline at end of file
diff --git a/app/Http/Controllers/CompanyBanks/DeleteCompanyBankController.php b/app/Http/Controllers/CompanyBanks/DeleteCompanyBankController.php
deleted file mode 100644
index 8a86eb1e..00000000
--- a/app/Http/Controllers/CompanyBanks/DeleteCompanyBankController.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\CompanyBanks;
-
-use App\Classes\Modules\CompanyBanks\ControllersLogic\DeleteCompanyBankLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class DeleteCompanyBankController
-{
-    /**
-     * @param Request $request
-     * @param DeleteCompanyBankLogic $logic
-     * @return JsonResponse
-     */
-    public function delete(Request $request, DeleteCompanyBankLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-}
\ No newline at end of file
diff --git a/app/Http/Controllers/CompanyBanks/UpdateCompanyBankController.php b/app/Http/Controllers/CompanyBanks/UpdateCompanyBankController.php
deleted file mode 100644
index a69bad4d..00000000
--- a/app/Http/Controllers/CompanyBanks/UpdateCompanyBankController.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\CompanyBanks;
-
-use App\Classes\Modules\CompanyBanks\ControllersLogic\UpdateCompanyBankLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class UpdateCompanyBankController
-{
-    /**
-     * @param Request $request
-     * @param UpdateCompanyBankLogic $logic
-     * @return JsonResponse
-     */
-    public function update(Request $request, UpdateCompanyBankLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-
-}
\ No newline at end of file
diff --git a/app/Http/Controllers/CompanyBanks/UpdateToDefaultCompanyBankController.php b/app/Http/Controllers/CompanyBanks/UpdateToDefaultCompanyBankController.php
deleted file mode 100644
index c5788ff4..00000000
--- a/app/Http/Controllers/CompanyBanks/UpdateToDefaultCompanyBankController.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\CompanyBanks;
-
-use App\Classes\Modules\CompanyBanks\ControllersLogic\UpdateToDefaultCompanyBankLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class UpdateToDefaultCompanyBankController
-{
-    /**
-     * @param Request $request
-     * @param UpdateToDefaultCompanyBankLogic $logic
-     * @return JsonResponse
-     */
-    public function update(Request $request, UpdateToDefaultCompanyBankLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-
-}
\ No newline at end of file
diff --git a/app/Http/Controllers/Currencies/FetchSystemPrimaryCurrencyController.php b/app/Http/Controllers/Currencies/FetchSystemPrimaryCurrencyController.php
new file mode 100644
index 00000000..73b8b1e5
--- /dev/null
+++ b/app/Http/Controllers/Currencies/FetchSystemPrimaryCurrencyController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Currencies;
+
+use App\Classes\Modules\Currencies\ControllersLogic\FetchSystemPrimaryCurrencyLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchSystemPrimaryCurrencyController
+{
+    /**
+     * @param Request $request
+     * @param FetchSystemPrimaryCurrencyLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchSystemPrimaryCurrencyLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Currencies/Rates/CalculateRateController.php b/app/Http/Controllers/Currencies/Rates/CalculateRateController.php
new file mode 100644
index 00000000..4ccd0923
--- /dev/null
+++ b/app/Http/Controllers/Currencies/Rates/CalculateRateController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Currencies\Rates;
+
+use App\Classes\Modules\Currencies\ControllersLogic\Rates\CalculateRateLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CalculateRateController
+{
+    /**
+     * @param Request $request
+     * @param CalculateRateLogic $logic
+     * @return JsonResponse
+     */
+    public function calculate(Request $request, CalculateRateLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Currencies/Rates/CreateRateController.php b/app/Http/Controllers/Currencies/Rates/CreateRateController.php
new file mode 100644
index 00000000..91a6f4d5
--- /dev/null
+++ b/app/Http/Controllers/Currencies/Rates/CreateRateController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Currencies\Rates;
+
+use App\Classes\Modules\Currencies\ControllersLogic\Rates\CreateRateLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateRateController
+{
+    /**
+     * @param Request $request
+     * @param CreateRateLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateRateLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Currencies/Rates/DeleteRateController.php b/app/Http/Controllers/Currencies/Rates/DeleteRateController.php
new file mode 100644
index 00000000..b361ed84
--- /dev/null
+++ b/app/Http/Controllers/Currencies/Rates/DeleteRateController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Currencies\Rates;
+
+use App\Classes\Modules\Currencies\ControllersLogic\Rates\DeleteRateLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteRateController
+{
+    /**
+     * @param Request $request
+     * @param DeleteRateLogic $logic
+     * @return JsonResponse
+     */
+    public function delete(Request $request, DeleteRateLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Currencies/Rates/FetchRateController.php b/app/Http/Controllers/Currencies/Rates/FetchRateController.php
new file mode 100644
index 00000000..b72b40df
--- /dev/null
+++ b/app/Http/Controllers/Currencies/Rates/FetchRateController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Currencies\Rates;
+
+use App\Classes\Modules\Currencies\ControllersLogic\Rates\FetchRateLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchRateController
+{
+    /**
+     * @param Request $request
+     * @param FetchRateLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchRateLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Currencies/Rates/ListRatesController.php b/app/Http/Controllers/Currencies/Rates/ListRatesController.php
new file mode 100644
index 00000000..04ba3162
--- /dev/null
+++ b/app/Http/Controllers/Currencies/Rates/ListRatesController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Currencies\Rates;
+
+use App\Classes\Modules\Currencies\ControllersLogic\Rates\ListRatesLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListRatesController
+{
+    /**
+     * @param Request $request
+     * @param ListRatesLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListRatesLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Currencies/Rates/UpdateRateController.php b/app/Http/Controllers/Currencies/Rates/UpdateRateController.php
new file mode 100644
index 00000000..651854bc
--- /dev/null
+++ b/app/Http/Controllers/Currencies/Rates/UpdateRateController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Currencies\Rates;
+
+use App\Classes\Modules\Currencies\ControllersLogic\Rates\UpdateRateLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateRateController
+{
+    /**
+     * @param Request $request
+     * @param UpdateRateLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateRateLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/CurrencyRates/CalculateCurrencyRateController.php b/app/Http/Controllers/CurrencyRates/CalculateCurrencyRateController.php
deleted file mode 100644
index dd432305..00000000
--- a/app/Http/Controllers/CurrencyRates/CalculateCurrencyRateController.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\CurrencyRates;
-
-use App\Classes\Modules\CurrencyRates\ControllersLogic\CalculateCurrencyRateLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class CalculateCurrencyRateController
-{
-    /**
-     * @param Request $request
-     * @param CalculateCurrencyRateLogic $logic
-     * @return JsonResponse
-     */
-    public function calculate(Request $request, CalculateCurrencyRateLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-}
\ No newline at end of file
diff --git a/app/Http/Controllers/CurrencyRates/CreateCurrencyRateController.php b/app/Http/Controllers/CurrencyRates/CreateCurrencyRateController.php
deleted file mode 100644
index cfe150c5..00000000
--- a/app/Http/Controllers/CurrencyRates/CreateCurrencyRateController.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\CurrencyRates;
-
-use App\Classes\Modules\CurrencyRates\ControllersLogic\CreateCurrencyRateLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class CreateCurrencyRateController
-{
-    /**
-     * @param Request $request
-     * @param CreateCurrencyRateLogic $logic
-     * @return JsonResponse
-     */
-    public function create(Request $request, CreateCurrencyRateLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-
-}
\ No newline at end of file
diff --git a/app/Http/Controllers/CurrencyRates/DeleteCurrencyRateController.php b/app/Http/Controllers/CurrencyRates/DeleteCurrencyRateController.php
deleted file mode 100644
index 91a5df45..00000000
--- a/app/Http/Controllers/CurrencyRates/DeleteCurrencyRateController.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\CurrencyRates;
-
-use App\Classes\Modules\CurrencyRates\ControllersLogic\DeleteCurrencyRateLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class DeleteCurrencyRateController
-{
-    /**
-     * @param Request $request
-     * @param DeleteCurrencyRateLogic $logic
-     * @return JsonResponse
-     */
-    public function delete(Request $request, DeleteCurrencyRateLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-
-}
\ No newline at end of file
diff --git a/app/Http/Controllers/CurrencyRates/FetchCurrencyRateController.php b/app/Http/Controllers/CurrencyRates/FetchCurrencyRateController.php
deleted file mode 100644
index 524ef007..00000000
--- a/app/Http/Controllers/CurrencyRates/FetchCurrencyRateController.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\CurrencyRates;
-
-use App\Classes\Modules\CurrencyRates\ControllersLogic\FetchCurrencyRateLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class FetchCurrencyRateController
-{
-    /**
-     * @param Request $request
-     * @param FetchCurrencyRateLogic $logic
-     * @return JsonResponse
-     */
-    public function fetch(Request $request, FetchCurrencyRateLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-
-}
\ No newline at end of file
diff --git a/app/Http/Controllers/CurrencyRates/ListCurrencyRatesController.php b/app/Http/Controllers/CurrencyRates/ListCurrencyRatesController.php
deleted file mode 100644
index 7254bca8..00000000
--- a/app/Http/Controllers/CurrencyRates/ListCurrencyRatesController.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\CurrencyRates;
-
-use App\Classes\Modules\CurrencyRates\ControllersLogic\ListCurrencyRatesLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ListCurrencyRatesController
-{
-    /**
-     * @param Request $request
-     * @param ListCompaniesLogic $logic
-     * @return JsonResponse
-     */
-    public function list(Request $request, ListCurrencyRatesLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-
-}
\ No newline at end of file
diff --git a/app/Http/Controllers/CurrencyRates/UpdateCompanyController.php b/app/Http/Controllers/CurrencyRates/UpdateCompanyController.php
deleted file mode 100644
index a6c6d61c..00000000
--- a/app/Http/Controllers/CurrencyRates/UpdateCompanyController.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\CurrencyRates;
-
-use App\Classes\Modules\CurrencyRates\ControllersLogic\UpdateCurrencyRateLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class UpdateCurrencyRateController
-{
-    /**
-     * @param Request $request
-     * @param UpdateCurrencyRateLogic $logic
-     * @return JsonResponse
-     */
-    public function update(Request $request, UpdateCurrencyRateLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-
-}
\ No newline at end of file
diff --git a/app/Http/Controllers/Documents/ApproveDocumentController.php b/app/Http/Controllers/Documents/ApproveDocumentController.php
index 964a3811..ae55f51c 100644
--- a/app/Http/Controllers/Documents/ApproveDocumentController.php
+++ b/app/Http/Controllers/Documents/ApproveDocumentController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Documents;
 
-use App\Classes\Modules\Documents\ControllersLogic\ApproveDocumentLogic;
+use App\Classes\Modules\Documents\ControllersLogic\ApproveIdentificationDocumentLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class ApproveDocumentController
 {
     /**
      * @param Request $request
-     * @param ApproveDocumentLogic $logic
+     * @param ApproveIdentificationDocumentLogic $logic
      * @return JsonResponse
      */
-    public function approve(Request $request, ApproveDocumentLogic $logic): JsonResponse {
+    public function approve(Request $request, ApproveIdentificationDocumentLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Documents/RejectDocumentController.php b/app/Http/Controllers/Documents/RejectDocumentController.php
new file mode 100644
index 00000000..156d7d03
--- /dev/null
+++ b/app/Http/Controllers/Documents/RejectDocumentController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Documents;
+
+use App\Classes\Modules\Documents\ControllersLogic\RejectDocumentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RejectDocumentController
+{
+    /**
+     * @param Request $request
+     * @param RejectDocumentLogic $logic
+     * @return JsonResponse
+     */
+    public function reject(Request $request, RejectDocumentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Documents/RenderDocumentController.php b/app/Http/Controllers/Documents/RenderDocumentController.php
new file mode 100644
index 00000000..690f99f9
--- /dev/null
+++ b/app/Http/Controllers/Documents/RenderDocumentController.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers\Documents;
+
+
+use App\Classes\Modules\Documents\ControllersLogic\RenderDocumentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RenderDocumentController
+{
+
+    /**
+     * @param Request $request
+     * @param RenderDocumentLogic $logic
+     * @return JsonResponse
+     */
+    public function fileStorageServe(Request $request, RenderDocumentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/SegmentConstants/CreateSegmentConstantController.php b/app/Http/Controllers/SegmentConstants/CreateSegmentConstantController.php
deleted file mode 100644
index 7520e1d1..00000000
--- a/app/Http/Controllers/SegmentConstants/CreateSegmentConstantController.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\SegmentConstants;
-
-use App\Classes\Modules\SegmentConstants\ControllersLogic\CreateSegmentConstantLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class CreateSegmentConstantController
-{
-    /**
-     * @param Request $request
-     * @param CreateSegmentConstantLogic $logic
-     * @return JsonResponse
-     */
-    public function create(Request $request, CreateSegmentConstantLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-}
\ No newline at end of file
diff --git a/app/Http/Controllers/SegmentConstants/UpdateSegmentConstantController.php b/app/Http/Controllers/SegmentConstants/UpdateSegmentConstantController.php
deleted file mode 100644
index c34914dc..00000000
--- a/app/Http/Controllers/SegmentConstants/UpdateSegmentConstantController.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\SegmentConstants;
-
-use App\Classes\Modules\SegmentConstants\ControllersLogic\UpdateSegmentConstantLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class UpdateSegmentConstantController
-{
-    /**
-     * @param Request $request
-     * @param UpdateSegmentConstantLogic $logic
-     * @return JsonResponse
-     */
-    public function update(Request $request, UpdateSegmentConstantLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-
-}
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/FetchConstantController.php b/app/Http/Controllers/Segments/FetchConstantController.php
new file mode 100644
index 00000000..e3658802
--- /dev/null
+++ b/app/Http/Controllers/Segments/FetchConstantController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\FetchConstantLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchConstantController
+{
+    /**
+     * @param Request $request
+     * @param FetchConstantLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchConstantLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/FetchSegmentController.php b/app/Http/Controllers/Segments/FetchSegmentController.php
new file mode 100644
index 00000000..91961689
--- /dev/null
+++ b/app/Http/Controllers/Segments/FetchSegmentController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\FetchSegmentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchSegmentController
+{
+    /**
+     * @param Request $request
+     * @param FetchSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchSegmentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/ListSegmentsController.php b/app/Http/Controllers/Segments/ListSegmentsController.php
new file mode 100644
index 00000000..3dc14ebd
--- /dev/null
+++ b/app/Http/Controllers/Segments/ListSegmentsController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\ListSegmentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListSegmentsController
+{
+    /**
+     * @param Request $request
+     * @param ListSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListSegmentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/UpdateConstantController.php b/app/Http/Controllers/Segments/UpdateConstantController.php
new file mode 100644
index 00000000..47def571
--- /dev/null
+++ b/app/Http/Controllers/Segments/UpdateConstantController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\UpdateConstantLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateConstantController
+{
+    /**
+     * @param Request $request
+     * @param UpdateConstantLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateConstantLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/UpdateCustomServiceConstantController.php b/app/Http/Controllers/Segments/UpdateCustomServiceConstantController.php
new file mode 100644
index 00000000..29bb6655
--- /dev/null
+++ b/app/Http/Controllers/Segments/UpdateCustomServiceConstantController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\ServiceTypes\ControllersLogic\UpdateCustomServiceConstantLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCustomServiceConstantController
+{
+    /**
+     * @param Request $request
+     * @param UpdateCustomServiceConstantLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateCustomServiceConstantLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/ServiceTypes/CreateServiceTypeController.php b/app/Http/Controllers/ServiceTypes/CreateServiceTypeController.php
new file mode 100644
index 00000000..831383d0
--- /dev/null
+++ b/app/Http/Controllers/ServiceTypes/CreateServiceTypeController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\ServiceTypes;
+
+use App\Classes\Modules\ServiceTypes\ControllersLogic\CreateServiceTypeLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateServiceTypeController
+{
+    /**
+     * @param Request $request
+     * @param CreateServiceTypeLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateServiceTypeLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/ServiceTypes/DeleteServiceTypeController.php b/app/Http/Controllers/ServiceTypes/DeleteServiceTypeController.php
new file mode 100644
index 00000000..2178f11a
--- /dev/null
+++ b/app/Http/Controllers/ServiceTypes/DeleteServiceTypeController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\ServiceTypes;
+
+use App\Classes\Modules\ServiceTypes\ControllersLogic\DeleteServiceTypeLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteServiceTypeController
+{
+    /**
+     * @param Request $request
+     * @param DeleteServiceTypeLogic $logic
+     * @return JsonResponse
+     */
+    public function destroy(Request $request, DeleteServiceTypeLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/ServiceTypes/FetchServiceTypeController.php b/app/Http/Controllers/ServiceTypes/FetchServiceTypeController.php
new file mode 100644
index 00000000..80742a54
--- /dev/null
+++ b/app/Http/Controllers/ServiceTypes/FetchServiceTypeController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\ServiceTypes;
+
+use App\Classes\Modules\ServiceTypes\ControllersLogic\FetchServiceTypeLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchServiceTypeController
+{
+    /**
+     * @param Request $request
+     * @param FetchServiceTypeLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchServiceTypeLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/ServiceTypes/ListServiceTypesController.php b/app/Http/Controllers/ServiceTypes/ListServiceTypesController.php
new file mode 100644
index 00000000..848e7f4c
--- /dev/null
+++ b/app/Http/Controllers/ServiceTypes/ListServiceTypesController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\ServiceTypes;
+
+use App\Classes\Modules\ServiceTypes\ControllersLogic\ListServiceTypesLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListServiceTypesController
+{
+    /**
+     * @param Request $request
+     * @param ListServiceTypesLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListServiceTypesLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/ServiceTypes/UpdateServiceTypeController.php b/app/Http/Controllers/ServiceTypes/UpdateServiceTypeController.php
new file mode 100644
index 00000000..0e103dcb
--- /dev/null
+++ b/app/Http/Controllers/ServiceTypes/UpdateServiceTypeController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\ServiceTypes;
+
+use App\Classes\Modules\ServiceTypes\ControllersLogic\UpdateServiceTypeLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateServiceTypeController
+{
+    /**
+     * @param Request $request
+     * @param UpdateServiceTypeLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateServiceTypeLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/ServiceTypes/UpdateServiceTypeStatusController.php b/app/Http/Controllers/ServiceTypes/UpdateServiceTypeStatusController.php
new file mode 100644
index 00000000..472d2535
--- /dev/null
+++ b/app/Http/Controllers/ServiceTypes/UpdateServiceTypeStatusController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\ServiceTypes;
+
+use App\Classes\Modules\ServiceTypes\ControllersLogic\UpdateServiceTypeStatusLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateServiceTypeStatusController
+{
+    /**
+     * @param Request $request
+     * @param UpdateServiceTypeStatusLogic $logic
+     * @return JsonResponse
+     */
+    public function activate(Request $request, UpdateServiceTypeStatusLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Services/CountriesListController.php b/app/Http/Controllers/Services/CountriesListController.php
new file mode 100644
index 00000000..cebb0b48
--- /dev/null
+++ b/app/Http/Controllers/Services/CountriesListController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Services;
+
+use App\Classes\Modules\Countries\ControllersLogic\ListCountriesLogic;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class CountriesListController extends Controller
+{
+    public function index(Request $request, ListCountriesLogic $logic){
+        return $logic->execute($request);
+	}
+}
diff --git a/app/Http/Controllers/StandardSegments/ListStandardSegmentsController.php b/app/Http/Controllers/StandardSegments/ListStandardSegmentsController.php
index 0218ac37..606e43a7 100644
--- a/app/Http/Controllers/StandardSegments/ListStandardSegmentsController.php
+++ b/app/Http/Controllers/StandardSegments/ListStandardSegmentsController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\StandardSegments;
 
-use App\Classes\Modules\Segments\ControllersLogic\ListStandardSegmentLogic;
+use App\Classes\Modules\Segments\ControllersLogic\ListSegmentLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class ListStandardSegmentsController
 {
     /**
      * @param Request $request
-     * @param ListStandardSegmentLogic $logic
+     * @param ListSegmentLogic $logic
      * @return JsonResponse
      */
-    public function list(Request $request, ListStandardSegmentLogic $logic): JsonResponse {
+    public function list(Request $request, ListSegmentLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Transactions/CreatePaymentProofDocumentController.php b/app/Http/Controllers/Transactions/CreatePaymentProofDocumentController.php
new file mode 100644
index 00000000..c7a34bc4
--- /dev/null
+++ b/app/Http/Controllers/Transactions/CreatePaymentProofDocumentController.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\CreatePaymentProofDocumentLogic;
+
+
+class CreatePaymentProofDocumentController
+{
+    /**
+     * @param Request $request
+     * @param CreatePaymentProofDocumentLogic $logic
+     * @return JsonResponse
+     */
+    public function verify(Request $request, CreatePaymentProofDocumentLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Transactions/CreatePurchaseOrderTransactionController.php b/app/Http/Controllers/Transactions/CreatePurchaseOrderTransactionController.php
new file mode 100644
index 00000000..67a74537
--- /dev/null
+++ b/app/Http/Controllers/Transactions/CreatePurchaseOrderTransactionController.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\CreatePurchaseOrderTransactionLogic;
+
+
+class CreatePurchaseOrderTransactionController
+{
+    /**
+     * @param Request $request
+     * @param CreatePurchaseOrderTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreatePurchaseOrderTransactionLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Transactions/CreateSupplierTransactionController.php b/app/Http/Controllers/Transactions/CreateSupplierTransactionController.php
new file mode 100644
index 00000000..5c989ddb
--- /dev/null
+++ b/app/Http/Controllers/Transactions/CreateSupplierTransactionController.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\CreateSupplierTransactionLogic;
+
+
+class CreateSupplierTransactionController
+{
+    /**
+     * @param Request $request
+     * @param CreateSupplierTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateSupplierTransactionLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Transactions/ListTransactionsController.php b/app/Http/Controllers/Transactions/ListTransactionsController.php
new file mode 100644
index 00000000..64571485
--- /dev/null
+++ b/app/Http/Controllers/Transactions/ListTransactionsController.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\ListTransactionsLogic;
+
+
+class ListTransactionsController
+{
+    /**
+     * @param Request $request
+     * @param ListTransactionsLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListTransactionsLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Transactions/SuspendTransactionController.php b/app/Http/Controllers/Transactions/SuspendTransactionController.php
new file mode 100644
index 00000000..ad7eef91
--- /dev/null
+++ b/app/Http/Controllers/Transactions/SuspendTransactionController.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\SuspendTransactionLogic;
+
+
+class SuspendTransactionController
+{
+    /**
+     * @param Request $request
+     * @param SuspendTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function suspend(Request $request, SuspendTransactionLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 94a92925..172d428b 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -48,7 +48,7 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
-            'throttle:60,1',
+            'throttle:300,1',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];
diff --git a/app/Http/Middleware/ValidateToken.php b/app/Http/Middleware/ValidateToken.php
index 41697e07..846972aa 100644
--- a/app/Http/Middleware/ValidateToken.php
+++ b/app/Http/Middleware/ValidateToken.php
@@ -2,27 +2,45 @@
 
 namespace App\Http\Middleware;
 
+use App\Classes\Exceptions\AccessUnauthorisedException;
 use App\Classes\ValueObjects\Constants\HttpStatus;
 use App\Classes\ValueObjects\Response\ApiResponseObject;
 use Closure;
 use Exception;
-use Tymon\JWTAuth\Facades\JWTAuth;
+use Tymon\JWTAuth\JWT;
 
 class ValidateToken
 {
+    /** @var JWT */
+    private $manager;
+
+    /**
+     * ValidateToken constructor.
+     * @param JWT $manager
+     */
+    public function __construct(JWT $manager)
+    {
+        $this->manager = $manager;
+    }
+
+
     /**
      * Checks if jwt token is valid.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure $next
      * @return mixed
      */
     public function handle($request, Closure $next)
     {
         try {
-            JWTAuth::parseToken()->authenticate();
+
+            if(!$this->manager->check()){ throw new AccessUnauthorisedException(); }
+
         } catch (Exception $exception) {
+
             return (new ApiResponseObject('Authentication', 'To keep your account secure we need to re-validate your account', HttpStatus::ACCESS_UNAUTHORISED))->handler();
+
         }
 
         return $next($request);
diff --git a/app/Http/Resources/AddressResource.php b/app/Http/Resources/AddressResource.php
index 1b2bebe9..4e545092 100644
--- a/app/Http/Resources/AddressResource.php
+++ b/app/Http/Resources/AddressResource.php
@@ -16,14 +16,12 @@ class AddressResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'company_id' => $this->company_id,
             'street_one' => $this->street_one,
             'street_two' => $this->street_two,
-            'city' => $this->city,
+            'district' => $this->district,
             'state' => $this->state,
-            'post_code' => $this->post_code,
+            'post_code' => $this->postcode,
             'country' => $this->country,
-            'default' => (int) $this->default,
             'billing' => (int) $this->billing
         ];
     }
diff --git a/app/Http/Resources/CompanyBankResource.php b/app/Http/Resources/BankResource.php
similarity index 80%
rename from app/Http/Resources/CompanyBankResource.php
rename to app/Http/Resources/BankResource.php
index 5bb9e2d2..a0bce774 100644
--- a/app/Http/Resources/CompanyBankResource.php
+++ b/app/Http/Resources/BankResource.php
@@ -4,7 +4,7 @@ namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
-class CompanyBankResource extends JsonResource
+class BankResource extends JsonResource
 {
     /**
      * Transform the resource into an array.
@@ -16,12 +16,13 @@ class CompanyBankResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'country_id' => $this->country_id,
-            'company_id' => $this->company_id,
+            'company_business_type' => $this->company->business_type,
+            'type' => $this->type,
+            'reference' => $this->reference,
             'bank_name' => $this->bank_name,
             'holder_name' => $this->holder_name,
             'account_no' => $this->account_no,
-            'type' => $this->type,
+            'country_id' => $this->country_id,
             'default' => $this->default,
             'status' => $this->status,
         ];
diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index ee5c62a9..57d93e57 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -2,29 +2,53 @@
 
 namespace App\Http\Resources;
 
+use App\Classes\Modules\Bookings\Services\CalculatesBookingFloatingAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingOutstanding;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingPaidAmount;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class BookingResource extends JsonResource
 {
+
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Http\Request $request
      * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
     public function toArray($request)
     {
         return [
             'id' => $this->id,
-            'company_id' => $this->company_id,
-            'transferable_bank_id' => $this->transferable_bank_id,
+            'company' => new CompanyResource($this->company),
+            'bank' => new BankResource($this->bank),
+            'service' => new ServiceTypeResource($this->service),
             'marking' => $this->marking,
-            'reference' => $this->reference,
-            'fix_amount' => $this->fix_amount,
-            'fix_currency_id' => $this->fix_currency_id,
-            'convertible_currency_id' => $this->convertible_currency_id,
-            'conversion_currency_id' => $this->conversion_currency_id,
-            'status' => $this->status
+            'amount' => $this->fix_amount,
+            'floating_amount' => floatval((App()->make(CalculatesBookingFloatingAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'paid_amount' => floatval((App()->make(CalculatesBookingPaidAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)),
+            'fixed_currency' => new CurrencyResource($this->fixedCurrency),
+            'convertible_currency' => new CurrencyResource($this->convertibleCurrency),
+            'conversion_currency' => new CurrencyResource($this->conversionCurrency),
+            'status' => $this->status,
+            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'),
+            $this->mergeWhen($this->relationLoaded('transactions'), [
+                'purchase_order' => new TransactionResource($this->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first()),
+                'payment_attempts' => TransactionResource::collection($this->transactions()->where('type', TransactionType::PAYMENT)->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->get()),
+                'expired_payment_attempts' => TransactionResource::collection($this->transactions()->where('type', TransactionType::PAYMENT)->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '<', Carbon::now())->get()),
+                'payment_history' => TransactionResource::collection($this->transactions()->where(function($query){
+                    $query->where(function($query){
+                        $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::REJECTED]);
+                    })->orWhere(function($query){
+                        $query->where('type', TransactionType::BILL)->whereIn('status', [ApprovalStatus::APPROVED,  ApprovalStatus::COMPLETED]);
+                    });
+                })->latest()->get())
+            ])
         ];
     }
 }
diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php
index af34cfdf..1cc465aa 100644
--- a/app/Http/Resources/CompanyResource.php
+++ b/app/Http/Resources/CompanyResource.php
@@ -2,6 +2,13 @@
 
 namespace App\Http\Resources;
 
+use App\Classes\Modules\Companies\Services\FetchesCompanyServices;
+use App\Classes\ValueObjects\Constants\BankAccountType;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Models\Currency;
+use App\Models\SegmentConstant;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class CompanyResource extends JsonResource
@@ -19,7 +26,27 @@ class CompanyResource extends JsonResource
             'name' => $this->name,
             'reference' => $this->reference,
             'type' => (int) $this->type,
-            'status' => (int) $this->status
+            'business_type' => (int) $this->business_type,
+            'status' => (int) $this->status,
+            'contact' => new ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
+            'address' => new AddressResource($this->when($this->has('addresses'), $this->addresses->first())),
+            'employee' => new UserResource($this->employees->first()),
+            'identification' => new DocumentResource($this->whenLoaded('documents', $this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->first())),
+            'bookings' => BookingResource::collection($this->whenLoaded('bookings', $this->bookings()->orderBy('id', 'DESC')->get(), [])),
+            'personal_banks' => BankResource::collection($this->banks->where('type', BankAccountType::PERSONAL)),
+            'recipient_banks' => [
+                'accounts' => BankResource::collection($this->banks->where('type', BankAccountType::EXTERNAL)),
+                'default' => new BankResource($this->banks->where('type', BankAccountType::EXTERNAL)->where('default', true)->first())
+            ],
+            'segments' => SegmentResource::collection($this->segments),
+            'services' => (new FetchesCompanyServices())->getServices($this->servicesConfigurations()),
+            'currencies' => $this->when($this->business_type === BusinessType::CURRENCY_VENDOR, function(){
+                $segment = SegmentConstant::where('reference', SegmentConstants::SUPPLIER_CURRENCIES)->where('detail->id', $this->id)->first();
+                return $segment ? CurrencyResource::collection(Currency::whereIn('id', $segment->detail->currencies)->get()) : [];
+            })
+
+
         ];
+
     }
 }
diff --git a/app/Http/Resources/ConstantResource.php b/app/Http/Resources/ConstantResource.php
new file mode 100644
index 00000000..3e1408c3
--- /dev/null
+++ b/app/Http/Resources/ConstantResource.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\Modules\Segments\Services\ConvertsConstantDetailsToResource;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ConstantResource extends JsonResource
+{
+
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'reference' => $this->reference,
+            'detail' => (App()->make(ConvertsConstantDetailsToResource::class))->execute($this)
+        ];
+    }
+}
diff --git a/app/Http/Resources/ContactResource.php b/app/Http/Resources/ContactResource.php
index 9a8435d4..359e61cd 100644
--- a/app/Http/Resources/ContactResource.php
+++ b/app/Http/Resources/ContactResource.php
@@ -16,8 +16,7 @@ class ContactResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'country_id' => $this->country_id,
-            'company_id' => $this->company_id,
+            'country_code' => $this->country->phone_code,
             'reference' => $this->reference,
             'phone' => $this->phone,
             'email' => $this->email,
diff --git a/app/Http/Resources/CountryResource.php b/app/Http/Resources/CountryResource.php
new file mode 100644
index 00000000..f15c41f8
--- /dev/null
+++ b/app/Http/Resources/CountryResource.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class CountryResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'short_code' => $this->short_code,
+            'phone_code' => $this->phone_code,
+        ];
+    }
+}
diff --git a/app/Http/Resources/CurrencyConversionResource.php b/app/Http/Resources/CurrencyConversionResource.php
new file mode 100644
index 00000000..0c87a9e7
--- /dev/null
+++ b/app/Http/Resources/CurrencyConversionResource.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Models\CurrencyRate;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class CurrencyConversionResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'country' => new CountryResource($this->country),
+            'name' => $this->name,
+            'short_code' => $this->short_code,
+            'symbol' => $this->symbol,
+        ];
+    }
+}
diff --git a/app/Http/Resources/CurrencyRateResource.php b/app/Http/Resources/CurrencyRateResource.php
index e94f0f67..66d548f1 100644
--- a/app/Http/Resources/CurrencyRateResource.php
+++ b/app/Http/Resources/CurrencyRateResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class CurrencyRateResource extends JsonResource
@@ -15,10 +16,11 @@ class CurrencyRateResource extends JsonResource
     public function toArray($request)
     {
         return [
-            'id' => $this->id,
-            'currency_id' => $this->currency_id,
-            'selling' => $this->selling,
-            'payment_method_type' => $this->payment_method_type
+            'payment_method' => PaymentMethodType::PAYMENT_METHODS_ID[$this->payment_method_type],
+            'selling' => [
+                'type' => property_exists($this->selling, 'type') ? $this->selling->type : 'rate',
+                'value' => property_exists($this->selling, 'value') ? $this->selling->value : $this->selling
+            ]
         ];
     }
 }
diff --git a/app/Http/Resources/CurrencyResource.php b/app/Http/Resources/CurrencyResource.php
index 52454483..e6265c67 100644
--- a/app/Http/Resources/CurrencyResource.php
+++ b/app/Http/Resources/CurrencyResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\Models\CurrencyRate;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class CurrencyResource extends JsonResource
@@ -16,11 +17,10 @@ class CurrencyResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'country_id' => $this->country_id,
+            'country' => new CountryResource($this->country),
             'name' => $this->name,
             'short_code' => $this->short_code,
             'symbol' => $this->symbol,
-            'currency_rates' => $this->currency_rates()->get()
         ];
     }
 }
diff --git a/app/Http/Resources/CustomServiceTypeResource.php b/app/Http/Resources/CustomServiceTypeResource.php
new file mode 100644
index 00000000..8ec26e47
--- /dev/null
+++ b/app/Http/Resources/CustomServiceTypeResource.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceConfigurations;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Models\ServiceType;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class CustomServiceTypeResource extends JsonResource
+{
+
+    /**
+     * @param \Illuminate\Http\Request $request
+     * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->detail->id,
+            'name' => ServiceType::where('id', $this->detail->id)->first()->name,
+            'detail' => $this->detail,
+            'configurations' => (App()->make(FetchesServiceConfigurations::class))->execute($this->resource, SegmentConstants::CUSTOM_SERVICE_TYPE)
+        ];
+    }
+}
diff --git a/app/Http/Resources/DistrictResource.php b/app/Http/Resources/DistrictResource.php
new file mode 100644
index 00000000..c0c24f73
--- /dev/null
+++ b/app/Http/Resources/DistrictResource.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class DistrictResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'city' => $this->name,
+            'state' => $this->state,
+            'country' => $this->country
+        ];
+    }
+}
diff --git a/app/Http/Resources/DocumentResource.php b/app/Http/Resources/DocumentResource.php
index 51aef2e7..dbfea08c 100644
--- a/app/Http/Resources/DocumentResource.php
+++ b/app/Http/Resources/DocumentResource.php
@@ -2,6 +2,9 @@
 
 namespace App\Http\Resources;
 
+use App\Models\Company;
+use App\Models\Document;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class DocumentResource extends JsonResource
@@ -16,11 +19,11 @@ class DocumentResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'document_type' => $this->document_type,
             'reference' => $this->reference,
             'status' => (int) $this->status,
-            'approved_by' => (int) $this->approved_by,
-            'files' => $this->files()->get()
+            'document_type' => $this->document_type,
+            'owner' =>  new CompanyResource($this->whenLoaded('owner')),
+            'files' => FileResource::collection($this->files)
         ];
     }
 }
diff --git a/app/Http/Resources/SegmentConstantResource.php b/app/Http/Resources/FileResource.php
similarity index 73%
rename from app/Http/Resources/SegmentConstantResource.php
rename to app/Http/Resources/FileResource.php
index aa939d8e..20a84589 100644
--- a/app/Http/Resources/SegmentConstantResource.php
+++ b/app/Http/Resources/FileResource.php
@@ -4,7 +4,7 @@ namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
-class SegmentConstantResource extends JsonResource
+class FileResource extends JsonResource
 {
     /**
      * Transform the resource into an array.
@@ -16,8 +16,8 @@ class SegmentConstantResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'name' => $this->name,
-            'detail' => $this->detail
+            'file' => $this->file,
+            'type' => (int) $this->file_type,
         ];
     }
 }
diff --git a/app/Http/Resources/SegmentResource.php b/app/Http/Resources/SegmentResource.php
index f07e9661..58118e08 100644
--- a/app/Http/Resources/SegmentResource.php
+++ b/app/Http/Resources/SegmentResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\Classes\ValueObjects\Constants\SegmentConstants;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class SegmentResource extends JsonResource
@@ -17,6 +18,10 @@ class SegmentResource extends JsonResource
         return [
             'id' => $this->id,
             'name' => $this->name,
+            'time_limit' => $this->when($this->whereHas('constants', function($query){
+                $query->where('reference', SegmentConstants::PAYMENT_ATTEMPT_DURATION_LIMIT);
+            }), $this->constants->where('reference', SegmentConstants::PAYMENT_ATTEMPT_DURATION_LIMIT)->first()),
+            'services' => CustomServiceTypeResource::collection($this->constants->where('reference', SegmentConstants::CUSTOM_SERVICE_TYPE))
         ];
     }
 }
diff --git a/app/Http/Resources/ServiceTypeResource.php b/app/Http/Resources/ServiceTypeResource.php
new file mode 100644
index 00000000..bc46b23d
--- /dev/null
+++ b/app/Http/Resources/ServiceTypeResource.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceConfigurations;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Models\SegmentConstant;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ServiceTypeResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function toArray($request)
+    {
+
+        $constants = SegmentConstant::where('reference', SegmentConstants::SERVICE_TYPE)->where('detail->id', $this->id)->first();
+        return [
+            'id' => $this->id,
+            'status' => (int) $this->status,
+            'name' => $this->name,
+            'configurations' => (App()->make(FetchesServiceConfigurations::class))->execute($constants, SegmentConstants::SERVICE_TYPE)
+        ];
+
+    }
+}
diff --git a/app/Http/Resources/TransactionDetailResource.php b/app/Http/Resources/TransactionDetailResource.php
index 9589b1f7..1b60cfce 100644
--- a/app/Http/Resources/TransactionDetailResource.php
+++ b/app/Http/Resources/TransactionDetailResource.php
@@ -16,16 +16,11 @@ class TransactionDetailResource extends JsonResource
     {
         
         return [
-            'id' => $this->id,
-            'trans_type1' => $this->trans_type1,
-            'trans_type2' => $this->trans_type2,
-            'transaction_id' => (int) $this->transaction_id,
-            'product_code' => $this->product_code,
-            'product_name' => $this->product_name,
-            'qty' => (int) $this->qty,
-            'price' => (double) $this->price,
-            'amount' => (double) $this->amount
-            
+            'stockCode' => $this->product_code,
+            'description' => $this->product_name,
+            'quantity' => $this->quantity,
+            'unit_price' => (double) $this->price,
+            'total' => (double) $this->amount
         ];
     }
 }
diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index c5ba9af5..a543f00d 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class TransactionResource extends JsonResource
@@ -14,21 +15,21 @@ class TransactionResource extends JsonResource
      */
     public function toArray($request)
     {
-        
+
         return [
             'id' => $this->id,
-            'trans_type1' => $this->trans_type1,
-            'trans_type2' => $this->trans_type2,
-            'bill_no' => (int) $this->bill_no,
+            'booking' => new BookingResource($this->booking),
+            'bill_no' => $this->bill_no,
             'amount' => (double) $this->amount,
-            'currency_id' => (int) $this->currency_id,
             'original_amount' => (double) $this->original_amount,
-            'original_currency_id' => (int) $this->original_currency_id,
+            'currency' => new CurrencyResource($this->currency),
+            'original_currency' => new CurrencyResource($this->original_currency),
             'currency_rate' => (double) $this->currency_rate,
-            'dt_transaction' => $this->dt_transaction,
             'status' => (int) $this->status,
-            'booking_id' => (int) $this->booking_id,
-            'company_id' => (int) $this->company_id
+            'details' => TransactionDetailResource::collection($this->transactionDetails),
+            'documents' => new DocumentResource($this->documents()->first()),
+            'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:s:i'),
+            'updated_at' => Carbon::parse($this->update_at)->format('d-m-Y h:s:i')
         ];
     }
 }
diff --git a/app/Models/Address.php b/app/Models/Address.php
index 78033755..47a615b2 100644
--- a/app/Models/Address.php
+++ b/app/Models/Address.php
@@ -2,13 +2,13 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * Class Address
  * @package App\Models
- * @version August 4, 2020, 4:36 am
  *
  * @property \App\Models\Country country_id
  * @property \App\Models\Company company_id
@@ -28,34 +28,34 @@ class Address extends AbstractModel
     protected $dates = ['deleted_at'];
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     **/
-    public function country(): HasOne
+     * @return BelongsTo
+     */
+    public function country(): BelongsTo
     {
-        return $this->hasOne(Country::class, 'country_id', 'id');
+        return $this->BelongsTo(Country::class, 'country_id', 'id');
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     **/
-    public function company(): HasOne
+     * @return BelongsTo
+     */
+    public function company(): BelongsTo
     {
-        return $this->hasOne(Company::class, 'company_id', 'id');
+        return $this->BelongsTo(Company::class, 'company_id', 'id');
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     **/
-    public function state(): HasOne
+     * @return BelongsTo
+     */
+    public function state(): BelongsTo
     {
-        return $this->hasOne(State::class, 'state_id', 'id');
+        return $this->BelongsTo(State::class, 'state_id', 'id');
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     **/
-    public function district(): HasOne
+     * @return BelongsTo
+     */
+    public function district(): BelongsTo
     {
-        return $this->hasOne(District::class, 'district_id', 'id');
+        return $this->BelongsTo(District::class, 'district_id', 'id');
     }
 }
diff --git a/app/Models/CompanyBank.php b/app/Models/Bank.php
similarity index 68%
rename from app/Models/CompanyBank.php
rename to app/Models/Bank.php
index 308d809d..9381b94a 100644
--- a/app/Models/CompanyBank.php
+++ b/app/Models/Bank.php
@@ -2,14 +2,14 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
 /**
- * Class CompanyBank
+ * Class Bank
  * @package App\Models
- * @version August 4, 2020, 4:36 am
  *
  * @property \App\Models\Country country_id
  * @property \App\Models\Company company_id
@@ -20,11 +20,11 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
  * @property int default
  * @property int status
  */
-class CompanyBank extends AbstractModel
+class Bank extends AbstractModel
 {
     use SoftDeletes;
     
-    protected $table = 'company_banks';
+    protected $table = 'banks';
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
@@ -35,10 +35,10 @@ class CompanyBank extends AbstractModel
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      **/
-    public function company(): HasOne
+    public function company(): BelongsTo
     {
-        return $this->hasOne(Company::class, 'company_id', 'id');
+        return $this->BelongsTo(Company::class, 'company_id', 'id');
     }
 }
diff --git a/app/Models/Booking.php b/app/Models/Booking.php
index 0e56c5fc..e719abc5 100644
--- a/app/Models/Booking.php
+++ b/app/Models/Booking.php
@@ -2,15 +2,20 @@
 
 namespace App\Models;
 
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Scopes\CustomerBookingsScope;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * Class Booking
  * @package App\Models
- * @version August 4, 2020, 4:36 am
  *
  * @property \App\Models\Company company_id
- * @property \App\Models\CompanyBank transferable_bank_id
+ * @property \App\Models\Bank transferable_bank_id
  * @property string marking
  * @property string reference
  * @property float fix_amount
@@ -24,4 +29,69 @@ class Booking extends AbstractModel
     protected $table = 'bookings';
 
     protected $dates = ['deleted_at'];
+
+    /**
+     * @return BelongsTo
+     */
+    public function company(): BelongsTo
+    {
+        return $this->BelongsTo(Company::class, 'company_id');
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function service(): BelongsTo
+    {
+        return $this->BelongsTo(ServiceType::class, 'service_id');
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function bank(): BelongsTo
+    {
+        return $this->BelongsTo(Bank::class, 'bank_id');
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function fixedCurrency(): BelongsTo
+    {
+        return $this->BelongsTo(Currency::class, 'fix_currency_id');
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function convertibleCurrency(): BelongsTo
+    {
+        return $this->BelongsTo(Currency::class, 'convertible_currency_id');
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function conversionCurrency(): BelongsTo
+    {
+        return $this->BelongsTo(Currency::class, 'conversion_currency_id');
+    }
+
+    /**
+     * @return HasMany
+     */
+    public function transactions(): HasMany
+    {
+        return $this->HasMany(Transaction::class, 'booking_id');
+    }
+
+    protected static function booted()
+    {
+        if (auth()->user()->type === RoleTypes::USER) {
+            static::addGlobalScope(new CustomerBookingsScope);
+        }
+    }
+
+
 }
diff --git a/app/Models/Company.php b/app/Models/Company.php
index f791ddeb..c1a6a191 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -1,14 +1,21 @@
 <?php
 
 namespace App\Models;
+use App\Classes\General\Interfaces\Documentable;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceConfigurationsObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Collection;
 
 /**
  * Class Company
  * @package App\Models
- * @version August 4, 2020, 4:36 am
  *
  * @property \App\Models\Country country_id
  * @property \App\Models\State state_id
@@ -18,7 +25,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property string street_two
  * @property integer billing_type
  */
-class Company extends AbstractModel
+class Company extends AbstractModel implements Documentable
 {
     use SoftDeletes;
 
@@ -26,13 +33,84 @@ class Company extends AbstractModel
 
     protected $dates = ['deleted_at'];
 
+
+    /**
+     * @return HasMany
+     */
+    public function contacts(): HasMany
+    {
+        return $this->HasMany(Contact::class, 'company_id');
+    }
+
+    /**
+     * @return HasMany
+     */
+    public function addresses(): HasMany
+    {
+        return $this->HasMany(Address::class, 'company_id');
+    }
+
     /**
      * @return belongsToMany
      */
-    public function segment(): belongsToMany 
+    public function segments(): belongsToMany
     {
-        return $this->belongsToMany(Segment::class, 'segment_company', 'company_id', 'segment_id');
+        return $this->belongsToMany(Segment::class, (new SegmentCompany())->getTable(), 'company_id', 'segment_id');
     }
+
+    /**
+     * @return belongsToMany
+     */
+    public function employees(): belongsToMany
+    {
+        return $this->belongsToMany(User::class, (new Employee())->getTable(), 'company_id','user_id');
+    }
+
+    /**
+     * @return MorphMany
+     */
+    public function documents(): morphMany
+    {
+        return $this->morphMany(Document::class, 'owner');
+    }
+
+    /**
+     * @return HasMany
+     */
+    public function banks(): HasMany
+    {
+        return $this->HasMany(Bank::class, 'company_id');
+    }
+
+    /**
+     * @return HasMany
+     */
+    public function bookings(): HasMany
+    {
+        return $this->HasMany(Booking::class, 'company_id');
+    }
+
+    /**
+     * @return Builder
+     */
+    public function services(): Builder  {
+        return ServiceType::where('status', ApprovalStatus::APPROVED)->whereHas('constants', function($query) {
+            $query->Where(function($query){
+                $query->where('reference', SegmentConstants::SERVICE_TYPE)->where('detail->is_active', true);
+            })->orWhere(function($query) {
+                $query->where('reference', SegmentConstants::CUSTOM_SERVICE_TYPE)->where('detail->is_active', true)->whereIn('segment_id', $this->segments->pluck('id'));
+            });
+        });
+    }
+
+    public function servicesConfigurations(): Collection {
+        return $this->services()->get()->map(function($service)  {
+            return new ServiceConfigurationsObject($service,
+                $service->constants->where('reference', SegmentConstants::SERVICE_TYPE)->first(),
+                $service->constants->where('reference', SegmentConstants::CUSTOM_SERVICE_TYPE)->whereIn('segment_id', $this->segments->pluck('id')));
+        });
+    }
+
 }
 
 
diff --git a/app/Models/Contact.php b/app/Models/Contact.php
index 5480d946..0a54d3f7 100644
--- a/app/Models/Contact.php
+++ b/app/Models/Contact.php
@@ -2,13 +2,13 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * Class Contact
  * @package App\Models
- * @version August 4, 2020, 4:36 am
  *
  * @property \App\Models\Country country_id
  * @property \App\Models\Company company_id
@@ -30,6 +30,14 @@ class Contact extends AbstractModel
      **/
     public function company(): HasOne
     {
-        return $this->hasOne(Company::class, 'company_id', 'id');
+        return $this->hasOne(Company::class);
+    }
+
+    /**
+     * @return belongsTo
+     **/
+    public function country(): belongsTo
+    {
+        return $this->belongsTo(Country::class);
     }
 }
diff --git a/app/Models/Country.php b/app/Models/Country.php
index b1abd046..3232366a 100644
--- a/app/Models/Country.php
+++ b/app/Models/Country.php
@@ -2,12 +2,12 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * Class Country
  * @package App\Models
- * @version August 4, 2020, 4:36 am
  *
  * @property string name
  * @property string short_code
@@ -20,4 +20,14 @@ class Country extends AbstractModel
     protected $table = 'countries';
 
     protected $dates = ['deleted_at'];
+
+    protected $fillable = ['name', 'short_code', 'phone_code'];
+
+    /**
+     * @return HasMany
+     */
+    public function currencies(): HasMany
+    {
+        return $this->HasMany(Currency::class, 'country_id', 'id');
+    }
 }
diff --git a/app/Models/Currency.php b/app/Models/Currency.php
index 7297a2ce..cf3b4a6f 100644
--- a/app/Models/Currency.php
+++ b/app/Models/Currency.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
@@ -10,7 +11,6 @@ use Illuminate\Database\Eloquent\Relations\hasMany;
 /**
  * Class Currency
  * @package App\Models
- * @version August 4, 2020, 4:36 am
  *
  * @property \App\Models\Country country_id
  * @property string name
@@ -27,17 +27,17 @@ class Currency extends AbstractModel
     protected $dates = ['deleted_at'];
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     **/
-    public function country(): HasOne
+     * @return BelongsTo
+     */
+    public function country(): BelongsTo
     {
-        return $this->hasOne(Country::class, 'country_id', 'id');
+        return $this->BelongsTo(Country::class, 'country_id', 'id');
     }
 
     /**
      * @return hasMany
      */
-    public function currency_rates(): hasMany 
+    public function rates(): hasMany
     {
         return $this->hasMany(CurrencyRate::class, 'currency_id');
     }
diff --git a/app/Models/CurrencyLog.php b/app/Models/CurrencyLog.php
index d294b282..ee519e8f 100644
--- a/app/Models/CurrencyLog.php
+++ b/app/Models/CurrencyLog.php
@@ -2,8 +2,6 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
-
 class CurrencyLog extends AbstractModel
 {
     protected $table = 'currency_logs';
diff --git a/app/Models/CurrencyRate.php b/app/Models/CurrencyRate.php
index 73b42c50..ca8cad92 100644
--- a/app/Models/CurrencyRate.php
+++ b/app/Models/CurrencyRate.php
@@ -10,5 +10,7 @@ class CurrencyRate extends AbstractModel
 
     protected $table = 'currency_rates';
 
+    protected $fillable = ['currency_id', 'selling', 'payment_method_type'];
+
     protected $dates = ['deleted_at'];
 }
diff --git a/app/Models/District.php b/app/Models/District.php
index 4cd4c7e6..13a90f85 100644
--- a/app/Models/District.php
+++ b/app/Models/District.php
@@ -2,18 +2,18 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * Class District
  * @package App\Models
- * @version August 4, 2020, 4:36 am
  *
  * @property \App\Models\Country country_id
  * @property \App\Models\State state_id
  * @property string name
- * @property text postcode
+ * @property string postcode
  */
 class District extends AbstractModel
 {
@@ -24,18 +24,18 @@ class District extends AbstractModel
     protected $dates = ['deleted_at'];
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     **/
-    public function country(): HasOne
+     * @return BelongsTo
+     */
+    public function country(): BelongsTo
     {
-        return $this->hasOne(Country::class, 'country_id', 'id');
+        return $this->belongsTo(Country::class, 'country_id', 'id');
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     * @return BelongsTo
      **/
-    public function state(): HasOne
+    public function state(): BelongsTo
     {
-        return $this->hasOne(State::class, 'state_id', 'id');
+        return $this->BelongsTo(State::class, 'state_id', 'id');
     }
 }
diff --git a/app/Models/Document.php b/app/Models/Document.php
index 05899fdf..eb3f8c77 100644
--- a/app/Models/Document.php
+++ b/app/Models/Document.php
@@ -2,7 +2,9 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
+use Carbon\Traits\Timestamp;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 use Illuminate\Database\Eloquent\Relations\hasMany;
@@ -17,7 +19,7 @@ use Illuminate\Database\Eloquent\Relations\hasMany;
  * @property int document_type
  * @property string reference
  * @property int status
- * @property \App\Models\User approved_by
+ * @property \App\Models\User approver
  * @property timestamp issued_date
  * @property timestamp expired_date
  * @property timestamp approved_date
@@ -30,6 +32,14 @@ class Document extends AbstractModel
 
     protected $dates = ['deleted_at'];
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
+     */
+    public function owner(): morphTo
+    {
+        return $this->morphTo();
+    }
+
     /**
      * @return hasMany
      */
@@ -38,4 +48,12 @@ class Document extends AbstractModel
         return $this->hasMany(File::class, 'document_id');
     }
 
+    /**
+     * @return HasOne
+     */
+    public function approver(): hasOne
+    {
+        return $this->hasOne(User::class, 'id', 'approver');
+    }
+
 }
diff --git a/app/Models/CompanyEmployee.php b/app/Models/Employee.php
similarity index 58%
rename from app/Models/CompanyEmployee.php
rename to app/Models/Employee.php
index bff993ad..65dab67d 100644
--- a/app/Models/CompanyEmployee.php
+++ b/app/Models/Employee.php
@@ -2,26 +2,26 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
 /**
  * Class CompanyEmployee
  * @package App\Models
- * @version August 4, 2020, 4:36 am
  *
  * @property \App\Models\Company company_id
  * @property \App\Models\User user_id
  */
-class CompanyEmployee extends AbstractModel
+class Employee extends AbstractModel
 {
-    protected $table = 'company_employee';
-    
+    protected $table = 'employees';
+
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     **/
-    public function company(): HasOne
+     * @return HasMany
+     */
+    public function company(): HasMany
     {
-        return $this->hasOne(Company::class, 'company_id', 'id');
+        return $this->HasMany(Company::class, 'company_id', 'id');
     }
 
     /**
diff --git a/app/Models/File.php b/app/Models/File.php
index 8c175039..6707fd9f 100644
--- a/app/Models/File.php
+++ b/app/Models/File.php
@@ -20,6 +20,8 @@ class File extends AbstractModel
 
     protected $table = 'files';
 
+    protected $fillable = ['file'];
+
     protected $dates = ['deleted_at'];
 
     public function getFileAttribute($value)
diff --git a/app/Models/PasswordReset.php b/app/Models/PasswordReset.php
new file mode 100644
index 00000000..6ab27179
--- /dev/null
+++ b/app/Models/PasswordReset.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class PasswordReset extends AbstractModel
+{
+    protected $table = 'password_resets';
+
+    /**
+     * @param $query
+     * @return mixed
+     */
+    public function scopeActive($query){
+        return $query->where('is_expired', false)->where('is_complete', false);
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function user(): BelongsTo {
+        return $this->belongsTo(User::class, 'user_id', 'id');
+    }
+}
diff --git a/app/Models/Receipt.php b/app/Models/Receipt.php
index d534e7fd..b4537c26 100644
--- a/app/Models/Receipt.php
+++ b/app/Models/Receipt.php
@@ -9,9 +9,9 @@ class Receipt extends AbstractModel
 {
     protected $table = 'receipt';
 
-    public function company(): HasOne
+    public function transaction(): HasOne
     {
-        return $this->hasOne(Companies::class, 'company_id', 'id');
+        return $this->hasOne(Transaction::class, 'transaction_id', 'id');
     }
     
     public function currency(): HasOne
diff --git a/app/Models/Role.php b/app/Models/Role.php
index c6b6e3a6..495d37da 100644
--- a/app/Models/Role.php
+++ b/app/Models/Role.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use Spatie\Permission\Models\Role as SpatieRole;
 use Spatie\Permission\Models\Permission;
 
 class Role extends AbstractModel
diff --git a/app/Models/Segment.php b/app/Models/Segment.php
index 97e2fa1a..339e8e86 100644
--- a/app/Models/Segment.php
+++ b/app/Models/Segment.php
@@ -2,12 +2,12 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * Class Segment
  * @package App\Models
- * @version August 4, 2020, 4:36 am
  *
  * @property string name
  * @property string reference
@@ -19,4 +19,12 @@ class Segment extends AbstractModel
     protected $table = 'segments';
 
     protected $dates = ['deleted_at'];
+
+    /**
+     * @return HasMany
+     */
+    public function constants(): HasMany
+    {
+        return $this->HasMany(SegmentConstant::class, 'segment_id', 'id');
+    }
 }
diff --git a/app/Models/SegmentCompany.php b/app/Models/SegmentCompany.php
index bda06fcf..660057fc 100644
--- a/app/Models/SegmentCompany.php
+++ b/app/Models/SegmentCompany.php
@@ -2,17 +2,7 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * Class SegmentCompany
- * @package App\Models
- * @version August 4, 2020, 4:36 am
- *
- * @property \App\Models\Segment segment_id
- * @property \App\Models\CPmpany company_id
- */
 class SegmentCompany extends AbstractModel
 {
-    protected $table = 'segment_company';
+    protected $table = 'segment_companies';
 }
diff --git a/app/Models/SegmentConstant.php b/app/Models/SegmentConstant.php
index aae6648d..08c8b2af 100644
--- a/app/Models/SegmentConstant.php
+++ b/app/Models/SegmentConstant.php
@@ -2,15 +2,16 @@
 
 namespace App\Models;
 
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * Class SegmentConstant
  * @package App\Models
- * @version August 4, 2020, 4:36 am
  *
  * @property \App\Models\Segment segment_id
- * @property text detail
+ * @property string detail
  */
 class SegmentConstant extends AbstractModel
 {
@@ -25,4 +26,22 @@ class SegmentConstant extends AbstractModel
         return $value ? json_decode($value) : [];
     }
 
+    /**
+     * @return BelongsTo
+     */
+    public function segment(): BelongsTo
+    {
+        return $this->BelongsTo(Segment::class, 'segment_id', 'id');
+    }
+
+    /**
+     * @return mixed
+     */
+    public function service(){
+        return $this->hasOne(ServiceType::class, 'id', 'detail->id')
+            ->whereIn('reference', [SegmentConstants::SERVICE_TYPE, SegmentConstants::CUSTOM_SERVICE_TYPE]);
+    }
+
+
+
 }
diff --git a/app/Models/ServiceType.php b/app/Models/ServiceType.php
new file mode 100644
index 00000000..b3cac31b
--- /dev/null
+++ b/app/Models/ServiceType.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Models;
+
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Models\AbstractModel as Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+
+/**
+ * Class ServiceType
+ * @package App\Models
+ * @version February 16, 2021, 9:04 pm
+ *
+ * @property string name
+ */
+class ServiceType extends AbstractModel
+{
+
+    use SoftDeletes;
+
+
+    protected $table = 'service_types';
+
+    
+    
+    protected $dates = ['deleted_at'];
+
+    
+
+    public $fillable = [
+        'name'
+    ];
+
+    /**
+     * The attributes that should be casted to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'name' => 'string'
+    ];
+
+    /**
+     * Validation rules
+     *
+     * @var array
+     */
+    public static $rules = [
+        'name' => 'required'
+    ];
+
+    /**
+     * @return hasMany
+     */
+    public function rates(): hasMany
+    {
+        return $this->hasMany(CurrencyRate::class, 'service_id');
+    }
+
+    /**
+     * @return hasMany
+     */
+    public function constants(): hasMany
+    {
+        return $this->hasMany(SegmentConstant::class, 'detail->id')
+            ->whereIn('reference', [SegmentConstants::SERVICE_TYPE, SegmentConstants::CUSTOM_SERVICE_TYPE]);
+    }
+
+}
diff --git a/app/Models/State.php b/app/Models/State.php
index 7912a1d7..fa920454 100644
--- a/app/Models/State.php
+++ b/app/Models/State.php
@@ -2,12 +2,12 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * Class State
  * @package App\Models
- * @version August 4, 2020, 4:36 am
  *
  * @property \App\Models\Country country_id
  * @property string name
@@ -21,8 +21,8 @@ class State extends AbstractModel
     protected $dates = ['deleted_at'];
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     **/
+     * @return HasOne
+     */
     public function country(): HasOne
     {
         return $this->hasOne(Country::class, 'country_id', 'id');
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index 51b28c09..51597ba2 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -2,26 +2,54 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Relations\HasOne;
+use App\Classes\General\Interfaces\Documentable;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 
 
-class Transaction extends AbstractModel
+class Transaction extends AbstractModel implements Documentable
 {
-    protected $table = 'transaction';
+    protected $table = 'transactions';
 
-    public function company(): HasOne
+    /**
+     * @return BelongsTo
+     */
+    public function booking(): BelongsTo
     {
-        return $this->hasOne(Companies::class, 'company_id', 'id');
+        return $this->BelongsTo( booking::class, 'booking_id', 'id');
     }
-    
-    public function currency(): HasOne
+
+    /**
+     * @return MorphMany
+     */
+    public function documents(): morphMany
     {
-        return $this->hasOne(Currency::class, 'currency_id', 'id');
+        return $this->morphMany(Document::class, 'owner');
     }
-    
-    public function original_currency(): HasOne
+
+    /**
+     * @return BelongsTo
+     */
+    public function currency(): BelongsTo
     {
-        return $this->hasOne(Currency::class, 'original_currency_id', 'id');
+        return $this->BelongsTo(Currency::class, 'currency_id', 'id');
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function original_currency(): BelongsTo
+    {
+        return $this->BelongsTo(Currency::class, 'original_currency_id', 'id');
+    }
+
+    /**
+     * @return HasMany
+     */
+    public function transactionDetails(): HasMany
+    {
+        return $this->HasMany(TransactionDetail::class, 'transaction_id', 'id');
     }
 
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index 36e9e2ab..d41cbb7f 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -60,8 +60,8 @@ class User extends AbstractModel implements
     /**
      * @return belongsToMany
      */
-    public function company(): belongsToMany 
+    public function company(): belongsToMany
     {
-        return $this->belongsToMany(Company::class, 'company_employee', 'user_id', 'company_id');
+        return $this->belongsToMany(Company::class, (new Employee())->getTable(), 'user_id', 'company_id');
     }
 }
diff --git a/app/Models/UserEmailVerification.php b/app/Models/UserEmailVerification.php
new file mode 100644
index 00000000..278c8cd6
--- /dev/null
+++ b/app/Models/UserEmailVerification.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class UserEmailVerification extends AbstractModel
+{
+    protected $table = 'user_email_verifications';
+
+    public $fillable = [
+        'token', 'is_complete', 'is_active', 'is_sent'
+    ];
+    /**
+     * @param $query
+     * @return mixed
+     */
+    public function scopeActive($query){
+        return $query->where('is_active', true)->where('is_complete', false);
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function user(): BelongsTo {
+        return $this->belongsTo(User::class, 'email', 'email');
+    }
+}
diff --git a/app/Models/WalletTransaction.php b/app/Models/WalletTransaction.php
index efd5a878..9441c396 100644
--- a/app/Models/WalletTransaction.php
+++ b/app/Models/WalletTransaction.php
@@ -13,6 +13,11 @@ class WalletTransaction extends AbstractModel
     {
         return $this->hasOne(Wallet::class, 'wallet_id', 'id');
     }
+
+    public function transaction(): HasOne
+    {
+        return $this->hasOne(Transaction::class, 'transaction_id', 'id');
+    }
     
     public function currency(): HasOne
     {
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 30490683..b14e5898 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -3,7 +3,6 @@
 namespace App\Providers;
 
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Gate;
 
 class AuthServiceProvider extends ServiceProvider
 {
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 723a290d..1c0e60ee 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -5,7 +5,6 @@ namespace App\Providers;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Event;
 
 class EventServiceProvider extends ServiceProvider
 {
diff --git a/app/Scopes/CustomerBookingsScope.php b/app/Scopes/CustomerBookingsScope.php
new file mode 100644
index 00000000..c2da5b86
--- /dev/null
+++ b/app/Scopes/CustomerBookingsScope.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Scopes;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Scope;
+
+class CustomerBookingsScope implements Scope
+{
+    /**
+     * Apply the scope to a given Eloquent query builder.
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder  $builder
+     * @param  \Illuminate\Database\Eloquent\Model  $model
+     * @return void
+     */
+    public function apply(Builder $builder, Model $model)
+    {
+        $builder->whereHas('company', function($query){
+            return $query->whereHas('employees', function($query){
+                return $query->where('user_id', Auth()->user()->id);
+            });
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 5aab2193..ec061d4f 100644
--- a/composer.json
+++ b/composer.json
@@ -9,13 +9,16 @@
     "license": "MIT",
     "require": {
         "php": "^7.2.5",
+        "ext-fileinfo": "*",
         "ext-json": "^1.6",
+        "barryvdh/laravel-dompdf": "^0.9.0",
         "fideloper/proxy": "^4.2",
         "fruitcake/laravel-cors": "^1.0",
         "guzzlehttp/guzzle": "^6.3",
         "intervention/image": "^2.5",
         "laravel/framework": "^7.0",
         "laravel/tinker": "^2.0",
+        "rinvex/countries": "^6.1",
         "spatie/laravel-activitylog": "^3.14",
         "spatie/laravel-permission": "^3.17",
         "tymon/jwt-auth": "^1.0"
diff --git a/config/app.php b/config/app.php
index deade8b0..a8881019 100644
--- a/config/app.php
+++ b/config/app.php
@@ -67,7 +67,7 @@ return [
     |
     */
 
-    'timezone' => 'UTC',
+    'timezone' => 'Asia/Kuala_Lumpur',
 
     /*
     |--------------------------------------------------------------------------
@@ -177,6 +177,7 @@ return [
 
         // Third Parties
         Spatie\Permission\PermissionServiceProvider::class,
+        Barryvdh\DomPDF\ServiceProvider::class,
     ],
 
     /*
@@ -228,6 +229,7 @@ return [
         'URL' => Illuminate\Support\Facades\URL::class,
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
+        'PDF' => Barryvdh\DomPDF\Facade::class,
 
     ],
 
diff --git a/config/filesystems.php b/config/filesystems.php
index 94c81126..3094b721 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -55,6 +55,13 @@ return [
             'visibility' => 'public',
         ],
 
+        'documents' => [
+            'driver' => 'local',
+            'root' => storage_path('app/documents'),
+            'url' => env('APP_URL').'/storage',
+            'visibility' => 'private',
+        ],
+
         's3' => [
             'driver' => 's3',
             'key' => env('AWS_ACCESS_KEY_ID'),
diff --git a/config/jwt.php b/config/jwt.php
new file mode 100644
index 00000000..e1af3ccc
--- /dev/null
+++ b/config/jwt.php
@@ -0,0 +1,302 @@
+<?php
+
+/*
+ * This file is part of jwt-auth.
+ *
+ * (c) Sean Tymon <tymon148@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | JWT Authentication Secret
+    |--------------------------------------------------------------------------
+    |
+    | Don't forget to set this in your .env file, as it will be used to sign
+    | your tokens. A helper command is provided for this:
+    | `php artisan jwt:secret`
+    |
+    | Note: This will be used for Symmetric algorithms only (HMAC),
+    | since RSA and ECDSA use a private/public key combo (See below).
+    |
+    */
+
+    'secret' => env('JWT_SECRET'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | JWT Authentication Keys
+    |--------------------------------------------------------------------------
+    |
+    | The algorithm you are using, will determine whether your tokens are
+    | signed with a random string (defined in `JWT_SECRET`) or using the
+    | following public & private keys.
+    |
+    | Symmetric Algorithms:
+    | HS256, HS384 & HS512 will use `JWT_SECRET`.
+    |
+    | Asymmetric Algorithms:
+    | RS256, RS384 & RS512 / ES256, ES384 & ES512 will use the keys below.
+    |
+    */
+
+    'keys' => [
+
+        /*
+        |--------------------------------------------------------------------------
+        | Public Key
+        |--------------------------------------------------------------------------
+        |
+        | A path or resource to your public key.
+        |
+        | E.g. 'file://path/to/public/key'
+        |
+        */
+
+        'public' => env('JWT_PUBLIC_KEY'),
+
+        /*
+        |--------------------------------------------------------------------------
+        | Private Key
+        |--------------------------------------------------------------------------
+        |
+        | A path or resource to your private key.
+        |
+        | E.g. 'file://path/to/private/key'
+        |
+        */
+
+        'private' => env('JWT_PRIVATE_KEY'),
+
+        /*
+        |--------------------------------------------------------------------------
+        | Passphrase
+        |--------------------------------------------------------------------------
+        |
+        | The passphrase for your private key. Can be null if none set.
+        |
+        */
+
+        'passphrase' => env('JWT_PASSPHRASE'),
+
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | JWT time to live
+    |--------------------------------------------------------------------------
+    |
+    | Specify the length of time (in minutes) that the token will be valid for.
+    | Defaults to 1 hour.
+    |
+    | You can also set this to null, to yield a never expiring token.
+    | Some people may want this behaviour for e.g. a mobile app.
+    | This is not particularly recommended, so make sure you have appropriate
+    | systems in place to revoke the token if necessary.
+    | Notice: If you set this to null you should remove 'exp' element from 'required_claims' list.
+    |
+    */
+
+    'ttl' => env('JWT_TTL', 60),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Refresh time to live
+    |--------------------------------------------------------------------------
+    |
+    | Specify the length of time (in minutes) that the token can be refreshed
+    | within. I.E. The user can refresh their token within a 2 week window of
+    | the original token being created until they must re-authenticate.
+    | Defaults to 2 weeks.
+    |
+    | You can also set this to null, to yield an infinite refresh time.
+    | Some may want this instead of never expiring tokens for e.g. a mobile app.
+    | This is not particularly recommended, so make sure you have appropriate
+    | systems in place to revoke the token if necessary.
+    |
+    */
+
+    'refresh_ttl' => env('JWT_REFRESH_TTL', 20160),
+
+    /*
+    |--------------------------------------------------------------------------
+    | JWT hashing algorithm
+    |--------------------------------------------------------------------------
+    |
+    | Specify the hashing algorithm that will be used to sign the token.
+    |
+    | See here: https://github.com/namshi/jose/tree/master/src/Namshi/JOSE/Signer/OpenSSL
+    | for possible values.
+    |
+    */
+
+    'algo' => env('JWT_ALGO', 'HS256'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Required Claims
+    |--------------------------------------------------------------------------
+    |
+    | Specify the required claims that must exist in any token.
+    | A TokenInvalidException will be thrown if any of these claims are not
+    | present in the payload.
+    |
+    */
+
+    'required_claims' => [
+        'iss',
+        'iat',
+        'exp',
+        'nbf',
+        'sub',
+        'jti',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Persistent Claims
+    |--------------------------------------------------------------------------
+    |
+    | Specify the claim keys to be persisted when refreshing a token.
+    | `sub` and `iat` will automatically be persisted, in
+    | addition to the these claims.
+    |
+    | Note: If a claim does not exist then it will be ignored.
+    |
+    */
+
+    'persistent_claims' => [
+        'name', 'email', 'type', 'company_id', 'status', 'verification'],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Lock Subject
+    |--------------------------------------------------------------------------
+    |
+    | This will determine whether a `prv` claim is automatically added to
+    | the token. The purpose of this is to ensure that if you have multiple
+    | authentication models e.g. `App\User` & `App\OtherPerson`, then we
+    | should prevent one authentication request from impersonating another,
+    | if 2 tokens happen to have the same id across the 2 different models.
+    |
+    | Under specific circumstances, you may want to disable this behaviour
+    | e.g. if you only have one authentication model, then you would save
+    | a little on token size.
+    |
+    */
+
+    'lock_subject' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Leeway
+    |--------------------------------------------------------------------------
+    |
+    | This property gives the jwt timestamp claims some "leeway".
+    | Meaning that if you have any unavoidable slight clock skew on
+    | any of your servers then this will afford you some level of cushioning.
+    |
+    | This applies to the claims `iat`, `nbf` and `exp`.
+    |
+    | Specify in seconds - only if you know you need it.
+    |
+    */
+
+    'leeway' => env('JWT_LEEWAY', 0),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Blacklist Enabled
+    |--------------------------------------------------------------------------
+    |
+    | In order to invalidate tokens, you must have the blacklist enabled.
+    | If you do not want or need this functionality, then set this to false.
+    |
+    */
+
+    'blacklist_enabled' => env('JWT_BLACKLIST_ENABLED', true),
+
+    /*
+    | -------------------------------------------------------------------------
+    | Blacklist Grace Period
+    | -------------------------------------------------------------------------
+    |
+    | When multiple concurrent requests are made with the same JWT,
+    | it is possible that some of them fail, due to token regeneration
+    | on every request.
+    |
+    | Set grace period in seconds to prevent parallel request failure.
+    |
+    */
+
+    'blacklist_grace_period' => env('JWT_BLACKLIST_GRACE_PERIOD', 0),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cookies encryption
+    |--------------------------------------------------------------------------
+    |
+    | By default Laravel encrypt cookies for security reason.
+    | If you decide to not decrypt cookies, you will have to configure Laravel
+    | to not encrypt your cookie token by adding its name into the $except
+    | array available in the middleware "EncryptCookies" provided by Laravel.
+    | see https://laravel.com/docs/master/responses#cookies-and-encryption
+    | for details.
+    |
+    | Set it to true if you want to decrypt cookies.
+    |
+    */
+
+    'decrypt_cookies' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Providers
+    |--------------------------------------------------------------------------
+    |
+    | Specify the various providers used throughout the package.
+    |
+    */
+
+    'providers' => [
+
+        /*
+        |--------------------------------------------------------------------------
+        | JWT Provider
+        |--------------------------------------------------------------------------
+        |
+        | Specify the provider that is used to create and decode the tokens.
+        |
+        */
+
+        'jwt' => Tymon\JWTAuth\Providers\JWT\Lcobucci::class,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Authentication Provider
+        |--------------------------------------------------------------------------
+        |
+        | Specify the provider that is used to authenticate users.
+        |
+        */
+
+        'auth' => Tymon\JWTAuth\Providers\Auth\Illuminate::class,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Storage Provider
+        |--------------------------------------------------------------------------
+        |
+        | Specify the provider that is used to store tokens in the blacklist.
+        |
+        */
+
+        'storage' => Tymon\JWTAuth\Providers\Storage\Illuminate::class,
+
+    ],
+
+];
diff --git a/database/migrations/2013_06_01_000006_create_permission_tables.php b/database/migrations/2013_06_01_000006_create_permission_tables.php
index ff39ab91..7859b785 100644
--- a/database/migrations/2013_06_01_000006_create_permission_tables.php
+++ b/database/migrations/2013_06_01_000006_create_permission_tables.php
@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
@@ -10,6 +11,7 @@ class CreatePermissionTables extends Migration
      * Run the migrations.
      *
      * @return void
+     * @throws Exception
      */
     public function up()
     {
@@ -36,10 +38,10 @@ class CreatePermissionTables extends Migration
         });
 
         Schema::create($tableNames['model_has_permissions'], function (Blueprint $table) use ($tableNames, $columnNames) {
-            $table->unsignedBigInteger('permission_id');
+            $table->foreignId('permission_id');
 
             $table->string('model_type');
-            $table->unsignedBigInteger($columnNames['model_morph_key']);
+            $table->foreignId($columnNames['model_morph_key']);
             $table->index([$columnNames['model_morph_key'], 'model_type'], 'model_has_permissions_model_id_model_type_index');
 
             $table->foreign('permission_id')
@@ -52,10 +54,10 @@ class CreatePermissionTables extends Migration
         });
 
         Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames) {
-            $table->unsignedBigInteger('role_id');
+            $table->foreignId('role_id');
 
             $table->string('model_type');
-            $table->unsignedBigInteger($columnNames['model_morph_key']);
+            $table->foreignId($columnNames['model_morph_key']);
             $table->index([$columnNames['model_morph_key'], 'model_type'], 'model_has_roles_model_id_model_type_index');
 
             $table->foreign('role_id')
@@ -68,8 +70,8 @@ class CreatePermissionTables extends Migration
         });
 
         Schema::create($tableNames['role_has_permissions'], function (Blueprint $table) use ($tableNames) {
-            $table->unsignedBigInteger('permission_id');
-            $table->unsignedBigInteger('role_id');
+            $table->foreignId('permission_id');
+            $table->foreignId('role_id');
 
             $table->foreign('permission_id')
                 ->references('id')
@@ -93,6 +95,7 @@ class CreatePermissionTables extends Migration
      * Reverse the migrations.
      *
      * @return void
+     * @throws Exception
      */
     public function down()
     {
diff --git a/database/migrations/2014_10_11_000000_create_users_table.php b/database/migrations/2014_10_11_000000_create_users_table.php
index 9fda5b3e..3ac34a63 100644
--- a/database/migrations/2014_10_11_000000_create_users_table.php
+++ b/database/migrations/2014_10_11_000000_create_users_table.php
@@ -1,6 +1,7 @@
 <?php
 
-use App\Classes\ValueObjects\Constants\Roles;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\RoleTypes;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -19,12 +20,12 @@ class CreateUsersTable extends Migration
             $table->string('name');
             $table->string('email')->unique();
             $table->string('password');
-            $table->integer('type')->nullable()->default(1);
-            $table->integer('status')->nullable()->default(1);
+            $table->integer('type')->default(RoleTypes::USER);
+            $table->integer('status')->default(ApprovalStatus::PENDING_VERIFICATION);
             $table->rememberToken();
             $table->timestamp('active_at')->nullable();
-            $table->timestamps();
             $table->softDeletes();
+            $table->timestamps();
         });
     }
 
diff --git a/database/migrations/2014_10_11_100009_create_countries_table.php b/database/migrations/2014_10_11_100009_create_countries_table.php
index c4946e70..11069e71 100644
--- a/database/migrations/2014_10_11_100009_create_countries_table.php
+++ b/database/migrations/2014_10_11_100009_create_countries_table.php
@@ -15,11 +15,11 @@ class CreateCountriesTable extends Migration
     {
         Schema::create('countries', function (Blueprint $table) {
             $table->id();
-            $table->string('name')->nullable();
-            $table->string('short_code')->nullable();
-            $table->string('phone_code')->nullable();
-            $table->timestamps();
+            $table->string('name')->unique();
+            $table->string('short_code')->unique();
+            $table->string('phone_code')->unique();
             $table->softDeletes();
+            $table->timestamps();
         });
     }
 
diff --git a/database/migrations/2014_10_11_100010_create_currencies_table.php b/database/migrations/2014_10_11_100010_create_currencies_table.php
index 62e92cd6..b550c86b 100644
--- a/database/migrations/2014_10_11_100010_create_currencies_table.php
+++ b/database/migrations/2014_10_11_100010_create_currencies_table.php
@@ -15,13 +15,14 @@ class CreateCurrenciesTable extends Migration
     {
         Schema::create('currencies', function (Blueprint $table) {
             $table->id();
-            $table->bigInteger('country_id')->unsigned()->nullable();
-            $table->foreign('country_id')->references('id')->on('countries')->onDelete('cascade');
-            $table->string('name')->nullable();
-            $table->string('short_code')->nullable();
+            $table->foreignId('country_id')->unsigned();
+            $table->string('name');
+            $table->string('short_code');
             $table->string('symbol')->nullable();
-            $table->timestamps();
             $table->softDeletes();
+            $table->timestamps();
+
+            $table->foreign('country_id')->references('id')->on('countries');
         });
     }
 
diff --git a/database/migrations/2014_10_11_100011_create_currency_logs_table.php b/database/migrations/2014_10_11_100011_create_currency_logs_table.php
index cd3ebb34..d356d5b5 100644
--- a/database/migrations/2014_10_11_100011_create_currency_logs_table.php
+++ b/database/migrations/2014_10_11_100011_create_currency_logs_table.php
@@ -15,12 +15,13 @@ class CreateCurrencyLogsTable extends Migration
     {
         Schema::create('currency_logs', function (Blueprint $table) {
             $table->id();
-            $table->bigInteger('currency_id')->unsigned()->nullable();
-            $table->foreign('currency_id')->references('id')->on('currencies')->onDelete('cascade');
-            $table->decimal('selling', 20, 5)->nullable();
-            $table->bigInteger('created_by')->unsigned()->nullable();
-            $table->foreign('created_by')->references('id')->on('users')->onDelete('cascade');
+            $table->foreignId('currency_id')->unsigned();
+            $table->foreignId('created_by')->unsigned();
+            $table->softDeletes();
             $table->timestamps();
+
+            $table->foreign('created_by')->references('id')->on('users');
+            $table->foreign('currency_id')->references('id')->on('currencies');
         });
     }
 
diff --git a/database/migrations/2014_10_11_100012_create_states_table.php b/database/migrations/2014_10_11_100012_create_states_table.php
index e3c89c1d..63c077bf 100644
--- a/database/migrations/2014_10_11_100012_create_states_table.php
+++ b/database/migrations/2014_10_11_100012_create_states_table.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -15,12 +16,13 @@ class CreateStatesTable extends Migration
     {
         Schema::create('states', function (Blueprint $table) {
             $table->id();
-            $table->bigInteger('country_id')->unsigned()->nullable();
-            $table->foreign('country_id')->references('id')->on('countries')->onDelete('cascade');
-            $table->string('name')->nullable();
-            $table->integer('status')->nullable();
-            $table->timestamps();
+            $table->foreignId('country_id')->unsigned();
+            $table->string('name');
+            $table->integer('status')->default(ApprovalStatus::APPROVED);
             $table->softDeletes();
+            $table->timestamps();
+
+            $table->foreign('country_id')->references('id')->on('countries');
         });
     }
 
diff --git a/database/migrations/2014_10_11_100013_create_districts_table.php b/database/migrations/2014_10_11_100013_create_districts_table.php
index 42da9530..a5d1f51c 100644
--- a/database/migrations/2014_10_11_100013_create_districts_table.php
+++ b/database/migrations/2014_10_11_100013_create_districts_table.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -15,15 +16,16 @@ class CreateDistrictsTable extends Migration
     {
         Schema::create('districts', function (Blueprint $table) {
             $table->id();
-            $table->bigInteger('country_id')->unsigned()->nullable();
-            $table->foreign('country_id')->references('id')->on('countries')->onDelete('cascade');
-            $table->bigInteger('state_id')->unsigned()->nullable();
-            $table->foreign('state_id')->references('id')->on('states')->onDelete('cascade');
-            $table->string('name')->nullable();
-            $table->text('postcode')->nullable();
-            $table->integer('status')->nullable();
-            $table->timestamps();
+            $table->foreignId('country_id')->unsigned();
+            $table->foreignId('state_id')->unsigned();
+            $table->string('name');
+            $table->text('postcode');
+            $table->integer('status')->default(ApprovalStatus::APPROVED);
             $table->softDeletes();
+            $table->timestamps();
+
+            $table->foreign('country_id')->references('id')->on('countries');
+            $table->foreign('state_id')->references('id')->on('states');
         });
     }
 
diff --git a/database/migrations/2020_07_30_022600_create_password_resets_table.php b/database/migrations/2020_07_30_022600_create_password_resets_table.php
index f465e56d..7d75d3c4 100644
--- a/database/migrations/2020_07_30_022600_create_password_resets_table.php
+++ b/database/migrations/2020_07_30_022600_create_password_resets_table.php
@@ -15,7 +15,7 @@ class CreatePasswordResetsTable extends Migration
     {
         Schema::create('password_resets', function (Blueprint $table) {
             $table->id();
-            $table->bigInteger('user_id')->unsigned();
+            $table->foreignId('user_id')->unsigned();
             $table->string('token');
             $table->boolean('is_expired')->default(true);
             $table->boolean('is_complete')->default(false);
diff --git a/database/migrations/2020_07_30_023042_create_activity_log_table.php b/database/migrations/2020_07_30_023042_create_activity_log_table.php
index 107cf045..2f49bef0 100644
--- a/database/migrations/2020_07_30_023042_create_activity_log_table.php
+++ b/database/migrations/2020_07_30_023042_create_activity_log_table.php
@@ -17,9 +17,9 @@ class CreateActivityLogTable extends Migration
             $table->id();
             $table->string('log_name')->nullable();
             $table->text('description');
-            $table->unsignedBigInteger('subject_id')->nullable();
+            $table->foreignId('subject_id')->nullable();
             $table->string('subject_type')->nullable();
-            $table->unsignedBigInteger('causer_id')->nullable();
+            $table->foreignId('causer_id')->nullable();
             $table->string('causer_type')->nullable();
             $table->text('properties')->nullable();
             $table->timestamps();
diff --git a/database/migrations/2020_10_22_071102_create_companies_table.php b/database/migrations/2020_10_22_071102_create_companies_table.php
index de5f45ab..cb6747e5 100644
--- a/database/migrations/2020_10_22_071102_create_companies_table.php
+++ b/database/migrations/2020_10_22_071102_create_companies_table.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\CompanyType;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -19,11 +20,11 @@ class CreateCompaniesTable extends Migration
             $table->id();
             $table->string('name');
             $table->string('reference');
-            $table->integer('type');
+            $table->integer('type')->default(CompanyType::COMPANY_BUSINESS);
             $table->integer('business_type')->default(BusinessType::IMPORTER);
-            $table->integer('status')->default(ApprovalStatus::ACTIVE);
-            $table->timestamps();
+            $table->integer('status')->default(ApprovalStatus::PENDING_SUBMISSION);
             $table->softDeletes();
+            $table->timestamps();
         });
     }
 
diff --git a/database/migrations/2020_10_22_071120_create_contacts_table.php b/database/migrations/2020_10_22_071120_create_contacts_table.php
index 5a685c90..c8e70331 100644
--- a/database/migrations/2020_10_22_071120_create_contacts_table.php
+++ b/database/migrations/2020_10_22_071120_create_contacts_table.php
@@ -15,15 +15,17 @@ class CreateContactsTable extends Migration
     {
         Schema::create('contacts', function (Blueprint $table) {
             $table->id();
-            $table->bigInteger('country_id')->unsigned()->nullable();
-            $table->foreign('country_id')->references('id')->on('countries')->onDelete('cascade');
-            $table->bigInteger('company_id')->unsigned()->nullable();
-            $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
-            $table->string('reference')->nullable();
+            $table->foreignId('company_id')->unsigned();
+            $table->foreignId('country_id')->unsigned();
+            $table->string('reference');
             $table->string('phone')->nullable();
             $table->string('email')->nullable();
             $table->string('wechat_id')->nullable();
+            $table->softDeletes();
             $table->timestamps();
+
+            $table->foreign('country_id')->references('id')->on('countries');
+            $table->foreign('company_id')->references('id')->on('companies');
         });
     }
 
diff --git a/database/migrations/2020_10_22_071121_create_addresses_table.php b/database/migrations/2020_10_22_071121_create_addresses_table.php
index 8c44b0f8..03583080 100644
--- a/database/migrations/2020_10_22_071121_create_addresses_table.php
+++ b/database/migrations/2020_10_22_071121_create_addresses_table.php
@@ -16,20 +16,21 @@ class CreateAddressesTable extends Migration
     {
         Schema::create('addresses', function (Blueprint $table) {
             $table->id();
-            $table->bigInteger('country_id')->unsigned()->nullable();
-            $table->foreign('country_id')->references('id')->on('countries')->onDelete('cascade');
-            $table->bigInteger('company_id')->unsigned()->nullable();
-            $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
-            $table->bigInteger('state_id')->unsigned()->nullable();
-            $table->foreign('state_id')->references('id')->on('states')->onDelete('cascade');
-            $table->bigInteger('district_id')->unsigned()->nullable();
-            $table->foreign('district_id')->references('id')->on('districts')->onDelete('cascade');
-            $table->string('postcode')->nullable();
-            $table->string('street_one')->nullable();
+            $table->foreignId('company_id')->unsigned();
+            $table->foreignId('country_id')->unsigned();
+            $table->foreignId('state_id')->unsigned();
+            $table->foreignId('district_id')->unsigned();
+            $table->string('postcode');
+            $table->string('street_one');
             $table->string('street_two')->nullable();
-            $table->integer('billing_type')->nullable();
-            $table->timestamps();
+            $table->integer('billing')->default(true);
             $table->softDeletes();
+            $table->timestamps();
+
+            $table->foreign('country_id')->references('id')->on('countries');
+            $table->foreign('company_id')->references('id')->on('companies');
+            $table->foreign('state_id')->references('id')->on('states');
+            $table->foreign('district_id')->references('id')->on('districts');
         });
     }
 
diff --git a/database/migrations/2020_10_22_071150_create_company_employees_table.php b/database/migrations/2020_10_22_071150_create_employees_table.php
similarity index 61%
rename from database/migrations/2020_10_22_071150_create_company_employees_table.php
rename to database/migrations/2020_10_22_071150_create_employees_table.php
index b8fb2b48..916692f8 100644
--- a/database/migrations/2020_10_22_071150_create_company_employees_table.php
+++ b/database/migrations/2020_10_22_071150_create_employees_table.php
@@ -1,10 +1,11 @@
 <?php
 
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateCompanyEmployeesTable extends Migration
+class CreateEmployeesTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,12 +14,14 @@ class CreateCompanyEmployeesTable extends Migration
      */
     public function up()
     {
-        Schema::create('company_employee', function (Blueprint $table) {
-            $table->bigInteger('company_id')->unsigned();
-            $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
-            $table->bigInteger('user_id')->unsigned();
-            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+        Schema::create('employees', function (Blueprint $table) {
+            $table->foreignId('company_id')->unsigned();
+            $table->foreignId('user_id')->unsigned();
+            $table->integer('status')->default(ApprovalStatus::APPROVED);
+
             $table->primary(['company_id', 'user_id']);
+            $table->foreign('user_id')->references('id')->on('users');
+            $table->foreign('company_id')->references('id')->on('companies');
         });
     }
 
diff --git a/database/migrations/2020_11_03_122319_create_documents_table.php b/database/migrations/2020_11_03_122319_create_documents_table.php
index dbe9c684..618a3b75 100644
--- a/database/migrations/2020_11_03_122319_create_documents_table.php
+++ b/database/migrations/2020_11_03_122319_create_documents_table.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -15,18 +16,18 @@ class CreateDocumentsTable extends Migration
     {
         Schema::create('documents', function (Blueprint $table) {
             $table->id();
-            $table->integer('owner_id')->nullable();
-            $table->integer('owner_type')->nullable();
-            $table->string('document_type')->nullable();
-            $table->string('reference')->nullable();
-            $table->integer('status')->nullable();
-            $table->bigInteger('approved_by')->unsigned()->nullable();
-            $table->foreign('approved_by')->references('id')->on('users')->onDelete('cascade');
+            $table->morphs('owner');
+            $table->string('document_type');
+            $table->string('reference');
+            $table->integer('status')->default(ApprovalStatus::PENDING_VERIFICATION);
             $table->timestamp('issued_date')->nullable();
             $table->timestamp('expired_date')->nullable();
-            $table->timestamp('approved_date')->nullable();
-            $table->timestamps();
+            $table->foreignId('approver')->nullable()->unsigned();
+            $table->timestamp('approval_date')->nullable();
             $table->softDeletes();
+            $table->timestamps();
+
+            $table->foreign('approver')->references('id')->on('users');
         });
     }
 
diff --git a/database/migrations/2020_11_03_122358_create_files_table.php b/database/migrations/2020_11_03_122358_create_files_table.php
index 483f0f4e..3ee1c9fe 100644
--- a/database/migrations/2020_11_03_122358_create_files_table.php
+++ b/database/migrations/2020_11_03_122358_create_files_table.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Classes\ValueObjects\Constants\FileType;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -15,12 +16,13 @@ class CreateFilesTable extends Migration
     {
         Schema::create('files', function (Blueprint $table) {
             $table->id();
-            $table->bigInteger('document_id')->unsigned();
-            $table->foreign('document_id')->references('id')->on('documents')->onDelete('cascade');
-            $table->text('file')->nullable();
-            $table->string('file_type')->nullable();
-            $table->timestamps();
+            $table->foreignId('document_id')->unsigned();
+            $table->text('file');
+            $table->string('file_type')->default(FileType::JPEG);
             $table->softDeletes();
+            $table->timestamps();
+
+            $table->foreign('document_id')->references('id')->on('documents');
         });
     }
 
diff --git a/database/migrations/2020_11_11_065757_create_segments_table.php b/database/migrations/2020_11_11_065757_create_segments_table.php
index 4bfa3f05..2d524073 100644
--- a/database/migrations/2020_11_11_065757_create_segments_table.php
+++ b/database/migrations/2020_11_11_065757_create_segments_table.php
@@ -1,5 +1,7 @@
 <?php
 
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -15,9 +17,11 @@ class CreateSegmentsTable extends Migration
     {
         Schema::create('segments', function (Blueprint $table) {
             $table->id();
-            $table->string('name')->nullable();
-            $table->timestamps();
+            $table->string('name');
+            $table->integer('type')->default(SegmentConstants::STANDARD_SEGMENT);
+            $table->integer('status')->default(ApprovalStatus::APPROVED);
             $table->softDeletes();
+            $table->timestamps();
         });
     }
 
diff --git a/database/migrations/2020_11_11_065838_create_segment_constants_table.php b/database/migrations/2020_11_11_065838_create_segment_constants_table.php
index a64fef62..85b8dc5e 100644
--- a/database/migrations/2020_11_11_065838_create_segment_constants_table.php
+++ b/database/migrations/2020_11_11_065838_create_segment_constants_table.php
@@ -15,14 +15,14 @@ class CreateSegmentConstantsTable extends Migration
     {
         Schema::create('segment_constants', function (Blueprint $table) {
             $table->id();
-            $table->bigInteger('segment_id')->unsigned()->nullable();
-            $table->foreign('segment_id')->references('id')->on('segments')->onDelete('cascade');
-            $table->string('name')->nullable();
-            $table->string('reference')->nullable();
-            $table->text('detail')->nullable();
-            $table->timestamps();
-            $table->integer('type')->nullable();
+            $table->foreignId('segment_id')->unsigned();
+            $table->string('name');
+            $table->string('reference');
+            $table->json('detail');
             $table->softDeletes();
+            $table->timestamps();
+
+            $table->foreign('segment_id')->references('id')->on('segments');
         });
     }
 
diff --git a/database/migrations/2020_11_11_065851_create_segment_companies_table.php b/database/migrations/2020_11_11_065851_create_segment_companies_table.php
index f2a55572..676cc155 100644
--- a/database/migrations/2020_11_11_065851_create_segment_companies_table.php
+++ b/database/migrations/2020_11_11_065851_create_segment_companies_table.php
@@ -13,12 +13,15 @@ class CreateSegmentCompaniesTable extends Migration
      */
     public function up()
     {
-        Schema::create('segment_company', function (Blueprint $table) {
-            $table->bigInteger('segment_id')->unsigned();
-            $table->foreign('segment_id')->references('id')->on('segments')->onDelete('cascade');
-            $table->bigInteger('company_id')->unsigned();
-            $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
+        Schema::create('segment_companies', function (Blueprint $table) {
+            $table->foreignId('segment_id')->unsigned();
+            $table->foreignId('company_id')->unsigned();
+            $table->softDeletes();
+            $table->timestamps();
+
             $table->primary(['segment_id', 'company_id']);
+            $table->foreign('segment_id')->references('id')->on('segments');
+            $table->foreign('company_id')->references('id')->on('companies');
         });
     }
 
diff --git a/database/migrations/2020_11_24_062534_create_company_banks_table.php b/database/migrations/2020_11_24_062534_create_banks_table.php
similarity index 55%
rename from database/migrations/2020_11_24_062534_create_company_banks_table.php
rename to database/migrations/2020_11_24_062534_create_banks_table.php
index 5ab6788a..ebd91e1a 100644
--- a/database/migrations/2020_11_24_062534_create_company_banks_table.php
+++ b/database/migrations/2020_11_24_062534_create_banks_table.php
@@ -1,10 +1,12 @@
 <?php
 
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BankAccountType;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateCompanyBanksTable extends Migration
+class CreateBanksTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,20 +15,22 @@ class CreateCompanyBanksTable extends Migration
      */
     public function up()
     {
-        Schema::create('company_banks', function (Blueprint $table) {
+        Schema::create('banks', function (Blueprint $table) {
             $table->id();
-            $table->bigInteger('country_id')->unsigned()->nullable();
-            $table->foreign('country_id')->references('id')->on('countries')->onDelete('cascade');
-            $table->bigInteger('company_id')->unsigned()->nullable();
-            $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
+            $table->foreignId('company_id')->unsigned();
+            $table->string('reference')->nullable();
             $table->string('bank_name');
             $table->string('holder_name');
             $table->string('account_no');
-            $table->integer('type');
-            $table->integer('default');
-            $table->integer('status')->default(1);
-            $table->timestamps();
+            $table->integer('type')->default(BankAccountType::EXTERNAL);
+            $table->integer('default')->default(false);
+            $table->integer('status')->default(ApprovalStatus::APPROVED);
+            $table->foreignId('country_id')->unsigned();
             $table->softDeletes();
+            $table->timestamps();
+
+            $table->foreign('country_id')->references('id')->on('countries');
+            $table->foreign('company_id')->references('id')->on('companies');
         });
     }
 
diff --git a/database/migrations/2020_11_28_060757_create_service_types_table.php b/database/migrations/2020_11_28_060757_create_service_types_table.php
new file mode 100644
index 00000000..b9e31227
--- /dev/null
+++ b/database/migrations/2020_11_28_060757_create_service_types_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+class CreateServiceTypesTable extends Migration
+{
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('service_types', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->string('status')->default(ApprovalStatus::APPROVED);
+            $table->softDeletes();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('service_types');
+    }
+}
diff --git a/database/migrations/2020_12_02_060758_create_bookings_table.php b/database/migrations/2020_11_28_060758_create_bookings_table.php
similarity index 50%
rename from database/migrations/2020_12_02_060758_create_bookings_table.php
rename to database/migrations/2020_11_28_060758_create_bookings_table.php
index 4b813510..115af43b 100644
--- a/database/migrations/2020_12_02_060758_create_bookings_table.php
+++ b/database/migrations/2020_11_28_060758_create_bookings_table.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -15,22 +16,24 @@ class CreateBookingsTable extends Migration
     {
         Schema::create('bookings', function (Blueprint $table) {
             $table->id();
-            $table->bigInteger('company_id')->unsigned()->nullable();
-            $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
-            $table->bigInteger('transferable_bank_id')->unsigned()->nullable();
-            $table->foreign('transferable_bank_id')->references('id')->on('company_banks')->onDelete('cascade');
-            $table->string('marking');
-            $table->string('reference');
-            $table->float('fix_amount', 20, 5)->nullable();
-            $table->bigInteger('fix_currency_id')->unsigned()->nullable();
-            $table->foreign('fix_currency_id')->references('id')->on('currencies')->onDelete('cascade');
-            $table->bigInteger('convertible_currency_id')->unsigned()->nullable();
-            $table->foreign('convertible_currency_id')->references('id')->on('currencies')->onDelete('cascade');
-            $table->bigInteger('conversion_currency_id')->unsigned()->nullable();
-            $table->foreign('conversion_currency_id')->references('id')->on('currencies')->onDelete('cascade');
-            $table->integer('status')->default(1);
-            $table->timestamps();
+            $table->foreignId('company_id')->unsigned();
+            $table->string('marking')->unique();
+            $table->foreignId('service_id')->unsigned();
+            $table->foreignId('bank_id')->unsigned();
+            $table->float('fix_amount', 20, 5);
+            $table->foreignId('fix_currency_id')->unsigned();
+            $table->foreignId('convertible_currency_id')->unsigned();
+            $table->foreignId('conversion_currency_id')->unsigned();
+            $table->integer('status')->default(ApprovalStatus::APPROVED);
             $table->softDeletes();
+            $table->timestamps();
+
+            $table->foreign('company_id')->references('id')->on('companies');
+            $table->foreign('service_id')->references('id')->on('service_types');
+            $table->foreign('bank_id')->references('id')->on('banks');
+            $table->foreign('fix_currency_id')->references('id')->on('currencies');
+            $table->foreign('convertible_currency_id')->references('id')->on('currencies');
+            $table->foreign('conversion_currency_id')->references('id')->on('currencies');
         });
     }
 
diff --git a/database/migrations/2020_11_29_212614_create_companies_wallet_table.php b/database/migrations/2020_11_29_212614_create_companies_wallet_table.php
index c55a9267..7a7ade13 100644
--- a/database/migrations/2020_11_29_212614_create_companies_wallet_table.php
+++ b/database/migrations/2020_11_29_212614_create_companies_wallet_table.php
@@ -16,14 +16,15 @@ class CreateCompaniesWalletTable extends Migration
         Schema::create('wallets', function (Blueprint $table) {
             $table->id();
 
-			$table->bigInteger('company_id')->unsigned();
+			$table->foreignId('company_id')->unsigned();
 			$table->string('code');
-            $table->bigInteger('currency_id')->unsigned();
+            $table->foreignId('currency_id')->unsigned();
             $table->decimal('amount', 20, 5)->default(0.00);
+            $table->softDeletes();
             $table->timestamps();
 
-            $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
-            $table->foreign('currency_id')->references('id')->on('currencies')->onDelete('cascade');
+            $table->foreign('company_id')->references('id')->on('companies');
+            $table->foreign('currency_id')->references('id')->on('currencies');
         });
     }
 
diff --git a/database/migrations/2020_12_01_102314_create_transaction_table.php b/database/migrations/2020_12_01_102314_create_transaction_table.php
deleted file mode 100644
index c66a6fbe..00000000
--- a/database/migrations/2020_12_01_102314_create_transaction_table.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateTransactionTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('transaction', function (Blueprint $table) {
-            $table->id();
-            $table->string('trans_type1');
-            $table->string('trans_type2');
-            $table->bigInteger('bill_no')->unsigned();
-            $table->decimal('amount', 14, 5)->default(0.00);
-            $table->decimal('original_amount', 14, 5)->default(0.00);
-            $table->bigInteger('currency_id')->unsigned();
-            $table->bigInteger('original_currency_id')->unsigned();
-            $table->decimal('currency_rate', 14, 5)->default(0.00);
-            $table->date('dt_transaction');
-            $table->integer('status');
-            $table->bigInteger('booking_id')->unsigned();
-            $table->bigInteger('company_id')->unsigned();
-            $table->timestamps();
-            $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
-            $table->foreign('currency_id')->references('id')->on('currencies')->onDelete('cascade');
-            $table->foreign('original_currency_id')->references('id')->on('currencies')->onDelete('cascade');
-            
-        });
-        
-        Schema::create('transaction_detail', function (Blueprint $table) {
-            $table->id();
-            $table->string('trans_type1');
-            $table->string('trans_type2');
-            $table->bigInteger('transaction_id')->unsigned();
-            $table->string('product_code');
-            $table->string('product_name');
-            $table->integer('qty')->default(0);
-            $table->decimal('price', 14, 5)->default(0.00);
-            $table->decimal('amount', 14, 5)->default(0.00);
-            $table->timestamps();
-            $table->foreign('transaction_id')->references('id')->on('transaction')->onDelete('cascade');
-            
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('transaction');
-        Schema::dropIfExists('transaction_detail');
-    }
-}
diff --git a/database/migrations/2020_12_01_102314_create_transactions_table.php b/database/migrations/2020_12_01_102314_create_transactions_table.php
new file mode 100644
index 00000000..a07bf413
--- /dev/null
+++ b/database/migrations/2020_12_01_102314_create_transactions_table.php
@@ -0,0 +1,59 @@
+<?php
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateTransactionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('transactions', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('booking_id')->unsigned();
+            $table->string('type')->default(TransactionType::PAYMENT);
+            $table->foreignId('issuer')->unsigned();
+            $table->foreignId('receiver')->unsigned();
+            $table->foreignId('recipient_bank_account_id')->unsigned();
+            $table->string('payment_method')->nullable();
+            $table->string('payment_reference')->nullable();
+            $table->string('bill_no')->unique();
+            $table->decimal('amount', 14, 5)->default(0.00);
+            $table->decimal('original_amount', 14, 5)->default(0.00);
+            $table->foreignId('currency_id')->unsigned();
+            $table->foreignId('original_currency_id')->unsigned();
+            $table->decimal('currency_rate', 14, 5)->default(0.00);
+            $table->decimal('tax', 14, 5)->default(0.00);
+            $table->decimal('service_charge', 14, 5)->default(0.00);
+            $table->timestamp('expires_on')->nullable();
+            $table->integer('status')->default(ApprovalStatus::PENDING_SUBMISSION);
+            $table->softDeletes();
+            $table->timestamps();
+
+            $table->foreign('booking_id')->references('id')->on('bookings');
+            $table->foreign('currency_id')->references('id')->on('currencies');
+            $table->foreign('issuer')->references('id')->on('companies');
+            $table->foreign('receiver')->references('id')->on('companies');
+            $table->foreign('recipient_bank_account_id')->references('id')->on('banks');
+            $table->foreign('original_currency_id')->references('id')->on('currencies');
+            
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('transaction');
+    }
+}
diff --git a/database/migrations/2020_12_01_102315_create_transaction_details_table.php b/database/migrations/2020_12_01_102315_create_transaction_details_table.php
new file mode 100644
index 00000000..04f1ee83
--- /dev/null
+++ b/database/migrations/2020_12_01_102315_create_transaction_details_table.php
@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateTransactionDetailsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('transaction_detail', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('transaction_id')->unsigned();
+            $table->string('product_code');
+            $table->string('product_name');
+            $table->integer('quantity')->default(0);
+            $table->decimal('price', 14, 5)->default(0.00);
+            $table->decimal('amount', 14, 5)->default(0.00);
+            $table->softDeletes();
+            $table->timestamps();
+
+            $table->foreign('transaction_id')->references('id')->on('transactions');
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('transaction_detail');
+    }
+}
diff --git a/database/migrations/2020_11_30_212314_create_wallet_transaction_table.php b/database/migrations/2020_12_01_212314_create_wallet_transaction_table.php
similarity index 57%
rename from database/migrations/2020_11_30_212314_create_wallet_transaction_table.php
rename to database/migrations/2020_12_01_212314_create_wallet_transaction_table.php
index 92818335..f87780c7 100644
--- a/database/migrations/2020_11_30_212314_create_wallet_transaction_table.php
+++ b/database/migrations/2020_12_01_212314_create_wallet_transaction_table.php
@@ -1,5 +1,7 @@
 <?php
 
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -16,19 +18,23 @@ class CreateWalletTransactionTable extends Migration
         Schema::create('wallet_transaction', function (Blueprint $table) {
             $table->id();
 
-            $table->bigInteger('wallet_id')->unsigned();
-            $table->bigInteger('bill_no')->unsigned();
-            $table->integer('trans_type');
+            $table->foreignId('wallet_id')->unsigned();
+            $table->foreignId('transaction_id')->unsigned()->nullable();
+            $table->foreignId('bill_no')->unsigned();
+            $table->integer('type')->default(TransactionType::PAYMENT);
             $table->decimal('amount', 14, 5)->default(0.00);
-            $table->bigInteger('currency_id')->unsigned();
+            $table->foreignId('currency_id')->unsigned();
             $table->decimal('original_amount', 14, 5)->default(0.00);
-            $table->bigInteger('original_currency_id')->unsigned();
+            $table->foreignId('original_currency_id')->unsigned();
             $table->decimal('currency_rate', 14, 5)->default(0.00);
+            $table->integer('status')->default(ApprovalStatus::PENDING_SUBMISSION);
+            $table->softDeletes();
             $table->timestamps();
 
-            $table->foreign('wallet_id')->references('id')->on('wallets')->onDelete('cascade');
-            $table->foreign('currency_id')->references('id')->on('currencies')->onDelete('cascade');
-            $table->foreign('original_currency_id')->references('id')->on('currencies')->onDelete('cascade');
+            $table->foreign('transaction_id')->references('id')->on('transactions');
+            $table->foreign('wallet_id')->references('id')->on('wallets');
+            $table->foreign('currency_id')->references('id')->on('currencies');
+            $table->foreign('original_currency_id')->references('id')->on('currencies');
             
         });
     }
diff --git a/database/migrations/2020_12_02_131122_create_receipt_table.php b/database/migrations/2020_12_02_131122_create_receipt_table.php
deleted file mode 100644
index a0569b25..00000000
--- a/database/migrations/2020_12_02_131122_create_receipt_table.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateReceiptTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('receipt', function (Blueprint $table) {
-            $table->id();
-            $table->string('trans_type1');
-            $table->string('trans_type2');
-            $table->bigInteger('bill_no')->unsigned();
-            $table->decimal('amount', 14, 5)->default(0.00);
-            $table->decimal('original_amount', 14, 5)->default(0.00);
-            $table->bigInteger('currency_id')->unsigned();
-            $table->bigInteger('original_currency_id')->unsigned();
-            $table->decimal('currency_rate', 14, 5)->default(0.00);
-            $table->date('dt_transaction');
-            $table->integer('status');
-            $table->bigInteger('booking_id')->unsigned();
-            $table->bigInteger('company_id')->unsigned();
-            $table->timestamps();
-            $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
-            $table->foreign('currency_id')->references('id')->on('currencies')->onDelete('cascade');
-            $table->foreign('original_currency_id')->references('id')->on('currencies')->onDelete('cascade');
-            
-        });
-        
-        Schema::create('receipt_detail', function (Blueprint $table) {
-            $table->id();
-            $table->string('trans_type1');
-            $table->string('trans_type2');
-            $table->bigInteger('receipt_id')->unsigned();
-            $table->bigInteger('transaction_id')->unsigned();
-            $table->decimal('price', 14, 5)->default(0.00);
-            $table->decimal('amount', 14, 5)->default(0.00);
-            $table->timestamps();
-            $table->foreign('receipt_id')->references('id')->on('receipt')->onDelete('cascade');
-            $table->foreign('transaction_id')->references('id')->on('transaction')->onDelete('cascade');
-            
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('receipt');
-        Schema::dropIfExists('receipt_detail');
-    }
-}
diff --git a/database/migrations/2020_12_02_131122_create_receipts_table.php b/database/migrations/2020_12_02_131122_create_receipts_table.php
new file mode 100644
index 00000000..16ec2684
--- /dev/null
+++ b/database/migrations/2020_12_02_131122_create_receipts_table.php
@@ -0,0 +1,50 @@
+<?php
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateReceiptsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('receipts', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('transaction_id')->unsigned();
+            $table->string('bill_no')->unique();
+            $table->decimal('amount', 14, 5)->default(0.00);
+            $table->decimal('original_amount', 14, 5)->default(0.00);
+            $table->foreignId('currency_id')->unsigned();
+            $table->foreignId('original_currency_id')->unsigned();
+            $table->decimal('currency_rate', 14, 5)->default(0.00);
+            $table->decimal('tax', 14, 5)->default(0.00);
+            $table->decimal('service_charge', 14, 5)->default(0.00);
+            $table->timestamp('transaction_date')->useCurrent();
+            $table->integer('status')->default(ApprovalStatus::COMPLETED);
+            $table->softDeletes();
+            $table->timestamps();
+
+            $table->foreign('transaction_id')->references('id')->on('transactions');
+            $table->foreign('currency_id')->references('id')->on('currencies');
+            $table->foreign('original_currency_id')->references('id')->on('currencies');
+            
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('receipt');
+    }
+}
diff --git a/database/migrations/2020_12_02_131123_create_receipt_details_table.php b/database/migrations/2020_12_02_131123_create_receipt_details_table.php
new file mode 100644
index 00000000..0a008293
--- /dev/null
+++ b/database/migrations/2020_12_02_131123_create_receipt_details_table.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateReceiptDetailsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        
+        Schema::create('receipt_details', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('receipt_id')->unsigned();
+            $table->decimal('price', 14, 5)->default(0.00);
+            $table->decimal('amount', 14, 5)->default(0.00);
+            $table->timestamps();
+
+            $table->foreign('receipt_id')->references('id')->on('receipts');
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('receipt_detail');
+    }
+}
diff --git a/database/migrations/2020_12_28_133342_create_currency_rates_table.php b/database/migrations/2020_12_28_133342_create_currency_rates_table.php
index 33d733b7..59cec832 100644
--- a/database/migrations/2020_12_28_133342_create_currency_rates_table.php
+++ b/database/migrations/2020_12_28_133342_create_currency_rates_table.php
@@ -7,6 +7,7 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateCurrencyRatesTable extends Migration
 {
+
     /**
      * Run the migrations.
      *
@@ -16,12 +17,15 @@ class CreateCurrencyRatesTable extends Migration
     {
         Schema::create('currency_rates', function (Blueprint $table) {
             $table->id();
-            $table->bigInteger('currency_id')->unsigned()->nullable();
-            $table->foreign('currency_id')->references('id')->on('currencies')->onDelete('cascade');
-            $table->decimal('selling', 20, 5)->nullable();
+            $table->foreignId('currency_id')->unsigned();
+            $table->decimal('selling', 20, 5);
             $table->integer('payment_method_type')->default(PaymentMethodType::CASH);
-            $table->timestamps();
+            $table->foreignId('service_id');
             $table->softDeletes();
+            $table->timestamps();
+
+            $table->foreign('currency_id')->references('id')->on('currencies');
+            $table->foreign('service_id')->references('id')->on('service_types');
         });
     }
 
diff --git a/database/migrations/2020_12_28_133406_create_currency_rate_logs_table.php b/database/migrations/2020_12_28_133406_create_currency_rate_logs_table.php
index 45e1f19a..29128f5a 100644
--- a/database/migrations/2020_12_28_133406_create_currency_rate_logs_table.php
+++ b/database/migrations/2020_12_28_133406_create_currency_rate_logs_table.php
@@ -15,12 +15,13 @@ class CreateCurrencyRateLogsTable extends Migration
     {
         Schema::create('currency_rate_logs', function (Blueprint $table) {
             $table->id();
-            $table->bigInteger('currency_rate_id')->unsigned()->nullable();
-            $table->foreign('currency_rate_id')->references('id')->on('currency_rates')->onDelete('cascade');
-            $table->decimal('selling', 20, 5)->nullable();
-            $table->bigInteger('created_by')->unsigned()->nullable();
-            $table->foreign('created_by')->references('id')->on('users')->onDelete('cascade');
+            $table->foreignId('currency_rate_id')->unsigned();
+            $table->decimal('selling', 20, 5);
+            $table->foreignId('created_by')->unsigned();
             $table->timestamps();
+
+            $table->foreign('currency_rate_id')->references('id')->on('currency_rates');
+            $table->foreign('created_by')->references('id')->on('users');
         });
     }
 
diff --git a/database/seeds/AddressesTableSeeder.php b/database/seeds/AddressesTableSeeder.php
deleted file mode 100644
index 2cefe328..00000000
--- a/database/seeds/AddressesTableSeeder.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-use Illuminate\Database\Seeder;
-
-class AddressesTableSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        if (app()->environment('local'))
-            factory(App\Models\Address::class, 30)->create();
-
-    }
-}
diff --git a/database/seeds/AdminUserTableSeeder.php b/database/seeds/AdminUserTableSeeder.php
index 0eb00cba..17e3d1c7 100644
--- a/database/seeds/AdminUserTableSeeder.php
+++ b/database/seeds/AdminUserTableSeeder.php
@@ -1,7 +1,9 @@
 <?php
 
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\RoleTypes;
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Str;
+use Illuminate\Support\Facades\DB;
 
 class AdminUserTableSeeder extends Seeder
 {
@@ -14,28 +16,25 @@ class AdminUserTableSeeder extends Seeder
     {
         DB::table('users')->insert([
             [
-                'id' => 1,
-                'name' => 'The One',
-                'email' => 'admin@exchange.com',
-                'password' => bcrypt('pass123'),
-                'type' => 1,
-                'status' => 1,
-                'remember_token' => (string) Str::uuid(),
-                'active_at' => date('Y-m-d H:i:s'),
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'name' => 'Shadow Admin',
+                'email' => 'omair@cief-malaysia.com',
+                'password' => bcrypt('123456abcabc'),
+                'type' => RoleTypes::SHADOW_ADMIN,
+                'status' => ApprovalStatus::APPROVED,
             ],
             [
-                'id' => 2,
-                'name' => 'The Admin',
-                'email' => 'admin2@exchange.com',
-                'password' => bcrypt('pass123'),
-                'type' => 1,
-                'status' => 1,
-                'remember_token' => (string) Str::uuid(),
-                'active_at' => date('Y-m-d H:i:s'),
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'name' => 'Super Admin',
+                'email' => 'pm@cief-malaysia.com',
+                'password' => bcrypt('123456abcabc'),
+                'type' => RoleTypes::SUPER_ADMIN,
+                'status' => ApprovalStatus::APPROVED,
+            ],
+            [
+                'name' => 'Admin',
+                'email' => 'admin@cief-malaysia.com',
+                'password' => bcrypt('123456abcabc'),
+                'type' => RoleTypes::ADMIN,
+                'status' => ApprovalStatus::APPROVED,
             ]
         ]);
     }
diff --git a/database/seeds/CompaniesTableSeeder.php b/database/seeds/CompaniesTableSeeder.php
index 54a0a74b..5e665a9e 100644
--- a/database/seeds/CompaniesTableSeeder.php
+++ b/database/seeds/CompaniesTableSeeder.php
@@ -1,7 +1,11 @@
 <?php
 
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\CompanyType;
+use App\Models\Company;
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Str;
+use Illuminate\Support\Facades\DB;
 
 class CompaniesTableSeeder extends Seeder
 {
@@ -12,16 +16,14 @@ class CompaniesTableSeeder extends Seeder
      */
     public function run()
     {
-        DB::table('companies')->insert([
-            [
-                'id' => 1,
-                'name' => 'CIEF SDN BHD',
-                'reference' => 'CIEF',
-                'type' => 2,
-                'business_type' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s')
-            ]
-        ]);
+        $company = new Company();
+        $company->name = 'CIEF SDN BHD';
+        $company->reference = 'CIEF';
+        $company->type = CompanyType::COMPANY_BUSINESS;
+        $company->business_type = BusinessType::FREIGHT_FORWARDER;
+        $company->status = ApprovalStatus::APPROVED;
+
+        $company->save();
+
     }
 }
diff --git a/database/seeds/CompanyBanksTableSeeder.php b/database/seeds/CompanyBanksTableSeeder.php
deleted file mode 100644
index 7e77f6be..00000000
--- a/database/seeds/CompanyBanksTableSeeder.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-use Illuminate\Database\Seeder;
-use Illuminate\Support\Str;
-
-class CompanyBanksTableSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        DB::table('company_banks')->insert([
-            [
-                'id' => 1,
-                'country_id' => 1,
-                'company_id' => 1,
-                'bank_name' => '12345678',
-                'holder_name' => '12345678',
-                'account_no' => '12345678',
-                'type' => 1,
-                'default' => 1,
-                'status' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s')
-            ]
-        ]);
-    }
-}
diff --git a/database/seeds/CountriesTableSeeder.php b/database/seeds/CountriesTableSeeder.php
index 655f16d1..ad7d1570 100644
--- a/database/seeds/CountriesTableSeeder.php
+++ b/database/seeds/CountriesTableSeeder.php
@@ -1,34 +1,38 @@
 <?php
 
+use App\Classes\Modules\Countries\DataTransferObjects\CountryObject;
+use App\Classes\Modules\Countries\Services\CreatesCountry;
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Str;
 
 class CountriesTableSeeder extends Seeder
 {
+
+    /** @var CreatesCountry */
+    private $createsCountry;
+
+    /**
+     * CountriesTableSeeder constructor.
+     * @param CreatesCountry $createsCountry
+     */
+    public function __construct(CreatesCountry $createsCountry)
+    {
+        $this->createsCountry = $createsCountry;
+    }
+
+
     /**
      * Run the database seeds.
      *
      * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
      */
     public function run()
     {
-        DB::table('countries')->insert([
-            [
-                'id' => 1,
-                'name' => 'Malaysia',
-                'short_code' => 'MY',
-                'phone_code' => '60',
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
-            ],
-            [
-                'id' => 2,
-                'name' => 'China',
-                'short_code' => 'CN',
-                'phone_code' => '852',
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
-            ]
-        ]);
+
+        foreach (['my', 'cn'] as $code) {
+            $object = new CountryObject(country($code));
+            $this->createsCountry->execute($object);
+        }
+
     }
 }
diff --git a/database/seeds/CurrenciesTableSeeder.php b/database/seeds/CurrenciesTableSeeder.php
index bf87e811..22fc52d3 100644
--- a/database/seeds/CurrenciesTableSeeder.php
+++ b/database/seeds/CurrenciesTableSeeder.php
@@ -1,36 +1,47 @@
 <?php
 
+use App\Classes\Modules\Countries\Services\FetchesCountry;
+use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyObject;
+use App\Classes\Modules\Currencies\Services\CreatesCurrency;
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Str;
 
 class CurrenciesTableSeeder extends Seeder
 {
+    /** @var FetchesCountry */
+    private $fetchesCountry;
+
+    /** @var CreatesCurrency */
+    private $createsCurrency;
+
+    /**
+     * CurrenciesTableSeeder constructor.
+     * @param FetchesCountry $fetchesCountry
+     * @param CreatesCurrency $createsCurrency
+     */
+    public function __construct(FetchesCountry $fetchesCountry, CreatesCurrency $createsCurrency)
+    {
+        $this->fetchesCountry = $fetchesCountry;
+        $this->createsCurrency = $createsCurrency;
+    }
+
+
     /**
      * Run the database seeds.
      *
      * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
      */
     public function run()
     {
-        DB::table('currencies')->insert([
-            [
-                'id' => 1,
-                'country_id' => 1,
-                'name' => 'Ringgit',
-                'short_code' => 'MYR',
-                'symbol' => 'RM',
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s')
-            ],
-            [
-                'id' => 2,
-                'country_id' => 2,
-                'name' => 'Renminbi',
-                'short_code' => 'RMB',
-                'symbol' => '¥',
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s')
-            ]
-        ]);
+
+        foreach (['my', 'cn'] as $code) {
+            $country = country($code);
+            $object = new CurrencyObject($country->getCurrency()['iso_4217_name'],
+                $code === 'cn' ? 'RMB' : $country->getCurrency()['iso_4217_code'],
+                $code === 'my' ? 'RM' : ( $code === 'cn' ? '¥' : '' ));
+
+            $this->createsCurrency->execute($this->fetchesCountry->execute(['name' => $country->getName()]), $object);
+        }
+
     }
 }
diff --git a/database/seeds/CurrencyRatesTableSeeder.php b/database/seeds/CurrencyRatesTableSeeder.php
deleted file mode 100644
index 31202e35..00000000
--- a/database/seeds/CurrencyRatesTableSeeder.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use Illuminate\Database\Seeder;
-use Illuminate\Support\Str;
-
-class CurrencyRatesTableSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        DB::table('currency_rates')->insert([
-            [
-                'currency_id' => 1,
-                'selling' => 1,
-                'payment_method_type' => PaymentMethodType::CASH,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s')
-            ],
-            [
-                'currency_id' => 1,
-                'selling' => 1.1,
-                'payment_method_type' => PaymentMethodType::CHEQUE,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s')
-            ],
-            [
-                'currency_id' => 2,
-                'selling' => 0.62,
-                'payment_method_type' => PaymentMethodType::CASH,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s')
-            ],
-            [
-                'currency_id' => 2,
-                'selling' => 0.70,
-                'payment_method_type' => PaymentMethodType::CHEQUE,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s')
-            ]
-        ]);
-    }
-}
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index bcd12e9b..5f813ef1 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\DB;
 
 class DatabaseSeeder extends Seeder
 {
@@ -16,7 +17,6 @@ class DatabaseSeeder extends Seeder
         //General
         $this->call(CountriesTableSeeder::class);
         $this->call(CurrenciesTableSeeder::class);
-        $this->call(CurrencyRatesTableSeeder::class);
 
         $this->call(StatesTableSeeder::class);
         $this->call(DistrictsTableSeeder::class);
@@ -25,8 +25,7 @@ class DatabaseSeeder extends Seeder
         $this->call(SegmentConstantsTableSeeder::class);
 
         $this->call(CompaniesTableSeeder::class);
-        $this->call(CompanyBanksTableSeeder::class);
-        
+
         // Admin
         $this->call(AdminUserTableSeeder::class);
         $this->call(AdminUserPermissionsTableSeeder::class);
diff --git a/database/seeds/DistrictsTableSeeder.php b/database/seeds/DistrictsTableSeeder.php
index 1076de9d..7d62de42 100644
--- a/database/seeds/DistrictsTableSeeder.php
+++ b/database/seeds/DistrictsTableSeeder.php
@@ -1,7 +1,7 @@
 <?php
 
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Str;
+use Illuminate\Support\Facades\DB;
 
 class DistrictsTableSeeder extends Seeder
 {
@@ -468,8 +468,6 @@ class DistrictsTableSeeder extends Seeder
                 'name' => $row[3],
                 'postcode' => $row[4],
                 'status' => $row[5],
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
             ];
         }
 
diff --git a/database/seeds/SegmentConstantsTableSeeder.php b/database/seeds/SegmentConstantsTableSeeder.php
index 283bb4d5..8e8a20db 100644
--- a/database/seeds/SegmentConstantsTableSeeder.php
+++ b/database/seeds/SegmentConstantsTableSeeder.php
@@ -1,79 +1,52 @@
 <?php
 
+use App\Classes\Modules\Currencies\Services\FetchesCurrency;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\CreatesConstant;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Str;
 
 class SegmentConstantsTableSeeder extends Seeder
 {
+
+    /** @var FetchesCurrency */
+    private $fetchesCurrency;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var CreatesConstant */
+    private $createsSegmentConstant;
+
+    /**
+     * SegmentConstantsTableSeeder constructor.
+     * @param FetchesCurrency $fetchesCurrency
+     * @param FetchesSegment $fetchesSegment
+     * @param CreatesConstant $createsSegmentConstant
+     */
+    public function __construct(FetchesCurrency $fetchesCurrency, FetchesSegment $fetchesSegment, CreatesConstant $createsSegmentConstant)
+    {
+        $this->fetchesCurrency = $fetchesCurrency;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->createsSegmentConstant = $createsSegmentConstant;
+    }
+
+
     /**
      * Run the database seeds.
      *
      * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
      */
     public function run()
     {
-        DB::table('segment_constants')->insert([
-            [
-                'id' => 1,
-                'segment_id' => 1,
-                'name' => 'Tax',
-                'reference' => 'TAX', 
-                'detail' => json_encode([
-                    'type' => 'percentage',
-                    'value' => '10'
-                ]),
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
-            ],
-            [
-                'id' => 2,
-                'segment_id' => 1,
-                'name' => 'Billing Fee',
-                'reference' => 'BILLING_FEE', 
-                'detail' => json_encode([
-                    'type' => 'fix_rate',
-                    'value' => '10'
-                ]),
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
-            ],
-            [
-                'id' => 3,
-                'segment_id' => 1,
-                'name' => 'Service Charge',
-                'reference' => 'SERVICE_CHARGE', 
-                'detail' => json_encode([
-                    'type' => 'fix_rate',
-                    'value' => '10'
-                ]),
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
-            ],
-            [
-                'id' => 4,
-                'segment_id' => 1,
-                'name' => 'Booking Amount Max',
-                'reference' => 'BOOKING_AMOUNT_MAX', 
-                'detail' => json_encode([
-                    'type' => 'fix_rate',
-                    'value' => '10',
-                    'currency_id' => 1
-                ]),
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
-            ],
-            [
-                'id' => 5,
-                'segment_id' => 1,
-                'name' => 'Payment Attempt Expiry Time',
-                'reference' => 'PAYMENT_ATTEMP_EXPIRY_TIME', 
-                'detail' => json_encode([
-                    'type' => 'day',
-                    'value' => '10',
-                ]),
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
-            ],
-        ]);
+
+        $object = new ConstantObject('System Primary Currency',
+            SegmentConstants::SYSTEM_PRIMARY_CURRENCY,
+            ['id' => $this->fetchesCurrency->execute(['name' => country('my')->getName()])->id]);
+
+        $this->createsSegmentConstant->execute($this->fetchesSegment->execute(['Standard Segment']), $object);
+
     }
 }
diff --git a/database/seeds/SegmentsTableSeeder.php b/database/seeds/SegmentsTableSeeder.php
index bda12c31..574a7769 100644
--- a/database/seeds/SegmentsTableSeeder.php
+++ b/database/seeds/SegmentsTableSeeder.php
@@ -1,24 +1,23 @@
 <?php
 
+use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
+use App\Classes\Modules\Segments\Services\CreatesSegment;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Str;
+use Illuminate\Support\Facades\DB;
 
 class SegmentsTableSeeder extends Seeder
 {
+
+
     /**
-     * Run the database seeds.
-     *
-     * @return void
      */
     public function run()
     {
+
         DB::table('segments')->insert([
-            [
-                'id' => 1,
-                'name' => 'Standard Segment',
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
-            ]
+            'name' => 'Standard Segment',
+            'type' => SegmentConstants::STANDARD_SEGMENT
         ]);
     }
 }
diff --git a/database/seeds/StatesTableSeeder.php b/database/seeds/StatesTableSeeder.php
index 8d710dd3..dec26b0b 100644
--- a/database/seeds/StatesTableSeeder.php
+++ b/database/seeds/StatesTableSeeder.php
@@ -1,10 +1,25 @@
 <?php
 
+use App\Classes\Modules\Countries\Services\FetchesCountry;
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Str;
+use Illuminate\Support\Facades\DB;
 
 class StatesTableSeeder extends Seeder
 {
+
+    /** @var FetchesCountry */
+    private $fetchesCountry;
+
+    /**
+     * StatesTableSeeder constructor.
+     * @param FetchesCountry $fetchesCountry
+     */
+    public function __construct(FetchesCountry $fetchesCountry)
+    {
+        $this->fetchesCountry = $fetchesCountry;
+    }
+
+
     /**
      * Run the database seeds.
      *
@@ -12,134 +27,89 @@ class StatesTableSeeder extends Seeder
      */
     public function run()
     {
+
+        $malaysia = $this->fetchesCountry->execute(['name' => country('my')->getName()]);
         DB::table('states')->insert([
             [
-                'id' => 1,
-                'country_id' => 1,
+                'country_id' => $malaysia->id,
                 'name' => 'Johor',
-                'status' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'status' => 1
             ],
             [
-                'id' => 2,
-                'country_id' => 1,
+                'country_id' => $malaysia->id,
                 'name' => 'Kedah',
-                'status' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'status' => 1
             ],
             [
-                'id' => 3,
-                'country_id' => 1,
+                'country_id' => $malaysia->id,
                 'name' => 'Kelantan',
-                'status' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'status' => 1
             ],
             [
-                'id' => 4,
-                'country_id' => 1,
+                'country_id' => $malaysia->id,
                 'name' => 'Kuala Lumpur',
-                'status' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'status' => 1
             ],
             [
-                'id' => 5,
-                'country_id' => 1,
+                'country_id' => $malaysia->id,
                 'name' => 'Labuan',
-                'status' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'status' => 1
+                
             ],
             [
-                'id' => 6,
-                'country_id' => 1,
+                'country_id' => $malaysia->id,
                 'name' => 'Melaka',
-                'status' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'status' => 1
             ],
             [
-                'id' => 7,
-                'country_id' => 1,
+                'country_id' => $malaysia->id,
                 'name' => 'Negeri Sembilan',
-                'status' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'status' => 1
             ],
             [
-                'id' => 8,
-                'country_id' => 1,
+                'country_id' => $malaysia->id,
                 'name' => 'Pahang',
-                'status' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'status' => 1
             ],
             [
-                'id' => 9,
-                'country_id' => 1,
+                'country_id' => $malaysia->id,
                 'name' => 'Perak',
-                'status' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'status' => 1
             ],
             [
-                'id' => 10,
-                'country_id' => 1,
+                'country_id' => $malaysia->id,
                 'name' => 'Perlis',
-                'status' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'status' => 1
             ],
             [
-                'id' => 11,
-                'country_id' => 1,
+                'country_id' => $malaysia->id,
                 'name' => 'Pulau Pinang',
-                'status' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'status' => 1
             ],
             [
-                'id' => 12,
-                'country_id' => 1,
+                'country_id' => $malaysia->id,
                 'name' => 'Putrajaya',
-                'status' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'status' => 1
             ],
             [
-                'id' => 13,
-                'country_id' => 1,
+                'country_id' => $malaysia->id,
                 'name' => 'Sabah',
-                'status' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'status' => 1
             ],
             [
-                'id' => 14,
-                'country_id' => 1,
+                'country_id' => $malaysia->id,
                 'name' => 'Sarawak',
-                'status' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'status' => 1
             ],
             [
-                'id' => 15,
-                'country_id' => 1,
+                'country_id' => $malaysia->id,
                 'name' => 'Selangor',
-                'status' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'status' => 1
             ],
             [
-                'id' => 16,
-                'country_id' => 1,
+                'country_id' => $malaysia->id,
                 'name' => 'Terengganu',
-                'status' => 1,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'status' => 1
             ]
         ]);
     }
diff --git a/gulpfile.js b/gulpfile.js
index 7d64dac9..142c0ca4 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -42,6 +42,14 @@ gulp.task('vendorCss', () => {
 
 gulp.task('vendorFonts', () => {
     fancyLog('Copying vendor fonts for dependencies');
+    return gulp.src(pkg.globs.vendorFlags)
+        .pipe(plugins.plumber({errorHandler: onError}))
+        .pipe(plugins.print())
+        .pipe(gulp.dest(pkg.paths.build.flags));
+});
+
+gulp.task('vendorFlags', () => {
+    fancyLog('Copying flags svg for dependencies');
     return gulp.src(pkg.globs.vendorFonts)
         .pipe(plugins.plumber({errorHandler: onError}))
         .pipe(plugins.print())
@@ -97,7 +105,7 @@ gulp.task('clean', () => {
     return del([pkg.paths.build.css + '/*', pkg.paths.build.js + '/*', !pkg.paths.build.js + '/app.js', pkg.paths.build.images + '/*', pkg.paths.build.fonts + '/*']);
 });
 
-gulp.task('vendor', gulp.series('vendorJs', 'vendorCss', 'vendorFonts', 'vendorImages'));
+gulp.task('vendor', gulp.series('vendorJs', 'vendorCss', 'vendorFonts', 'vendorFlags', 'vendorImages'));
 gulp.task('source', gulp.series('sourceCss', 'sourceImages', 'sourceJs', 'sourceFonts'));
 gulp.task('build', gulp.series('clean', 'vendor', 'source'));
 
diff --git a/load_font.php b/load_font.php
new file mode 100644
index 00000000..066abfe7
--- /dev/null
+++ b/load_font.php
@@ -0,0 +1,202 @@
+<?php
+// 1. [Required] Point to the composer or dompdf autoloader
+require_once "vendor/autoload.php";
+
+// 2. [Optional] Set the path to your font directory
+//    By default dompdf loads fonts to dompdf/lib/fonts
+//    If you have modified your font directory set this
+//    variable appropriately.
+//$fontDir = "lib/fonts";
+
+
+// *** DO NOT MODIFY BELOW THIS POINT ***
+
+use Dompdf\Dompdf;
+use Dompdf\CanvasFactory;
+use Dompdf\Exception;
+use Dompdf\FontMetrics;
+use Dompdf\Options;
+
+use FontLib\Font;
+
+/**
+ * Display command line usage
+ */
+function usage() {
+  echo <<<EOD
+
+Usage: {$_SERVER["argv"][0]} font_family [n_file [b_file] [i_file] [bi_file]]
+
+font_family:      the name of the font, e.g. Verdana, 'Times New Roman',
+                  monospace, sans-serif. If it equals to "system_fonts", 
+                  all the system fonts will be installed.
+
+n_file:           the .ttf or .otf file for the normal, non-bold, non-italic
+                  face of the font.
+
+{b|i|bi}_file:    the files for each of the respective (bold, italic,
+                  bold-italic) faces.
+
+If the optional b|i|bi files are not specified, load_font.php will search
+the directory containing normal font file (n_file) for additional files that
+it thinks might be the correct ones (e.g. that end in _Bold or b or B).  If
+it finds the files they will also be processed.  All files will be
+automatically copied to the DOMPDF font directory, and afm files will be
+generated using php-font-lib (https://github.com/PhenX/php-font-lib).
+
+Examples:
+
+./load_font.php silkscreen /usr/share/fonts/truetype/slkscr.ttf
+./load_font.php 'Times New Roman' /mnt/c_drive/WINDOWS/Fonts/times.ttf
+
+EOD;
+exit;
+}
+
+if ( $_SERVER["argc"] < 3 && @$_SERVER["argv"][1] != "system_fonts" ) {
+  usage();
+}
+
+$dompdf = new Dompdf();
+if (isset($fontDir) && realpath($fontDir) !== false) {
+  $dompdf->getOptions()->set('fontDir', $fontDir);
+}
+
+/**
+ * Installs a new font family
+ * This function maps a font-family name to a font.  It tries to locate the
+ * bold, italic, and bold italic versions of the font as well.  Once the
+ * files are located, ttf versions of the font are copied to the fonts
+ * directory.  Changes to the font lookup table are saved to the cache.
+ *
+ * @param Dompdf $dompdf      dompdf main object 
+ * @param string $fontname    the font-family name
+ * @param string $normal      the filename of the normal face font subtype
+ * @param string $bold        the filename of the bold face font subtype
+ * @param string $italic      the filename of the italic face font subtype
+ * @param string $bold_italic the filename of the bold italic face font subtype
+ *
+ * @throws Exception
+ */
+function install_font_family($dompdf, $fontname, $normal, $bold = null, $italic = null, $bold_italic = null) {
+  $fontMetrics = $dompdf->getFontMetrics();
+  
+  // Check if the base filename is readable
+  if ( !is_readable($normal) )
+    throw new Exception("Unable to read '$normal'.");
+
+  $dir = dirname($normal);
+  $basename = basename($normal);
+  $last_dot = strrpos($basename, '.');
+  if ($last_dot !== false) {
+    $file = substr($basename, 0, $last_dot);
+    $ext = strtolower(substr($basename, $last_dot));
+  } else {
+    $file = $basename;
+    $ext = '';
+  }
+
+  if ( !in_array($ext, array(".ttf", ".otf")) ) {
+    throw new Exception("Unable to process fonts of type '$ext'.");
+  }
+
+  // Try $file_Bold.$ext etc.
+  $path = "$dir/$file";
+  
+  $patterns = array(
+    "bold"        => array("_Bold", "b", "B", "bd", "BD"),
+    "italic"      => array("_Italic", "i", "I"),
+    "bold_italic" => array("_Bold_Italic", "bi", "BI", "ib", "IB"),
+  );
+  
+  foreach ($patterns as $type => $_patterns) {
+    if ( !isset($$type) || !is_readable($$type) ) {
+      foreach($_patterns as $_pattern) {
+        if ( is_readable("$path$_pattern$ext") ) {
+          $$type = "$path$_pattern$ext";
+          break;
+        }
+      }
+      
+      if ( is_null($$type) )
+        echo ("Unable to find $type face file.\n");
+    }
+  }
+
+  $fonts = compact("normal", "bold", "italic", "bold_italic");
+  $entry = array();
+
+  // Copy the files to the font directory.
+  foreach ($fonts as $var => $src) {
+    if ( is_null($src) ) {
+      $entry[$var] = $dompdf->getOptions()->get('fontDir') . '/' . mb_substr(basename($normal), 0, -4);
+      continue;
+    }
+
+    // Verify that the fonts exist and are readable
+    if ( !is_readable($src) )
+      throw new Exception("Requested font '$src' is not readable");
+
+    $dest = $dompdf->getOptions()->get('fontDir') . '/' . basename($src);
+
+    if ( !is_writeable(dirname($dest)) )
+      throw new Exception("Unable to write to destination '$dest'.");
+
+    echo "Copying $src to $dest...\n";
+
+    if ( !copy($src, $dest) )
+      throw new Exception("Unable to copy '$src' to '$dest'");
+    
+    $entry_name = mb_substr($dest, 0, -4);
+    
+    echo "Generating Adobe Font Metrics for $entry_name...\n";
+    
+    $font_obj = Font::load($dest);
+    $font_obj->saveAdobeFontMetrics("$entry_name.ufm");
+    $font_obj->close();
+
+    $entry[$var] = $entry_name;
+  }
+
+  // Store the fonts in the lookup table
+  $fontMetrics->setFontFamily($fontname, $entry);
+
+  // Save the changes
+  $fontMetrics->saveFontFamilies();
+}
+
+// If installing system fonts (may take a long time)
+if ( $_SERVER["argv"][1] === "system_fonts" ) {
+  $fontMetrics = $dompdf->getFontMetrics();
+  $files = glob("/usr/share/fonts/truetype/*.ttf") +
+    glob("/usr/share/fonts/truetype/*/*.ttf") +
+    glob("/usr/share/fonts/truetype/*/*/*.ttf") +
+    glob("C:\\Windows\\fonts\\*.ttf") +
+    glob("C:\\WinNT\\fonts\\*.ttf") +
+    glob("/mnt/c_drive/WINDOWS/Fonts/");
+  $fonts = array();
+  foreach ($files as $file) {
+      $font = Font::load($file);
+      $records = $font->getData("name", "records");
+      $type = $fontMetrics->getType($records[2]);
+      $fonts[mb_strtolower($records[1])][$type] = $file;
+      $font->close();
+  }
+  
+  foreach ( $fonts as $family => $files ) {
+    echo " >> Installing '$family'... \n";
+    
+    if ( !isset($files["normal"]) ) {
+      echo "No 'normal' style font file\n";
+    }
+    else {
+      install_font_family($dompdf, $family, @$files["normal"], @$files["bold"], @$files["italic"], @$files["bold_italic"]);
+      echo "Done !\n";
+    }
+    
+    echo "\n";
+  }
+}
+else {
+  call_user_func_array("install_font_family", array_merge( array($dompdf), array_slice($_SERVER["argv"], 1) ));
+}
diff --git a/package.json b/package.json
index 8bc1d6c5..b2003517 100644
--- a/package.json
+++ b/package.json
@@ -15,18 +15,24 @@
         "bootstrap-datepicker": "^1.7.1",
         "dropzone": "^5.7.2",
         "epic-spinners": "^1.1.0",
+        "flag-icon-css": "^3.5.0",
         "font-awesome": "^4.7.0",
         "intro.js": "^3.1.0",
         "jquery": "^3.2",
         "jquery.scrollbar": "^0.2.11",
+        "jwt-decode": "^3.1.2",
         "noty": "^3.2.0-beta",
+        "pdfjs-dist": "^2.6.347",
         "perfect-scrollbar": "^1.5.0",
         "popper.js": "^1.12",
         "sass-loader": "10.1.0",
         "select2": "^4.0.6-rc.1",
+        "v-money": "^0.8.1",
         "vue": "^2.6.10",
         "vue-avatar": "^2.1.8",
+        "vue-debounce": "^2.6.0",
         "vue-template-compiler": "^2.6.10",
+        "vue-the-mask": "^0.11.1",
         "vuelidate": "^0.7.4",
         "vuex": "^3.1.1"
     },
@@ -62,6 +68,7 @@
             "js": "./public/js/",
             "images": "./public/images/",
             "fonts": "./public/fonts/",
+            "flags": "./public/flag-icon-css/flags",
             "main": "./public/"
         }
     },
@@ -80,6 +87,7 @@
         ],
         "vendorCss": [
             "./node_modules/font-awesome/css/font-awesome.min.css",
+            "./node_modules/flag-icon-css/css/flag-icon.min.css",
             "./node_modules/jquery.scrollbar/jquery.scrollbar.css",
             "./node_modules/select2/dist/css/select2.min.css",
             "./node_modules/dropzone/dist/dropzone.css",
@@ -93,6 +101,9 @@
         "vendorFonts": [
             "./node_modules/font-awesome/fonts/**/*"
         ],
+        "vendorFlags": [
+            "./node_modules/flag-icon-css/flags/**/*"
+        ],
         "vendorImages": [
             "./node_modules/jquery-ui-dist/images/**/*.png",
             "./node_modules/datatables.net-dt/images/**/*.png"
diff --git a/resources/assets/images/2829248.png b/resources/assets/images/2829248.png
new file mode 100644
index 00000000..50a0280f
Binary files /dev/null and b/resources/assets/images/2829248.png differ
diff --git a/resources/assets/images/2853457.png b/resources/assets/images/2853457.png
new file mode 100644
index 00000000..b9107cf8
Binary files /dev/null and b/resources/assets/images/2853457.png differ
diff --git a/resources/assets/images/2942005.jpg b/resources/assets/images/2942005.jpg
new file mode 100644
index 00000000..83908287
Binary files /dev/null and b/resources/assets/images/2942005.jpg differ
diff --git a/resources/assets/images/3231370.jpg b/resources/assets/images/3231370.jpg
new file mode 100644
index 00000000..41002f1b
Binary files /dev/null and b/resources/assets/images/3231370.jpg differ
diff --git a/resources/assets/images/3568950.png b/resources/assets/images/3568950.png
new file mode 100644
index 00000000..9003367b
Binary files /dev/null and b/resources/assets/images/3568950.png differ
diff --git a/resources/assets/images/easter-egg.png b/resources/assets/images/easter-egg.png
new file mode 100644
index 00000000..cc7ff537
Binary files /dev/null and b/resources/assets/images/easter-egg.png differ
diff --git a/resources/assets/images/iStock-976354264_Malaysia.jpg b/resources/assets/images/iStock-976354264_Malaysia.jpg
new file mode 100644
index 00000000..3f8db0b0
Binary files /dev/null and b/resources/assets/images/iStock-976354264_Malaysia.jpg differ
diff --git a/resources/assets/images/logo-dark.png b/resources/assets/images/logo-dark.png
new file mode 100644
index 00000000..50c14872
Binary files /dev/null and b/resources/assets/images/logo-dark.png differ
diff --git a/resources/assets/images/logo-gradient.png b/resources/assets/images/logo-gradient.png
new file mode 100644
index 00000000..050fa371
Binary files /dev/null and b/resources/assets/images/logo-gradient.png differ
diff --git a/resources/assets/images/logo-light.png b/resources/assets/images/logo-light.png
new file mode 100644
index 00000000..e9bbd538
Binary files /dev/null and b/resources/assets/images/logo-light.png differ
diff --git a/resources/assets/images/logo.png b/resources/assets/images/logo.png
deleted file mode 100644
index c0a1f3bb..00000000
Binary files a/resources/assets/images/logo.png and /dev/null differ
diff --git a/resources/assets/images/logo_white.png b/resources/assets/images/logo_white.png
deleted file mode 100644
index c4be42e0..00000000
Binary files a/resources/assets/images/logo_white.png and /dev/null differ
diff --git a/resources/assets/images/order_form.png b/resources/assets/images/order_form.png
new file mode 100644
index 00000000..3f940fd5
Binary files /dev/null and b/resources/assets/images/order_form.png differ
diff --git a/resources/assets/js/pages.js b/resources/assets/js/pages.js
index fbeb52e3..2455508d 100644
--- a/resources/assets/js/pages.js
+++ b/resources/assets/js/pages.js
@@ -13,7 +13,7 @@
 
         this.setUserOS();
         this.setUserAgent();
-    }
+    };
 
     /** @function setUserOS
     * @description SET User Operating System eg: mac,windows,etc
@@ -27,7 +27,7 @@
         if (navigator.appVersion.indexOf("Linux") != -1) OSName = "linux";
 
         this.$body.addClass(OSName);
-    }
+    };
 
     /** @function setUserAgent
     * @description SET User Device Name to mobile | desktop
@@ -42,7 +42,7 @@
                 this.$body.addClass('ie9');
             }
         }
-    }
+    };
 
     /** @function isVisibleXs
     * @description Checks if the screen size is XS - Extra Small i.e below W480px
@@ -51,7 +51,7 @@
     Pages.prototype.isVisibleXs = function() {
         (!$('#pg-visible-xs').length) && this.$body.append('<div id="pg-visible-xs" class="visible-xs" />');
         return $('#pg-visible-xs').is(':visible');
-    }
+    };
 
     /** @function isVisibleSm
     * @description Checks if the screen size is SM - Small Screen i.e Above W480px
@@ -60,7 +60,7 @@
     Pages.prototype.isVisibleSm = function() {
         (!$('#pg-visible-sm').length) && this.$body.append('<div id="pg-visible-sm" class="visible-sm" />');
         return $('#pg-visible-sm').is(':visible');
-    }
+    };
 
     /** @function isVisibleMd
     * @description Checks if the screen size is MD - Medium Screen i.e Above W1024px
@@ -69,7 +69,7 @@
     Pages.prototype.isVisibleMd = function() {
         (!$('#pg-visible-md').length) && this.$body.append('<div id="pg-visible-md" class="visible-md" />');
         return $('#pg-visible-md').is(':visible');
-    }
+    };
 
     /** @function isVisibleLg
     * @description Checks if the screen size is LG - Large Screen i.e Above W1200px
@@ -78,7 +78,7 @@
     Pages.prototype.isVisibleLg = function() {
         (!$('#pg-visible-lg').length) && this.$body.append('<div id="pg-visible-lg" class="visible-lg" />');
         return $('#pg-visible-lg').is(':visible');
-    }
+    };
 
     /** @function getUserAgent
     * @description Get Current User Agent.
@@ -86,7 +86,7 @@
     */
     Pages.prototype.getUserAgent = function() {
         return $('body').hasClass('mobile') ? "mobile" : "desktop";
-    }
+    };
 
     /** @function setFullScreen
     * @description Make Browser fullscreen.
@@ -103,7 +103,7 @@
                 wscript.SendKeys("{F11}");
             }
         }
-    }
+    };
 
     /** @function getColor
     * @description Get Color from CSS
@@ -124,7 +124,7 @@
         var rgba = "rgba(" + rgb[1] + ", " + rgb[2] + ", " + rgb[3] + ', ' + opacity + ')';
 
         return rgba;
-    }
+    };
 
     /** @function initSidebar
     * @description Initialize side bar to open and close
@@ -133,10 +133,10 @@
     */
     Pages.prototype.initSidebar = function(context) {
         $('[data-pages="sidebar"]', context).each(function() {
-            var $sidebar = $(this)
+            var $sidebar = $(this);
             $sidebar.sidebar($sidebar.data())
         })
-    }
+    };
 
     /** @function initDropDown
     * @description Initialize Boot-Strap dropdown Menue
@@ -158,7 +158,7 @@
                 $(this).find('.dropdown-menu').width(btn.actual('outerWidth'));
             }
         });
-    }
+    };
 
     /** @function initFormGroupDefault
     * @description Initialize Pages form group input
@@ -193,7 +193,7 @@
         }, function() {
             $(this).parents('.form-group').removeClass('focused');
         });
-    }
+    };
 
     /** @function initSlidingTabs
     * @description Initialize Bootstrap Custom Sliding Tabs
@@ -216,7 +216,7 @@
                 $(hrefCurrent).removeClass('sliding');
             }, 100);
         });
-    }
+    };
     /** @function reponsiveTabs
     * @description Responsive handlers for Bootstrap Tabs
     */
@@ -225,7 +225,7 @@
          $('[data-init-reponsive-tabs="dropdownfx"]').each(function() {
             var drop = $(this);
             drop.addClass("hidden-sm-down");
-            var content = '<select class="cs-select cs-skin-slide full-width" data-init-plugin="cs-select">'
+            var content = '<select class="cs-select cs-skin-slide full-width" data-init-plugin="cs-select">';
             for(var i = 1; i <= drop.children("li").length; i++){
                 var li = drop.children("li:nth-child("+i+")");
                 var selected ="";
@@ -240,7 +240,7 @@
                 content += li.children('a').text();
                 content += '</option>';
             }
-            content +='</select>'
+            content +='</select>';
             drop.after(content);
             var select = drop.next()[0];
             $(select).on('change', function (e) {
@@ -251,11 +251,11 @@
                     tabLink = drop.find('a[data-target="'+valueSelected+'"]')
                 }
                 tabLink.tab('show')
-            })
+            });
              $(select).wrap('<div class="nav-tab-dropdown cs-wrapper full-width d-md-none d-lg-none"></div>');
             new SelectFx(select);
          });
-    }
+    };
 
     /** @function initNotificationCenter
     * @description Initialize Pages Header Notifcation Dropdown
@@ -270,7 +270,7 @@
                 p.toggleClass('open');
             });
         });
-    }
+    };
 
     /** @function initProgressBars
     * @description Initialize Pages ProgressBars
@@ -280,7 +280,7 @@
             // Hack: FF doesn't play SVG animations set as background-image
             $('.progress-bar-indeterminate, .progress-circle-indeterminate, .mapplic-pin').hide().show(0);
         });
-    }
+    };
 
     /** @function initInputFile
     * @description Initialize File Input for Bootstrap Buttons and Input groups
@@ -302,7 +302,7 @@
                 $(this).parent().html(log);
             }
         });
-    }
+    };
     /** @function initHorizontalMenu
     * @description Initialize Horizontal Dropdown Menu
     */
@@ -378,7 +378,7 @@
 
         function autoHideLi(){
             var hMenu  = $("[data-pages-init='horizontal-menu']");
-            var extraLiHide = parseInt(hMenu.data("hideExtraLi")) || 0
+            var extraLiHide = parseInt(hMenu.data("hideExtraLi")) || 0;
             if(hMenu.length == 0){
                 return
             }
@@ -429,7 +429,7 @@
                 "width":rect.width+"px",
                 "height":rect.height+"px",
                 "z-index":"auto"
-            })
+            });
             $el.append(ghost);
             var timingSpeed = ul.children("li").css('transition-duration');
 
@@ -459,14 +459,14 @@
             ghost.height(rect.height);
             var timingSpeed = ghost.css('transition-duration');
 
-            timingSpeed = parseInt(parseFloat(timingSpeed) * 1000)
+            timingSpeed = parseInt(parseFloat(timingSpeed) * 1000);
             window.clearTimeout(animationTimer);
             animationTimer = window.setTimeout(function(){
                 $el.addClass('opening');
                 ghost.remove()
             },timingSpeed);
         }
-    }
+    };
     /** @function initTooltipPlugin
     * @description Initialize Bootstrap tooltip
     * @param {(Element|JQuery)} [context] - A DOM Element, Document, or jQuery to use as context.
@@ -474,7 +474,7 @@
     */
     Pages.prototype.initTooltipPlugin = function(context) {
         $.fn.tooltip && $('[data-toggle="tooltip"]', context).tooltip();
-    }
+    };
     /** @function initSelect2Plugin
     * @description Initialize select2 dropdown
     * @param {(Element|JQuery)} [context] - A DOM Element, Document, or jQuery to use as context.
@@ -490,7 +490,7 @@
                 })
             });
         });
-    }
+    };
     /** @function initScrollBarPlugin
     * @description Initialize Global Scroller
     * @param {(Element|JQuery)} [context] - A DOM Element, Document, or jQuery to use as context.
@@ -500,7 +500,7 @@
         $.fn.scrollbar && $('.scrollable', context).scrollbar({
             ignoreOverlay: false
         });
-    }
+    };
     /** @function initListView
     * @description Initialize iOS like List view plugin
     * @param {(Element|JQuery)} [context] - A DOM Element, Document, or jQuery to use as context.
@@ -512,7 +512,7 @@
         $.fn.scrollbar && $('.list-view-wrapper', context).scrollbar({
             ignoreOverlay: false
         });
-    }
+    };
 
     /** @function initSwitcheryPlugin
     * @description Initialize iOS like List view plugin
@@ -529,7 +529,7 @@
                 size : (el.data("size") != null ?  el.data("size") : "default")
             });
         });
-    }
+    };
 
     /** @function initSelectFxPlugin
     * @description Initialize iOS like List view plugin
@@ -542,7 +542,7 @@
             $(el).wrap('<div class="cs-wrapper"></div>');
             new SelectFx(el);
         });
-    }
+    };
     /** @function initUnveilPlugin
     * @description To load retina images to img tag
     * @param {(Element|JQuery)} [context] - A DOM Element, Document, or jQuery to use as context.
@@ -550,7 +550,7 @@
     Pages.prototype.initUnveilPlugin = function(context) {
         // lazy load retina images
         $.fn.unveil && $("img", context).unveil();
-    }
+    };
 
     /** @function initValidatorPlugin
     * @description Inintialize and Overide exsisting jquery-validate methods.
@@ -616,14 +616,14 @@
                 }
             }
         });
-    }
+    };
 
     /** @function setBackgroundImage
     * @description load images to div using data API
     */
     Pages.prototype.setBackgroundImage = function() {
         $('[data-pages-bg-image]').each(function() {
-            var _elem = $(this)
+            var _elem = $(this);
             var defaults = {
                 pagesBgImage: "",
                 lazyLoad: 'true',
@@ -632,7 +632,7 @@
                 bgOverlay:'',
                 bgOverlayClass:'',
                 overlayOpacity:0,
-            }
+            };
             var data = _elem.data();
             $.extend( defaults, data );
             var url = defaults.pagesBgImage;
@@ -657,7 +657,7 @@
             }
 
         })
-    }
+    };
     /** @function secondarySidebar
     * @description dropdown Toggle and responive toggle for secondary sidebar
     */
@@ -703,7 +703,7 @@
                     menu.removeAttr("style");
                 }
                 else{
-                    menu.addClass("open")
+                    menu.addClass("open");
                     var menuRect = menu.get(0).getBoundingClientRect();
                     menu.css({
                         top : toggleRect.bottom,
@@ -717,7 +717,7 @@
 
         });
 
-    }
+    };
     /** @function init
     * @description Inintialize all core components.
     */
@@ -743,24 +743,13 @@
         this.initInputFile();
         this.reponsiveTabs();
         this.secondarySidebar();
-    }
+    };
 
     $.Pages = new Pages();
     $.Pages.Constructor = Pages;
 
 })(window.jQuery);
 
-/**
- * selectFx.js v1.0.0
- * http://www.codrops.com
- *
- * Licensed under the MIT license.
- * http://www.opensource.org/licenses/mit-license.php
- * 
- * Copyright 2014, Codrops
- * http://www.codrops.com
- */
-;
 (function(window) {
 
     'use strict';
@@ -775,8 +764,7 @@
             el = el.parentNode || false;
         }
         return (el !== false);
-    };
-
+    }
     /**
      * extend obj function
      */
@@ -848,7 +836,7 @@
             event.initEvent('change', true, false);
             el.dispatchEvent(event);
         }
-    }
+    };
 
     /**
      * init function
@@ -886,7 +874,7 @@
             var inputText = this.children[index].innerHTML.trim();
         }
 
-    }
+    };
 
     /**
      * creates the structure for the select element
@@ -932,7 +920,7 @@
                 options += '<li class="cs-optgroup"><span>' + el.label + '</span><ul>';
                 [].slice.call(el.children).forEach(function(opt) {
                     options += createOptionHTML(opt);
-                })
+                });
                 options += '</ul></li>';
             }
         });
@@ -949,7 +937,7 @@
         var backdrop = document.createElement('div');
         backdrop.className = 'cs-backdrop';
         this.selEl.appendChild(backdrop);
-    }
+    };
 
     /**
      * initialize the events
@@ -1020,7 +1008,7 @@
                     break;
             }
         });
-    }
+    };
 
     /**
      * navigate with up/dpwn keys
@@ -1040,7 +1028,7 @@
             // add class focus - track which option we are navigating
             classie.add(this.selOpts[this.preSelCurrent], 'cs-focus');
         }
-    }
+    };
 
     /**
      * open/close select
@@ -1153,7 +1141,7 @@
             }, 300);
 
         }
-    }
+    };
 
     /**
      * change option - the new value is set
@@ -1193,24 +1181,24 @@
 
         // callback
         this.options.onChange(this.el);
-    }
+    };
 
     /**
      * returns true if select element is opened
      */
     SelectFx.prototype._isOpen = function(opt) {
         return classie.has(this.selEl, 'cs-active');
-    }
+    };
 
     /**
      * removes the focus class from the option
      */
     SelectFx.prototype._removeFocus = function(opt) {
-        var focusEl = this.selEl.querySelector('li.cs-focus')
+        var focusEl = this.selEl.querySelector('li.cs-focus');
         if (focusEl) {
             classie.remove(focusEl, 'cs-focus');
         }
-    }
+    };
 
     /**
      * add to global namespace
@@ -1263,7 +1251,7 @@
             this.$pie.$left.css('transform', 'rotate(' + deg + 'deg)');
         }
 
-    }
+    };
     Progress.VERSION = "1.0.0";
 
     Progress.prototype.value = function(val) {
@@ -1284,7 +1272,7 @@
             this.$pie.$left.css('transform', 'rotate(' + deg + 'deg)');
         }
 
-    }
+    };
 
     // CIRCULAR PROGRESS PLUGIN DEFINITION
     // =======================
@@ -1300,15 +1288,15 @@
         })
     }
 
-    var old = $.fn.circularProgress
+    var old = $.fn.circularProgress;
 
-    $.fn.circularProgress = Plugin
-    $.fn.circularProgress.Constructor = Progress
+    $.fn.circularProgress = Plugin;
+    $.fn.circularProgress.Constructor = Progress;
 
 
     $.fn.circularProgress.defaults = {
         value: 0
-    }
+    };
 
     // CIRCULAR PROGRESS NO CONFLICT
     // ====================
@@ -1316,17 +1304,17 @@
     $.fn.circularProgress.noConflict = function() {
         $.fn.circularProgress = old;
         return this;
-    }
+    };
 
     // CIRCULAR PROGRESS DATA API
     //===================
 
     $(window).on('load', function() {
         $('[data-pages-progress="circle"]').each(function() {
-            var $progress = $(this)
+            var $progress = $(this);
             $progress.circularProgress($progress.data())
         })
-    })
+    });
 
     function perc2deg(p) {
         return parseInt(p / 100 * 360);
@@ -1460,10 +1448,10 @@
           var containerHeight = self.container.height();
           var containerWidth = self.container.width();
 
-          var containerTop = containerPosition.top
-          var containerBottom = self.container.parent().height() - (containerTop + containerHeight)
-          var containerLeft = containerPosition.left
-          var containerRight = self.container.parent().width() - (containerLeft + containerWidth)
+          var containerTop = containerPosition.top;
+          var containerBottom = self.container.parent().height() - (containerTop + containerHeight);
+          var containerLeft = containerPosition.left;
+          var containerRight = self.container.parent().width() - (containerLeft + containerWidth);
 
           if(/top/.test(self.options.position)){
             self.wrapper.css('top', containerTop)
@@ -1479,7 +1467,7 @@
           }
         }
         if($('body').hasClass('horizontal-menu')){
-          alignWrapperToContainer()
+          alignWrapperToContainer();
           $(window).on('resize', alignWrapperToContainer)
         }
 
@@ -1545,7 +1533,7 @@
         this.options = $.extend(true, {}, $.fn.card.defaults, options);
         this.$loader = null;
         this.$body = this.$element.find('.card-block');
-    }
+    };
     Card.VERSION = "1.0.0";
     // Button actions
     Card.prototype.collapse = function() {
@@ -1563,12 +1551,12 @@
         this.$element.addClass('card-collapsed');
         icon.removeClass().addClass('fa-chevron-right');
         $.isFunction(this.options.onCollapse) && this.options.onCollapse(this);
-    }
+    };
 
     Card.prototype.close = function() {
         this.$element.remove();
         $.isFunction(this.options.onClose) && this.options.onClose(this);
-    }
+    };
 
     Card.prototype.error = function(error) {
         if (error) {
@@ -1587,7 +1575,7 @@
                 }
             }).show();
         }
-    }
+    };
 
     // CARD PLUGIN DEFINITION
     // =======================
@@ -1605,10 +1593,10 @@
         })
     }
 
-    var old = $.fn.card
+    var old = $.fn.card;
 
-    $.fn.card = Plugin
-    $.fn.card.Constructor = Card
+    $.fn.card = Plugin;
+    $.fn.card.Constructor = Card;
 
 
     $.fn.card.defaults = {
@@ -1629,7 +1617,7 @@
         // onMaximize: function(portlet) {},
         // onRestore: function(portlet) {},
         // onClose: function(portlet) {}
-    }
+    };
 
     // CARD NO CONFLICT
     // ====================
@@ -1666,7 +1654,7 @@
             el.toggleClass(data.viewAnimation);
             self.options.onNavigate(toView, data.viewAnimation);
             return false;
-        })
+        });
         return this; // enable chaining
     };
     $.fn.pgMobileViews = function(options) {
@@ -1676,13 +1664,13 @@
     $.fn.pgMobileViews.defaults = {
         //Returns Target View & Animation Type
         onNavigate: function(view, animation) {}
-    }
+    };
     // MOBILE VIEW DATA API
     //===================
 
     $(window).on('load', function() {
         $('[data-navigate="view"]').each(function() {
-            var $mobileView = $(this)
+            var $mobileView = $(this);
             $mobileView.pgMobileViews();
         })
     });
@@ -1739,7 +1727,7 @@
             $(this).toggleClass('active');
         });
 
-    }
+    };
     Quickview.VERSION = "1.0.0";
 
     // QUICKVIEW PLUGIN DEFINITION
@@ -1755,10 +1743,10 @@
         })
     }
 
-    var old = $.fn.quickview
+    var old = $.fn.quickview;
 
-    $.fn.quickview = Plugin
-    $.fn.quickview.Constructor = Quickview
+    $.fn.quickview = Plugin;
+    $.fn.quickview.Constructor = Quickview;
 
 
     $.fn.quickview.defaults = {
@@ -1771,7 +1759,7 @@
         deleteNoteConfirmButton: '.btn-remove-notes',
         newNoteButton: '.new-note-link',
         backButton: '.close-note-link'
-    }
+    };
 
     // QUICKVIEW NO CONFLICT
     // ====================
@@ -1779,7 +1767,7 @@
     $.fn.quickview.noConflict = function() {
         $.fn.quickview = old;
         return this;
-    }
+    };
 
     // QUICKVIEW DATA API
     //===================
@@ -1787,7 +1775,7 @@
     $(window).on('load', function() {
 
         $('[data-pages="quickview"]').each(function() {
-            var $quickview = $(this)
+            var $quickview = $(this);
             $quickview.quickview($quickview.data())
         })
     });
@@ -1920,7 +1908,7 @@
                  return;
 
              if ($('.sidebar-overlay-slide').hasClass('show')) {
-                 $('.sidebar-overlay-slide').removeClass('show')
+                 $('.sidebar-overlay-slide').removeClass('show');
                  $("[data-pages-toggle]").removeClass('active')
 
              }
@@ -1939,7 +1927,7 @@
            var width = $(window).width();
            if(width < 1200){
              if($('body').hasClass('menu-pin')){
-               $('body').removeClass('menu-pin')
+               $('body').removeClass('menu-pin');
                $('body').addClass('menu-unpinned')
              }
            } else {
@@ -1952,7 +1940,7 @@
          $(document).bind('ready', toggleMenuPin);
          $(window).bind('resize', toggleMenuPin);
 
-     }
+     };
 
      // Toggle sidebar for mobile view
      Sidebar.prototype.toggleSidebar = function(toggle) {
@@ -1977,7 +1965,7 @@
 
          }
 
-     }
+     };
 
      Sidebar.prototype.togglePinSidebar = function(toggle) {
          if (toggle == 'hide') {
@@ -1988,7 +1976,7 @@
              this.$body.toggleClass('menu-pin');
          }
 
-     }
+     };
 
 
      // SIDEBAR PLUGIN DEFINITION
@@ -2012,7 +2000,7 @@
 
      $.fn.sidebar.defaults = {
          pageContainer: '.page-container'
-     }
+     };
 
      // SIDEBAR PROGRESS NO CONFLICT
      // ====================
@@ -2020,7 +2008,7 @@
      $.fn.sidebar.noConflict = function() {
          $.fn.sidebar = old;
          return this;
-     }
+     };
 
      // SIDEBAR PROGRESS DATA API
      //===================
@@ -2030,7 +2018,7 @@
          var $target = $('[data-pages="sidebar"]');
          $target.data('pg.sidebar').togglePinSidebar();
          return false;
-     })
+     });
      $(document).on('click.pg.sidebar.data-api touchstart', '[data-toggle="sidebar"]', function(e) {
          var $this = $(this);
          var $target = $('[data-pages="sidebar"]');
diff --git a/resources/assets/js/pdfThumbnail.js b/resources/assets/js/pdfThumbnail.js
new file mode 100644
index 00000000..3ef6c079
--- /dev/null
+++ b/resources/assets/js/pdfThumbnail.js
@@ -0,0 +1,90 @@
+/**
+ * Find all img elements with data-pdf-thumbnail-file attribute,
+ * then load pdf file given in the attribute,
+ * then use pdf.js to draw the first page on a canvas,
+ * then convert it to base64,
+ * then set it as the img src.
+ */
+var createPDFThumbnails = function(){
+
+    var worker = null;
+    var loaded = false;
+    var renderQueue = [];
+
+    // select all img elements with data-pdf-thumbnail-file attribute
+    var nodesArray = Array.prototype.slice.call(document.querySelectorAll('img[data-pdf-thumbnail-file]'));
+
+    if (!nodesArray.length) {
+        // No PDF found, don't load PDF.js
+        return;
+    }
+
+    if (!loaded && typeof(pdfjsLib) === 'undefined') {
+        var src = document.querySelector('script[data-pdfjs-src]').getAttribute('data-pdfjs-src');
+
+        if (!src) {
+            throw Error('PDF.js URL not set in "data-pdfjs-src" attribute: cannot load PDF.js');
+        }
+
+        var script = document.createElement('script');
+        script.src = src;
+        document.head.appendChild(script).onload = renderThumbnails;
+        loaded = true;
+    }
+    else {
+        renderThumbnails();
+    }
+
+    function renderThumbnails() {
+        if (!pdfjsLib) {
+            throw Error("pdf.js failed to load. Check data-pdfjs-src attribute.");
+        }
+
+        nodesArray.forEach(function(element) {
+            if (null === worker) {
+                worker = new pdfjsLib.PDFWorker();
+            }
+
+            var filePath = element.getAttribute('data-pdf-thumbnail-file');
+            var imgWidth = element.getAttribute('data-pdf-thumbnail-width');
+            var imgHeight = element.getAttribute('data-pdf-thumbnail-height');
+
+            pdfjsLib.getDocument({url: filePath, worker: worker}).promise.then(function (pdf) {
+                pdf.getPage(1).then(function (page) {
+                    var canvas = document.createElement("canvas");
+                    var viewport = page.getViewport({scale: 1.0});
+                    var context = canvas.getContext('2d');
+
+                    if (imgWidth) {
+                        viewport = page.getViewport({scale: imgWidth / viewport.width});
+                    } else if (imgHeight) {
+                        viewport = page.getViewport({scale: imgHeight / viewport.height});
+                    }
+
+                    canvas.height = viewport.height;
+                    canvas.width = viewport.width;
+
+                    page.render({
+                        canvasContext: context,
+                        viewport: viewport
+                    }).promise.then(function () {
+                        element.src = canvas.toDataURL();
+                    });
+                }).catch(function() {
+                    console.log("pdfThumbnails error: could not open page 1 of document " + filePath + ". Not a pdf ?");
+                });
+            }).catch(function() {
+                console.log("pdfThumbnails error: could not find or open document " + filePath + ". Not a pdf ?");
+            });
+        });
+    }
+};
+
+if (
+    document.readyState === "complete" ||
+    (document.readyState !== "loading" && !document.documentElement.doScroll)
+) {
+    createPDFThumbnails();
+} else {
+    document.addEventListener("DOMContentLoaded", createPDFThumbnails);
+}
\ No newline at end of file
diff --git a/resources/assets/js/scripts.js b/resources/assets/js/scripts.js
index 3114f2fd..64282038 100644
--- a/resources/assets/js/scripts.js
+++ b/resources/assets/js/scripts.js
@@ -1,5 +1,6 @@
 $(function() {
     $('.page-container').scrollbar().addClass('scrollbar-macosx');
+    $('.scrollable').scrollbar().addClass('scrollbar-macosx');
 	$.fn.selectListTrigger = function(eventName) {
         return this.each(function() {
             var el = $(this).get(0);
@@ -23,7 +24,7 @@ $(function() {
 
     $('body').on('click', '.requestModal', function () {
         let type = $(this).attr('data-type');
-        if(type){ $(this).parents('.parentContainer').find('.modalContainer[data-type="'+type+'"]').modal('show'); }
+        if(type){ $(this).closest('.parentContainer').find('.modalContainer[data-type="'+type+'"]').modal('show'); }
     });
 
     $('body').on('click', '.tabButton', function(){
@@ -49,4 +50,7 @@ $(function() {
         })
     }
 
+    $.fn.select2.defaults.set( "theme", "bootstrap" );
+    $.fn.select2.defaults.set( "containerCssClass", "form-control" );
+
 });
\ No newline at end of file
diff --git a/resources/assets/sass/_var.scss b/resources/assets/sass/_var.scss
index 42cfacd2..6c0da668 100644
--- a/resources/assets/sass/_var.scss
+++ b/resources/assets/sass/_var.scss
@@ -27,11 +27,11 @@ $color-master-darkest:mix($color-master, #000, 18%) !default;
 $color-white: #fff !default;
 $color-black: #000 !default;
 
-$color-success: #47b5ab !default;
-$color-complete : #69b6f3 !default;
-$color-primary: #ea336b !default;
-$color-warning: #f9dc6b !default;
-$color-danger: #ff3738 !default;
+$color-success: #1ac86f !default;
+$color-complete : #009add !default;
+$color-primary: #00baa4 !default;
+$color-warning: #ffca00 !default;
+$color-danger: #ed5335 !default;
 $color-info: #4d6286 !default;
 
 $base-font-family: wf_segoe-ui_light,wf_segoe-ui_normal,"Helvetica Neue", Helvetica, Arial, sans-serif !default;
diff --git a/resources/assets/sass/modules/_buttons.scss b/resources/assets/sass/modules/_buttons.scss
index 9aec7004..e4c1e5b4 100644
--- a/resources/assets/sass/modules/_buttons.scss
+++ b/resources/assets/sass/modules/_buttons.scss
@@ -15,7 +15,7 @@
     &:focus{
     color: $text-color;
     background-color: $background-color;
-    border-color: $background-color;
+    border-color: $border-color;
     }
 
   &.active,
@@ -24,8 +24,8 @@
   &:active:focus,
   &:active:hover,
   .show .dropdown-toggle#{&} {
-    background-color: mix($background-color, $color-black, $mix-percentage-dark);
-    border-color: mix($background-color, $color-black, $mix-percentage-dark);
+    background-color: mix($background-color, $color-black, $mix-percentage-dark) !important;
+    border-color: mix($background-color, $color-black, $mix-percentage-dark) !important;
     color:$text-color;
   }
   &.hover,
@@ -143,6 +143,43 @@ Alternate buttons
 .btn-danger {
     @include button($color-white, $color-danger, $color-danger);
 }
+
+.btn-outline-primary {
+    @include button($color-primary, transparent, $color-primary);
+    &:hover{
+        @include button($color-white, $color-primary, $color-primary);
+    }
+}
+.btn-outline-success {
+    @include button($color-success, transparent, $color-success);
+    &:hover{
+        @include button($color-white, $color-success, $color-success);
+    }
+}
+.btn-outline-complete{
+    @include button($color-complete, transparent, $color-complete);
+    &:hover{
+        @include button($color-white, $color-complete, $color-complete);
+    }
+}
+.btn-outline-info {
+    @include button($color-info, transparent, $color-info);
+    &:hover{
+        @include button($color-white, $color-info, $color-info);
+    }
+}
+.btn-outline-warning {
+    @include button($color-warning, transparent, $color-warning);
+    &:hover{
+        @include button($color-white, $color-warning, $color-warning);
+    }
+}
+.btn-outline-danger {
+    @include button($color-danger, transparent, $color-danger);
+    &:hover{
+        @include button($color-white, $color-danger, $color-danger);
+    }
+}
 .btn-default, .btn-default:focus{
     color: #5e5e5e;
     background-color: $color-white;
diff --git a/resources/assets/sass/modules/_form_elements.scss b/resources/assets/sass/modules/_form_elements.scss
index 36161631..e242894f 100644
--- a/resources/assets/sass/modules/_form_elements.scss
+++ b/resources/assets/sass/modules/_form_elements.scss
@@ -1092,8 +1092,8 @@ select.full-width + .select2-container {
         transition: border 0.2s linear 0s;
         .select2-selection__rendered {
             padding: 0;
-            padding-left: 3px;
-            padding-top: 1px;
+            padding-left: 2px;
+            margin-top: 20px;
         }
         .select2-selection__arrow {
             top: auto;
diff --git a/resources/assets/sass/modules/_layout.scss b/resources/assets/sass/modules/_layout.scss
index c36e3499..a7be3a0a 100644
--- a/resources/assets/sass/modules/_layout.scss
+++ b/resources/assets/sass/modules/_layout.scss
@@ -95,6 +95,26 @@ body {
     }
 }
 
+.zig-zag-top:before{
+    background: linear-gradient(-45deg, #ffffff 16px, #ffffff 16px, #ffffff 16px, transparent 0), linear-gradient(45deg, #ffffff 16px, transparent 0);
+    background-position: left top;
+    background-repeat: repeat-x;
+    background-size: 22px 32px;
+    content: " ";
+    display: block;
+    height: 32px;
+    width: 100%;
+    position: relative;
+    bottom: 0px;
+    left:0;
+}
+
+.zig-zag-bottom{
+    margin: 32px 0;
+    margin-top: 0;
+    background: #1ba1e2;
+}
+
 /* Page Loader
 ------------------------------------
 */
@@ -276,7 +296,6 @@ body {
      -o-transition: -o-transform 400ms cubic-bezier($menu-bezier);
         transition: transform 400ms cubic-bezier($menu-bezier);
 -webkit-backface-visibility: hidden;
-    -webkit-perspective: 1000;
     a,button {
         color:$color-menu-light;
         &:hover,&:active{
@@ -587,12 +606,41 @@ body {
     -webkit-transition: -webkit-transform 0.4s cubic-bezier($menu-bezier);
     transition: transform 0.4s cubic-bezier($menu-bezier);
     -webkit-backface-visibility: hidden;
-    -webkit-perspective: 1000;
     font-family: "Segoe UI","Helvetica Neue", Helvetica, Arial, sans-serif;
     -webkit-font-smoothing:antialiased;
     -webkit-text-size-adjust:100%;
     -ms-text-size-adjust:100%;
     font-weight: bold;
+    &.icon-12 {
+        height: 12px;
+        width: 12px;
+        line-height: 12px;
+    }
+    &.icon-25 {
+        height: 25px;
+        width: 25px;
+        line-height: 25px;
+    }
+    &.icon-35 {
+        height: 35px;
+        width: 35px;
+        line-height: 35px;
+    }
+    &.icon-50 {
+        height: 50px;
+        width: 50px;
+        line-height: 50px;
+    }
+    &.icon-75 {
+        height: 75px;
+        width: 75px;
+        line-height: 75px;
+    }
+    &.icon-100 {
+        height: 100px;
+        width: 100px;
+        line-height: 100px;
+    }
     & > i{
         font-size: 14px;
     }
@@ -925,7 +973,6 @@ body {
     transition: transform 400ms cubic-bezier($menu-bezier);
     -webkit-backface-visibility: hidden;
     -ms-backface-visibility:hidden;
-    -webkit-perspective: 1000;
     &.open{
         @include translate3d(-100%,0,0);
     }
@@ -1547,7 +1594,7 @@ padding-right: 30px;
     -ms-flex-direction: column;
     flex-direction: column;
     &.fixed-header {
-        overflow: hidden;
+        //overflow: hidden;
         .header {
             position: fixed;
         }
@@ -1738,7 +1785,7 @@ padding-right: 30px;
                             position: absolute;
                             height: 1px;
                             top: $navbar-width + 7px;
-                            width: calc(100% - $menu-padding * 2);
+                            //width: calc(100% - $menu-padding * 2);
                             background-color: $form-control-border-color;
                         }
                         & > li {
@@ -1879,7 +1926,6 @@ padding-right: 30px;
             transition: transform 400ms cubic-bezier($menu-bezier);
             -webkit-backface-visibility: hidden;
             -ms-backface-visibility:hidden;
-            -webkit-perspective: 1000;
 
             &.open{
                 @include translate3d(-100%,0,0);
@@ -2008,7 +2054,11 @@ padding-right: 30px;
 
 .select2-container--open .select2-dropdown {
     border-radius: 0px !important;
-    border: none !important;
+    border: solid 1px rgba(0, 0, 0, 0.07);
+    border-top: none;
+    left: -1px;
+    margin-top: -25px;
+    box-sizing: content-box;
 }
 
 .select2-dropdown {
@@ -2031,6 +2081,20 @@ padding-right: 30px;
     }
 }
 
+select2-dropdown,
+.select2-container--bootstrap .select2-selection.form-control {
+    padding-top: 0.8rem !important;
+    height: calc(2em + 1.5rem) !important;
+}
+
+.select2-container {
+    width: 100% !important;
+}
+
+.select2-results__option[aria-disabled="true"] {
+    display: none;
+}
+
 .select2-dark {
     .select2-container--default {
         .select2-selection__arrow b {
@@ -2088,18 +2152,15 @@ padding-right: 30px;
     background-size: 7.25rem .1875rem;
     background-image: repeating-linear-gradient(45deg,$color-complete,$color-complete 33px,transparent 0,transparent 41px,$color-primary 0,$color-primary 74px,transparent 0,transparent 82px);
 }
-.order-history {
-    .bullet-connector {
-        width: 2px;
-        height: 100%;
-        background: $color-master-light;
-        top: 10px;
-        left: 18px;
-    }
-    &:last-child {
-        .bullet-connector {
-            display: none !important;
-        }
+
+.bullet-connector {
+    width: 2px;
+    height: 100%;
+    background: $color-master-light;
+    top: 0px;
+    left: 18px;
+    &.thin{
+        width: 1px;
     }
 }
 .noty_bar {
@@ -2112,4 +2173,4 @@ padding-right: 30px;
         padding-top: 0;
         padding-bottom: 0;
     }
-}
\ No newline at end of file
+}
diff --git a/resources/assets/sass/modules/_login.scss b/resources/assets/sass/modules/_login.scss
index b2fc3afa..9b5361fe 100644
--- a/resources/assets/sass/modules/_login.scss
+++ b/resources/assets/sass/modules/_login.scss
@@ -14,12 +14,11 @@
 	z-index: 10;
 }
 
-.login-wrapper{
-	height: 100%;
-	background-color: $color-primary;
-	& > * {
-		height: 100%;
-	}
+.login-wrapper {
+	background: linear-gradient(rgba(0, 0, 0, 0.6), $color-primary), url('../images/iStock-976354264_Malaysia.jpg');
+	background-size: cover;
+	padding: 80px 0 20px 0;
+	min-height: 100%;
 	.bg-pic{
 		position: absolute;
 		width: 100%;
diff --git a/resources/assets/sass/modules/_misc.scss b/resources/assets/sass/modules/_misc.scss
index 9f8006b1..714c02d7 100644
--- a/resources/assets/sass/modules/_misc.scss
+++ b/resources/assets/sass/modules/_misc.scss
@@ -390,7 +390,7 @@
 }
 
 .b-thick{
-  border-width : 2px;
+  border-width : 2px !important;
 }
 
 .b-transparent{
diff --git a/resources/assets/sass/modules/_modals.scss b/resources/assets/sass/modules/_modals.scss
index a528caf3..73272c57 100644
--- a/resources/assets/sass/modules/_modals.scss
+++ b/resources/assets/sass/modules/_modals.scss
@@ -32,7 +32,6 @@
 	.modal-body {
 	    box-shadow: none;
 	    padding: 25px;
-	    padding-top: 0;
 	    white-space: normal;
 	}
 	.modal-footer {
diff --git a/resources/assets/sass/modules/_typography.scss b/resources/assets/sass/modules/_typography.scss
index a50118db..73c918dd 100644
--- a/resources/assets/sass/modules/_typography.scss
+++ b/resources/assets/sass/modules/_typography.scss
@@ -13,6 +13,8 @@
 
 @import url('https://fonts.googleapis.com/css?family=Open+Sans:400,500,600');
 
+@import url('https://fonts.googleapis.com/css?family=Orbitron:400,500,600');
+
 html{
     font-size: 100%;
     -ms-text-size-adjust: 100%;
@@ -292,6 +294,9 @@ hr{
 ------------------------------------
 */
 
+.bg-primary-complete-gradient {
+    background: linear-gradient(to right, $color-complete, $color-primary);
+}
 /* Primary
 ------------------------------------
 */
@@ -462,7 +467,9 @@ hr{
     color: #fff !important;
 }
 .hover-white {
-    color: $color-white !important;
+    &:hover {
+        color: $color-white !important;
+    }
 }
 
 .text-master {
@@ -481,7 +488,9 @@ hr{
     color: $color-master-lighter !important;
 }
 .hover-master {
-    color: $color-master !important;
+    &:hover {
+        color: $color-master !important;
+    }
 }
 
 .text-complete {
@@ -500,7 +509,9 @@ hr{
     color: $color-complete-lighter !important;
 }
 .hover-complete {
-    color: $color-complete !important;
+    &:hover {
+        color: $color-complete !important;
+    }
 }
 
 .text-success {
@@ -519,7 +530,9 @@ hr{
     color: $color-success-lighter !important;
 }
 .hover-success {
-    color: $color-success !important;
+    &:hover {
+        color: $color-success !important;
+    }
 }
 
 .text-info {
@@ -541,7 +554,9 @@ hr{
     color: $color-warning !important;
 }
 .hover-info {
-    color: $color-info !important;
+    &:hover {
+        color: $color-info !important;
+    }
 }
 
 .text-warning-dark {
@@ -557,7 +572,9 @@ hr{
     color: $color-warning-lighter !important;
 }
 .hover-warning {
-    color: $color-warning !important;
+    &:hover {
+        color: $color-warning !important;
+    }
 }
 
 .text-danger {
@@ -576,7 +593,9 @@ hr{
     color: $color-danger-lighter !important;
 }
 .hover-danger {
-    color: $color-danger !important;
+    &:hover{
+        color: $color-danger !important;
+    }
 }
 
 .text-primary {
@@ -595,7 +614,9 @@ hr{
     color: $color-primary-lighter !important;
 }
 .hover-primary {
-    color: $color-primary !important;
+    &:hover {
+        color: $color-primary !important;
+    }
 }
 
 /* Text Aligngments
@@ -678,15 +699,19 @@ hr{
     font-family: 'Open Sans', sans-serif !important;
 }
 .font-montserrat{
-    font-family: 'Montserrat' !important;
+    font-family: 'Montserrat', sans-serif !important;
 }
 
 .font-lato{
     font-family: 'Lato', sans-serif !important;
 }
 
+.font-orbitron{
+    font-family: 'Orbitron', sans-serif !important;
+}
+
 .font-georgia{
-    font-family: Georgia !important;
+    font-family: 'Georgia', sans-serif !important;
 }
 .font-heading{
     font-family: "Segoe UI","Helvetica Neue", Helvetica, Arial, sans-serif;
diff --git a/resources/assets/vue/app.js b/resources/assets/vue/app.js
index 269b4dee..192f9fb6 100644
--- a/resources/assets/vue/app.js
+++ b/resources/assets/vue/app.js
@@ -1,77 +1,54 @@
 
-/**
- * First we will load all of this project's JavaScript dependencies which
- * includes Vue and other libraries. It is a great starting point when
- * building robust, powerful web applications using Vue and Laravel.
- */
-
+/** Dependencies */
 import Vue from 'vue'
-import store from './vuex/store'
+import store from './vuex/store';
+
+window.route = require('./general/functions/router');
+
+/** Guards */
+import guards from './general/mixins/guards';
+
+/** Validation **/
+import vuelidate from 'vuelidate';
+
+/** Input Mask **/
+import VueTheMask from 'vue-the-mask';
+
+
+/** Mixins */
+import request from './general/mixins/request';
+import crudHandler from './general/mixins/crudHandler';
+
+/** Directives */
+import closable from './general/directives/closable';
+
 import Avatar from 'vue-avatar';
-import Vuelidate from 'vuelidate'
-import request from './mixins/requestMixin'
-import crud from './mixins/crudMixin'
-
-Vue.use(Vuelidate);
-Vue.component('user-avatar', Avatar);
-
-window.EventBus  = new Vue();
-window.route = require('../js/route');
-
-let handleOutsideClick;
-
-Vue.directive('closable', {
-    bind (el, binding, vnode) {
-        handleOutsideClick = (e) => {
-
-            e.stopPropagation();
-
-            const { handler, exclude } = binding.value;
-
-            let clickedOnExcludedEl = false;
-
-            exclude.forEach(refName => {
-                if (!clickedOnExcludedEl) {
-                    const excludedEl = vnode.context.$refs[refName];
-
-
-                    if (excludedEl) {
-                        clickedOnExcludedEl = excludedEl.contains(e.target)
-                    }
-
-                }
-            });
-
-            if (!el.contains(e.target) && !clickedOnExcludedEl) {
-                vnode.context[handler]()
-            }
-        }
-        document.addEventListener('click', handleOutsideClick)
-        document.addEventListener('touchstart', handleOutsideClick)
-    },
-    unbind () {
-        document.removeEventListener('click', handleOutsideClick)
-        document.removeEventListener('touchstart', handleOutsideClick)
-    }
-});
-
-/**
- * Next, we will create a fresh Vue application instance and attach it to
- * the page. Then, you may begin adding components to this application
- * or customize the JavaScript scaffolding to fit your unique needs.
- */
-
-const files = require.context('./', true, /\.vue$/i)
-files.keys().map(key => Vue.component(key.split('/').pop().split('.')[0], files(key).default));
 
+/** Application Injections */
+Vue.use(vuelidate);
+Vue.use(VueTheMask);
+Vue.directive('closable', closable);
 Vue.mixin({
     methods: {
         route: route
     },
-    mixins: [request, crud]
-});
+    mixins: [request, crudHandler]
+    });
+
+/** Components Registrations */
+Vue.component(Avatar);
+
+const files = require.context('./', true, /\.vue$/i);
+files.keys().map(key => Vue.component(key.split('/').pop().split('.')[0], files(key).default));
 
 const app = new Vue({
     el: '#app',
-    store
+    store,
+    created(){
+        this.routesGuard();
+    },
+    methods: {
+        route: route
+    },
+    mixins: [guards]
 });
diff --git a/resources/assets/vue/components/accounts/elements/EmailVerificationComponent.vue b/resources/assets/vue/components/accounts/elements/EmailVerificationComponent.vue
new file mode 100644
index 00000000..c81a9ad9
--- /dev/null
+++ b/resources/assets/vue/components/accounts/elements/EmailVerificationComponent.vue
@@ -0,0 +1,75 @@
+<template>
+    <div class="row h-100 align-items-center justify-content-center text-center">
+        <div class="col">
+            <loading-component style="height: 200px; top: 0;" key="1" color="white" v-show="loading"></loading-component>
+            <div class="row" v-show="!loading">
+                <div class="col">
+                    <div class="row justify-content-center m-b-20">
+                        <div class="col-4">
+                            <i class="fa fs-80 text-white" :class="[{'fa-check-circle': !error}, {'fa-times': error}]"></i>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading text-white fs-20 all-caps bold lh-25">Email {{error ? 'Failed Verification': 'Verified'}}</div>
+                            <div class="font-heading text-white fs-12 all-caps m-b-10 lh-25">Your Email address was{{ error ? 'n\'t' : '' }} successfully verified</div>
+                            <div class="font-heading text-white fs-12 all-caps m-b-20 lh-25">{{ error }}</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <a class="btn btn p-t-10 p-b-10 btn-primary bg-master-darker b-rad-none" :href="route('login')">
+                                <div class="row align-items-center">
+                                    <div class="col-auto p-r-10">
+                                        <i class="fa fa-angle-left fs-16" style="margin-top: 1px;"></i>
+                                    </div>
+                                    <div class="col p-l-5">
+                                        Back to login
+                                    </div>
+                                </div>
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+</template>
+<script>
+    export default {
+        props: {
+            token:{
+                type: String,
+                required: false
+            }
+        },
+        data(){
+            return {
+                loading: true,
+                error: '',
+                parameters: {
+                    token: this.token
+                }
+            }
+        },
+        created(){
+            this.submit(this.route('api.account.email.verify'), 'post', 'emailVerificationSection', false, false);
+        },
+        methods: {
+            successHandler(){
+
+                this.error = '';
+
+                this.$store.getters.isAuthenticated ? window.location.href = this.route('dashboard'): this.loading = false;;
+
+            },
+            errorHandler(error){
+                this.loading = false;
+                this.error = error.message;
+            }
+        }
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/accounts/elements/LoginFormComponent.vue b/resources/assets/vue/components/accounts/elements/LoginFormComponent.vue
new file mode 100644
index 00000000..fa023930
--- /dev/null
+++ b/resources/assets/vue/components/accounts/elements/LoginFormComponent.vue
@@ -0,0 +1,57 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row m-b-20 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                <div class="col">
+                    <small class="bold fs-10 text-danger">{{error}}</small>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.email">
+                        <label class="text-primary">Email Address</label>
+                        <div class="controls">
+                            <input type="text" class="form-control fs-12" v-model="parameters.email">
+                        </div>
+                    </validation-wrapper-component>
+                    <validation-wrapper-component :validator="$v.parameters.password">
+                        <label class="text-primary">Password</label>
+                        <div class="controls">
+                            <input type="password" class="form-control fs-12" v-model="parameters.password">
+                        </div>
+                    </validation-wrapper-component>
+                    <div class="row m-t-15 align-items-center justify-content-center">
+                        <div class="col-auto">
+                            <p class="muted fs-11 font-arial m-b-0 pointer">Forgot password?</p>
+                        </div>
+                        <div class="col text-right">
+                            <div class="btn btn-sm p-l-30 p-r-30 btn-primary bold v-align-middle b-rad-none all-caps" @click="submit(route('api.account.authentication.authenticate.attempt'), 'post', section, false, false)">Sign In</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import loginFormValidation from '../../../general/mixins/accounts/validation/loginFormValidation'
+    export default {
+        props: {
+            section:{
+                type: String,
+                required: true
+            }
+        },
+        data() {
+            return {
+                error: '',
+                parameters: {
+                    email: this.email,
+                    password: ''
+                }
+            };
+        },
+        mixins: [loginFormValidation]
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/accounts/elements/OnboardingStepComponent.vue b/resources/assets/vue/components/accounts/elements/OnboardingStepComponent.vue
new file mode 100644
index 00000000..dca841e9
--- /dev/null
+++ b/resources/assets/vue/components/accounts/elements/OnboardingStepComponent.vue
@@ -0,0 +1,53 @@
+<template>
+    <div class="row m-b-15">
+        <div class="col  padding-15" :class="[{'pointer': !active && !disabled}, {'bg-white': !active && !disabled}, {'bg-master-lighter': !active && disabled}, {'b-a': !active}, {'b-grey': !active}, {'bg-success': active}]">
+            <div class="absolute bullet-connector thin hint-text" style="top: -50%; left: 29px; z-index: -1;"></div>
+            <div class="row align-items-center" :class="[{'hint-text': !active && disabled}]">
+                <div class="col-auto p-r-5">
+                    <div class="btn-rounded bg-success-darker padding-5" v-if="active">
+                        <i class="fa fa-check text-success fs-16 fa-fw"></i>
+                    </div>
+                    <div class="btn-rounded b-a padding-5" :class="[{'b-success': !active && !disabled}, {'b-grey': !active && disabled}, {'bg-master-light': !active && disabled}]" v-show="!active" >
+                        <slot name="icon"></slot>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading bold fs-12" :class="[{'text-success': !active && !disabled}, {'text-white': active}]">
+                                <slot name="title"></slot>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-11" :class="[{'muted': !active}, {'text-white': active}]">
+                                <slot name="subTitle"></slot>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            active: {
+                type: Boolean,
+                default: false
+            },
+            disabled: {
+                type: Boolean,
+                default: false
+            }
+        },
+        watch: {
+            'active': function() {
+                this.address = this.data;
+            }
+        },
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/accounts/forms/EmailVerificationFormComponent.vue b/resources/assets/vue/components/accounts/forms/EmailVerificationFormComponent.vue
new file mode 100644
index 00000000..8cfeb88b
--- /dev/null
+++ b/resources/assets/vue/components/accounts/forms/EmailVerificationFormComponent.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="sent">
+                <div class="col">
+                    <div class="row align-items-center m-b-10">
+                        <div class="col-auto p-r-0">
+                            <div class="icon-thumbnail fs-16 icon-25 m-r-10 btn-rounded bg-success">
+                                <i class="fa fa-check fs-16 text-white"></i>
+                            </div>
+                        </div>
+                        <div class="col p-l-0">
+                            <div class="font-heading fs-12 all-caps bold text-success">Verification email sent</div>
+                        </div>
+                    </div>
+                    <div class="font-heading fs-11">It may take a few minutes. follow the directions in the email to confirm and activate your account</div>
+                </div>
+            </div>
+            <div class="row" v-show="!$store.getters.isLoading(section) && !sent">
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-16 all-caps bold m-b-15">Verify your email</div>
+                            <div class="font-heading fs-12 m-b-5">We have sent an email to <span class="bold text-primary">{{ $store.getters.getUserEmail }}</span></div>
+                            <div class="font-heading fs-11">You need to verify your email to continue.</div>
+                            <div class="font-heading fs-11 m-b-15">If you have not received the verification email, please check your <span class="text-danger">Spam</span> folder.</div>
+                            <div class="font-heading fs-11 m-b-10">You can also click the resend button below to have another email sent to you.</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-auto">
+                            <button class="btn btn-sm b-rad-none btn-outline-success" @click="submit(route('api.account.email.verification.resend'), 'post', section, true, false); sent=true">Resend Verification Email</button>
+                        </div>
+                        <div class="col no-padding">
+                            <error-message-component :error="error"></error-message-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import ModalFromHandler from '../../../general/mixins/modalFormHandler'
+    export default {
+        data(){
+            return {
+                sent: false,
+                parameters: {
+                    user_id: this.$store.getters.getUserId
+                }
+            }
+        },
+        mixins: [ModalFromHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/accounts/forms/ForgetPasswordFormComponent.vue b/resources/assets/vue/components/accounts/forms/ForgetPasswordFormComponent.vue
index 88f4f169..6fa4ea8b 100644
--- a/resources/assets/vue/components/accounts/forms/ForgetPasswordFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/ForgetPasswordFormComponent.vue
@@ -1,13 +1,13 @@
 <template>
     <div class="row">
         <div class="col">
-            <div class="row m-r-0 m-l-0 m-b-20 animated fadeInUpBig fast" v-if="error">
+            <div class="row m-r-0 m-l-0 m-b-20 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
                 <div class="col p-l-50">
                     <small class="bold fs-10 text-danger">{{error}}</small>
                 </div>
             </div>
-            <div class="row m-l-0 animated fadeInUpBig">
-                <div class="col b-t b-b b-grey animated" :class="[{'shake': $v.parameters.email.$error}]"  :style="[$v.parameters.email.$error ? {'border-bottom': 'solid 2px red !important'} : {}]">
+            <div class="row m-l-0 animate__animated animate__fadeInUpBig">
+                <div class="col b-t b-b b-grey animate__animated" :class="[{'animate__shake': $v.parameters.email.$error}]"  :style="[$v.parameters.email.$error ? {'border-bottom': 'solid 2px red !important'} : {}]">
                     <div class="row align-items-center">
                         <div class="col no-padding bg-white ">
                             <div class="input-group transparent">
@@ -22,10 +22,10 @@
                 </div>
             </div>
             <div class="row m-t-30 align-items-center">
-                <div class="col-auto animated fadeInLeftBig slower">
+                <div class="col-auto animate__animated animate__fadeInLeftBig animate__slower">
                     <div class="b-t b-b b-r b-grey all-caps muted p-t-15 p-b-15 p-l-30 p-r-20 font-lato pointer fs-12" @click="$store.dispatch('toggleSection', {name: 'forgetPassword', status: false})" style="letter-spacing: 2px;"><i class="fa fa-angle-left" style="padding-right: 18px;"></i>Back to login</div>
                 </div>
-                <div class="col-auto ml-auto p-r-0 animated fadeInRightBig slow">
+                <div class="col-auto ml-auto p-r-0 animate__animated animate__fadeInRightBig animate__slow">
                     <div class="bg-success all-caps text-white p-t-15 p-b-15 p-l-50 p-r-20 bold font-lato pointer fs-12" style="letter-spacing: 4px;" @click="submit(route('api.account.authentication.password.forget'), 'post', section, false , false)">Request Reset Link</div>
                 </div>
             </div>
@@ -35,7 +35,7 @@
 <script>
 
     import { required, email } from "vuelidate/lib/validators";
-    import request from '../../../mixins/requestMixin'
+    import request from '../../../general/mixins/request'
     export default {
         props: {
             section:{
@@ -58,7 +58,7 @@
         },
         methods:{
             successHandler(){
-                this.$store.dispatch('toggleSection', {name: 'forgetPasswordSuccess', status: true})
+                this.$store.dispatch('toggleSection', {name: 'forgetPasswordSuccess', status: true});
                 this.$store.dispatch('passwordResetEmail', {email: this.parameters.email})
             },
             errorHandler(error){
diff --git a/resources/assets/vue/components/accounts/forms/LogOutFormComponent.vue b/resources/assets/vue/components/accounts/forms/LogOutFormComponent.vue
new file mode 100644
index 00000000..9baa0aa6
--- /dev/null
+++ b/resources/assets/vue/components/accounts/forms/LogOutFormComponent.vue
@@ -0,0 +1,63 @@
+<template>
+    <div class="row h-100 parentContainer">
+        <div class="col">
+            <div class="row align-items-center justify-content-center b-a b-thick h-100 pointer requestModal" data-type="logoutModal" style="border-color: #ffffff3d">
+                <div class="col p-r-10 p-l-10">
+                    <i class="fa fa-power-off fs-12 text-primary-lighter"></i>
+                    <loading-component class="fixed-top h-100 bg-white" style="height: 200px; top: 0;" key="1" color="success" v-show="loading"></loading-component>
+                </div>
+            </div>
+            <modal-component styleType="fill-in" type="logoutModal">
+                <div class="row">
+                    <div class="col text-center">
+                        <div class="row m-b-20">
+                            <div class="col">
+                                <div class="row text-center">
+                                    <div class="col">
+                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                             width="64" height="64"
+                                             viewBox="0 0 172 172"
+                                             style=" fill:#000000;"><defs><linearGradient x1="86" y1="73.90625" x2="86" y2="102.15725" gradientUnits="userSpaceOnUse" id="color-1_48180_gr1"><stop offset="0" stop-color="#f6ab9c"></stop><stop offset="1" stop-color="#f6ab9c"></stop></linearGradient><linearGradient x1="86" y1="12.09375" x2="86" y2="161.54563" gradientUnits="userSpaceOnUse" id="color-2_48180_gr2"><stop offset="0" stop-color="#ed5335"></stop><stop offset="1" stop-color="#ed5335"></stop></linearGradient><linearGradient x1="86" y1="12.09375" x2="86" y2="161.54563" gradientUnits="userSpaceOnUse" id="color-3_48180_gr3"><stop offset="0" stop-color="#ed5335"></stop><stop offset="1" stop-color="#ed5335"></stop></linearGradient><linearGradient x1="86" y1="12.09375" x2="86" y2="161.54563" gradientUnits="userSpaceOnUse" id="color-4_48180_gr4"><stop offset="0" stop-color="#ed5335"></stop><stop offset="1" stop-color="#ed5335"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M86,77.9375c-5.93706,0 -10.75,4.81294 -10.75,10.75c0,5.93706 4.81294,10.75 10.75,10.75c5.93706,0 10.75,-4.81294 10.75,-10.75c0,-5.93706 -4.81294,-10.75 -10.75,-10.75z" fill="url(#color-1_48180_gr1)"></path><path d="M112.89113,27.10075l-2.15269,4.9235c22.52125,9.84431 37.07406,32.08606 37.07406,56.66325c0,34.08556 -27.72694,61.8125 -61.8125,61.8125c-34.08556,0 -61.8125,-27.72694 -61.8125,-61.8125c0,-24.5745 14.55013,-46.81356 37.07138,-56.66325l-2.15269,-4.9235c-24.48044,10.70163 -40.29369,34.87838 -40.29369,61.58675c0,37.04719 30.14031,67.1875 67.1875,67.1875c37.04719,0 67.1875,-30.14031 67.1875,-67.1875c0,-26.71106 -15.81862,-50.88781 -40.29637,-61.58675z" fill="url(#color-2_48180_gr2)"></path><path d="M86,134.375c-25.19263,0 -45.6875,-20.49487 -45.6875,-45.6875c0,-15.28381 7.59219,-29.48725 20.30944,-37.99587l-2.99388,-4.46663c-14.20881,9.50837 -22.69056,25.38613 -22.69056,42.4625c0,28.15694 22.90556,51.0625 51.0625,51.0625c28.15694,0 51.0625,-22.90556 51.0625,-51.0625c0,-17.14356 -8.5355,-33.05088 -22.83031,-42.55387l-2.97506,4.47738c12.7925,8.50325 20.43037,22.73625 20.43037,38.0765c0,25.19263 -20.49487,45.6875 -45.6875,45.6875z" fill="url(#color-3_48180_gr3)"></path><path d="M72.40394,48.375h10.90856v27.14644c-5.375,1.24969 -10.75,6.67575 -10.75,13.16606c0,7.40944 6.02806,13.4375 13.4375,13.4375c7.40944,0 13.4375,-6.02806 13.4375,-13.4375c0,-6.49031 -5.375,-11.91638 -10.75,-13.16606v-27.14644h10.90587c1.86244,0 3.59856,-0.96481 4.52575,-2.52356c0.88956,-1.49156 0.9245,-3.29219 0.09675,-4.816l-11.33856,-20.92487c-1.33031,-2.45906 -3.96406,-3.98556 -6.87731,-3.98556c-2.91325,0 -5.547,1.5265 -6.88,3.98288l-11.33856,20.92488c-0.82775,1.52381 -0.79281,3.32444 0.09675,4.816c0.92719,1.56144 2.66331,2.52625 4.52575,2.52625zM94.0625,88.6875c0,4.44512 -3.61738,8.0625 -8.0625,8.0625c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625c0,-4.44512 3.61737,-8.0625 8.0625,-8.0625c4.44512,0 8.0625,3.61737 8.0625,8.0625zM83.84463,22.67175c0.58856,-1.08844 1.79794,-1.17175 2.15537,-1.17175c0.35744,0 1.56681,0.08331 2.15537,1.17175l11.01606,20.33094l-26.41275,0.13438z" fill="url(#color-4_48180_gr4)"></path></g></g></svg>
+                                    </div>
+                                </div>
+                                <h3 class="all-caps">Are you leaving?</h3>
+                                <div class="fs-11">Are you sure you want to log out ? You will return to the login screen.</div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col p-r-5">
+                                <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Stay Here</div>
+                            </div>
+                            <div class="col p-l-5">
+                                <div class="btn btn-sm btn-danger btn-block b-rad-none" data-dismiss="modal" @click="logout()">Logout</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </modal-component>
+        </div>
+    </div>
+
+</template>
+<script>
+    export default {
+        data(){
+            return {
+                loading: false
+            }
+        },
+        methods:{
+            logout(){
+                this.loading = true;
+                this.submit(this.route('api.account.authentication.logout'), 'get', this.section, false, false)
+            },
+            successHandler(){
+                this.$store.dispatch('userAuthentication', {access_token: '', redirect_url: this.route('login')});
+            },
+            errorHandler(){
+                this.$store.dispatch('userAuthentication', {access_token: '', redirect_url: this.route('login')});
+            }
+        }
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue b/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue
index d233a606..454038a7 100644
--- a/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue
@@ -1,69 +1,41 @@
 <template>
-    <div class="row">
-        <div class="col p-r-0">
-            <div class="row no-margin">
+    <div class="row" @keyup.enter="submitForm">
+        <div class="col">
+            <error-message-component class="m-b-20" :error="error"></error-message-component>
+            <div class="row">
                 <div class="col">
-                    <div class="row m-b-20 animated fadeInUpBig fast" v-if="error">
-                        <div class="col p-l-50">
-                            <small class="bold fs-10 text-danger">{{error}}</small>
+                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.email">
+                        <label class="text-primary">Email Address</label>
+                        <div class="controls">
+                            <input type="text" class="form-control fs-12" v-model="parameters.email">
+                        </div>
+                    </validation-wrapper-component>
+                    <validation-wrapper-component :validator="$v.parameters.password">
+                        <label class="text-primary">Password</label>
+                        <div class="controls">
+                            <input type="password" class="form-control fs-12" v-model="parameters.password">
+                        </div>
+                    </validation-wrapper-component>
+                    <div class="row m-t-15 align-items-center justify-content-center">
+                        <div class="col-auto">
+                            <p class="muted fs-11 font-arial m-b-0 pointer">Forgot password?</p>
+                        </div>
+                        <div class="col text-right">
+                            <div class="btn btn-sm p-l-30 p-r-30 btn-primary bold v-align-middle b-rad-none all-caps" @click="submitForm">Sign In</div>
                         </div>
                     </div>
-                    <div class="row animated fadeInDownBig">
-                        <div class="col b-t b-b b-grey animated" :class="[{'shake': $v.parameters.email.$error}]" :style="[$v.parameters.email.$error ? {'border-bottom': 'solid 2px red !important'} : {}]">
-                            <div class="row align-items-center">
-                                <div class="col pl-md-0 pr-md-0 bg-white">
-                                    <div class="input-group transparent b-grey b-t">
-                                        <span class="input-group-addon no-border">
-                                            <i class="fa fa-user-o fa-fw p-l-15 p-t-20" style="padding-right: 18px;"></i>
-                                        </span>
-                                        <div class="form-control no-border bg-white p-t-25 p-b-35 p-l-0 p-r-0 text-muted fs-13 text-lowercase" style="cursor: default;">{{parameters.email}}</div>
-                                        <validation-error-component :validator="$v.parameters.email" class="absolute fs-12" style=" top: 10px; right: 15px; z-index: 99;"></validation-error-component>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row animated fadeInUpBig">
-                        <div class="col bg-white b-b b-grey animated" :class="[{'shake': $v.parameters.password.$error}]" :style="[$v.parameters.password.$error ? {'border-bottom': 'solid 2px red !important'} : {}]">
-                            <div class="row align-items-center">
-                                <div class="col pl-md-0 pr-md-0 bg-white">
-                                    <div class="input-group transparent b-grey b-b">
-                                        <span class="input-group-addon no-border">
-                                            <i class="fa fa-lock fa-fw p-l-15 p-t-20" style="padding-right: 18px;"></i>
-                                        </span>
-                                        <input type="password" v-model="parameters.password" placeholder="Password" class="form-control no-border bg-white p-t-35 p-b-35 p-l-0 p-r-0">
-                                        <validation-error-component :validator="$v.parameters.password" class="absolute fs-12" style=" top: 10px; right: 15px; z-index: 99;"></validation-error-component>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row m-t-30 align-items-center">
-                <div class="col-auto animated fadeInLeftBig slow">
-                    <div class="b-t b-b b-r b-primary bg-transparent all-caps text-primary p-t-15 p-b-15 p-l-50 p-r-50 bold font-lato pointer" style="letter-spacing: 8px;" @click="submit(route('api.account.authentication.authenticate.attempt'), 'post', section, false, false)">Login</div>
-                </div>
-                <div class="col animated fadeInRightBig slow">
-                    <small class="font-lato muted fs-10 pointer" @click="$store.dispatch('toggleSection', {name: 'forgetPassword', status: true})" style=" letter-spacing: 2px; ">Forgot Password ?</small>
                 </div>
             </div>
         </div>
     </div>
 </template>
 <script>
-    import { required, email } from "vuelidate/lib/validators";
-    import request from '../../../mixins/requestMixin'
-
+    import loginFormValidation from '../../../general/mixins/accounts/validation/loginFormValidation'
     export default {
         props: {
             section:{
                 type: String,
                 required: true
-            },
-            email: {
-                type: String,
-                required: true
             }
         },
         data() {
@@ -75,37 +47,12 @@
                 }
             };
         },
-        validations: {
-            parameters: {
-                email: { required, email },
-                password: { required }
-            }
+        methods: {
+          submitForm(){
+              this.submit(this.route('api.account.authentication.authenticate.attempt'), 'post', this.section, false, false)
+          }
         },
-        watch: {
-            'email': function() {
-                this.parameters.email = this.email;
-            }
-        },
-        methods:{
-            successHandler(response){
-                localStorage.setItem('user-token', response.payload.access_token);
-                console.log(response.payload.access_token);
-                this.$store.dispatch('userAuthentication', {access_token: response.payload.access_token});
-
-                this.error = '';
-                this.$store.dispatch('toggleSection', {name: 'loginSuccess', status: true})
-                setTimeout(function(){
-                    // window.location.href = response.payload.redirect_url;
-                }, 2000);
-            },
-            errorHandler(error){
-                this.$store.dispatch('userAuthentication', {access_token: ''});
-                localStorage.removeItem('user-token');
-
-                this.error = error.message;
-            }
-        },
-        mixins: [request]
+        mixins: [loginFormValidation]
     }
 
 </script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue b/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
index d6e55e09..1789325a 100644
--- a/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
@@ -1,46 +1,157 @@
 <template>
-    <div class="row p-t-25 text-left">
+    <div class="row text-left" @keyup.enter="submitForm">
         <div class="col">
+            <div class="row m-b-20">
+                <div class="col">
+                    <div class="font-heading fs-18 text-primary all-caps">Create Account</div>
+                    <div class="fs-11 muted">Create your account by filling in the form below.</div>
+                </div>
+            </div>
+            <error-message-component class="m-b-20" :error="error"></error-message-component>
             <div class="row">
                 <div class="col">
-                    <div class="b-l b-success p-l-15 m-b-15" style="border-left-width: 3px;">
-                        <h6 class="bold all-caps no-margin text-success">Registration</h6>
+                    <div class="row" v-show="step === 1">
+                        <div class="col">
+                            <div class="row m-b-15 animate__animated animate__fadeInUpBig">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <p class="bold fs-11 all-caps muted">Select your account type</p>
+                                        </div>
+                                    </div>
+                                    <div class="row text-center fs-10">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col-auto p-r-0">
+                                                    <div class="b-a b-grey bg-white p-t-20 p-b-20 p-l-45 p-r-45 pointer" :class="{ 'b-primary': parameters.type === 1, 'text-primary': parameters.type === 1, 'b-grey': parameters.type !== 1 }" @click="parameters.type = 1">
+                                                        <div class="m-b-15">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                 width="45" height="45"
+                                                                 viewBox="0 0 172 172"
+                                                                 style=" fill:#000000;"><defs><linearGradient x1="107.5" y1="82.30469" x2="107.5" y2="101.12525" gradientUnits="userSpaceOnUse" id="color-1_114458_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="107.5" y1="56.10156" x2="107.5" y2="73.73962" gradientUnits="userSpaceOnUse" id="color-2_114458_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="123.625" y1="82.30469" x2="123.625" y2="101.12525" gradientUnits="userSpaceOnUse" id="color-3_114458_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="123.625" y1="56.10156" x2="123.625" y2="73.73962" gradientUnits="userSpaceOnUse" id="color-4_114458_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="25.98006" x2="86" y2="147.8125" gradientUnits="userSpaceOnUse" id="color-5_114458_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="115.5625" y1="25.98006" x2="115.5625" y2="147.8125" gradientUnits="userSpaceOnUse" id="color-6_114458_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="115.5625" y1="25.98006" x2="115.5625" y2="147.8125" gradientUnits="userSpaceOnUse" id="color-7_114458_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="53.75" y1="99.4375" x2="53.75" y2="106.82813" gradientUnits="userSpaceOnUse" id="color-8_114458_gr8"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="63.15625" y1="85.88713" x2="63.15625" y2="94.23719" gradientUnits="userSpaceOnUse" id="color-9_114458_gr9"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="44.34375" y1="85.94356" x2="44.34375" y2="94.00606" gradientUnits="userSpaceOnUse" id="color-10_114458_gr10"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M104.8125,83.3125h5.375v16.125h-5.375z" fill="url(#color-1_114458_gr1)"></path><path d="M104.8125,56.4375h5.375v16.125h-5.375z" fill="url(#color-2_114458_gr2)"></path><path d="M120.9375,83.3125h5.375v16.125h-5.375z" fill="url(#color-3_114458_gr3)"></path><path d="M120.9375,56.4375h5.375v16.125h-5.375z" fill="url(#color-4_114458_gr4)"></path><path d="M155.875,37.625v-5.375c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-102.125c-2.96431,0 -5.375,2.41069 -5.375,5.375v5.375c0,2.96431 2.41069,5.375 5.375,5.375v16.7485c-10.01631,2.28438 -17.68644,10.78494 -18.69425,21.2205c-4.68431,1.15831 -8.18075,5.36694 -8.18075,10.406c0,5.47444 4.12531,9.9545 9.42506,10.61563c0.47569,1.36256 1.05888,2.67406 1.75763,3.91569c-10.38181,7.02512 -16.55769,18.57062 -16.55769,31.15619v8.0625h69.875h5.375h64.5v-5.375h-5.375v-96.75c2.96431,0 5.375,-2.41069 5.375,-5.375zM48.375,32.25h102.125l0.00538,5.375h-102.13038zM34.9375,83.3125c0,-10.37106 8.44144,-18.8125 18.8125,-18.8125c10.37106,0 18.8125,8.44144 18.8125,18.8125v10.75c0,10.37106 -8.44144,18.8125 -18.8125,18.8125c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125zM26.875,91.375c0,-1.98069 1.08844,-3.69531 2.6875,-4.62788v7.31538c0,0.67188 0.04838,1.33569 0.10213,1.99412c-1.6555,-0.91644 -2.78963,-2.66062 -2.78963,-4.68162zM53.75,118.25c7.095,0 13.46437,-3.08794 17.89338,-7.97113c1.51575,1.01319 2.90788,2.15 4.20862,3.37281c-5.58194,6.28069 -13.62831,9.97331 -22.102,9.97331c-8.47637,0 -16.52275,-3.68994 -22.102,-9.97062c1.30075,-1.22281 2.69288,-2.35963 4.20863,-3.37281c4.429,4.8805 10.79838,7.96844 17.89338,7.96844zM21.5,139.75v-2.6875c0,-7.14875 2.3435,-13.89169 6.49837,-19.393c6.57631,7.15681 15.9315,11.3305 25.75163,11.3305c9.81744,0 19.17531,-4.17369 25.75163,-11.33319c4.15487,5.504 6.49837,12.24962 6.49837,19.39569v2.6875zM115.5625,139.75v-5.375h29.5625v5.375zM145.125,118.25h-18.8125v5.375h18.8125v5.375h-29.5625v-13.4375c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-13.4375v5.375h13.4375c1.4835,0 2.6875,1.204 2.6875,2.6875v24.1875h-18.8125v-2.6875c0,-12.58556 -6.17588,-24.13106 -16.55769,-31.15619c0.70144,-1.24162 1.28463,-2.55044 1.75762,-3.91569c5.29975,-0.66112 9.42506,-5.14119 9.42506,-10.61562c0,-5.03906 -3.49644,-9.24769 -8.18075,-10.406c-1.1825,-12.24156 -11.52131,-21.844 -24.06925,-21.844v-16.125h91.375zM77.9375,94.0625v-7.31538c1.59906,0.93256 2.6875,2.64719 2.6875,4.62788c0,2.021 -1.13412,3.76519 -2.78963,4.68162c0.05375,-0.65844 0.10213,-1.32225 0.10213,-1.99412z" fill="url(#color-5_114458_gr5)"></path><path d="M99.4375,102.125h32.25c2.96431,0 5.375,-2.41069 5.375,-5.375v-10.75c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-32.25c-2.96431,0 -5.375,2.41069 -5.375,5.375v10.75c0,2.96431 2.41069,5.375 5.375,5.375zM99.4375,86h32.25l0.00538,10.75h-32.25538z" fill="url(#color-6_114458_gr6)"></path><path d="M99.4375,75.25h32.25c2.96431,0 5.375,-2.41069 5.375,-5.375v-10.75c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-32.25c-2.96431,0 -5.375,2.41069 -5.375,5.375v10.75c0,2.96431 2.41069,5.375 5.375,5.375zM99.4375,59.125h32.25l0.00538,10.75h-32.25538z" fill="url(#color-7_114458_gr7)"></path><path d="M53.75,107.5c4.45319,0 8.0625,-3.60931 8.0625,-8.0625h-16.125c0,4.45319 3.60931,8.0625 8.0625,8.0625z" fill="url(#color-8_114458_gr8)"></path><path d="M63.15625,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-9_114458_gr9)"></path><path d="M44.34375,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-10_114458_gr10)"></path></g></g></svg>
+                                                        </div>
+                                                        <p class="no-margin bold">Company</p>
+                                                    </div>
+                                                </div>
+                                                <div class="col-auto">
+                                                    <div class="b-a b-grey bg-white p-t-20 p-b-20 p-l-45 p-r-45 pointer" :class="{ 'b-primary': parameters.type === 0, 'text-primary': parameters.type === 0, 'b-grey': parameters.type !== 0 }"  @click="parameters.type = 0">
+                                                        <div class="m-b-15">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                 width="45" height="45"
+                                                                 viewBox="0 0 172 172"
+                                                                 style=" fill:#000000;"><defs><linearGradient x1="99.4375" y1="82.64063" x2="99.4375" y2="95.42506" gradientUnits="userSpaceOnUse" id="color-1_43595_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="72.5625" y1="82.64063" x2="72.5625" y2="95.42506" gradientUnits="userSpaceOnUse" id="color-2_43595_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="99.21444" x2="86" y2="110.1875" gradientUnits="userSpaceOnUse" id="color-3_43595_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="16.57381" x2="86" y2="157.67563" gradientUnits="userSpaceOnUse" id="color-4_43595_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M99.4375,83.3125c-2.96853,0 -5.375,2.40647 -5.375,5.375c0,2.96853 2.40647,5.375 5.375,5.375c2.96853,0 5.375,-2.40647 5.375,-5.375c0,-2.96853 -2.40647,-5.375 -5.375,-5.375z" fill="url(#color-1_43595_gr1)"></path><path d="M72.5625,83.3125c-2.96853,0 -5.375,2.40647 -5.375,5.375c0,2.96853 2.40647,5.375 5.375,5.375c2.96853,0 5.375,-2.40647 5.375,-5.375c0,-2.96853 -2.40647,-5.375 -5.375,-5.375z" fill="url(#color-2_43595_gr2)"></path><path d="M91.375,99.4375h-10.75c-1.4835,0 -2.6875,1.204 -2.6875,2.6875c0,4.45319 3.60931,8.0625 8.0625,8.0625c4.45319,0 8.0625,-3.60931 8.0625,-8.0625c0,-1.4835 -1.204,-2.6875 -2.6875,-2.6875z" fill="url(#color-3_43595_gr3)"></path><path d="M120.40538,103.85575c1.02662,-2.31931 1.83288,-4.75419 2.37575,-7.29119c6.53062,-0.91106 11.59387,-6.47419 11.59387,-13.25206c0,-4.37256 -2.13119,-8.22644 -5.375,-10.68281v-5.44219c0,-18.00625 -11.137,-33.43787 -26.875,-39.83412v-5.84263c0,-2.96969 -2.41606,-5.38575 -5.38575,-5.38575h-2.67675c-3.225,0 -6.08987,1.45662 -8.0625,3.71412c-1.97263,-2.2575 -4.8375,-3.71412 -8.0625,-3.71412h-2.6875c-2.96431,0 -5.375,2.41069 -5.375,5.375v5.85338c-15.738,6.39625 -26.875,21.82787 -26.875,39.83413v5.44219c-3.24381,2.45637 -5.375,6.31025 -5.375,10.68281c0,6.77787 5.06325,12.341 11.59387,13.25206c0.54288,2.537 1.34913,4.97187 2.37575,7.29119c-12.30875,10.25281 -19.34462,25.18456 -19.34462,41.26925v10.75h107.5v-10.75c0,-16.08469 -7.03588,-31.01644 -19.34463,-41.26925zM120.97781,111.72206l-19.64025,19.64025c-1.01856,1.01319 -2.78156,1.01319 -3.80013,0l-5.5685,-5.5685c10.87631,-1.74419 20.19119,-8.14581 25.84569,-17.11131c1.10994,0.9675 2.15538,1.98875 3.16319,3.03956zM53.75,88.6875v-13.4375h5.375c6.84775,0 12.83281,-3.68994 16.125,-9.17513c3.29219,5.48519 9.27725,9.17513 16.125,9.17513h26.875v13.4375c0,17.78319 -14.46681,32.25 -32.25,32.25c-17.78319,0 -32.25,-14.46681 -32.25,-32.25zM123.51213,90.91544c0.043,-0.74175 0.11288,-1.47544 0.11288,-2.22794v-12.943c3.12287,1.11531 5.375,4.06888 5.375,7.568c0,3.53944 -2.30856,6.52256 -5.48788,7.60294zM94.0625,21.5l2.6875,0.01075v4.09038c-2.39725,-0.62081 -4.86706,-1.04813 -7.40675,-1.24431c0.90838,-1.69044 2.67137,-2.85681 4.71925,-2.85681zM75.25,21.5h2.6875c2.04788,0 3.81087,1.16637 4.71925,2.85681c-2.53969,0.19619 -5.0095,0.6235 -7.40675,1.24431zM86,29.5625c17.97669,0 33.02938,12.67963 36.73275,29.5625h-31.35775c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-5.375h-5.375v5.375c0,4.44512 3.61738,8.0625 8.0625,8.0625h32.11294c0.0645,0.89225 0.13706,1.78181 0.13706,2.6875v2.6875h-2.6875h-2.6875h-26.875c-7.40944,0 -13.4375,-6.02806 -13.4375,-13.4375v-5.375h-5.375v5.375c0,7.40944 -6.02806,13.4375 -13.4375,13.4375h-5.375h-2.6875h-2.6875v-2.6875c0,-0.90569 0.07256,-1.79525 0.13706,-2.6875h10.61294c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-5.375h-5.375v5.375c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-9.85775c3.70338,-16.88287 18.75606,-29.5625 36.73275,-29.5625zM43,83.3125c0,-3.49912 2.25212,-6.45269 5.375,-7.568v12.943c0,0.7525 0.06987,1.48619 0.11288,2.22794c-3.17931,-1.08038 -5.48788,-4.0635 -5.48788,-7.60294zM80.07406,125.79919l-5.6115,5.6115c-1.01856,1.01319 -2.78156,1.01319 -3.80013,0l-19.66175,-19.66175c1.01319,-1.05887 2.06669,-2.08819 3.18469,-3.06375c5.66256,8.97356 14.99356,15.37788 25.88869,17.114zM37.625,145.125c0,-10.7715 3.51525,-20.96519 9.8685,-29.283l19.36881,19.36881c1.57219,1.57219 3.63619,2.35694 5.70019,2.35694c2.064,0 4.128,-0.78475 5.70019,-2.35694l5.04981,-5.04981v20.339h-45.6875zM134.375,150.5h-5.375c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-10.75c-2.96431,0 -5.375,2.41069 -5.375,5.375h-18.8125v-20.38737l5.04981,5.04981c1.57219,1.57219 3.63619,2.35694 5.70019,2.35694c2.064,0 4.128,-0.78475 5.70019,-2.35694l19.34731,-19.34731c6.36669,8.32319 9.89,18.52494 9.89,29.30987z" fill="url(#color-4_43595_gr4)"></path></g></g></svg></div>
+                                                        <p class="no-margin bold">Personal</p>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <p class="bold fs-11 all-caps muted">Personal Information</p>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-15" v-show="parameters.type === 1">
+                                        <div class="col">
+                                            <validation-wrapper-component :validator="$v.parameters.company_name">
+                                                <label class="muted">Company Name</label>
+                                                <input class="form-control" v-model="parameters.company_name">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-15">
+                                        <div class="col p-r-5">
+                                            <validation-wrapper-component :validator="$v.parameters.name">
+                                                <label class="muted">Full Name</label>
+                                                <input class="form-control" v-model="parameters.name">
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <div class="col p-l-5">
+                                            <validation-wrapper-component :validator="$v.parameters.phone">
+                                                <label class="muted">Phone</label>
+                                                <input class="form-control" v-model="parameters.phone">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row" v-show="step === 2">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col">
+                                    <p class="bold fs-11 all-caps muted">Account Information</p>
+                                </div>
+                            </div>
+                            <div class="row m-b-15">
+                                <div class="col">
+                                    <validation-wrapper-component :validator="$v.parameters.email">
+                                        <label class="muted">Email</label>
+                                        <input class="form-control" v-model="parameters.email">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row m-b-15">
+                                <div class="col p-r-5">
+                                    <validation-wrapper-component :validator="$v.parameters.password">
+                                        <label class="muted">Password</label>
+                                        <input class="form-control" type="password" v-model="parameters.password">
+                                    </validation-wrapper-component>
+                                </div>
+                                <div class="col p-l-5">
+                                    <validation-wrapper-component :validator="$v.parameters.password_confirmation">
+                                        <label class="muted">Password Confirmation</label>
+                                        <input class="form-control" type="password" v-model="parameters.password_confirmation">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
-            <div class="row">
-                <div class="col">
-                    <validation-wrapper-component :validator="$v.parameters.name">
-                        <label class="muted">Name</label>
-                        <input class="form-control" name="name" v-model="parameters.name">
-                    </validation-wrapper-component>
-                    <validation-wrapper-component :validator="$v.parameters.email">
-                        <label class="muted">Email</label>
-                        <input class="form-control" name="email" v-model="parameters.email">
-                    </validation-wrapper-component>
-                     <validation-wrapper-component :validator="$v.parameters.company_name">
-                        <label class="muted">Company Name</label>
-                        <input class="form-control" name="company_name" v-model="parameters.company_name">
-                    </validation-wrapper-component>
-                    <validation-wrapper-component :validator="$v.parameters.phone">
-                        <label class="muted">Phone</label>
-                        <input class="form-control" name="phone" v-model="parameters.phone">
-                    </validation-wrapper-component>
-                    <validation-wrapper-component :validator="$v.parameters.password">
-                        <label class="muted">Password</label>
-                        <input class="form-control" type="password" name="password" v-model="parameters.password">
-                    </validation-wrapper-component>
-                    <validation-wrapper-component :validator="$v.parameters.password_confirmation">
-                        <label class="muted">Password Confirmation</label>
-                        <input class="form-control" type="password" name="password_confirmation" v-model="parameters.password_confirmation">
-                    </validation-wrapper-component>
-                </div>
-            </div>
-            <div class="row mb-3">
+            <div class="row" v-show="step === 1">
                 <div class="col">
                     <div class="row">
+                        <div class="col">
+                            <button type="button" class="btn btn-sm p-t-10 p-b-10 btn-default bg-master-lighter b-rad-none" @click="$v.$reset;$store.dispatch('toggleSection', {name: 'registrationForm', status: false})">
+                                <div class="row align-items-center">
+                                    <div class="col-auto p-r-10">
+                                        <i class="fa fa-angle-left fs-16" style="margin-top: 1px;"></i>
+                                    </div>
+                                    <div class="col p-l-5">
+                                        Back To Login
+                                    </div>
+                                </div>
+                            </button>
+                        </div>
                         <div class="col text-right">
-                            <button type="button" class="btn btn-success" @click="submitForm()">Submit</button>
+                            <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-success b-rad-none" @click="changeStep('next')">Next</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row" v-show="step === 2">
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <button type="button" class="btn btn-sm p-t-10 p-b-10 btn-default bg-master-lighter b-rad-none" @click="changeStep('back')">
+                                <div class="row align-items-center">
+                                    <div class="col-auto p-r-10">
+                                        <i class="fa fa-angle-left fs-16" style="margin-top: 1px;"></i>
+                                    </div>
+                                    <div class="col p-l-5">
+                                        Go Back
+                                    </div>
+                                </div>
+                            </button>
+                        </div>
+                        <div class="col text-right">
+                            <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-success b-rad-none" @click="submitForm">Complete Registration</button>
                         </div>
                     </div>
                 </div>
@@ -49,16 +160,16 @@
     </div>
 </template>
 <script>
-    import { required, email, sameAs, numeric } from "vuelidate/lib/validators";
+    import registrationFormValidation from '../../../general/mixins/accounts/validation/registrationFormValidation'
     export default {
-        props: {
-           
-        },
         data() {
             return {
+                error: '',
+                step: 1,
                 parameters : {
                     name: '',
                     email: '',
+                    type: 1,
                     company_name: '',
                     phone: '',
                     password: '',
@@ -66,28 +177,28 @@
                 }
             }
         },
-        validations: {
-            parameters: {
-                name: { required },
-                email: { required, email },
-                company_name: { required },
-                phone: { required, numeric },
-                password: { required },
-                password_confirmation: { required, sameAsPassword: sameAs('password') }
+        methods:{
+            changeStep(direction){
+
+                if(direction === 'next'){
+                    if(this.validate()){
+                        this.$v.$reset();
+                        this.step += 1;
+                    }
+                    return;
+                }
+
+                this.parameters.email = '';
+                this.parameters.password = '';
+                this.parameters.password_confirmation = '';
+
+                return this.step -= 1
+
+            },
+            submitForm(){
+                this.step === 2 ? this.submit(this.route('api.account.registration.register'), 'post', 'registrationSection', false, false) : this.changeStep('next');
             }
         },
-        methods:{
-            submitForm(){
-                this.submit((this.route('api.account.registration')), 'post', 'registrationSection', true, true)
-            },
-            errorHandler(){
-                
-            },
-            successHandler(){
-                console.log('yess');
-                this.crudSuccess();
-                EventBus.$emit('updateAddress')
-            }
-        }
+        mixins: [registrationFormValidation]
     }
 </script>
diff --git a/resources/assets/vue/components/accounts/forms/RegistrationStep2FormComponent.vue b/resources/assets/vue/components/accounts/forms/RegistrationStep2FormComponent.vue
deleted file mode 100644
index f0429fc9..00000000
--- a/resources/assets/vue/components/accounts/forms/RegistrationStep2FormComponent.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<template>
-    <div class="row p-t-25 text-left">
-        <div class="col">
-            <div class="row">
-                <div class="col">
-                    <div class="b-l b-success p-l-15 m-b-15" style="border-left-width: 3px;">
-                        <h6 class="bold all-caps no-margin text-success">Registration Step 2</h6>
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col">
-                    <validation-wrapper-component :validator="$v.parameters.type">
-                        <label class="muted">Type</label>
-                        <select class="form-control" v-model="parameters.type">
-                            <option value="1">Public Company</option>
-                            <option value="2">Personal Company</option>
-                        </select>
-                    </validation-wrapper-component>
-                    <validation-wrapper-component :validator="$v.parameters.file">
-                        <label class="muted">File</label>
-                        <div class="upload-box">
-                            <div class="file-container">
-                                <i class="fa fa-cloud-upload"></i>
-                                <input type='file'
-                                    @change="onChange"
-                                />
-                            </div>
-                            <div class="upload-img">
-                                <div v-if="preview" v-for="(img, $index) in preview" :key="$index">
-                                    <img class='img-responsive' alt='' :src="img"/>
-                                </div>
-                            </div>
-                        </div>
-                    </validation-wrapper-component>
-                    <validation-wrapper-component :validator="$v.parameters.document_reference">
-                        <label class="muted">Refrence</label>
-                        <input class="form-control" name="name" v-model="parameters.document_reference">
-                    </validation-wrapper-component>
-                </div>
-            </div>
-            <div class="row mb-3">
-                <div class="col">
-                    <div class="row">
-                        <div class="col text-right">
-                            <button type="button" class="btn btn-success" @click="submitForm()">Submit</button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import { required, email, sameAs, numeric } from "vuelidate/lib/validators";
-    export default {
-        props: {
-           
-        },
-        data() {
-            return {
-                parameters : {
-                    type: '',
-                    file: [],
-                    document_reference: ''
-                },
-                preview: []
-            }
-        },
-        validations: {
-            parameters: {
-                type: { required },
-                file: { required },
-                document_reference: { required },
-            }
-        },
-        methods:{
-            onChange(e) {
-                let vm = this;
-                let files = e.target.files;
-
-                vm.preview = [];
-                Array.from(files).forEach(file => { 
-                    vm.preview.push(URL.createObjectURL(file));
-                });
-
-                vm.imageBase64(e.target.files).then(data => {
-                    vm.parameters.file = data;
-                });
-            },
-            imageBase64(imgs) {
-                let num = 1;
-                let base = [];
-                let count = imgs.length;
-
-                return new Promise((resolve, reject) => {
-                    Array.from(imgs).forEach(file => { 
-                        let reader = new FileReader();
-                        reader.onload = () => {
-                            base.push(reader.result);
-                            if (num >= count) {
-                                resolve(base);
-                            }
-                            num++;
-                        };
-                        reader.readAsDataURL(file);
-                    })
-                });
-            },
-            submitForm(){
-                this.submit((this.route('api.account.registration-step-2')), 'post', 'RegistrationSectionStep2', true, true)
-            },
-            errorHandler(){
-                
-            },
-            successHandler(){
-                this.crudSuccess();
-                EventBus.$emit('updateAddress')
-            }
-        }
-    }
-</script>
diff --git a/resources/assets/vue/components/accounts/sections/LoginSectionComponent.vue b/resources/assets/vue/components/accounts/sections/LoginSectionComponent.vue
deleted file mode 100644
index ebe212ce..00000000
--- a/resources/assets/vue/components/accounts/sections/LoginSectionComponent.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
-    <div class="row">
-        <div class="col p-r-0">
-            <transition-component key="2" group enter-class="animated fadeInRightBig faster" leave-class="animated fadeOutUpBig" v-show="!$store.getters.isLoading('loginSection')">
-                <div class="row" key="1" v-show="!$store.getters.isShowing('loginForm') && !$store.getters.isShowing('registrationForm')">
-                    <div class="col p-r-0">
-                        <div class="row m-l-0">
-                            <div class="col p-l-50">
-                                <h5 class="font-lato light animated fadeInRightBig slow" style=" line-height: 50px; letter-spacing: 5px; ">Hi There!</h5>
-                            </div>
-                        </div>
-                        <div class="row  m-l-0 m-b-20  animated fadeInRightBig slow">
-                            <div class="col p-l-50">
-                                <p class="muted font-lato light lh-25" style="letter-spacing: 2px; ">Enter your email address to <b>register</b>/<b>login</b>.</p>
-                            </div>
-                        </div>
-                        <div class="row no-margin">
-                            <div class="col">
-                                <div class="row m-b-20 animated fadeInUpBig fast" v-if="error">
-                                    <div class="col p-l-50">
-                                        <small class="bold fs-10 text-danger">{{error}}</small>
-                                    </div>
-                                </div>
-                                <div class="row animated fadeInDownBig">
-                                    <div class="col b-t b-b b-grey animated" :class="[{'shake': $v.parameters.email.$error}]" :style="[$v.parameters.email.$error ? {'border-bottom': 'solid 2px red !important'} : {}]">
-                                        <div class="row align-items-center">
-                                            <div class="col pl-md-0 pr-md-0  bg-white">
-                                                <div class="input-group transparent b-grey b-t b-b">
-                                                    <span class="input-group-addon no-border">
-                                                        <i class="fa fa-user-o fa-fw p-l-15 p-t-20" style="padding-right: 18px;"></i>
-                                                    </span>
-                                                    <input placeholder="My Email Address" v-model.trim="parameters.email" class="form-control no-border bg-white p-t-35 p-b-35 p-l-0 p-r-0">
-                                                    <validation-error-component :validator="$v.parameters.email" class="absolute fs-12" style=" top: 10px; right: 15px; z-index: 99;"></validation-error-component>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row m-t-30 align-items-center">
-                            <div class="col-auto animated fadeInLeftBig slow">
-                                <div class="b-t b-b b-r b-primary bg-transparent all-caps text-primary p-t-15 p-b-15 p-l-50 p-r-50 bold font-lato pointer" style="letter-spacing: 8px;" @click="submit(route('api.account.authentication.authenticate.email.check'), 'post', section, false, false)">Next <i class="fa fa-chevron-right fs-13"></i></div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="row" key="2" v-show="$store.getters.isShowing('loginForm')" >
-                    <div class="col all-caps">
-                        <div class="row  m-l-0">
-                            <div class="col p-l-50">
-                                <h5 class="font-lato light lh-40 animated fadeInLeftBig slow" style="letter-spacing: 5px; ">Welcome Back!</h5>
-                            </div>
-                        </div>
-                        <div class="row  m-l-0 m-b-20  animated fadeInRightBig slow">
-                            <div class="col p-l-50">
-                                <p class="muted font-lato light lh-25" style="letter-spacing: 2px; ">Looks like you already have an account with us.</p>
-                            </div>
-                        </div>
-                        <login-form-component section="loginSection" :email="parameters.email"></login-form-component>
-                    </div>
-                </div>
-                <div class="row m-t-30" key="3" v-show="$store.getters.isShowing('registrationForm')" >
-                    <div class="col all-caps">
-                        <div class="row m-b-20">
-                            <div class="col p-l-50">
-                                <div class="row  m-l-0 align-items-center justify-content-center">
-                                    <div class="col">
-                                        <h5 class="font-lato light lh-40 animated fadeInLeftBig slow" style="letter-spacing: 5px; ">Create Account</h5>
-                                    </div>
-                                </div>
-                                <div class="row m-l-0 animated fadeInRightBig slow">
-                                    <div class="col">
-                                        <p class="muted font-lato light lh-25" style="letter-spacing: 2px; ">Looks like you are a new user.<br>Let's create a fresh new izyim profile for you.</p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <registration-form-component ref="registration" :email="parameters.email" section="loginSection"></registration-form-component>
-                    </div>
-                </div>
-            </transition-component>
-        </div>
-    </div>
-</template>
-<script>
-    import { required, email } from "vuelidate/lib/validators";
-    import request from '../../../mixins/requestMixin'
-
-    export default {
-        props: {
-            section:{
-                type: String,
-                required: true
-            }
-        },
-        data() {
-            return {
-                error: '',
-                parameters: {
-                    email: ''
-                }
-            };
-        },
-        validations: {
-            parameters: {
-                email: { required, email }
-            }
-        },
-        methods:{
-            successHandler(){
-                this.$store.dispatch('toggleSection', {name: 'loginForm', status: true})
-            },
-            errorHandler(){
-                this.$store.dispatch('toggleSection', {name: 'registrationForm', status: true})
-            }
-        },
-        mixins: [request]
-    }
-
-</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/accounts/sections/OnboardingSectionComponent.vue b/resources/assets/vue/components/accounts/sections/OnboardingSectionComponent.vue
new file mode 100644
index 00000000..340f7ef2
--- /dev/null
+++ b/resources/assets/vue/components/accounts/sections/OnboardingSectionComponent.vue
@@ -0,0 +1,101 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row">
+                        <div class="col padding-25 bg-white">
+                            <div class="font-heading fs-14 bold all-caps">Welcome To Exchange System, <span class="text-primary">{{$store.getters.getUserName}}</span></div>
+                            <div class="font-heading fs-12 muted">This is your setup guide. It has everything you need to get set up to start managing your overseas transfers.</div>
+                        </div>
+                    </div>
+                    <div class="row align-items-center">
+                        <div class="col-5 padding-25">
+                            <div class="row h-100 align-items-end">
+                                <div class="col no-padding">
+                                    <img src="/images/2829248.png" class="w-100">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col padding-25">
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row parentContainer">
+                                        <div class="col">
+                                            <div class="row m-b-25 align-items-center">
+                                                <div class="col-auto p-l-5">
+                                                    <div class="absolute bullet-connector thin" style="top: -50%; left: 29px; z-index: -1;"></div>
+                                                    <div class="btn-rounded bg-white b-grey b-a padding-5">
+                                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                             width="35" height="35"
+                                                             viewBox="0 0 172 172"
+                                                             style=" fill:#000000;"><defs><linearGradient x1="51.0625" y1="38.93919" x2="51.0625" y2="48.20569" gradientUnits="userSpaceOnUse" id="color-1_sutdFBpBE0lc_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="120.9375" y1="38.93919" x2="120.9375" y2="48.20569" gradientUnits="userSpaceOnUse" id="color-2_sutdFBpBE0lc_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="93.94694" x2="86" y2="98.84356" gradientUnits="userSpaceOnUse" id="color-3_sutdFBpBE0lc_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="19.26938" x2="86" y2="150.88163" gradientUnits="userSpaceOnUse" id="color-4_sutdFBpBE0lc_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g id="original-icon"><path d="M51.0625,48.375l-10.75,5.375v-16.125h21.5z" fill="url(#color-1_sutdFBpBE0lc_gr1)"></path><path d="M120.9375,48.375l10.75,5.375v-16.125h-21.5z" fill="url(#color-2_sutdFBpBE0lc_gr2)"></path><path d="M86,99.4375c2.96969,0 5.375,-2.408 5.375,-5.375h-10.75c0,2.96969 2.40531,5.375 5.375,5.375z" fill="url(#color-3_sutdFBpBE0lc_gr3)"></path><g fill="url(#color-4_sutdFBpBE0lc_gr4)"><path d="M137.84994,50.79913c-0.26337,-0.02956 -0.52406,-0.086 -0.78744,-0.12094v-7.67819c0,-4.44512 -3.91837,-8.0625 -8.73437,-8.0625h-19.0275c-3.28144,-3.96138 -5.90713,-8.4925 -7.64863,-13.40525c-1.14487,-3.23306 -4.18713,-5.40725 -7.60025,-5.40725h-16.1035c-3.41312,0 -6.45538,2.17419 -7.60025,5.40725c-1.73881,4.91275 -4.36719,9.44387 -7.64863,13.40525h-19.0275c-4.816,0 -8.73437,3.61738 -8.73437,8.0625v7.67819c-0.26338,0.03494 -0.52406,0.09137 -0.78744,0.12094c-4.14681,0.473 -7.27506,3.92644 -7.27506,8.02219v36.60644c0,32.55369 25.86719,59.65981 57.65494,60.42575c0.4945,0.01075 0.97556,0.0215 1.45931,0.0215c0.00269,0 0.01881,0 0.0215,0c0.48375,0 0.96481,-0.01075 1.45931,-0.0215c31.78775,-0.76594 57.65494,-27.87206 57.65494,-60.42575v-36.60644c0,-4.09575 -3.12825,-7.54919 -7.27506,-8.02219zM128.32813,40.3125c1.85169,0 3.35938,1.20669 3.35938,2.6875v6.59244c-6.278,-1.73613 -12.13138,-4.96919 -17.10056,-9.27994zM40.3125,43c0,-1.48081 1.50769,-2.6875 3.35938,-2.6875h13.74119c-4.96919,4.31075 -10.82256,7.54381 -17.10056,9.27994zM139.75,95.42775c0,25.37538 -17.23763,47.07156 -40.3125,53.2555v-6.24575h-5.375v7.38525c-1.76569,0.27681 -3.55825,0.46225 -5.375,0.55363v-13.31387h-5.375v13.31387c-1.81675,-0.09137 -3.60931,-0.27681 -5.375,-0.55363v-7.38525h-5.375v6.24575c-23.07487,-6.18394 -40.3125,-27.88012 -40.3125,-53.2555v-36.60644c0,-1.38675 1.06156,-2.51013 2.51012,-2.67675c18.10838,-2.07744 34.45375,-15.265 40.64844,-32.82781c0.387,-1.08306 1.40556,-1.81675 2.53969,-1.81675h16.1035c1.13412,0 2.15269,0.73369 2.53969,1.81675c6.19469,17.56281 22.54006,30.74769 40.64844,32.82781c1.44856,0.16663 2.51012,1.29 2.51012,2.67675z"></path><path d="M86,56.4375c-19.264,0 -34.9375,15.6735 -34.9375,34.9375c0,19.264 15.6735,34.9375 34.9375,34.9375c19.264,0 34.9375,-15.6735 34.9375,-34.9375c0,-19.264 -15.6735,-34.9375 -34.9375,-34.9375zM67.83519,114.64875c0.99438,-3.73562 3.14706,-7.10306 6.11406,-9.59437c2.95625,3.3325 7.25625,5.44756 12.05075,5.44756c4.79988,0 9.10256,-2.11775 12.05881,-5.45563c2.97238,2.494 5.117,5.85606 6.11406,9.59706c-5.02025,3.92913 -11.31975,6.29413 -18.17288,6.29413c-6.85044,0 -13.14725,-2.36231 -18.16481,-6.28875zM96.75,94.37694c0,5.92863 -4.82137,10.75 -10.75,10.75c-5.92863,0 -10.75,-4.82137 -10.75,-10.75v-5.762c0,-5.92862 4.82138,-10.75 10.75,-10.75c5.92863,0 10.75,4.82138 10.75,10.75zM108.47288,110.5315c-1.57487,-3.94256 -4.18444,-7.42825 -7.5465,-10.07544c0.76863,-1.87587 1.19862,-3.92644 1.19862,-6.07912v-5.762c0,-8.89294 -7.23206,-16.125 -16.125,-16.125c-8.89294,0 -16.125,7.23206 -16.125,16.125v5.762c0,2.14731 0.43,4.1925 1.19325,6.06569c-3.35669,2.6445 -5.94744,6.15975 -7.525,10.10769c-4.41825,-5.16537 -7.10575,-11.85725 -7.10575,-19.17531c0,-16.29969 13.26281,-29.5625 29.5625,-29.5625c16.29969,0 29.5625,13.26281 29.5625,29.5625c0,7.30731 -2.67944,13.99113 -7.08962,19.1565z"></path></g></g></g></svg>
+                                                    </div>
+                                                </div>
+                                                <div class="col p-l-0">
+                                                    <div class="font-heading fs-11 bold all-caps muted">Getting started with Exchange</div>
+                                                    <div class="font-heading fs-10 muted">Just few more steps and you can start transferring money overseas</div>
+                                                </div>
+                                            </div>
+                                            <onboarding-step-component active>
+                                                <template slot="title">Sign up for Exchange</template>
+                                                <template slot="subTitle">Create your own Exchange account.</template>
+                                            </onboarding-step-component>
+                                            <onboarding-step-component :active="item.employee.status === 2" :class="[{'requestModal': item.employee.status !== 2}]" data-type="emailActivationModal">
+                                                <template slot="icon">
+                                                    <svg  xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                          width="23" height="23"
+                                                          viewBox="0 0 172 172"
+                                                          style=" fill:#000000;"><defs><linearGradient x1="86" y1="49.71875" x2="86" y2="86.02419" gradientUnits="userSpaceOnUse" id="color-1_k5TOe_wo6JDZ_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="26.703" x2="86" y2="143.32169" gradientUnits="userSpaceOnUse" id="color-2_k5TOe_wo6JDZ_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="26.703" x2="86" y2="143.32169" gradientUnits="userSpaceOnUse" id="color-3_k5TOe_wo6JDZ_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="26.703" x2="86" y2="143.32169" gradientUnits="userSpaceOnUse" id="color-4_k5TOe_wo6JDZ_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="26.42619" x2="86" y2="147.05731" gradientUnits="userSpaceOnUse" id="color-5_k5TOe_wo6JDZ_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M119.92969,56.10425l-30.60794,25.972c-1.94306,1.64744 -4.70312,1.64744 -6.64619,0l-30.60794,-25.972c-1.96725,-1.67162 -0.85462,-5.04175 1.66894,-5.04175h64.52419c2.52625,0 3.63887,3.37013 1.66894,5.04175z" fill="url(#color-1_k5TOe_wo6JDZ_gr1)"></path><rect x="18" y="48" transform="scale(2.6875,2.6875)" width="28" height="2" fill="url(#color-2_k5TOe_wo6JDZ_gr2)"></rect><rect x="25" y="44" transform="scale(2.6875,2.6875)" width="14" height="2" fill="url(#color-3_k5TOe_wo6JDZ_gr3)"></rect><path d="M139.75,37.625h-107.5c-7.40944,0 -13.4375,6.02806 -13.4375,13.4375v80.625c0,7.40944 6.02806,13.4375 13.4375,13.4375h107.5c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-80.625c0,-7.40944 -6.02806,-13.4375 -13.4375,-13.4375zM32.25,43h107.5c2.50744,0 4.72463,1.17444 6.20275,2.97506l-54.79006,45.66063c-2.99119,2.494 -7.33419,2.494 -10.32538,0l-54.79006,-45.66062c1.47813,-1.80062 3.69531,-2.97506 6.20275,-2.97506zM24.1875,51.428l37.92869,31.60769l-37.92869,31.605zM147.8125,131.6875c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-107.5c-4.44513,0 -8.0625,-3.61738 -8.0625,-8.0625v-10.04587l42.12925,-35.10681l11.07788,9.23156c2.494,2.07475 5.54969,3.11481 8.60537,3.11481c3.05569,0 6.11138,-1.04006 8.60537,-3.11481l11.07788,-9.23156l42.12925,35.10681zM147.8125,114.64069l-37.92869,-31.60769l37.92869,-31.605z" fill="url(#color-4_k5TOe_wo6JDZ_gr4)"></path><path d="M32.25,26.875h107.5v5.375h-107.5z" fill="url(#color-5_k5TOe_wo6JDZ_gr5)"></path></g></g></svg>
+                                                </template>
+                                                <template slot="title">Activate Account</template>
+                                                <template slot="subTitle">We've sent you a link in your email to confirm your account.</template>
+                                            </onboarding-step-component>
+                                            <modal-component type="emailActivationModal" v-if="item.employee.status !== 2">
+                                                <email-verification-form-component section="resendEmailVerificationSection"></email-verification-form-component>
+                                            </modal-component>
+                                            <onboarding-step-component :class="[{'requestModal': item.status !== 2 && item.status !== 1}]" data-type="identificationVerificationModal" :active="item.status === 2 || item.status === 1">
+                                                <template slot="icon">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                         width="23" height="23"
+                                                         viewBox="0 0 172 172"
+                                                         style=" fill:#000000;"><defs><linearGradient x1="86" y1="18.8125" x2="86" y2="150.07" gradientUnits="userSpaceOnUse" id="color-1_44031_gr1"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="130.34375" y1="18.8125" x2="130.34375" y2="150.07" gradientUnits="userSpaceOnUse" id="color-2_44031_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="53.86019" y1="18.8125" x2="53.86019" y2="150.07" gradientUnits="userSpaceOnUse" id="color-3_44031_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="53.75" y1="65.17188" x2="53.75" y2="92.10063" gradientUnits="userSpaceOnUse" id="color-4_44031_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="102.125" y1="65.17188" x2="102.125" y2="92.10063" gradientUnits="userSpaceOnUse" id="color-5_44031_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="77.9375" y1="93.72656" x2="77.9375" y2="121.2815" gradientUnits="userSpaceOnUse" id="color-6_44031_gr6"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g id="original-icon"><path d="M147.80175,100.63613c-2.61762,-2.76812 -5.676,-4.93425 -9.00581,-6.48763c0.62887,-3.56362 0.95406,-7.19444 0.95406,-10.836c0,-34.08556 -27.72694,-61.8125 -61.8125,-61.8125c-34.08556,0 -61.8125,27.72694 -61.8125,61.8125c0,34.08556 27.72694,61.8125 61.8125,61.8125c8.9225,0 17.4795,-1.85975 25.49094,-5.50131c5.42606,6.63275 13.66594,10.87631 22.88406,10.87631c16.29969,0 29.5625,-13.26281 29.5625,-29.5625c0,-7.57875 -2.86488,-14.78931 -8.07325,-20.30138zM77.9375,139.75c-31.11856,0 -56.4375,-25.31894 -56.4375,-56.4375c0,-31.11856 25.31894,-56.4375 56.4375,-56.4375c31.11856,0 56.4375,25.31894 56.4375,56.4375c0,3.02612 -0.25531,6.03881 -0.731,9.0085c-2.365,-0.602 -4.816,-0.946 -7.3315,-0.946c-16.29969,0 -29.5625,13.26281 -29.5625,29.5625c0,5.13312 1.31956,9.95988 3.62812,14.17119c-7.07081,3.07719 -14.60388,4.64131 -22.44062,4.64131zM126.3125,145.125c-13.33806,0 -24.1875,-10.84944 -24.1875,-24.1875c0,-13.33806 10.84944,-24.1875 24.1875,-24.1875c6.71875,0 12.9645,2.69019 17.58431,7.57606c4.257,4.51231 6.60319,10.40869 6.60319,16.61144c0,13.33806 -10.84944,24.1875 -24.1875,24.1875z" fill="url(#color-1_44031_gr1)"></path><path d="M141.88119,112.31869l-15.56869,15.56869l-7.50619,-7.50619l-3.80013,3.80013l11.30631,11.30631l19.36881,-19.36881z" fill="url(#color-2_44031_gr2)"></path><path d="M29.78288,66.29256l5.06594,1.78988c4.55531,-12.88925 14.96938,-23.30331 27.86131,-27.85863c4.8805,-1.72538 10.00556,-2.59881 15.22737,-2.59881v-5.375c-5.83456,0 -11.56162,0.97825 -17.01725,2.90788c-14.40769,5.09013 -26.04725,16.72969 -31.13737,31.13469z" fill="url(#color-3_44031_gr3)"></path><path d="M53.75,67.1875c-5.93706,0 -10.75,4.81294 -10.75,10.75c0,5.93706 4.81294,10.75 10.75,10.75c5.93706,0 10.75,-4.81294 10.75,-10.75c0,-5.93706 -4.81294,-10.75 -10.75,-10.75z" fill="url(#color-4_44031_gr4)"></path><path d="M102.125,67.1875c-5.93706,0 -10.75,4.81294 -10.75,10.75c0,5.93706 4.81294,10.75 10.75,10.75c5.93706,0 10.75,-4.81294 10.75,-10.75c0,-5.93706 -4.81294,-10.75 -10.75,-10.75z" fill="url(#color-5_44031_gr5)"></path><path d="M91.375,96.75h-26.875c-1.4835,0 -2.6875,1.204 -2.6875,2.6875v2.6875c0,8.90637 7.21863,16.125 16.125,16.125c8.90637,0 16.125,-7.21863 16.125,-16.125v-2.6875c0,-1.4835 -1.204,-2.6875 -2.6875,-2.6875z" fill="url(#color-6_44031_gr6)"></path></g></g></svg>
+                                                </template>
+                                                <template slot="title">Identity Verification</template>
+                                                <template slot="subTitle">Upload you identification document.</template>
+                                            </onboarding-step-component>
+                                            <modal-component type="identificationVerificationModal" v-if="item.status !== 2 && item.status !== 1 ">
+                                                <identification-verification-form-component section="customerProfileSection" :data="item"></identification-verification-form-component>
+                                            </modal-component>
+                                            <onboarding-step-component :disabled="item.status !== 2 && item.status !== 1" :active="!!item.bookings.length" v-on:click.native="callAttention()">
+                                                <template slot="icon">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                         width="23" height="23"
+                                                         viewBox="0 0 172 172"
+                                                         style=" fill:#000000;"><defs><linearGradient x1="86" y1="45.01563" x2="86" y2="152.92681" gradientUnits="userSpaceOnUse" id="color-1_48314_gr1"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="45.01563" x2="86" y2="152.92681" gradientUnits="userSpaceOnUse" id="color-2_48314_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="16.79688" x2="86" y2="92.05225" gradientUnits="userSpaceOnUse" id="color-3_48314_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="45.01563" x2="86" y2="152.92681" gradientUnits="userSpaceOnUse" id="color-4_48314_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M147.8125,48.375h-32.25v5.375h32.25c1.50769,0 2.6875,1.12875 2.6875,2.56925v75.25c0,1.51844 -1.23087,2.80575 -2.6875,2.80575h-123.625c-1.45662,0 -2.6875,-1.28731 -2.6875,-2.80575v-75.25c0,-1.4405 1.17981,-2.56925 2.6875,-2.56925h32.25v-5.375h-32.25c-4.52038,0 -8.0625,3.49106 -8.0625,7.94425v75.25c0,3.55019 2.25481,6.54944 5.375,7.67819v3.07181c0,4.51231 3.61737,8.18075 8.0625,8.18075h112.875c4.44512,0 8.0625,-3.66844 8.0625,-8.18075v-3.07181c3.12019,-1.12875 5.375,-4.128 5.375,-7.67819v-75.25c0,-4.45319 -3.54212,-7.94425 -8.0625,-7.94425zM142.4375,145.125h-112.875c-1.45662,0 -2.6875,-1.28731 -2.6875,-2.80575v-2.56925h118.25v2.56925c0,1.51844 -1.23087,2.80575 -2.6875,2.80575z" fill="url(#color-1_48314_gr1)"></path><path d="M126.3125,129h-83.3125v-2.6875c0,-7.51425 -6.02806,-13.4375 -13.4375,-13.4375h-2.6875v-37.625h2.6875c6.3425,0 13.4375,-5.79156 13.4375,-13.46706v-2.70363l13.4375,0.04569v5.375l-8.2775,-0.01613c-1.26044,7.95231 -7.94425,14.61731 -15.91,15.86969v27.219c8.25869,1.18788 14.80006,7.76956 15.94762,16.05244h75.6155c1.17444,-8.30438 7.70238,-14.85112 15.93688,-16.03631v-27.262c-7.96844,-1.247 -14.65494,-7.89587 -15.91269,-15.82669h-8.27481v-5.375h13.4375v2.6875c0,6.30219 5.74587,13.4375 13.4375,13.4375h2.6875v37.50675l-2.6875,0.01613c-7.40944,0 -13.4375,6.03344 -13.4375,13.45094v2.6875z" fill="url(#color-2_48314_gr2)"></path><path d="M104.8125,53.75h-8.0625c-1.4835,0 -2.6875,1.14487 -2.6875,2.63106v29.61356c0,1.48619 -1.204,2.69288 -2.6875,2.69288h-10.75c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.69288v-29.61356c0,-1.48619 -1.204,-2.63106 -2.6875,-2.63106h-8.0625c-2.2145,0 -3.47763,-2.881 -2.15,-4.87781l16.65175,-25.04481c2.05056,-3.08256 6.57094,-3.08794 8.6215,-0.00806l16.65175,25.05556c1.32762,1.99681 0.0645,4.87512 -2.15,4.87512z" fill="url(#color-3_48314_gr3)"></path><path d="M86,112.875c-10.37375,0 -18.8125,-8.0625 -18.8125,-18.8125h5.375c0,8.0625 6.02806,13.4375 13.4375,13.4375c7.40944,0 13.4375,-5.375 13.4375,-13.4375h5.375c0,10.75 -8.43875,18.8125 -18.8125,18.8125z" fill="url(#color-4_48314_gr4)"></path></g></g></svg>
+                                                </template>
+                                                <template slot="title">1<sup>st</sup> Transfer Request</template>
+                                                <template slot="subTitle">Create your first transfer request.</template>
+                                            </onboarding-step-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        methods: {
+            callAttention(){
+                if(this.item.status === 2 || this.item.status === 1) this.$emit('attention');
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/address/forms/AddressFormComponent.vue b/resources/assets/vue/components/address/forms/AddressFormComponent.vue
index d35dcbec..e3508e01 100644
--- a/resources/assets/vue/components/address/forms/AddressFormComponent.vue
+++ b/resources/assets/vue/components/address/forms/AddressFormComponent.vue
@@ -3,47 +3,33 @@
         <div class="col">
             <div class="row">
                 <div class="col">
-                    <div class="b-l b-success p-l-15 m-b-15" style="border-left-width: 3px;">
-                        <h6 class="bold all-caps no-margin text-success">New Address</h6>
-                        <div class="muted all-caps fs-12">Create A New Delivery Address</div>
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col">
-                    <validation-wrapper-component :validator="$v.parameters.street_one">
-                        <label class="muted">Address Line 1</label>
-                        <input class="form-control" name="street_one" v-model="parameters.street_one">
-                    </validation-wrapper-component>
-                    <validation-wrapper-component :validator="$v.parameters.street_two">
-                        <label class="muted">Address Line 2</label>
-                        <input class="form-control" name="street_two" v-model="parameters.street_two">
-                    </validation-wrapper-component>
-                    <div class="row">
-                        <div class="col p-r-5">
-                            <validation-wrapper-component :validator="$v.parameters.city">
-                                <label class="muted">City</label>
-                                <input class="form-control" name="city" v-model="parameters.city">
+                    <div class="row m-b-15">
+                        <div class="col-6 p-r-5">
+                            <validation-wrapper-component selecatable :validator="$v.parameters.district_id">
+                                <label class="muted">District</label>
+                                <selectable-component :endpoint="route('api.address.district.list')" section="districtListSection" valueColumn="id" :labelColumn="['city']" v-model="parameters.district_id"></selectable-component>
                             </validation-wrapper-component>
                         </div>
-                        <div class="col p-l-5">
-                            <validation-wrapper-component :validator="$v.parameters.state">
-                                <label class="muted">State</label>
-                                <input class="form-control" name="State" v-model="parameters.state">
-                            </validation-wrapper-component>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col p-r-5">
+                        <div class="col-4 p-l-5">
                             <validation-wrapper-component :validator="$v.parameters.post_code">
                                 <label class="muted">Post Code</label>
                                 <input class="form-control" name="post_code" v-model="parameters.post_code">
                             </validation-wrapper-component>
                         </div>
-                        <div class="col p-l-5">
-                            <validation-wrapper-component :validator="$v.parameters.country">
-                                <label class="muted">Country</label>
-                                <input class="form-control" name="country" v-model="parameters.country">
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.street_one">
+                                <label class="muted">Address Line 1</label>
+                                <input class="form-control" name="street_one" v-model="parameters.street_one">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.street_two">
+                                <label class="muted">Address Line 2</label>
+                                <input class="form-control" name="street_two" v-model="parameters.street_two">
                             </validation-wrapper-component>
                         </div>
                     </div>
@@ -53,8 +39,7 @@
                 <div class="col">
                     <div class="row">
                         <div class="col text-right">
-                            <button type="button" class="btn btn-outline-dark float-left" @click="closeModal()">Cancel</button>
-                            <button type="button" class="btn btn-success" @click="submitForm()">Submit</button>
+                            <button type="button" class="btn btn-sm btn-success b-rad-none" @click="submitForm()">Create Billing Address</button>
                         </div>
                     </div>
                 </div>
@@ -82,12 +67,8 @@
                     company_id: this.id,
                     street_one: '',
                     street_two: '',
-                    city: '',
-                    state: '',
+                    district_id: '',
                     post_code: '',
-                    country: '',
-                    default: 1,
-                    billing: 1
 				}
 
 			}
@@ -96,19 +77,16 @@
             parameters: {
                 street_one: { required },
                 street_two: {},
-                city: { required },
-                state: { required },
+                district_id: { required },
                 post_code: { required },
-                country: { required }
             }
         },
         methods:{
             submitForm(){
-                this.submit((this.route('api.address.create')), 'post', 'address.form', true, true)
+                this.submit((this.route('api.address.create')), 'post', 'bookingDetailSection', true, true)
             },
             successHandler(){
-                this.crudSuccess();
-                EventBus.$emit('updateAddress')
+                this.updateList()
             }
         }
     }
diff --git a/resources/assets/vue/components/banks/elements/BankAccountComponent.vue b/resources/assets/vue/components/banks/elements/BankAccountComponent.vue
new file mode 100644
index 00000000..1fb6ac43
--- /dev/null
+++ b/resources/assets/vue/components/banks/elements/BankAccountComponent.vue
@@ -0,0 +1,63 @@
+<template>
+    <div class="row align-items-center m-b-15 parentContainer">
+        <div class="col-auto p-r-0">
+            <div class="padding-5 bg-master-lightest">
+                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                     width="30" height="30"
+                     viewBox="0 0 172 172"
+                     style=" fill:#000000;"><defs><linearGradient x1="86" y1="38.97413" x2="86" y2="57.78663" gradientUnits="userSpaceOnUse" id="color-1_77055_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="129" y1="77.49138" x2="129" y2="121.38631" gradientUnits="userSpaceOnUse" id="color-2_77055_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="43" y1="77.49138" x2="43" y2="121.38631" gradientUnits="userSpaceOnUse" id="color-3_77055_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="64.94881" x2="86" y2="133.92888" gradientUnits="userSpaceOnUse" id="color-4_77055_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="16.11963" x2="86" y2="155.875" gradientUnits="userSpaceOnUse" id="color-5_77055_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M86,40.31787c-4.4528,0 -8.0625,3.6097 -8.0625,8.0625c0,4.4528 3.6097,8.0625 8.0625,8.0625c4.4528,0 8.0625,-3.6097 8.0625,-8.0625c0,-4.4528 -3.6097,-8.0625 -8.0625,-8.0625z" fill="url(#color-1_77055_gr1)"></path><path d="M126.3125,80.625h5.375v37.625h-5.375z" fill="url(#color-2_77055_gr2)"></path><path d="M40.3125,80.625h5.375v37.625h-5.375z" fill="url(#color-3_77055_gr3)"></path><path d="M56.4375,69.875v59.125h59.125v-59.125zM99.4375,88.6875h-21.5v8.0625h16.125c2.96431,0 5.375,2.41069 5.375,5.375v8.0625c0,2.96431 -2.41069,5.375 -5.375,5.375h-5.375v5.375h-5.375v-5.375h-10.75v-5.375h21.5v-8.0625h-16.125c-2.96431,0 -5.375,-2.41069 -5.375,-5.375v-8.0625c0,-2.96431 2.41069,-5.375 5.375,-5.375h5.375v-5.375h5.375v5.375h10.75z" fill="url(#color-4_77055_gr4)"></path><path d="M86,59.125c-5.92862,0 -10.75,-4.82138 -10.75,-10.75c0,-5.92862 4.82138,-10.75 10.75,-10.75c5.92863,0 10.75,4.82138 10.75,10.75c0,5.92862 -4.82137,10.75 -10.75,10.75zM86,43c-2.96431,0 -5.375,2.41069 -5.375,5.375c0,2.96431 2.41069,5.375 5.375,5.375c2.96431,0 5.375,-2.41069 5.375,-5.375c0,-2.96431 -2.41069,-5.375 -5.375,-5.375zM108.84375,53.75c-2.22256,0 -4.03125,-1.80869 -4.03125,-4.03125c0,-2.22256 1.80869,-4.03125 4.03125,-4.03125c2.22256,0 4.03125,1.80869 4.03125,4.03125c0,2.22256 -1.80869,4.03125 -4.03125,4.03125zM108.84375,49.71606v0.00269zM63.15625,53.75c-2.22256,0 -4.03125,-1.80869 -4.03125,-4.03125c0,-2.22256 1.80869,-4.03125 4.03125,-4.03125c2.22256,0 4.03125,1.80869 4.03125,4.03125c0,2.22256 -1.80869,4.03125 -4.03125,4.03125zM63.15625,49.71606v0.00269zM150.5,69.875c2.96431,0 5.375,-2.39456 5.375,-5.34544v-1.29806c0,-1.72269 -0.84119,-3.34862 -2.30319,-4.39138l-60.03069,-40.40925c-4.58219,-3.08256 -10.49737,-3.08256 -15.07956,0l-60.08981,40.44956c-1.40825,1.00244 -2.24675,2.62838 -2.24675,4.35106v1.29806c0,2.95088 2.41069,5.34544 5.375,5.34544h8.0625v59.13037c-4.44513,0 -8.0625,3.61738 -8.0625,8.0625v3.182c-3.12019,1.11531 -5.375,4.06888 -5.375,7.568v8.05713h139.75v-8.05712c0,-3.49913 -2.25481,-6.45269 -5.375,-7.568v-3.182c0,-4.44513 -3.61738,-8.0625 -8.0625,-8.0625v-59.13038zM150.5,147.81788v2.68212h-129v-2.68212c0,-1.4835 1.204,-2.69288 2.6875,-2.69288h123.625c1.4835,0 2.6875,1.20937 2.6875,2.69288zM145.125,137.06788v2.68212h-118.25v-2.68212c0,-1.4835 1.204,-2.69288 2.6875,-2.69288h26.875h16.125h26.875h16.125h26.875c1.4835,0 2.6875,1.20937 2.6875,2.69288zM51.0625,80.625v37.625h-16.125v-37.625zM34.9375,75.25v-5.375h16.125v5.375zM51.0625,123.625v5.375h-16.125v-5.375zM56.4375,129v-59.125h5.375h10.75h5.375h16.125h5.375h5.375h10.75v59.125h-10.75h-5.375h-5.375h-16.125h-5.375h-10.75zM137.0625,80.625v37.625h-16.125v-37.625zM120.9375,75.25v-5.375h16.125v5.375zM137.0625,123.625v5.375h-16.125v-5.375zM115.5625,64.5h-16.125h-26.875v0.0215l-16.125,0.00269v-0.02419h-26.875h-8.0625l-0.06719,-1.21475l60.03069,-40.40387c1.376,-0.92987 2.95625,-1.38944 4.5365,-1.38944c1.58025,0 3.1605,0.46494 4.5365,1.39481l59.9635,40.33938l0.00806,1.27388c0,0 -0.00269,0 -0.00806,0h-8.0625z" fill="url(#color-5_77055_gr5)"></path></g></g></svg>
+            </div>
+        </div>
+        <div class="col-5">
+            <div class="row">
+                <div class="col-auto p-r-10">
+                    <div class="font-heading all-caps fs-11">{{item.type === 2 ? item.reference : item.company_business_type === 1 ? 'Company\'s Bank Account' : 'Personal Bank Account'}}</div>
+                </div>
+                <div class="col-auto p-l-0">
+                    <div class="bg-success-light fs-7 all-caps text-white b-rad-sm lh-18 p-l-10 p-r-10" v-if="item.company_business_type !== 1 && item.default">default</div>
+                    <!--<div class="fs-7 all-caps text-white b-rad-sm lh-18 p-l-10 p-r-10" :class="[{'bg-danger-light': item.status !== 2}, {'bg-success-light': item.status === 2}]" v-if="item.company_business_type === 1">{{item.status === 2 ? 'Active':'Inactive'}}</div>-->
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <div class="font-heading all-caps fs-10 muted">{{item.bank_name}}</div>
+                </div>
+            </div>
+        </div>
+        <div class="col">
+            <div class="font-heading fs-10">{{item.holder_name}}</div>
+            <div class="font-heading fs-11 text-complete m-b-5">{{item.account_no.replace(/[^\dA-Z]/g, '').replace(/(.{4})/g, '$1 ').trim()}}</div>
+        </div>
+        <div class="col-auto">
+            <div class="row align-items-center">
+                <div class="col-auto no-padding m-r-5">
+                    <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="deleteBank">
+                        <i class="fa fa-times"></i>
+                    </button>
+                </div>
+                <div class="col no-padding">
+                    <div class="btn btn-xs btn-outline-success b-rad-none pointer requestModal" data-type="defaultBank" v-if="item.company_business_type !== 1 && !item.default">Set As Default</div>
+                    <div class="bg-master-lighter p-t-10 p-b-10 p-r-15 p-l-15 muted hint-text fs-10" v-if="item.company_business_type !== 1 && item.default">Set As Default</div>
+                </div>
+            </div>
+            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteBank">
+                <delete-bank-account-form-component :data="item" :section="section" class="text-center"></delete-bank-account-form-component>
+            </modal-component>
+            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="defaultBank">
+                <set-bank-account-default-form-component :data="item" :section="section" class="text-center"></set-bank-account-default-form-component>
+            </modal-component>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        props: {
+            section: {
+                default: 'banksSection'
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue b/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
new file mode 100644
index 00000000..eadb8ef9
--- /dev/null
+++ b/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
@@ -0,0 +1,132 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20" v-if="type !== 2">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">Add Bank Account</h6>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-10" v-if="type === 2">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.reference">
+                                <label class="muted">Reference</label>
+                                <input type="text" class="form-control" v-model="parameters.reference">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.holder_name">
+                                <label class="muted">Account Holder Name</label>
+                                <input type="text" class="form-control" v-model="parameters.holder_name">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.account_no">
+                                <label class="muted">Account No.</label>
+                                <input type="text" class="form-control" v-model="parameters.account_no">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-20" v-if="type !== 2">
+                        <div class="col">
+                            <validation-wrapper-component selecatable :validator="$v.parameters.bank_name">
+                                <label class="muted">Bank Name</label>
+                                <selectable-component endpoint="storage/malaysian_banks.json" section="banksListSection" valueColumn="name" :labelColumn="['name']" v-model="parameters.bank_name"></selectable-component>
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10" v-if="type === 2">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.bank_name">
+                                <label class="muted">Bank Name</label>
+                                <input type="text" class="form-control" v-model="parameters.bank_name">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" :data-dismiss="type !== 2 ? 'modal':''" @click="$emit('close')">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">Add Account</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import FormHandler from '../../../general/mixins/formHandler';
+    import { required, requiredIf } from "vuelidate/lib/validators";
+    export default {
+        props : {
+            company_id: {
+                type: Number,
+                default: 1
+            },
+            type: {
+                type: Number,
+                default: 1
+            },
+            country_id: {
+                type: Number,
+                default: 1
+            }
+        },
+        data(){
+            return {
+                parameters: {
+                    company_id: this.company_id,
+                    account_type: this.type,
+                    reference: '',
+                    bank_name: '',
+                    holder_name: '',
+                    account_no: '',
+                    country_id: this.country_id,
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                holder_name: {
+                    required
+                },
+                account_no: {
+                    required
+                },
+                bank_name: {
+                    required
+                },
+                reference: {
+                    required: requiredIf(function () { return this.parameters.type === 2 })
+                }
+            }
+        },
+        methods: {
+            submitForm(){
+                this.submit(route('api.bank.create'), 'post', this.section, true, false);
+            },
+            successHandler(response){
+                this.type !== 2 ? this.closeModal() : this.$emit('createdBank', response.payload.data);
+                this.formHandler();
+            },
+            errorHandler(error){
+                this.formHandler(error.message);
+            }
+        },
+        mixins: [FormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/banks/forms/DeleteBankAccountFormComponent.vue b/resources/assets/vue/components/banks/forms/DeleteBankAccountFormComponent.vue
new file mode 100644
index 00000000..3414c75f
--- /dev/null
+++ b/resources/assets/vue/components/banks/forms/DeleteBankAccountFormComponent.vue
@@ -0,0 +1,33 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to delete this bank account?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.bank.delete', item.id), 'delete', section, true, true)">Delete</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/banks/forms/SetBankAccountDefaultFormComponent.vue b/resources/assets/vue/components/banks/forms/SetBankAccountDefaultFormComponent.vue
new file mode 100644
index 00000000..0455a0a6
--- /dev/null
+++ b/resources/assets/vue/components/banks/forms/SetBankAccountDefaultFormComponent.vue
@@ -0,0 +1,33 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to set this bank account as the default?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.bank.default', item.id), 'put', section, true, true)">Set Default</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/elements/BookingComponent.vue b/resources/assets/vue/components/bookings/elements/BookingComponent.vue
new file mode 100644
index 00000000..4e27e8a0
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/BookingComponent.vue
@@ -0,0 +1,75 @@
+<template>
+    <div class="row align-items-center m-b-15 parentContainer">
+        <div class="col-auto p-r-0">
+            <div class="padding-5 bg-master-lightest">
+                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                     width="30" height="30"
+                     viewBox="0 0 172 172"
+                     style=" fill:#000000;"><defs><linearGradient x1="86" y1="104.14063" x2="86" y2="140.57775" gradientUnits="userSpaceOnUse" id="color-1_44825_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="16.125" x2="86" y2="159.93044" gradientUnits="userSpaceOnUse" id="color-2_44825_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M121.41588,139.75h-70.83175c-2.53431,0 -3.66575,-3.18469 -1.6985,-4.78106l33.72544,-27.40175c1.97531,-1.60444 4.80256,-1.60444 6.77787,0l33.72544,27.40175c1.96725,1.59638 0.83581,4.78106 -1.6985,4.78106z" fill="url(#color-1_44825_gr1)"></path><path d="M148.135,71.77238l-8.385,-8.385v-28.42031c0,-4.46125 -3.63081,-8.09206 -8.09206,-8.09206h-2.65794v-2.65794c0,-4.46125 -3.63081,-8.09206 -8.09206,-8.09206h-69.81587c-4.46125,0 -8.09206,3.63081 -8.09206,8.09206v2.65794h-2.65794c-4.46125,0 -8.09206,3.63081 -8.09206,8.09206v28.42031l-8.385,8.385c-1.5265,1.52381 -2.365,3.55019 -2.365,5.70825v64.95688c0,7.40944 6.02806,13.4375 13.4375,13.4375h102.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-64.95688c0,-2.15806 -0.84119,-4.18444 -2.365,-5.70825zM77.60156,91.96356l-0.30906,0.24725c-1.28731,-1.79525 -2.0425,-3.92375 -2.0425,-6.21081c0,-5.92862 4.82138,-10.75 10.75,-10.75c5.92863,0 10.75,4.82138 10.75,10.75c0,2.26287 -0.70413,4.41019 -2.01294,6.235l-0.34131,-0.27412c-4.93962,-3.95063 -11.84919,-3.95063 -16.79419,0.00269zM86,69.875c-8.89294,0 -16.125,7.23206 -16.125,16.125c0,3.53406 1.14487,6.85581 3.18738,9.59438l-10.578,8.46025l-3.35937,-2.6875v-55.88388c6.95256,-1.06963 12.16094,-6.28069 13.23325,-13.23325h27.2835c1.06963,6.95256 6.28069,12.16094 13.23325,13.23325v55.88656l-3.35937,2.6875l-10.56994,-8.45488c2.07744,-2.79231 3.17931,-6.10869 3.17931,-9.60244c0,-8.89294 -7.23206,-16.125 -16.125,-16.125zM58.179,107.5l-31.304,25.04481v-50.08694zM145.125,82.45519v50.08963l-31.30669,-25.04481zM144.33488,75.5725c0.11825,0.11825 0.18006,0.27412 0.27412,0.4085l-4.859,3.88612v-8.8795zM131.65794,32.25c1.49962,0 2.71706,1.21744 2.71706,2.71706v49.20275l-5.375,4.3v-56.21981zM51.09206,21.5h69.81856c1.49694,0 2.71438,1.21744 2.71438,2.71706v68.55275l-5.375,4.3v-56.75731h-2.6875c-6.22694,0 -10.75,-4.52306 -10.75,-10.75v-2.6875h-37.625v2.6875c0,6.22694 -4.52306,10.75 -10.75,10.75h-2.6875v56.75731l-5.375,-4.3v-68.55275c0,-1.49962 1.21744,-2.71706 2.71706,-2.71706zM40.34206,32.25h2.65794v56.21981l-5.375,-4.3v-49.20275c0,-1.49963 1.21744,-2.71706 2.71706,-2.71706zM32.25,70.98763v8.88219l-4.859,-3.88881c0.09406,-0.13438 0.15587,-0.29025 0.27412,-0.4085zM137.0625,150.5h-102.125c-4.44513,0 -8.0625,-3.61738 -8.0625,-8.0625v-3.00463l54.08325,-43.27144c2.96969,-2.37306 7.11381,-2.37306 10.08081,0l54.08594,43.26875v3.00731c0,4.44513 -3.61737,8.0625 -8.0625,8.0625z" fill="url(#color-2_44825_gr2)"></path></g></g></svg>
+            </div>
+        </div>
+        <div class="col-auto">
+            <div class="row">
+                <div class="col-auto p-r-10 all-caps">
+                    <div class="font-heading all-caps fs-11 bold">{{this.item.marking}}</div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <div class="font-heading all-caps fs-10 muted">{{this.item.created_at}}</div>
+                </div>
+            </div>
+        </div>
+        <div class="col" v-if="$store.getters.isAdmin">
+            <div class="font-heading fs-10 muted all-caps">Marking</div>
+            <div class="font-heading fs-12">
+                {{this.item.company.reference}}
+            </div>
+        </div>
+        <div class="col-auto">
+            <div class="font-heading fs-10 muted all-caps">Currency</div>
+            <div class="font-heading fs-12 bold">
+                <span class="flag-icon fs-12" :class="'flag-icon-'+item.convertible_currency.country.short_code.toLowerCase()"></span> {{this.item.convertible_currency.short_code}}
+            </div>
+        </div>
+        <div class="col-auto">
+            <div class="font-heading fs-10 muted all-caps">Transfer Type</div>
+            <div class="font-heading fs-11">{{this.item.service.name}}</div>
+        </div>
+        <div class="col">
+            <div class="font-heading fs-10 muted all-caps">Payable Amount</div>
+            <div class="font-heading fs-11 text-success bold">{{this.item.amount}} {{this.item.fixed_currency.short_code}}</div>
+        </div>
+        <div class="col-auto" v-if="!$store.getters.isAdmin">
+            <div class="font-heading fs-10 muted all-caps">Payment</div>
+            <div class="font-heading fs-8 all-caps text-white btn-rounded bg-danger p-l-10 p-r-10 lh-15 mt-1">
+                pending...
+            </div>
+        </div>
+        <div class="col-auto" :class="[{'invisible': !item.service.configurations.billable}]" v-if="!$store.getters.isAdmin">
+            <div class="font-heading fs-10 muted all-caps">Billing</div>
+            <div class="font-heading fs-8 all-caps text-danger btn-rounded bg-master-lightest p-l-10 p-r-10 lh-15 mt-1">
+                Pending...
+            </div>
+        </div>
+        <div class="col-2 p-r-5">
+            <div class="row align-items-center">
+                <div class="col-auto ml-auto">
+                    <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal hide" data-type="deleteBank">
+                        <i class="fa fa-times fa-fw"></i>
+                    </button>
+                    <a class="btn btn-xs btn-info b-rad-none" :href="route('booking.details', item.marking)">
+                        <i class="fa fa-angle-right fa-fw"></i>
+                    </a>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue b/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
new file mode 100644
index 00000000..04eac563
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
@@ -0,0 +1,268 @@
+<template>
+    <div class="row zig-zag-top">
+        <div class="col bg-white padding-25">
+            <div class="row p-b-20 b-b b-dashed m-b-20 b-grey">
+                <div class="col">
+                    <div class="row m-b-5">
+                        <div class="col">
+                            <div class="font-heading all-caps bold fs-10">Transfer Summary</div>
+                        </div>
+                    </div>
+                    <div class="row align-items-end">
+                        <div class="col-2">
+                            <div class="row">
+                                <div class="col">
+                                    <div class="font-heading fs-10">{{this.data.serviceType.name}}</div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="font-heading fs-8 all-caps">Service Type</div>
+                                </div>
+                            </div>
+
+                        </div>
+                        <div class="col-2">
+                            <div class="row">
+                                <div class="col">
+                                    <div class="font-heading fs-12 bold text-primary">{{this.data.serviceType.selectedCurrency.short_code}}</div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="font-heading fs-8 all-caps">Currency</div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col">
+                            <div class="row">
+                                <div class="col">
+                                    <div class="font-heading fs-12 bold text-primary">{{(Math.round((parseFloat(this.data.amount.replace(",", "")) + Number.EPSILON) * 100) / 100).toFixed(2)}} {{this.parameters.type === 0 ? 'MYR': this.data.serviceType.selectedCurrency.short_code}}</div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="font-heading fs-8 all-caps">Transfer Total</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row p-b-20 b-b b-dashed b-grey m-b-20">
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="font-heading all-caps bold fs-10">Recipient Details</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="row m-b-10" v-if="data.recipientBanks.length > 0 && !createBank">
+                                <div class="col">
+                                    <div class="row m-l-0 m-r-0 m-b-5">
+                                        <div class="col-auto p-l-0">
+                                            <div class="row align-items-center justify-content-center">
+                                                <div class="col-auto">
+                                                    <div class="fs-10 all-caps">Recipient Bank Account</div>
+                                                </div>
+                                                <div class="col-auto text-right lh-10 p-r-0 p-l-0 hide">
+                                                    <i class="fa fa-info-circle fs-10 lh-15 hint-text"></i>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-8">
+                                            <div class="row">
+                                                <div class="col p-r-0">
+                                                    <div class="btn btn-xs btn-default bg-transparent text-master btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="parameters.bankAccount.status = !parameters.bankAccount.status">
+                                                        <div class="row">
+                                                            <div class="col p-t-10 p-b-5 ">
+                                                                <div class="row">
+                                                                    <div class="col">
+                                                                        <div class="font-heading bold lh-15">{{parameters.bankAccount.reference ? parameters.bankAccount.reference + ' - ':''}}{{parameters.bankAccount.holder_name}}</div>
+                                                                    </div>
+                                                                </div>
+                                                                <div class="row">
+                                                                    <div class="col">
+                                                                        <div class="font-heading all-caps fs-10 muted"><b class="m-r-5 text-primary">{{parameters.bankAccount.account_no}}</b> {{parameters.bankAccount.bank_name}}</div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="col-auto b-l b-grey ">
+                                                                <div class="row h-100 align-items-center">
+                                                                    <div class="col">
+                                                                        <i class="fa text-primary" :class="[{'fa-angle-down': !parameters.bankAccount.status}, {'fa-angle-up': parameters.bankAccount.status}]"></i>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="relative w-100">
+                                                        <div class="absolute w-100 b-l b-b b-r b-grey" :class="[{'hide': !parameters.bankAccount.status}]" style="top: 100%; right: 0; z-index: 1;">
+                                                            <div class="row text-left no-margin bg-white">
+                                                                <div class="col no-padding">
+                                                                    <div class="row no-margin"  v-for="bank in data.recipientBanks" v-bind:key="bank.id" >
+                                                                        <div class="col b-b b-grey p-t-10 p-b-10 pointer  p-t-10 p-b-10" :class="[{'bg-master-lightest': parameters.bankAccount.id === bank.id}, {'text-master': parameters.bankAccount.id === bank.id}, {'hover-primary': parameters.bankAccount.id !== bank.id}, {'pointer': parameters.bankAccount.id !== bank.id}]" @click="updateBank(bank)">
+                                                                            <div class="row align-items-center justify-content-center">
+                                                                                <div class="col">
+                                                                                    <div class="row">
+                                                                                        <div class="col">
+                                                                                            <div class="font-heading bold lh-15 fs-10">{{bank.reference ? bank.reference + ' - ':''}}{{bank.holder_name}}</div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                    <div class="row">
+                                                                                        <div class="col">
+                                                                                            <div class="font-heading all-caps fs-10 muted"><b class="m-r-5 text-primary">{{bank.account_no}}</b> {{bank.bank_name}}</div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row parentContainer">
+                        <div class="col">
+                            <div class="row" v-show="!createBank">
+                                <div class="col">
+                                    <button class="btn btn-xs btn-outline-primary b-rad-none" @click="createBank = !createBank">
+                                        <i class="fa fa-plus m-r-5"></i>
+                                        Add New Recipient
+                                    </button>
+                                </div>
+                            </div>
+                            <div class="row" v-show="createBank">
+                                <div class="col">
+                                    <bank-account-form-component section="customerProfileSection" :company_id="data.company.id" :country_id="2" :type="2" v-on:createdBank="updateBank($event)" v-on:close="createBank = !createBank"></bank-account-form-component>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row m-b-20">
+                <div class="col">
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <div class="font-heading all-caps bold fs-10">Transfer Amount and Charges</div>
+                            <div class="font-heading fs-8 muted all-caps">** These are the rate as of <span class="text-danger">{{this.parameters.calculation.date}}</span>, all charges and rates are subject to change when making payment</div>
+                        </div>
+                    </div>
+                    <div class="row align-items-end no-margin">
+                        <div class="col">
+                            <div class="row align-items-end bg-master-lightest p-t-10 p-b-10">
+                                <div class="col">
+                                    <div class="font-heading fs-10 all-caps">Amount you are Transferring</div>
+                                </div>
+                                <div class="col-1 no-padding text-center">
+                                    <div class="font-heading fs-10 bold">{{this.parameters.type === 0 ? 'MYR': parameters.serviceType.selectedCurrency.short_code}}</div>
+                                </div>
+                                <div class="col-3 text-right">
+                                    <div class="font-heading fs-10 bold">{{(Math.round((parseFloat(this.parameters.amount.replace(",", ""))+ Number.EPSILON) * 100) / 100).toFixed(2)}}</div>
+                                </div>
+                            </div>
+                            <div class="row align-items-end  p-t-10 p-b-10">
+                                <div class="col">
+                                    <div class="font-heading fs-10 all-caps text-primary">Exchange Rate</div>
+                                </div>
+                                <div class="col-1 no-padding text-center">
+                                    <div class="font-heading fs-10"></div>
+                                </div>
+                                <div class="col-3 text-right">
+                                    <div class="font-heading fs-10 text-primary bold">{{(Math.round((this.parameters.calculation.rate + Number.EPSILON) * 100000) / 100000).toFixed(5)}}</div>
+                                </div>
+                            </div>
+                            <div class="row align-items-end bg-master-lightest p-t-10 p-b-10">
+                                <div class="col">
+                                    <div class="font-heading fs-10 all-caps">Money Transfer Fee</div>
+                                </div>
+                                <div class="col-1 no-padding text-center">
+                                    <div class="font-heading fs-10">MYR</div>
+                                </div>
+                                <div class="col-3 text-right">
+                                    <div class="font-heading fs-10">{{(Math.round((this.parameters.calculation.service_charge + Number.EPSILON) * 100) / 100).toFixed(2)}}</div>
+                                </div>
+                            </div>
+                            <div class="row align-items-end p-t-10 p-b-10">
+                                <div class="col text-right">
+                                    <div class="font-heading fs-10 all-caps">Sub-Total</div>
+                                </div>
+                                <div class="col-1 no-padding text-center">
+                                    <div class="font-heading fs-10">MYR</div>
+                                </div>
+                                <div class="col-3 text-right">
+                                    <div class="font-heading fs-10">{{(Math.round((this.parameters.calculation.sub_total + Number.EPSILON) * 100) / 100).toFixed(2)}}</div>
+                                </div>
+                            </div>
+                            <div class="row align-items-end bg-master-lightest p-t-10 p-b-10">
+                                <div class="col text-right">
+                                    <div class="font-heading fs-10 all-caps">Tax</div>
+                                </div>
+                                <div class="col-1 no-padding text-center">
+                                    <div class="font-heading fs-10">{{Math.round((this.parameters.calculation.tax + Number.EPSILON) * 100) / 100}}%</div>
+                                </div>
+                                <div class="col-3 text-right">
+                                    <div class="font-heading fs-10">{{(Math.round((this.parameters.calculation.tax_total + Number.EPSILON) * 100) / 100).toFixed(2)}}</div>
+                                </div>
+                            </div>
+                            <div class="row align-items-end p-t-10 p-b-10">
+                                <div class="col text-right">
+                                    <div class="font-heading all-caps bold">Amount you are Paying</div>
+                                </div>
+                                <div class="col-1 no-padding text-center">
+                                    <div class="font-heading bold">MYR</div>
+                                </div>
+                                <div class="col-3 text-right">
+                                    <div class="font-heading text-success bold">{{(Math.round((this.parameters.calculation.total + Number.EPSILON) * 100) / 100).toFixed(2)}}</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <confirm-booking-component :section="section" :data="data" v-if="parameters.bankAccount"></confirm-booking-component>
+        </div>
+    </div>
+</template>
+
+<script>
+    import FormHandler from '../../../general/mixins/formHandler';
+    import ConfirmBookingComponent from "../forms/confirmBookingComponent";
+    export default {
+        components: {ConfirmBookingComponent},
+        data(){
+          return {
+              createBank: false,
+              recipientBanks: []
+          }
+        },
+        created(){
+            this.createBank = !this.data.recipientBanks.length;
+            this.recipientBanks = this.data.recipientBanks;
+            if(this.parameters.bankAccount){
+                this.parameters.bankAccount.status = false
+            }
+        },
+        methods: {
+            updateBank(bank){
+                this.parameters.bankAccount = bank;
+                this.parameters.bankAccount.status = false;
+                this.recipientBanks.push(bank);
+                this.createBank = false;
+            },
+        },
+        mixins: [FormHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue
new file mode 100644
index 00000000..462a89d9
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue
@@ -0,0 +1,66 @@
+<template>
+    <div class="row m-b-10 parentContainer">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row align-items-center pointer" >
+                        <div class="col p-t-5 p-b-5">
+                            <div class="row">
+                                <div class="col-auto">
+                                    <div class="font-heading fs-10 muted all-caps">Reference</div>
+                                    <div class="font-heading fs-10">
+                                        {{item.booking.marking}}
+                                    </div>
+                                </div>
+                                <div class="col-auto">
+                                    <div class="font-heading fs-10 muted all-caps">Date</div>
+                                    <div class="font-heading fs-10">
+                                        {{item.updated_at}}
+                                    </div>
+                                </div>
+                                <div class="col-auto">
+                                    <div class="font-heading fs-10 muted all-caps">Marking</div>
+                                    <div class="font-heading fs-10">
+                                        {{item.booking.company.reference}}
+                                    </div>
+                                </div>
+                                <div class="col-auto">
+                                    <div class="font-heading fs-10 muted all-caps">Currency</div>
+                                    <div class="font-heading fs-10">
+                                        <span class="flag-icon" :class="'flag-icon-'+item.original_currency.country.short_code.toLowerCase()"></span> {{item.original_currency.short_code}}
+                                    </div>
+                                </div>
+                                <div class="col">
+                                    <div class="font-heading fs-10 muted all-caps">Amount</div>
+                                    <div class="font-heading fs-12 text-success bold">
+                                        {{(Math.round((item.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                    </div>
+                                </div>
+                                <div class="col-auto p-l-5 p-r-5 bg-success requestModal pointer" data-type="paymentProofModal">
+                                    <div class="row align-items-center h-100">
+                                        <div class="col">
+                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                 width="30" height="30"
+                                                 viewBox="0 0 172 172"
+                                                 style=" fill:#000000;"><defs><linearGradient x1="86" y1="70.76994" x2="86" y2="116.46013" gradientUnits="userSpaceOnUse" id="color-1_52139_gr1"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient><linearGradient x1="61.8125" y1="34.48869" x2="61.8125" y2="144.97181" gradientUnits="userSpaceOnUse" id="color-2_52139_gr2"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient><linearGradient x1="130.34375" y1="34.48869" x2="130.34375" y2="144.97181" gradientUnits="userSpaceOnUse" id="color-3_52139_gr3"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient><linearGradient x1="86" y1="32.25" x2="86" y2="148.71013" gradientUnits="userSpaceOnUse" id="color-4_52139_gr4"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M102.45825,99.43213h-5.70825c-1.4835,0 -2.6875,1.16637 -2.6875,2.65256v8.10013c0,1.48081 -1.19862,2.68481 -2.67944,2.68481h-10.76612c-1.48081,0 -2.67944,-1.204 -2.67944,-2.68481v-8.10013c0,-1.48619 -1.204,-2.65256 -2.6875,-2.65256h-5.70825c-1.93769,0 -3.04225,-2.39188 -1.88125,-4.05275l14.577,-20.855c1.8275,-2.61494 5.69481,-2.61763 7.52231,-0.00538l14.577,20.86306c1.16369,1.66088 0.05644,4.05006 -1.87856,4.05006z" fill="url(#color-1_52139_gr1)"></path><path d="M51.0625,67.1875h5.375c0,-8.0625 7.23206,-16.12231 16.125,-16.12231v-5.375c-11.85456,0 -21.5,10.74731 -21.5,21.49731z" fill="url(#color-2_52139_gr2)"></path><path d="M139.75,80.625c0,-10.75 -8.44144,-18.80981 -18.8125,-18.80981v5.375c7.40944,0 13.4375,5.37231 13.4375,13.43481z" fill="url(#color-3_52139_gr3)"></path><path d="M148.09738,92.27263c1.59369,-3.68188 2.40263,-7.59219 2.40263,-11.64494c0,-16.29969 -13.26281,-29.5625 -29.5625,-29.5625c-6.5145,0 -12.68769,2.08819 -17.78588,5.96088c-4.30269,-13.03438 -16.52006,-22.08587 -30.58912,-22.08587c-17.78319,0 -32.25,14.46681 -32.25,32.25c0,4.14681 0.16662,8.05981 1.42437,10.74731h-1.42437c-13.33806,0 -24.1875,10.84944 -24.1875,24.1875c0,11.56431 8.16194,21.24737 19.0275,23.62044c1.02394,6.39894 6.53869,11.31706 13.2225,11.31706h56.4375h16.125h5.375c6.54944,0 12.00238,-4.71388 13.18488,-10.92469c9.2235,-1.20131 16.37762,-9.08913 16.37762,-18.63513c0,-6.09256 -2.924,-11.72019 -7.77762,-15.23006zM126.3125,131.6875h-5.375h-16.125h-56.4375c-3.49912,0 -6.45538,-2.6875 -7.568,-5.375h93.0735c-1.11263,2.6875 -4.06888,5.375 -7.568,5.375zM137.0625,120.9375h-96.75c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125c0,-10.37106 8.44144,-18.8125 18.8125,-18.8125h9.51375l-1.68506,-3.78131c-2.23063,-5.01488 -2.45369,-7.48737 -2.45369,-12.341c0,-14.81888 12.05613,-26.875 26.875,-26.875c13.01825,0 24.13106,9.29875 26.42619,22.11275l0.92719,5.17075l3.64962,-3.77325c4.60638,-4.76225 10.77687,-7.38525 17.372,-7.38525c13.33806,0 24.1875,10.84944 24.1875,24.1875c0,3.6765 -0.81431,7.21056 -2.37575,10.41944l-1.763,3.32713l2.37037,1.26044c4.40481,2.34081 7.14338,6.88806 7.14338,11.868c0,7.40944 -6.02806,13.43481 -13.4375,13.43481z" fill="url(#color-4_52139_gr4)"></path></g></g></svg>
+                                        </div>
+                                    </div>
+                                </div>
+                                <modal-component type="paymentProofModal">
+                                    <payment-proof-form-component section="paymentProofSection" :id="item.id" :data="item"></payment-proof-form-component>
+                                </modal-component>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        mixins: [componentHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue
new file mode 100644
index 00000000..8935e61b
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue
@@ -0,0 +1,114 @@
+<template>
+    <div class="row m-b-10 parentContainer">
+        <div class="col">
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+            <div class="row" v-show="!isLoading">
+                <div class="col">
+                    <div class="row align-items-center">
+                        <div class="col p-t-5 p-b-5">
+                            <div class="row">
+                                <div class="col-auto">
+                                    <div class="font-heading fs-10 muted all-caps">Reference</div>
+                                    <div class="font-heading fs-10">
+                                        {{item.bill_no}}
+                                    </div>
+                                </div>
+                                <div class="col">
+                                    <div class="font-heading fs-10 muted all-caps">Amount</div>
+                                    <div class="font-heading fs-12 text-success bold">
+                                        MYR {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                    </div>
+                                </div>
+                                <div class="col-auto text-right">
+                                    <div class="font-heading fs-10 muted all-caps">Date</div>
+                                    <div class="font-heading fs-10">
+                                        {{item.updated_at}}
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row align-items-end">
+                                <div class="col">
+                                    <div class="row no-margin">
+                                        <div v-for="file in item.documents.files" v-bind:key="file.id"  class="col-auto no-padding m-r-5">
+                                            <document-file-viewr-component :file="file"></document-file-viewr-component>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-auto text-right">
+                                    <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="rejectPayment">
+                                        <i class="fa fa-times fa-fw"></i>
+                                    </button>
+                                    <button class="btn btn-xs btn-success b-rad-none requestModal" data-type="approvePayment">
+                                        <i class="fa fa-check fa-fw"></i>
+                                    </button>
+                                    <modal-component small type="rejectPayment">
+                                        <div class="row">
+                                            <div class="col text-center">
+                                                <div class="row">
+                                                    <div class="col text-center">
+                                                        <div class="row m-b-20">
+                                                            <div class="col">
+                                                                <h5 class="all-caps">Reject Document</h5>
+                                                                <div class="fs-11">Are you sure you want to reject this payment?</div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="row">
+                                                            <div class="col p-r-5">
+                                                                <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                                                            </div>
+                                                            <div class="col p-l-5">
+                                                                <div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="approvePayment('reject')">Reject</div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </modal-component>
+                                    <modal-component small type="approvePayment">
+                                        <div class="row">
+                                            <div class="col text-center">
+                                                <div class="row">
+                                                    <div class="col text-center">
+                                                        <div class="row m-b-20">
+                                                            <div class="col">
+                                                                <h5 class="all-caps">Approve Payment</h5>
+                                                                <div class="fs-11">Are you sure you want to approve this payment?</div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="row">
+                                                            <div class="col p-r-5">
+                                                                <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                                                            </div>
+                                                            <div class="col p-l-5">
+                                                                <div data-dismiss="modal" class="btn btn-sm btn-success btn-block b-rad-none" @click="approvePayment('approve')">Approve</div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </modal-component>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import staticFormHandler from '../../../general/mixins/staticFormHandler'
+    export default {
+        methods: {
+            approvePayment(status){
+                this.isLoading = true;
+                this.submit(this.route('api.booking.payment.approval', this.item.booking.id, this.item.id, status), 'put', 'identificationVerificationSection', true, true);
+            },
+        },
+        mixins: [componentHandler, staticFormHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue b/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
new file mode 100644
index 00000000..9d0cc4b7
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
@@ -0,0 +1,57 @@
+<template>
+    <div class="row m-b-10 parentContainer">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row align-items-center pointer" @click="activate()">
+                        <div class="col-auto p-r-0">
+                            <div class="b-grey b-a fs-10 btn-rounded icon-thumbnail icon-25 m-r-0" :class="[{'bg-primary': active}, {'bg-transparent': !active}]">
+                                <i class="fa fa-check text-white fs-12 fa-fw"></i>
+                            </div>
+                        </div>
+                        <div class="col p-t-5 p-b-5">
+                            <div class="row">
+                                <div class="col-auto">
+                                    <div class="font-heading fs-10 muted all-caps">Date</div>
+                                    <div class="font-heading fs-10">
+                                        {{item.updated_at}}
+                                    </div>
+                                </div>
+                                <div class="col-auto">
+                                    <div class="font-heading fs-10 muted all-caps">Currency</div>
+                                    <div class="font-heading fs-10">
+                                        <span class="flag-icon" :class="'flag-icon-'+item.original_currency.country.short_code.toLowerCase()"></span> {{item.original_currency.short_code}}
+                                    </div>
+                                </div>
+                                <div class="col">
+                                    <div class="font-heading fs-10 muted all-caps">Amount</div>
+                                    <div class="font-heading fs-12 text-success bold">
+                                        {{(Math.round((item.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                active: false,
+            }
+        },
+        methods: {
+            activate(){
+                this.active = !this.active;
+                this.$emit('input', this.item)
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue b/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue
new file mode 100644
index 00000000..b05e4c2a
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue
@@ -0,0 +1,195 @@
+<template>
+    <div class="row parentContainer">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-l-0 m-r-0 m-b-20" v-if="!data.services.length">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col">
+                                    <img src="images/3568950.png" class="w-100">
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col text-center">
+                                    <div class="font-heading fs-11 all-caps text-danger bold">Service Is Currently Unavailable!</div>
+                                    <div class="font-heading fs-10 muted">We apologise for any inconvenience. In the mean time feel free to manage your existing transfers as usual, We will be back soon.</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row no-margin">
+                        <div class="col bg-white p-t-15 p-b-10 p-l-25 p-r-25">
+                            <div class="absolute w-100 h-100 bg-white hint-text" style="top: 0; left: 0; z-index: 1;" v-if="!data.services.length"></div>
+                            <img src="images/order_form.png" class="w-100" v-if="!data.services.length">
+                            <div class="row" v-if="data.services.length">
+                                <div class="col">
+                                    <div class="row p-t-5 p-b-20">
+                                        <div class="col">
+                                            <div class="row m-b-20" v-if="data.services.length > 1">
+                                                <div class="col">
+                                                    <div class="row m-l-0 m-r-0 m-b-5">
+                                                        <div class="col-auto p-l-0">
+                                                            <div class="row align-items-center justify-content-center">
+                                                                <div class="col-auto">
+                                                                    <div class="fs-10 all-caps">Service Type</div>
+                                                                </div>
+                                                                <div class="col-auto text-right lh-10 p-r-0 p-l-0 hide">
+                                                                    <i class="fa fa-info-circle fs-10 lh-15 hint-text"></i>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col-8">
+                                                            <div class="row">
+                                                                <div class="col p-r-0">
+                                                                    <div class="btn btn-xs btn-success btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="serviceType.status = !serviceType.status">
+                                                                        <div class="row">
+                                                                            <div class="col p-t-5 p-b-5">
+                                                                                {{serviceType.name}}
+                                                                            </div>
+                                                                            <div class="col-auto bg-success-dark ">
+                                                                                <div class="row h-100 align-items-center">
+                                                                                    <div class="col">
+                                                                                        <i class="fa text-white" :class="[{'fa-angle-down': !serviceType.status}, {'fa-angle-up': serviceType.status}]"></i>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="relative w-100">
+                                                                        <div class="absolute w-100 b-l b-b b-r b-success" :class="[{'hide': !serviceType.status}]" style="top: 100%; right: 0; z-index: 1;">
+                                                                            <div class="row text-left no-margin bg-white">
+                                                                                <div class="col no-padding">
+                                                                                    <div class="row no-margin"  v-for="service in data.services" v-bind:key="service.id" >
+                                                                                        <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10" :class="[{'bg-success-light': serviceType.id === service.id}, {'text-white': serviceType.id === service.id}, {'hover-success': serviceType.id !== service.id}, {'pointer': serviceType.id !== service.id}]" @click="updateServiceType(service)">
+                                                                                            <div class="row align-items-center justify-content-center">
+                                                                                                <div class="col">
+                                                                                                    <div class="font-heading fs-10">{{service.name}}</div>
+                                                                                                </div>
+                                                                                            </div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row m-l-0 m-r-0 m-b-5">
+                                                        <div class="col-auto p-l-0">
+                                                            <div class="row align-items-center justify-content-center">
+                                                                <div class="col-auto">
+                                                                    <div class="fs-10 all-caps">Payment Type</div>
+                                                                </div>
+                                                                <div class="col-auto text-right lh-10 p-r-0 p-l-0 hide">
+                                                                    <i class="fa fa-info-circle fs-10 lh-15 hint-text"></i>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row m-b-10">
+                                                        <div class="col">
+                                                            <div class="btn btn-xs  b-rad-none p-l-25 p-r-25 m-r-5 p-t-5 p-b-5" :class="[{'btn-success': paymentType === 0}, {'btn-default': paymentType !== 0}, {'bg-master-lighter': paymentType !== 0}]" @click="paymentType = 0">Deposit</div>
+                                                            <div class="btn btn-xs b-rad-none p-l-25 p-r-25 p-t-5 p-b-5" :class="[{'btn-success': paymentType === 1}, {'btn-default': paymentType !== 1}, {'bg-master-lighter': paymentType !== 1}]" @click="paymentType = 1">Full Payment</div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row" v-if="paymentType === 0">
+                                                        <div class="col">
+                                                            <div class="fs-10">** If you like to create <span class="text-danger">a single invoice</span> for your purchase order, please key in the <span class="text-danger">full amount of your purchase order</span> in the form below. You will still be able to make <span class="text-success">partial payment</span> for the transfer request with your deposit amount when making payment.</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row p-t-5">
+                                        <div class="col">
+                                            <currency-converter-component :data="serviceType" :section="section" :id="data.id" v-on:newCalculation="updateCalculation($event)"></currency-converter-component>
+                                        </div>
+                                    </div>
+                                    <div class="row p-b-15" v-if="(summary.calculation.total > 0 && (data.status === 1 || data.status === 2)) || ($store.getters.isAdmin && summary.calculation.total > 0)">
+                                        <div class="col">
+                                            <div class="btn btn-sm btn-block btn-success b-rad-none shadow-sm pointer requestModal" data-type="transferSummary" >Transfer Now</div>
+                                        </div>
+                                    </div>
+                                    <modal-component v-if="summary.calculation.total > 0" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="transferSummary" size="large">
+                                        <booking-confirmation-component :data="summary" :section="section"></booking-confirmation-component>
+                                    </modal-component>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import formHandler from "../../../general/mixins/formHandler";
+    export default {
+        data(){
+            return {
+                paymentType: 0,
+                serviceType: {
+                    status: false,
+                    name: '',
+                    id: '',
+                    currencies: [],
+                    selectedCurrency: {}
+                },
+                summary: {
+                    calculation: {},
+                    amount: 0,
+                    type: 0,
+                    bankAccount: {},
+                    recipientBanks: [],
+                    company: {}
+                },
+                parameters: {}
+            }
+        },
+        created(){
+            this.serviceType = {
+                id: this.data.services[0].id,
+                name: this.data.services[0].name,
+                currencies: this.data.services[0].currencies,
+                selectedCurrency: this.data.services[0].currencies[0],
+                status: false
+            };
+
+            this.summary.bankAccount = this.data.recipient_banks.default ? this.data.recipient_banks.default : this.data.recipient_banks.accounts[0];
+            this.summary.recipientBanks = this.data.recipient_banks.accounts;
+
+        },
+        methods: {
+            updateServiceType(service){
+                this.serviceType.id = service.id;
+                this.serviceType.name = service.name;
+                this.serviceType.currencies = service.currencies;
+                this.serviceType.selectedCurrency = service.currencies[0];
+                this.serviceType.status = false;
+            },
+            updateCalculation(conversion){
+                this.summary = {
+                    calculation: conversion.calculation,
+                    amount: conversion.amount,
+                    serviceType: conversion.serviceType,
+                    type: conversion.type,
+                    bankAccount: this.summary.bankAccount,
+                    recipientBanks: this.data.recipient_banks.accounts,
+                    company: this.data,
+                }
+
+            }
+        },
+        mixins: [formHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
new file mode 100644
index 00000000..a58244b8
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -0,0 +1,336 @@
+<template>
+    <div class="row no-margin">
+        <div class="col">
+            <div class="row m-b-10 align-items-center">
+                <div class="col-auto bg-white p-t-10 p-b-5 p-l-20 p-r-20 text-center">
+                    <div class="row">
+                        <div class="col">
+                            <span class="flag-icon fs-20" :class="'flag-icon-'+data.conversion_currency.country.short_code.toLowerCase()"></span>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-10 bold">{{this.data.conversion_currency.short_code}}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto no-padding" style="margin-left: -8px;margin-right: -8px;z-index: 1;">
+                    <i class="fa fa-exchange text-master-lighter fs-20"></i>
+                </div>
+                <div class="col-auto bg-white p-t-10 p-b-5 p-l-20 p-r-20 text-center">
+                    <div class="row">
+                        <div class="col">
+                            <span class="flag-icon fs-20" :class="'flag-icon-'+data.convertible_currency.country.short_code.toLowerCase()"></span>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-10 bold">{{this.data.convertible_currency.short_code}}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col bg-white padding-15">
+                    <div class="row" v-if="!expandPayment">
+                        <div class="col">
+                            <div class="row align-items-end m-b-10 text-complete">
+                                <div class="col">
+                                    <div class="font-heading all-caps fs-10">Transfer Total:</div>
+                                </div>
+                                <div class="col-auto text-right">
+                                    <div class="font-heading fs-12">{{this.data.fixed_currency.short_code}} {{(Math.round((this.data.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                </div>
+                            </div>
+                            <div class="row align-items-end m-b-10 text-success">
+                                <div class="col">
+                                    <div class="font-heading all-caps fs-10">Paid Total:</div>
+                                </div>
+                                <div class="col-auto text-right">
+                                    <div class="font-heading fs-12">{{this.data.fixed_currency.short_code}} {{(Math.round((this.data.paid_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                </div>
+                            </div>
+                            <div class="row align-items-end m-b-10  ">
+                                <div class="col">
+                                    <div class="font-heading all-caps fs-10">Floating Amount:</div>
+                                </div>
+                                <div class="col-auto text-right">
+                                    <div class="font-heading fs-12">{{this.data.fixed_currency.short_code}} {{(Math.round((this.data.floating_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                </div>
+                            </div>
+                            <div class="row align-items-end bold text-danger">
+                                <div class="col">
+                                    <div class="font-heading all-caps fs-10">OutStanding Total:</div>
+                                </div>
+                                <div class="col-auto text-right">
+                                    <div class="font-heading fs-12">{{this.data.fixed_currency.short_code}} {{(Math.round((this.data.outstanding_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                </div>
+                            </div>
+                            <div class="row m-t-20" v-if="data.company.employee.status === 2 && data.company.status === 2 && data.outstanding_amount > 0">
+                                <div class="col">
+                                    <button class="btn btn-xs all-caps b-rad-none btn-success btn-block" @click="makePayment()">Make Payment</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row" v-if="expandPayment && !calculation">
+                        <div class="col">
+                            <div class="row m-b-20">
+                                <div class="col">
+                                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                                        <div class="col">
+                                            <small class="bold fs-10 text-danger">{{error}}</small>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-8">
+                                            <div class="btn btn-xs btn-complete no-border btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="paymentMethod.status = !paymentMethod.status">
+                                                <div class="row">
+                                                    <div class="col p-t-10 p-b-10">
+                                                        {{paymentMethod.name}}
+                                                    </div>
+                                                    <div class="col-auto bg-complete-light">
+                                                        <div class="row h-100 align-items-center">
+                                                            <div class="col">
+                                                                <i class="fa" :class="[{'fa-angle-down': !paymentMethod.status}, {'fa-angle-up': paymentMethod.status}]"></i>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="relative w-100">
+                                                <div class="absolute w-100 b-l b-b b-r b-complete" :class="[{'hide': !paymentMethod.status}]" style="top: 100%; right: 0; z-index: 1;">
+                                                    <div class="row text-left no-margin bg-white">
+                                                        <div class="col no-padding">
+                                                            <div class="row no-margin" :class="[{'bg-complete-light': paymentMethod.name === 'Cash Deposit'}, {'text-white': paymentMethod.name === 'Cash Deposit'}, {'hover-complete': paymentMethod.name !== 'Cash Deposit'}]"  @click="updatePaymentType({name: 'Cash Deposit', id: 'cash'})">
+                                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                                    <div class="row align-items-center justify-content-center">
+                                                                        <div class="col">
+                                                                            <div class="font-heading fs-10">Cash Deposit</div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row no-margin" :class="[{'bg-complete-light': paymentMethod.name === 'Bank Transfer'}, {'text-white': paymentMethod.name === 'Bank Transfer'}, {'hover-complete': paymentMethod.name !== 'Bank Transfer'}]" @click="updatePaymentType({name: 'Bank Transfer', id: 'cash'})">
+                                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                                    <div class="row align-items-center justify-content-center">
+                                                                        <div class="col">
+                                                                            <div class="font-heading fs-10">Bank Transfer</div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row no-margin" :class="[{'bg-complete-light': paymentMethod.name === 'Cheque'}, {'text-white': paymentMethod.name === 'Cheque'}, {'hover-complete': paymentMethod.name !== 'Cheque'}]" @click="updatePaymentType({name: 'Cheque', id: 'cheque'})">
+                                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                                    <div class="row align-items-center justify-content-center">
+                                                                        <div class="col">
+                                                                            <div class="font-heading fs-10">Cheque</div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row no-margin" :class="[{'bg-complete-light': paymentMethod.name === 'Banker\'s Acceptance'}, {'text-white': paymentMethod.name === 'Banker\'s Acceptance'}, {'hover-complete': paymentMethod.name !== 'Banker\'s Acceptance'}]" @click="updatePaymentType({name: 'Banker\'s Acceptance', id: 'ba'})">
+                                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                                    <div class="row align-items-center justify-content-center">
+                                                                        <div class="col">
+                                                                            <div class="font-heading fs-10">Banker's Acceptance</div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row m-r-0">
+                                        <div class="col p-r-0">
+                                            <validation-wrapper-component :validator="$v.amount">
+                                                <label class="muted">Amount</label>
+                                                <input class="form-control" name="amount" v-model.lazy="amount" v-money="{decimal: '.',thousands: ',', precision: 2}">
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <div class="col-auto b-r b-t b-b b-grey">
+                                            <div class="row h-100 align-items-center">
+                                                <div class="col">
+                                                    <div class="font-heading fs-10 muted">{{this.data.fixed_currency.short_code}}</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-4 p-r-0">
+                                    <button class="btn btn-xs all-caps b-rad-none btn-default bg-master-lighter btn-block" @click="expandPayment = false">Cancel</button>
+                                </div>
+                                <div class="col p-l-0">
+                                    <button class="btn btn-xs all-caps b-rad-none btn-success btn-block" @click="submitForm()">Get Quotation</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row" v-if="calculation">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row align-items-end m-b-20 text-danger" v-if="(this.data.amount - parseFloat(amount.replace(',', '')))">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10">Outstanding</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-10">{{this.data.fixed_currency.short_code}} {{(Math.round(((this.data.amount - parseFloat(amount.replace(',', '')))+ Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-10 text-success bold">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10">Recipient Gets</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-10">{{this.data.convertible_currency.short_code}} {{(Math.round((calculation.foreign_total + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end bold m-b-10 text-primary">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10">Rate</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-10 ">{{(Math.round((calculation.rate + Number.EPSILON) * 100000) / 100000).toFixed(5) }}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-10 hint-text">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10">You are sending</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-10">MYR {{(Math.round((calculation.local_total + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-10 hint-text">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10">Transfer Charges</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-10">MYR {{(Math.round((calculation.service_charge + Number.EPSILON) * 100) / 100).toFixed(2)}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-20 ">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10">Sub Total</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-10">MYR {{(Math.round((calculation.sub_total + Number.EPSILON) * 100) / 100).toFixed(2)}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-5 hint-text">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10">Tax {{(Math.round((calculation.tax + Number.EPSILON) * 10) / 10).toFixed(1)}}%</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-10">MYR {{(Math.round((calculation.tax_total + Number.EPSILON) * 100) / 100).toFixed(2)}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-10 bold text-success">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10">You are paying</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-12">MYR {{(Math.round((calculation.total + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row parentContainer">
+                                <div class="col-4 p-r-0">
+                                    <button class="btn btn-xs all-caps b-rad-none btn-default bg-master-lighter btn-block" @click="cancelQuotation()">Cancel</button>
+                                </div>
+                                <div class="col p-l-0">
+                                    <button class="btn btn-xs all-caps b-rad-none btn-success btn-block requestModal" data-type="paymentSummary" >Lock Quotation</button>
+                                </div>
+                                <modal-component v-if="calculation.total > 0" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="paymentSummary">
+                                    <confirm-quotation-form-component v-on:cancelQuotation="cancelQuotation()" :calculation="calculation" :section="section" :id="item.id" :payment_method="paymentMethod.id" :amount="amount"></confirm-quotation-form-component>
+                                </modal-component>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from "../../../general/mixins/componentHandler";
+    import { required, requiredIf, minValue, maxValue} from "vuelidate/lib/validators";
+    import {VMoney} from 'v-money'
+    export default {
+        props : {
+            section: {
+                type: String,
+                required: true
+            }
+        },
+        data(){
+            return {
+                error: '',
+                expandPayment: false,
+                paymentMethod: {
+                    name: 'Cash Deposit',
+                    id: 'cash',
+                    status: false
+                },
+                amount: (Math.round((this.data.outstanding_amount + Number.EPSILON) * 100) / 100).toFixed(2),
+                calculation: null
+            }
+        },
+        validations () {
+            return {
+                amount: {
+                    required,
+                }
+            }
+        },
+        methods: {
+            updatePaymentType(payment){
+
+                this.paymentMethod = {
+                    name: payment.name,
+                    id: payment.id,
+                    status: false,
+                }
+
+            },
+            submitForm(){
+                this.parameters = {
+                    payment_method: this.paymentMethod.id,
+                    amount: this.amount
+                };
+
+                this.submit(route('api.booking.payment.quotation', this.item.id), 'post', this.section, false, false)
+                this.calculation = null;
+            },
+            successHandler(response){
+                this.calculation = response.payload.data;
+            },
+            errorHandler(error) {
+                this.error = error.message;
+            },
+            makePayment(){
+                this.amount = (Math.round((this.data.outstanding_amount + Number.EPSILON) * 100) / 100).toFixed(2);
+                this.expandPayment = true;
+
+            },
+            cancelQuotation(){
+                this.calculation = null;
+                this.expandPayment = false;
+            }
+        },
+        mixins: [componentHandler],
+        directives: {money: VMoney}
+    }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue b/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue
new file mode 100644
index 00000000..33c85c61
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue
@@ -0,0 +1,112 @@
+<template>
+    <div class="row zig-zag-top">
+        <div class="col bg-white padding-25">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-12 bold">Congratulation, you have got great rates.</div>
+                        </div>
+                    </div>
+                    <div class="row m-b-25">
+                        <div class="col">
+                            <div class="font-heading fs-11">You can proceed by bank in <span class="text-success bold">{{(Math.round((calculation.total + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}} MYR</span> to the bank account detailed below and upload your payment proof to proceed with your transfer after clicking on the confirm button below.</div>
+                        </div>
+                    </div>
+                    <div class="row align-items-center m-b-25">
+                        <div class="col-auto p-r-0">
+                            <div class="icon-thumbnail icon-50 bg-master-lightest">
+                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                     width="35" height="35"
+                                     viewBox="0 0 172 172"
+                                     style=" fill:#000000; margin-top: -2px; margin-bottom: 2px;"><defs><linearGradient x1="86" y1="35.8405" x2="86" y2="60.92294" gradientUnits="userSpaceOnUse" id="color-1_77151_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="129" y1="126.46031" x2="129" y2="137.97356" gradientUnits="userSpaceOnUse" id="color-2_77151_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="149.15625" y1="18.58944" x2="149.15625" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-3_77151_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="111.53125" y1="18.58944" x2="111.53125" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-4_77151_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="107.5" y1="18.58944" x2="107.5" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-5_77151_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="129" y1="18.58944" x2="129" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-6_77151_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="18.58944" x2="86" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-7_77151_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M86,37.63037c-5.93706,0 -10.75,4.81294 -10.75,10.75c0,5.93706 4.81294,10.75 10.75,10.75c5.93706,0 10.75,-4.81294 10.75,-10.75c0,-5.93706 -4.81294,-10.75 -10.75,-10.75z" fill="url(#color-1_77151_gr1)"></path><path d="M88.6875,126.3125h80.625v10.75h-80.625z" fill="url(#color-2_77151_gr2)"></path><path d="M139.75,150.5h18.8125v5.375h-18.8125z" fill="url(#color-3_77151_gr3)"></path><path d="M99.4375,142.4375h24.1875v5.375h-24.1875z" fill="url(#color-4_77151_gr4)"></path><path d="M99.4375,153.1875h16.125v5.375h-16.125z" fill="url(#color-5_77151_gr5)"></path><path d="M161.25,112.875h-64.5c-5.92863,0 -10.75,4.82137 -10.75,10.75v37.625c0,5.92863 4.82137,10.75 10.75,10.75h64.5c5.92863,0 10.75,-4.82137 10.75,-10.75v-37.625c0,-5.92863 -4.82137,-10.75 -10.75,-10.75zM166.625,161.25c0,2.96431 -2.41069,5.375 -5.375,5.375h-64.5c-2.96431,0 -5.375,-2.41069 -5.375,-5.375v-37.625c0,-2.96431 2.41069,-5.375 5.375,-5.375h64.5c2.96431,0 5.375,2.41069 5.375,5.375z" fill="url(#color-6_77151_gr6)"></path><path d="M153.50463,61.47388c-59.30238,-39.96313 -60.65419,-40.83119 -60.84231,-40.94137c-3.74369,-2.2145 -9.59169,-2.20913 -13.31925,-0.00538c-0.16663,0.09675 -0.67187,0.39506 -60.85306,40.94675c-1.48081,0.99975 -2.365,2.666 -2.365,4.45587v1.25775c0,2.96431 2.41069,5.375 5.375,5.375h2.6875c0,0.7095 0,1.58831 0,2.6875c0,3.49912 2.25481,6.45538 5.375,7.568v43.49987c-4.44513,0 -8.0625,3.61738 -8.0625,8.0625v3.182c-3.12019,1.11531 -5.375,4.06888 -5.375,7.568v8.05713h72.5625v-5.375h-67.1875v-2.68212c0,-1.4835 1.204,-2.69288 2.6875,-2.69288h64.5v-5.375h-61.8125v-2.68212c0,-1.4835 1.204,-2.69288 2.6875,-2.69288h59.125v-5.375h-8.0625v-43h10.75v32.25h5.375v-32.7445c3.12019,-1.11263 5.375,-4.06888 5.375,-7.568c0,-1.09919 0,-1.978 0,-2.6875h13.4375c0,0.7095 0,1.58831 0,2.6875c0,3.49912 2.25481,6.45538 5.375,7.568v32.7445h5.375v-32.25h10.75v32.25h5.375v-32.7445c3.12019,-1.11263 5.375,-4.06888 5.375,-7.568c0,-1.09919 0,-1.978 0,-2.6875h2.6875c2.96431,0 5.375,-2.41069 5.375,-5.375v-1.25775c0,-1.78987 -0.88419,-3.45612 -2.37037,-4.45587zM45.6875,126.3125h-10.75v-43h10.75zM48.375,77.9375h-16.125c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875c0,-0.62619 0,-1.677 0,-2.6875h21.5c0,1.0105 0,2.06131 0,2.6875c0,1.4835 -1.204,2.6875 -2.6875,2.6875zM75.25,126.3125h-24.1875v-43.4945c3.12019,-1.11263 5.375,-4.06888 5.375,-7.568c0,-1.09919 0,-1.978 0,-2.6875h13.4375c0,0.7095 0,1.58831 0,2.6875c0,3.49912 2.25481,6.45538 5.375,7.568zM96.75,75.25c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-16.125c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875c0,-0.62619 0,-1.677 0,-2.6875h21.5c0,1.0105 0,2.06131 0,2.6875zM142.4375,75.25c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-16.125c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875c0,-0.62619 0,-1.677 0,-2.6875h21.5c0,1.0105 0,2.06131 0,2.6875zM150.5,67.1875h-129l-0.00269,-1.25775c37.10363,-25.00181 59.76731,-40.25337 60.57894,-40.77475c1.05619,-0.6235 2.44831,-0.9675 3.92375,-0.9675c1.462,0 2.84337,0.33862 3.89419,0.95137c1.16369,0.7525 23.76825,15.96912 60.60581,40.79356z" fill="url(#color-7_77151_gr7)"></path></g></g></svg>
+                            </div>
+                        </div>
+                        <div class="col-auto p-l-0">
+                            <div class="row">
+                                <div class="col">
+                                    <div class="font-heading all-caps fs-10 text-primary bold">{{ calculation.bank.holder_name}}</div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="font-heading all-caps fs-10 bold">{{ calculation.bank.bank_name}}: <span class="text-complete">{{ calculation.bank.account_no}}</span></div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="font-heading all-caps fs-10 bold">Bank In Amount: <span class="text-success">{{(Math.round((calculation.total + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}} MYR</span></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <div class="font-heading text-danger fs-10 m-b-5">Please upload your payment proof before the quotation expires within 12 hours 30 minutes.</div>
+                        </div>
+                    </div>
+                    <div class="row m-b-5">
+                        <div class="col">
+                            <button class="btn btn-sm all-caps b-rad-none btn-default bg-master-lighter" data-dismiss="modal">Cancel</button>
+                        </div>
+                        <div class="col-auto">
+                            <button class="btn btn-sm all-caps b-rad-none btn-success" @click="submitForm()">Confirm Quotation</button>
+                        </div>
+                    </div>
+                    <div class="row text-right">
+                        <div class="col">
+                            <div class="font-heading fs-8">Your timer will start after clicking the confirm button.</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            calculation: {
+                type: Object,
+                required: true
+            },
+            amount: {
+                required: true
+            },
+            payment_method: {
+                required: true
+            },
+            id: {
+                type: Number,
+                required: true
+            },
+            section: {
+                type: String,
+                required: true
+            }
+        },
+        data(){
+            return {
+                parameters: {
+                    payment_method: this.payment_method,
+                    amount: this.amount,
+                }
+            }
+        },
+        methods: {
+            submitForm(){
+                this.submit(route('api.booking.payment.create', this.id), 'post', this.section, false, false);
+            },
+            successHandler(){
+                this.$emit('cancelQuotation');
+                this.updateList();
+                this.closeModal();
+            }
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue b/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue
new file mode 100644
index 00000000..485f73ed
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue
@@ -0,0 +1,285 @@
+<template>
+    <div class="row m-b-20">
+        <div class="col">
+            <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                <div class="col">
+                    <small class="bold fs-10 text-danger">{{error}}</small>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <div class="row m-l-0 m-r-0">
+                        <div class="col no-padding">
+                            <div class="form-group form-group-default m-b-0">
+                                <label>Recipient Gets</label>
+                                <input type="text" placeholder="0.00" value="0" class="form-control" v-model="recipientInput" @keyup="updateAmount($event, 1)" v-money="money">
+                            </div>
+                        </div>
+                        <div class="col-auto bg-primary text-white">
+                            <div class="row h-100 align-items-center">
+                                <div class="col-auto p-r-0">
+                                    <span class="flag-icon fs-14" :class="'flag-icon-'+serviceType.selectedCurrency.country.short_code.toLowerCase()"></span>
+                                </div>
+                                <div class="col p-l-5 p-r-20">
+                                    {{serviceType.selectedCurrency.short_code}}
+                                </div>
+                                <div class="col-auto h-100 pointer"  @click="recipientMenu = !recipientMenu">
+                                    <div class="row align-items-center bg-primary-light h-100">
+                                        <div class="col ">
+                                            <i class="fa fa-angle-down fs-14 m-t-5" :class="[{'fa-angle-down': !recipientMenu}, {'fa-angle-up': recipientMenu}]"></i>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="relative w-100 text-master">
+                                    <div class="absolute w-100 b-l b-b b-r b-success" :class="[{'hide': !recipientMenu}]" style="top: 100%; right: 0; z-index: 1;">
+                                        <div class="row text-left no-margin bg-white">
+                                            <div class="col no-padding">
+                                                <div class="row no-margin"  v-for="currency in serviceType.currencies" v-bind:key="currency.id" >
+                                                    <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10 " :class="[{'bg-primary-light': serviceType.selectedCurrency.id === currency.id}, {'text-white': serviceType.selectedCurrency.id === currency.id}, {'hover-primary': serviceType.selectedCurrency.id !== currency.id}, {'pointer': serviceType.selectedCurrency.id !== currency.id}]" @click="UpdateCurrency(currency)">
+                                                        <div class="row align-items-center justify-content-center">
+                                                            <div class="col">
+                                                                <div class="row align-items-center justify-content-center">
+                                                                    <div class="col-auto p-r-5 p-l-0">
+                                                                        <span class="flag-icon fs-14" :class="'flag-icon-'+currency.country.short_code.toLowerCase()"></span>
+                                                                    </div>
+                                                                    <div class="col-auto p-l-5">
+                                                                        <div class="font-heading fs-12">
+                                                                            {{currency.short_code}}
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <div class="row m-l-0 m-r-0 relative p-b-15 p-t-15">
+                        <div class="absolute bullet-connector hint-text"></div>
+                        <div class="col">
+                            <div class="row align-items-center">
+                                <div class="col-1 p-r-25">
+                                    <div class="bg-master-light btn-rounded hint-text" style="width: 8px; height: 8px;"></div>
+                                </div>
+                                <div class="col-4 p-l-0 fs-12 bold lh-20">MYR {{(Math.round((this.calculation.service_charge + Number.EPSILON) * 100) / 100).toFixed(2)}}</div>
+                                <div class="col-auto all-caps fs-10">Transfer Fee</div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-l-0 m-r-0 relative p-b-15">
+                        <div class="absolute bullet-connector hint-text"></div>
+                        <div class="col">
+                            <div class="row align-items-center">
+                                <div class="col-1 p-r-25">
+                                    <div class="bg-master-light btn-rounded hint-text" style="width: 8px; height: 8px;"></div>
+                                </div>
+                                <div class="col-4 p-l-0 fs-12 bold lh-20">MYR {{(Math.round((this.calculation.total + Number.EPSILON) * 100) / 100).toFixed(2)}}</div>
+                                <div class="col-auto all-caps fs-10">Payable Amount</div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-l-0 m-r-0 relative p-b-15" v-if="calculation.rate > 0">
+                        <div class="absolute bullet-connector hint-text"></div>
+                        <div class="col">
+                            <div class="row align-items-center">
+                                <div class="col-1 p-r-25" >
+                                    <i class="fa fa-exchange bg-white text-complete fs-16 p-t-5 p-b-5" style="margin-left: -4px;"></i>
+                                </div>
+                                <div class="col p-l-0 fs-14 bold lh-20 text-complete">1 MYR = {{(Math.round((this.calculation.rate + Number.EPSILON) * 100000) / 100000).toFixed(5)}} RMB</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row m-b-10 ">
+                <div class="col">
+                    <div class="row m-l-0 m-r-0">
+                        <div class="col no-padding">
+                            <div class="form-group form-group-default m-b-0">
+                                <label>You'r Sending</label>
+                                <input type="text" placeholder="0.00" value="0.00" v-model="senderInput" class="form-control"  @keyup="updateAmount($event, 0)"  v-money="money">
+                            </div>
+                        </div>
+                        <div class="col-auto bg-primary text-white">
+                            <div class="row h-100 align-items-center">
+                                <div class="col-auto p-r-0">
+                                    <span class="flag-icon fs-14 flag-icon-my"></span>
+                                </div>
+                                <div class="col p-l-5 p-r-20">
+                                    MYR
+                                </div>
+                                <div class="col-auto h-100 pointer"  @click="senderMenu = !senderMenu">
+                                    <div class="row align-items-center bg-primary-light h-100">
+                                        <div class="col ">
+                                            <i class="fa fa-angle-down fs-14 m-t-5" :class="[{'fa-angle-down': !senderMenu}, {'fa-angle-up': senderMenu}]"></i>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="relative w-100 text-master">
+                                    <div class="absolute w-100 b-l b-b b-r b-success" :class="[{'hide': !senderMenu}]" style="top: 100%; right: 0; z-index: 1;">
+                                        <div class="row text-left no-margin bg-white">
+                                            <div class="col no-padding">
+                                                <div class="row no-margin" >
+                                                    <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10 bg-primary-light text-white" @click="senderMenu = !senderMenu">
+                                                        <div class="row align-items-center justify-content-center">
+                                                            <div class="col">
+                                                                <div class="row align-items-center justify-content-center">
+                                                                    <div class="col-auto p-r-5 p-l-0">
+                                                                        <span class="flag-icon fs-14 flag-icon-my"></span>
+                                                                    </div>
+                                                                    <div class="col-auto p-l-5">
+                                                                        <div class="font-heading fs-12">
+                                                                            MYR
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row" v-if="calculation.date">
+                <div class="col text-right">
+                    <div class="fs-9">These are the rates as of {{calculation.date}}</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import { debounce } from 'vue-debounce'
+    import formHandler from "../../../general/mixins/formHandler";
+    export default {
+        props: {
+            data: {
+                required: true,
+                type: Object
+            },
+            id: {
+                required: true,
+                type: Number
+            }
+        },
+        data(){
+            return {
+                recipientMenu: false,
+                senderMenu: false,
+                senderInput: 0,
+                recipientInput: 0,
+                serviceType: {},
+                calculation: {
+                    rate: 0,
+                    conversion_amount: 0,
+                    date: '',
+                    service_charge: 0,
+                    sub_total: 0,
+                    tax: 0,
+                    tax_total: 0,
+                    total: 0
+                },
+                parameters: {
+                    type: 1,
+                    amount: '',
+                    service_id: '',
+                    currency_id: '',
+                }
+            }
+        },
+        created(){
+            this.serviceType = this.data;
+        },
+        watch: {
+            data: {
+                handler: function (val) {
+                    this.serviceType = this.data;
+                    if(val.id !== this.parameters.service_id) {
+                        this.parameters.service_id = this.data.id;
+                        this.parameters.currency_id = this.data.selectedCurrency.id;
+                        this.submitForm();
+                    }
+                },
+                deep: true
+            }
+
+        },
+        methods: {
+            UpdateCurrency(currency){
+                this.serviceType.selectedCurrency = currency;
+                this.recipientMenu = false;
+                this.parameters.currency_id = currency.id;
+                this.submitForm();
+            },
+            updateAmount(event, type){
+                if(event.target !== null){
+                    if(parseFloat(event.target.value) > 0 && event.target.value !== this.parameters.amount){
+
+                        this.parameters = {
+                            type: type,
+                            amount: event.target.value,
+                            service_id: this.serviceType.id,
+                            currency_id: this.serviceType.selectedCurrency.id,
+                        };
+
+                        this.fetchCalculations(event.target.value, type)
+
+                        this.calculation = {
+                            rate: 0,
+                            conversion_amount: 0,
+                            date: '',
+                            service_charge: 0,
+                            sub_total: 0,
+                            tax: 0,
+                            tax_total: 0,
+                            total: 0
+                        };
+                    }
+                }
+            },
+            fetchCalculations: debounce(function() {
+                this.submitForm();
+            }, 700),
+            submitForm(){
+                if(parseFloat(this.parameters.amount) > 0){
+                    this.submit(route('api.company.currency.convert', this.id), 'post', 'bookingFormSection', false, false);
+                }
+
+            },
+            successHandler(response){
+                this.$emit('newCalculation', {
+                    calculation: response.payload.data,
+                    amount: this.parameters.amount,
+                    serviceType: this.serviceType,
+                    type: this.parameters.type,
+                });
+                this.error = '';
+                this.calculation = response.payload.data;
+                (this.parameters.type === 1) ? this.senderInput = (Math.round((this.calculation.conversion_amount + Number.EPSILON) * 100) / 100).toFixed(2): this.recipientInput = (Math.round((this.calculation.conversion_amount + Number.EPSILON) * 100) / 100).toFixed(2)
+                this.isloading = false;
+            },
+            errorHandler(error){
+                this.$emit('newCalculation', {});
+                this.error = error.message;
+                this.loading = false;
+            }
+        },
+        mixins: [formHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/bookings/forms/DeletePaymentAttemptFormComponent.vue b/resources/assets/vue/components/bookings/forms/DeletePaymentAttemptFormComponent.vue
new file mode 100644
index 00000000..39180940
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/DeletePaymentAttemptFormComponent.vue
@@ -0,0 +1,33 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to delete payment quotation? you will not be able to recover your quotation after confirming your action.</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.transaction.suspend', item.id), 'delete', section, true, true)">Delete</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/forms/PaymentProofFormComponent.vue b/resources/assets/vue/components/bookings/forms/PaymentProofFormComponent.vue
new file mode 100644
index 00000000..612b8735
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/PaymentProofFormComponent.vue
@@ -0,0 +1,85 @@
+<template>
+    <div class="row" @keyup.enter="submitForm">
+        <div class="col">
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="font-heading fs-16 all-caps bold m-b-15">Payment Proof</div>
+                        </div>
+                    </div>
+                    <error-message-component class="m-b-20" :error="error"></error-message-component>
+                    <div class="row">
+                        <div class="col">
+                            <file-input-component :validator="$v.files" v-model="files">
+                                <template slot="label">
+                                    <div class="font-heading fs-11 text-primary all-caps">Payment Proof</div>
+                                </template>
+                                <template slot="tips">
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row m-b-10">
+                                                <div class="col">
+                                                    <div class="font-heading fs-11 text-warning m-b-10">The payment total shown in the photo should tally with customer booking amount.</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </template>
+                            </file-input-component>
+                        </div>
+                    </div>
+                    <div class="row m-t-20">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col-auto">
+                                    <button type="button" class="btn btn-sm bg-master-lighter p-t-10 p-b-10 p-r-35 p-l-35 btn-default b-rad-none" data-dismiss="modal">Cancel</button>
+                                </div>
+                                <div class="col text-right">
+                                    <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-success b-rad-none" @click="submitForm">Save and continue</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import ModalFromHandler from '../../../general/mixins/modalFormHandler'
+    import { required } from "vuelidate/lib/validators";
+    export default {
+        props: {
+            id: {
+                required: true,
+                type: Number
+            }
+        },
+        data(){
+            return {
+                files: [],
+                parameters: {}
+            }
+        },
+        validations: {
+            files: {
+                required
+            }
+        },
+        methods: {
+            submitForm(){
+
+                this.parameters = {
+                    files: this.files
+                };
+
+                this.submit(this.route('api.transaction.bill.verification', this.id, this.data.id), 'post', this.section, true, false)
+            }
+        },
+        mixins: [ModalFromHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/forms/PaymentVerificationFormComponent.vue b/resources/assets/vue/components/bookings/forms/PaymentVerificationFormComponent.vue
new file mode 100644
index 00000000..dde8d47f
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/PaymentVerificationFormComponent.vue
@@ -0,0 +1,109 @@
+<template>
+    <div class="row" @keyup.enter="submitForm">
+        <div class="col">
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="font-heading fs-16 all-caps bold m-b-15">Payment Verification</div>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="row align-items-top">
+                                <div class="col">
+                                    <div class="font-heading fs-10 muted all-caps">You are Paying</div>
+                                    <div class="font-heading fs-16 bold text-success">
+                                        {{data.currency.short_code}} {{(Math.round((data.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                    </div>
+                                </div>
+                                <div class="col-auto">
+                                    <div class="font-heading fs-10 muted all-caps">Rate</div>
+                                    <div class="font-heading fs-12 bold">
+                                        {{(Math.round((data.currency_rate + Number.EPSILON) * 10000) / 10000).toFixed(5)}}
+                                    </div>
+                                </div>
+                                <div class="col-auto">
+                                    <div class="font-heading fs-10 muted all-caps">Recipient Gets</div>
+                                    <div class="font-heading fs-12 bold">
+                                        {{data.original_currency.short_code}} {{(Math.round((data.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <error-message-component class="m-b-20" :error="error"></error-message-component>
+                    <div class="row">
+                        <div class="col">
+                            <file-input-component :validator="$v.files" v-model="files">
+                                <template slot="label">
+                                    <div class="font-heading fs-11 text-primary all-caps">Payment Proof</div>
+                                </template>
+                                <template slot="tips">
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row m-b-10">
+                                                <div class="col">
+                                                    <div class="font-heading fs-11 text-warning m-b-10">Your payment total shown in the photo should tally with payment attempt total.</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </template>
+                            </file-input-component>
+                        </div>
+                    </div>
+                    <div class="row m-t-20">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col-auto">
+                                    <button type="button" class="btn btn-sm bg-master-lighter p-t-10 p-b-10 p-r-35 p-l-35 btn-default b-rad-none" data-dismiss="modal">Cancel</button>
+                                </div>
+                                <div class="col text-right">
+                                    <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-success b-rad-none" @click="submitForm">Save and continue</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import ModalFromHandler from '../../../general/mixins/modalFormHandler'
+    import { required } from "vuelidate/lib/validators";
+    export default {
+        props: {
+            id: {
+                required: true,
+                type: Number
+            }
+        },
+        data(){
+            return {
+                files: [],
+                parameters: {}
+            }
+        },
+        validations: {
+            files: {
+                required
+            }
+        },
+        methods: {
+            submitForm(){
+
+                this.parameters = {
+                    files: this.files
+                };
+
+                this.submit(this.route('api.booking.payment.verification.create', this.id, this.data.id), 'post', this.section, true, false)
+            }
+        },
+        mixins: [ModalFromHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
new file mode 100644
index 00000000..6d6ca0a8
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
@@ -0,0 +1,230 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row no-margin">
+                <div class="col p-t-25 p-t-25">
+                    <div class="row">
+                        <div class="col p-b-10 b-b b-grey">
+                            <div class="row align-items-center">
+                                <div class="col-auto p-r-0" style="min-width: 40px;">
+                                    <div class="font-heading all-caps fs-10"></div>
+                                </div>
+                                <div class="col p-r-10">
+                                    <div class="font-heading all-caps fs-10 muted">Stock Code</div>
+                                </div>
+                                <div class="col-4 p-r-5 p-l-10">
+                                    <div class="font-heading all-caps fs-10 muted">description</div>
+                                </div>
+                                <div class="col text-center p-r-5 p-l-10">
+                                    <div class="font-heading all-caps fs-10 muted">quantity</div>
+                                </div>
+                                <div class="col text-center p-r-5 p-l-10">
+                                    <div class="font-heading all-caps fs-10 muted">Unit Price</div>
+                                </div>
+                                <div class="col-1 text-center p-r-5 p-l-10">
+                                    <div class="font-heading all-caps fs-10 muted"></div>
+                                </div>
+                                <div class="col-1 text-right p-r-5 p-l-10">
+                                    <div class="font-heading all-caps fs-10 muted">Total</div>
+                                </div>
+                                <div class="col-auto text-center">
+                                    <button class="btn btn-xs btn-outline-success b-rad-none invisible"><i class="fa fa-check"></i></button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <div class="row" v-for="(product, index) in products">
+                                <div class="col p-b-10 p-t-10 b-b b-grey">
+                                    <div class="row  align-items-center">
+                                        <div class="col-auto p-r-0" style="min-width: 40px;">
+                                            <div class="font-heading all-caps fs-10">{{index + 1}}</div>
+                                        </div>
+                                        <div class="col p-r-5">
+                                            <div class="font-heading all-caps fs-10">{{product.stockCode}}</div>
+                                        </div>
+                                        <div class="col-4 p-r-5 p-l-5">
+                                            <div class="font-heading all-caps fs-10">{{product.description}}</div>
+                                        </div>
+                                        <div class="col text-center p-r-5 p-l-5">
+                                            <div class="font-heading all-caps fs-10">{{product.quantity}}</div>
+                                        </div>
+                                        <div class="col text-center p-r-5 p-l-5">
+                                            <div class="font-heading all-caps fs-10">{{product.unit_price}}</div>
+                                        </div>
+                                        <div class="col-1 text-center p-r-5 p-l-5">
+                                            <div class="font-heading all-caps fs-10">{{data.fixed_currency.short_code}}</div>
+                                        </div>
+                                        <div class="col-1 text-right p-r-5 p-l-5">
+                                            <div class="font-heading all-caps fs-10">{{(Math.round((product.total + Number.EPSILON) * 100) / 100).toFixed(2) }}</div>
+                                        </div>
+                                        <div class="col-auto">
+                                            <button class="btn btn-xs btn-outline-danger b-rad-none" v-if="!submitted" @click="removeProduct(index)"><i class="fa fa-times"></i></button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row" v-if="!submitted">
+                                <div class="col p-b-5 p-t-5 b-b b-grey">
+                                    <div class="row align-items-center">
+                                        <div class="col-auto p-r-0" style="min-width: 40px;">
+                                            <div class="font-heading all-caps fs-10">{{products.length + 1}}</div>
+                                        </div>
+                                        <div class="col p-r-5">
+                                            <input type="text" class="form-control fs-10 b-rad-none" placeholder="Stock Code" v-model="product.stockCode" />
+                                        </div>
+                                        <div class="col-4 p-r-5 p-l-5">
+                                            <textarea class="form-control fs-10 b-rad-none" placeholder="Description" rows="1" v-model="product.description"></textarea>
+                                        </div>
+                                        <div class="col text-center p-r-5 p-l-5">
+                                            <input type="text" class="form-control fs-10 b-rad-none text-center" placeholder="Quantity" v-model.lazy="product.quantity" v-mask="'#########'"/>
+                                        </div>
+                                        <div class="col text-center p-r-5 p-l-5">
+                                            <input type="text" class="form-control fs-10 b-rad-none text-center" placeholder="Unit Price" v-model.lazy="product.unit_price" v-money="money" />
+                                        </div>
+                                        <div class="col-1 text-center p-r-5 p-l-5">
+                                            <div class="font-heading all-caps fs-10">{{data.fixed_currency.short_code}}</div>
+                                        </div>
+                                        <div class="col-1 text-right p-r-5 p-l-5">
+                                            <div class="font-heading all-caps fs-10">{{(Math.round((productTotal + Number.EPSILON) * 100) / 100).toFixed(2) }}</div>
+                                        </div>
+                                        <div class="col-auto">
+                                            <button class="btn btn-xs btn-outline-success b-rad-none" @click="addProduct()"><i class="fa fa-check"></i></button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-7">
+                    <div class="row" v-if="poTotal > data.amount">
+                        <div class="col">
+                            <div class="alert alert-warning padding-15" role="alert">
+                                <div class="font-heading fs-12 all-caps bold m-b-15">Can't Complete Your Purchase Order ?</div>
+                                <div class="row m-b-15">
+                                    <div class="col">
+                                        <div class="font-heading fs-10 m-b-10">If your Purchase Order total amount doesn't match your transfer total amount we are unable to confirm your purchase order and generate the invoice for you, this usually happen when you pay for your purchase order with multiple transfer orders.</div>
+                                        <div class="font-heading fs-10">But don't worry you can always merge your transfer orders into one to complete your purchase order successfully and generate your invoice.</div>
+                                    </div>
+                                </div>
+                                <button class="btn btn-xs all-caps b-rad-none btn-warning">Merge Transfer Orders</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-5" v-if="data.company.address">
+                    <div class="row align-items-end p-t-10 p-b-10">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-12 bold">Total:</div>
+                        </div>
+                        <div class="col-auto text-right">
+                            <div class="font-heading muted"><span v-if="!submitted" class="bold m-r-5" :class="[{'text-danger' : poTotal !== data.amount}, {'text-success' : poTotal === data.amount}]">{{(Math.round(( poTotal + Number.EPSILON) * 100) / 100).toFixed(2)}}/</span><span class="text-primary bold m-l-5">{{(Math.round((data.amount + Number.EPSILON) * 100) / 100).toFixed(2)}} {{data.fixed_currency.short_code}}</span></div>
+                        </div>
+                    </div>
+                    <div class="row" v-if="poTotal > 0 && !submitted">
+                        <div class="col">
+                            <div class="row m-b-10">
+                                <div class="col">
+                                    <button class="btn btn-xs all-caps b-rad-none btn-primary btn-block" @click="submitForm()">{{poTotal !== data.amount ? 'Save Purchase Order' : 'Save & Confirm'}}</button>
+                                </div>
+                            </div>
+                            <div class="row" v-if="poTotal !== data.amount">
+                                <div class="col">
+                                    <div class="fs-10">** you purchase order will be saved but wont be approved until your <span class="text-danger bold all-caps">purchase order's total</span> matches your <span class="text-success bold all-caps">transfer order's total</span>.</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row" v-if="submitted && data.status !== 3">
+                <div class="col-7">
+                    <button class="btn btn-xs btn-success b-rad-none" v-if="$store.getters.isAdmin && data.purchase_order.status === 1" @click="submit(route('api.booking.po.approval', data.id), 'post', section, true, true)">Approve Purchase Order</button>
+                </div>
+                <div class="col" v-if="submitted">
+                    <div class="alert alert-success padding-15" role="alert">
+                        <div class="font-heading fs-12 all-caps bold m-b-15">Your Purchase Order {{data.purchase_order.status === 1 ? 'is Being Processed for Verification' : 'has been Approved' }}</div>
+                        <div class="row m-b-15">
+                            <div class="col">
+                                <div class="font-heading fs-10">If you would like to still edit your Purchase Order you can do that by clicking on the edit button below, but your purchase order verification request will be reset.</div>
+                            </div>
+                        </div>
+                        <button class="btn btn-xs all-caps b-rad-none btn-default bg-master-lightest" @click="submitted = false">Edit Purchase Order</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import formHandle from '../../../general/mixins/FormHandler';
+    export default {
+        data(){
+          return {
+              submitted: false,
+              product: {
+                  stockCode: '',
+                  description: '',
+                  quantity: 1,
+                  unit_price: 0,
+              },
+              products: []
+          }
+        },
+        created() {
+            this.products = this.data.purchase_order.details;
+            this.submitted = this.data.purchase_order.status === 1 || this.data.purchase_order.status === 2;
+        },
+        computed: {
+            productTotal(){
+                return this.product.quantity * parseFloat((this.product.unit_price).toString().replace(',', ''));
+            },
+            poTotal(){
+                return this.products.reduce(function(last, product) {
+                    return last + product.total;
+                }, 0);
+            }
+        },
+        methods: {
+            submitForm(){
+
+                this.parameters = {
+                    products: this.products
+                };
+
+                this.submit(route('api.transaction.po.create', this.data.id), 'post', this.section, true, true);
+            },
+            successHandler(){
+                if(this.poTotal === this.data.amount){
+                    this.submitted = true;
+                }
+                this.updateList()
+            },
+            addProduct(){
+              this.products.push({
+                  stockCode: this.product.stockCode,
+                  description: this.product.description,
+                  quantity: this.product.quantity,
+                  unit_price: this.product.unit_price,
+                  total: this.productTotal
+              });
+
+              this.product = {
+                  stockCode: '',
+                  description: '',
+                  quantity: 1,
+                  unit_price: 0,
+              };
+
+            },
+            removeProduct(index){
+                this.products.splice(index, 1);
+            }
+        },
+        mixins: [formHandle]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/forms/SupplierPlaceOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/SupplierPlaceOrderFormComponent.vue
new file mode 100644
index 00000000..de4d5d57
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/SupplierPlaceOrderFormComponent.vue
@@ -0,0 +1,145 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row align-items-end m-b-10">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">Supplier:</div>
+                        </div>
+                        <div class="col-auto">
+                            <div class="font-heading fs-10">{{this.supplier.name}}</div>
+                        </div>
+                    </div>
+                    <div class="row align-items-end m-b-5 text-info">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">Order Total:</div>
+                        </div>
+                        <div class="col-auto text-right">
+                            <div class="font-heading fs-11">{{currency.short_code}} {{(Math.round((this.total + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                        </div>
+                    </div>
+                    <div class="row align-items-end m-b-5 text-info">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">Rate:</div>
+                        </div>
+                        <div class="col-auto text-right">
+                            <div class="font-heading fs-11">{{parameters.rate}}</div>
+                        </div>
+                    </div>
+                    <div class="row align-items-end m-b-10 text-success">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">Payment Total:</div>
+                        </div>
+                        <div class="col-auto text-right">
+                            <div class="font-heading bold">MYR {{(Math.round((paymentTotal  + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <validation-wrapper-component :validator="$v.parameters.rate">
+                        <label class="muted all-caps">Purchase Rate</label>
+                        <input type="text" class="form-control" v-model.lazy="parameters.rate" v-money="exchangeRate">
+                    </validation-wrapper-component>
+                </div>
+            </div>
+            <div class="row" v-if="paymentTotal > 0">
+                <div class="col">
+                    <button class="btn btn-xs btn-success b-rad-none p-t-5 p-b-5 all-caps fs-10 btn-block" @click="submitForm()">Create Order</button>
+                </div>
+            </div>
+            <modal-component size="small" id="">
+                <div class="row">
+                    <div class="col">
+                        <div class="row">
+                            <div class="col">
+                                <div class="row">
+                                    <div class="col">
+                                        <div class="font-heading fs-10">Download Supplier Order Summary</div>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col">
+                                        <button class="btn btn-sm btn-success b-rad-none">Download</button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col"></div>
+                        </div>
+                    </div>
+                </div>
+            </modal-component>
+        </div>
+    </div>
+</template>
+
+<script>
+    import FormHandler from '../../../general/mixins/formHandler';
+    import { required, minValue} from "vuelidate/lib/validators";
+    import ModalComponent from "../../general/elements/ModalComponent";
+    export default {
+        components: {ModalComponent},
+        props: {
+            payments: {
+                type: Array,
+                required: true
+            },
+            currency: {
+                type: Object,
+                required: true
+            },
+            supplier: {
+                type: Object,
+                required: true
+            }
+        },
+        data(){
+            return {
+                parameters: {
+                    rate: 0
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                rate: {
+                    required
+                }
+            }
+        },
+        computed: {
+            total(){
+                return this.payments.reduce(function (total, currentValue) {
+                    return total + currentValue.original_amount;
+                }, 0);
+
+            },
+            paymentTotal(){
+                return (this.total && parseFloat(this.parameters.rate )) ? this.total * (1/this.parameters.rate) : 0;
+            }
+        },
+        methods: {
+            submitForm(){
+
+                this.parameters = {
+                    payments: this.payments,
+                    rate: this.parameters.rate
+                };
+
+                this.submit(route('api.transaction.supplier.create', this.supplier.id), 'post', 'pendingOrdersSection', true, true)
+            },
+            successHandler(){
+                this.updateList();
+                this.parameters = {
+                    payments: [],
+                    rate: 0
+                };
+            }
+        },
+        mixins: [FormHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/forms/confirmBookingComponent.vue b/resources/assets/vue/components/bookings/forms/confirmBookingComponent.vue
new file mode 100644
index 00000000..a581513e
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/confirmBookingComponent.vue
@@ -0,0 +1,36 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <button class="btn btn-lg btn-default bg-master-lightest b-rad-none all-caps fs-12" data-dismiss="modal">Cancel</button>
+        </div>
+        <div class="col-auto">
+            <button class="btn btn-lg btn-success b-rad-none all-caps fs-12" @click="submitForm()">Confirm & Proceed</button>
+        </div>
+    </div>
+</template>
+
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        data(){
+            return {
+                parameters: {}
+            }
+        },
+        methods: {
+            submitForm(){
+                this.parameters = {
+                    company_id: this.data.company.id,
+                    type: this.data.type,
+                    fix_amount: this.data.amount,
+                    service_id: this.data.serviceType.id,
+                    transferable_bank_id: this.data.bankAccount.id,
+                    convertible_currency_id: this.data.serviceType.selectedCurrency.id,
+                };
+
+                this.submit(route('api.booking.create'), 'post', this.section, true, true)
+            }
+        },
+        mixins: [ModalFormHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
new file mode 100644
index 00000000..67de1163
--- /dev/null
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -0,0 +1,315 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+            <div class="row" v-show="!isLoading" v-if="booking">
+                <div class="col-7">
+                    <div class="row">
+                        <div class="col bg-white padding-25">
+                            <div class="absolute" style="top: -5px;right: -5px;width: 0px;height: 0px;border-style: solid;border-width: 0px 110px 110px 0px;border-color: transparent rgb(249, 249, 249) transparent transparent;z-index: 2;">
+                                <div @mouseover="bearShowing = true" style="width: 52px;height: 30px;margin-top: 75px;margin-left: 22px;"></div>
+                            </div>
+                            <div class="absolute shadow-sm " style="top: 0px; right: 0px; width: 0px; height: 0px; border-style: solid; border-width: 100px 0px 0px 100px; border-color: transparent transparent transparent rgb(255, 255, 255); z-index: 1;"></div>
+                            <!--<bear-component class="animate__animated animate__slow animate__fadeInDown" v-on:mouseover.native="bearShowing = true" v-on:mouseleave.native="bearShowing = false" v-if="bearShowing"></bear-component>-->
+                            <div class="row align-items-center m-b-25">
+                                <div class="col-auto p-r-0">
+                                    <div class="icon-thumbnail icon-35 bg-transparent">
+                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                             width="35" height="35"
+                                             viewBox="0 0 172 172"
+                                             style=" fill:#000000;"><defs><linearGradient x1="69.875" y1="39.05475" x2="69.875" y2="54.29019" gradientUnits="userSpaceOnUse" id="color-1_L06xtIstZ632_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="69.875" y1="17.09788" x2="69.875" y2="144.1575" gradientUnits="userSpaceOnUse" id="color-2_L06xtIstZ632_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="69.875" y1="17.09788" x2="69.875" y2="144.1575" gradientUnits="userSpaceOnUse" id="color-3_L06xtIstZ632_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="69.875" y1="17.09788" x2="69.875" y2="144.1575" gradientUnits="userSpaceOnUse" id="color-4_L06xtIstZ632_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="48.375" y1="17.09788" x2="48.375" y2="144.1575" gradientUnits="userSpaceOnUse" id="color-5_L06xtIstZ632_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="59.125" y1="17.09788" x2="59.125" y2="144.1575" gradientUnits="userSpaceOnUse" id="color-6_L06xtIstZ632_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="69.875" y1="17.09788" x2="69.875" y2="144.1575" gradientUnits="userSpaceOnUse" id="color-7_L06xtIstZ632_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="17.09788" x2="86" y2="144.1575" gradientUnits="userSpaceOnUse" id="color-8_L06xtIstZ632_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="130.34375" y1="17.09788" x2="130.34375" y2="144.1575" gradientUnits="userSpaceOnUse" id="color-9_L06xtIstZ632_gr9"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M48.23794,53.75h43.27681c1.40556,0 2.54775,-1.14219 2.54775,-2.55044v-5.65181c0,-1.40556 -1.14219,-2.54775 -2.55044,-2.54775h-43.27412c-1.40825,0 -2.55044,1.14219 -2.55044,2.55044v5.65181c0,1.40556 1.14219,2.54775 2.55044,2.54775z" fill="url(#color-1_L06xtIstZ632_gr1)"></path><rect x="17" y="23" transform="scale(2.6875,2.6875)" width="18" height="2" fill="url(#color-2_L06xtIstZ632_gr2)"></rect><rect x="17" y="28" transform="scale(2.6875,2.6875)" width="18" height="2" fill="url(#color-3_L06xtIstZ632_gr3)"></rect><rect x="17" y="33" transform="scale(2.6875,2.6875)" width="18" height="2" fill="url(#color-4_L06xtIstZ632_gr4)"></rect><rect x="17" y="39" transform="scale(2.6875,2.6875)" width="2" height="3" fill="url(#color-5_L06xtIstZ632_gr5)"></rect><rect x="21" y="39" transform="scale(2.6875,2.6875)" width="2" height="3" fill="url(#color-6_L06xtIstZ632_gr6)"></rect><rect x="25" y="39" transform="scale(2.6875,2.6875)" width="2" height="3" fill="url(#color-7_L06xtIstZ632_gr7)"></rect><path d="M155.875,86c0,-12.01044 -7.92006,-22.20413 -18.8125,-25.63606v-35.7545c0,-2.18494 -1.30075,-4.14144 -3.31369,-4.97456c-1.99681,-0.83044 -4.28387,-0.38431 -5.82381,1.15025l-4.02587,4.0205l-6.78325,-4.95306c-1.892,-1.38675 -4.43706,-1.38944 -6.32906,-0.00269l-7.04125,5.15194l-7.052,-5.14925c-1.88931,-1.38675 -4.43438,-1.38944 -6.32906,-0.00269l-7.04125,5.15194l-7.05469,-5.14925c-1.88931,-1.38675 -4.43437,-1.38944 -6.32906,-0.00269l-7.04125,5.15194l-7.052,-5.14925c-1.88931,-1.38675 -4.43437,-1.38944 -6.32906,-0.00269l-6.77519,4.95306l-4.042,-4.01781c-1.54263,-1.53456 -3.82969,-1.98606 -5.82381,-1.15025c-2.01294,0.83312 -3.31369,2.78962 -3.31369,4.97456v101.70575h-13.4375v13.4375c0,7.40944 6.03075,13.4375 13.4375,13.4375h94.05981c7.40944,-0.00269 13.44019,-6.03075 13.44019,-13.44019v-28.11394c10.89244,-3.43194 18.8125,-13.62562 18.8125,-25.63606zM29.5625,147.8125c-4.44513,0 -8.0625,-3.61738 -8.0625,-8.0625v-8.0625h88.6875v8.0625c0,3.02344 1.00244,5.375 2.69019,8.0625zM131.6875,139.75c0,4.44512 -3.61738,8.0625 -8.0625,8.0625c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-13.4375h-80.625v-24.1875h-0.00269l-0.02419,-77.53169l4.03663,4.01781c1.88125,1.8705 4.79988,2.09356 6.94987,0.53213l6.7725,-4.95575l7.05469,5.15194c1.89737,1.38406 4.43438,1.37869 6.32637,0l7.04125,-5.15194l7.05738,5.15194c1.89469,1.38137 4.429,1.38137 6.32369,0l7.04394,-5.15194l7.05469,5.15194c1.89737,1.38406 4.43437,1.37869 6.32637,0l7.04125,-5.15194l6.78862,4.95575c2.14194,1.56413 5.06594,1.34106 6.94719,-0.53213l4.01244,-4.00169v34.65263c-0.88419,-0.08869 -1.77912,-0.13706 -2.6875,-0.13706c-14.81888,0 -26.875,12.05613 -26.875,26.875c0,14.81887 12.05612,26.875 26.875,26.875c0.90838,0 1.80331,-0.04838 2.6875,-0.13706zM129,107.5c-11.85456,0 -21.5,-9.64544 -21.5,-21.5c0,-11.85456 9.64544,-21.5 21.5,-21.5c11.85456,0 21.5,9.64544 21.5,21.5c0,11.85456 -9.64544,21.5 -21.5,21.5z" fill="url(#color-8_L06xtIstZ632_gr8)"></path><path d="M140.53744,75.25l-14.22763,14.79469l-6.15975,-6.407l-3.80013,3.95331l6.15975,6.407c1.04812,1.09113 2.42413,1.634 3.80281,1.634c1.37869,0 2.75469,-0.54287 3.80281,-1.634l14.22225,-14.79469z" fill="url(#color-9_L06xtIstZ632_gr9)"></path></g></g></svg>
+                                    </div>
+                                </div>
+                                <div class="col-auto p-l-0">
+                                    <div class="font-heading all-caps fs-12 bold hint-text">Billing Details</div>
+                                </div>
+                                <div class="col">
+                                    <button class="btn btn-xs all-caps b-rad-none btn-outline-success hide">Generate Preforma Invoice</button>
+                                </div>
+                            </div>
+                            <div class="row" v-if="!booking.company.address">
+                                <div class="col-8">
+                                    <address-form-component :id="booking.company.id"></address-form-component>
+                                </div>
+                            </div>
+                            <div class="row b-b b-dashed b-grey p-b-25" v-if="booking.company.address">
+                                <div class="col-10">
+                                    <div class="row m-b-15">
+                                        <div class="col-4">
+                                            <div class="row">
+                                                <div class="col-auto">
+                                                    <div class="font-heading fs-10 muted all-caps">Date</div>
+                                                    <div class="font-heading fs-10">
+                                                        {{booking.created_at}}
+                                                    </div>
+                                                </div>
+                                                <div class="col-auto">
+                                                    <div class="font-heading fs-10 muted all-caps">Reference</div>
+                                                    <div class="font-heading fs-10">
+                                                        {{booking.marking}}
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-auto">
+                                            <div class="font-heading fs-10 muted all-caps">{{booking.company.type === 1 ? 'SSM Registration No.' : 'Identification Card No.'}}</div>
+                                            <div class="font-heading fs-10 text-info">
+                                                {{booking.company.identification.reference}}
+                                            </div>
+                                        </div>
+                                        <div class="col">
+                                            <div class="row align-items-end">
+                                                <div class="col-auto">
+                                                    <div class="font-heading fs-10 muted all-caps">Contact</div>
+                                                    <div class="font-heading fs-10 bold">
+                                                        {{booking.company.contact.phone}}
+                                                    </div>
+                                                </div>
+                                                <div class="col-auto p-l-0 hide">
+                                                    <button class="btn btn-xs btn-default bg-master-lightest no-border b-rad-none"><i class="fa fa-pencil text-complete"></i></button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-4">
+                                            <div class="font-heading fs-10 muted all-caps">Bill To</div>
+                                            <div class="font-heading fs-10">
+                                                {{booking.company.name}}
+                                            </div>
+                                        </div>
+                                        <div class="col">
+                                            <div class="row align-items-end">
+                                                <div class="col-auto">
+                                                    <div class="font-heading fs-10 muted all-caps">Address</div>
+                                                    <div class="font-heading fs-10">
+                                                        {{booking.company.address.street_one}} {{booking.company.address.street_two}}, {{booking.company.address.district.name}}, {{booking.company.address.post_code}} {{booking.company.address.state.name}}, {{booking.company.address.country.name}}
+                                                    </div>
+                                                </div>
+                                                <div class="col-auto p-l-0 hide">
+                                                    <button class="btn btn-xs btn-default bg-master-lightest no-border b-rad-none"><i class="fa fa-pencil text-complete"></i></button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <purchase-order-form-component :data="booking" :section="section"></purchase-order-form-component>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-3">
+                    <booking-payment-quotation-component :data="booking" :section="section"></booking-payment-quotation-component>
+                    <div class="row m-t-20" v-if="booking.payment_attempts.length">
+                        <div class="col">
+                            <div class="row m-b-10">
+                                <div class="col">
+                                    <div class="font-head fs-10 all-caps">Payment Attempts</div>
+                                </div>
+                            </div>
+                            <div class="row ">
+                                <div class="col">
+                                    <div class="row m-l-0 m-b-10 m-r-0 parentContainer" v-for="item in booking.payment_attempts" v-bind:key="item.id" >
+                                        <div class="col-auto bg-master-lighter requestModal pointer" data-type="deleteAttempt">
+                                            <div class="row align-items-center h-100">
+                                                <div class="col">
+                                                    <i class="fa fa-times muted"></i>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col bg-white p-t-10 p-b-10 p-r-0">
+                                            <div class="row m-b-5">
+                                                <div class="col-auto">
+                                                    <div class="font-heading fs-8 muted all-caps">Booked</div>
+                                                    <div class="font-heading fs-10 bold">
+                                                        {{item.original_currency.short_code}} {{(Math.round((item.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                                    </div>
+                                                </div>
+                                                <div class="col-auto p-l-0">
+                                                    <div class="font-heading fs-8 muted all-caps">Rate</div>
+                                                    <div class="font-heading fs-10 bold">
+                                                        {{(Math.round((item.currency_rate + Number.EPSILON) * 10000) / 10000).toFixed(5)}}
+                                                    </div>
+                                                </div>
+                                                <div class="col-auto p-l-0">
+                                                    <div class="font-heading fs-8 muted all-caps">Payable</div>
+                                                    <div class="font-heading fs-10 bold">
+                                                        {{item.currency.short_code}} {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="font-heading fs-10 text-danger">Expires On: {{item.expires_on}}</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-auto p-l-5 p-r-5 bg-success requestModal pointer" data-type="identificationVerificationModal">
+                                            <div class="row align-items-center h-100">
+                                                <div class="col">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                         width="30" height="30"
+                                                         viewBox="0 0 172 172"
+                                                         style=" fill:#000000;"><defs><linearGradient x1="86" y1="70.76994" x2="86" y2="116.46013" gradientUnits="userSpaceOnUse" id="color-1_52139_gr1"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient><linearGradient x1="61.8125" y1="34.48869" x2="61.8125" y2="144.97181" gradientUnits="userSpaceOnUse" id="color-2_52139_gr2"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient><linearGradient x1="130.34375" y1="34.48869" x2="130.34375" y2="144.97181" gradientUnits="userSpaceOnUse" id="color-3_52139_gr3"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient><linearGradient x1="86" y1="32.25" x2="86" y2="148.71013" gradientUnits="userSpaceOnUse" id="color-4_52139_gr4"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M102.45825,99.43213h-5.70825c-1.4835,0 -2.6875,1.16637 -2.6875,2.65256v8.10013c0,1.48081 -1.19862,2.68481 -2.67944,2.68481h-10.76612c-1.48081,0 -2.67944,-1.204 -2.67944,-2.68481v-8.10013c0,-1.48619 -1.204,-2.65256 -2.6875,-2.65256h-5.70825c-1.93769,0 -3.04225,-2.39188 -1.88125,-4.05275l14.577,-20.855c1.8275,-2.61494 5.69481,-2.61763 7.52231,-0.00538l14.577,20.86306c1.16369,1.66088 0.05644,4.05006 -1.87856,4.05006z" fill="url(#color-1_52139_gr1)"></path><path d="M51.0625,67.1875h5.375c0,-8.0625 7.23206,-16.12231 16.125,-16.12231v-5.375c-11.85456,0 -21.5,10.74731 -21.5,21.49731z" fill="url(#color-2_52139_gr2)"></path><path d="M139.75,80.625c0,-10.75 -8.44144,-18.80981 -18.8125,-18.80981v5.375c7.40944,0 13.4375,5.37231 13.4375,13.43481z" fill="url(#color-3_52139_gr3)"></path><path d="M148.09738,92.27263c1.59369,-3.68188 2.40263,-7.59219 2.40263,-11.64494c0,-16.29969 -13.26281,-29.5625 -29.5625,-29.5625c-6.5145,0 -12.68769,2.08819 -17.78588,5.96088c-4.30269,-13.03438 -16.52006,-22.08587 -30.58912,-22.08587c-17.78319,0 -32.25,14.46681 -32.25,32.25c0,4.14681 0.16662,8.05981 1.42437,10.74731h-1.42437c-13.33806,0 -24.1875,10.84944 -24.1875,24.1875c0,11.56431 8.16194,21.24737 19.0275,23.62044c1.02394,6.39894 6.53869,11.31706 13.2225,11.31706h56.4375h16.125h5.375c6.54944,0 12.00238,-4.71388 13.18488,-10.92469c9.2235,-1.20131 16.37762,-9.08913 16.37762,-18.63513c0,-6.09256 -2.924,-11.72019 -7.77762,-15.23006zM126.3125,131.6875h-5.375h-16.125h-56.4375c-3.49912,0 -6.45538,-2.6875 -7.568,-5.375h93.0735c-1.11263,2.6875 -4.06888,5.375 -7.568,5.375zM137.0625,120.9375h-96.75c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125c0,-10.37106 8.44144,-18.8125 18.8125,-18.8125h9.51375l-1.68506,-3.78131c-2.23063,-5.01488 -2.45369,-7.48737 -2.45369,-12.341c0,-14.81888 12.05613,-26.875 26.875,-26.875c13.01825,0 24.13106,9.29875 26.42619,22.11275l0.92719,5.17075l3.64962,-3.77325c4.60638,-4.76225 10.77687,-7.38525 17.372,-7.38525c13.33806,0 24.1875,10.84944 24.1875,24.1875c0,3.6765 -0.81431,7.21056 -2.37575,10.41944l-1.763,3.32713l2.37037,1.26044c4.40481,2.34081 7.14338,6.88806 7.14338,11.868c0,7.40944 -6.02806,13.43481 -13.4375,13.43481z" fill="url(#color-4_52139_gr4)"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteAttempt">
+                                            <delete-payment-attempt-form-component :data="item" :section="section" class="text-center"></delete-payment-attempt-form-component>
+                                        </modal-component>
+                                        <modal-component type="identificationVerificationModal">
+                                            <payment-verification-form-component :section="section" :id="booking.id" :data="item"></payment-verification-form-component>
+                                        </modal-component>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-t-20" v-if="booking.expired_payment_attempts.length">
+                        <div class="col">
+                            <div class="row m-b-10">
+                                <div class="col">
+                                    <div class="font-head fs-10 all-caps">Expired Payment Attempts</div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row m-l-0 m-b-10 m-r-0 " v-for="item in booking.expired_payment_attempts" v-bind:key="item.id" >
+                                        <div class="col-auto bg-danger">
+                                            <div class="row align-items-center h-100">
+                                                <div class="col">
+                                                    <i class="fa fa-exclamation text-white fs-18"></i>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col bg-danger-light p-t-10 p-b-10 p-r-0">
+                                            <div class="row m-b-5">
+                                                <div class="col-auto">
+                                                    <div class="font-heading fs-8 text-white all-caps">Booked</div>
+                                                    <div class="font-heading fs-10 text-white bold">
+                                                        {{item.original_currency.short_code}} {{(Math.round((item.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                                    </div>
+                                                </div>
+                                                <div class="col-auto p-l-0">
+                                                    <div class="font-heading fs-8 text-white all-caps">Rate</div>
+                                                    <div class="font-heading fs-10 text-white bold">
+                                                        {{(Math.round((item.currency_rate + Number.EPSILON) * 10000) / 10000).toFixed(5)}}
+                                                    </div>
+                                                </div>
+                                                <div class="col-auto p-l-0">
+                                                    <div class="font-heading fs-8 text-white all-caps">Payable</div>
+                                                    <div class="font-heading fs-10 text-white bold">
+                                                        {{item.original_currency.short_code}} {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="font-heading fs-10 text-white">Expired On: {{item.expires_on}}</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-t-20" v-if="booking.payment_history.length">
+                        <div class="col">
+                            <div class="row m-b-10">
+                                <div class="col">
+                                    <div class="font-head fs-10 all-caps">Payment History</div>
+                                </div>
+                            </div>
+                            <div class="row ">
+                                <div class="col">
+                                    <div class="row m-l-0 m-b-10 m-r-0 parentContainer" :class="[{'b-a': item.status === 4}, {'b-danger': item.status === 4}]" v-for="item in booking.payment_history" v-bind:key="item.id" >
+                                        <div class="col p-t-10 p-b-10 p-r-0" :class="[{'bg-master-lighter': item.status === 1}, {'bg-white': item.status !== 1 && item.status !== 4}]">
+                                            <div class="row m-b-5">
+                                                <div class="col-auto">
+                                                    <div class="font-heading fs-8 muted all-caps">Status</div>
+                                                    <div class="font-heading fs-10 bold" :class="[{'text-danger': item.status === 1 || item.status === 4}, {'text-success': item.status !== 1 && item.status !== 4}]">
+                                                        {{ item.status === 1 ? 'Pending Verification' : item.status === 2 ? 'Processing Payment' : item.status === 4 ? 'Rejected' : 'Transferred'}}
+                                                    </div>
+                                                </div>
+                                                <div class="col-auto p-l-0">
+                                                    <div class="font-heading fs-8 muted all-caps">Payment Amount</div>
+                                                    <div class="font-heading fs-10 bold">
+                                                        {{item.currency.short_code}} {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="font-heading fs-8 all-caps" :class="[{'text-danger': item.status === 4}, {'text-primary': item.status !== 4}]">{{ item.status === 1 ? 'Submitted' : item.status === 2 ? 'Received' : item.status === 4 ? 'Rejected' : 'Paid'}} On: {{item.updated_at}}</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-auto" :class="[{'bg-master-light': item.status === 1}, {'bg-master-lighter': item.status === 2}, {'bg-primary': item.status === 3}, {'pointer': item.status === 3}]">
+                                            <div class="row align-items-center h-100">
+                                                <div class="col">
+                                                    <i class="fa" :class="[{'fa-spinner': item.status === 1 || item.status === 2}, {'fa-cloud-download': item.status === 3}, {'fa-ban': item.status === 4}, {'text-white': item.status === 3}, {'text-danger':  item.status === 4}]"></i>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col p-l-0">
+                    <verification-warning-component :data="booking.company"></verification-warning-component>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        props: {
+            marking: {
+                type: Number,
+                required: true
+            }
+        },
+        data(){
+            return {
+                section: 'bookingDetailSection',
+                isLoading: true,
+                booking: null,
+                attention: false,
+                bearShowing: false
+            }
+        },
+        computed: {
+            pendingQueue () {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            }
+        },
+        watch: {
+            pendingQueue(inComplete){
+                if(inComplete){
+                    this.fetchBooking();
+                }
+            }
+        },
+        created(){
+            this.$store.dispatch('updateListQueue', {'name': this.section});
+        },
+        methods: {
+            fetchBooking(){
+                this.isLoading = true;
+                this.submit(route('api.booking.show', this.marking), 'get', this.section, false, false)
+            },
+            successHandler(response){
+                this.$store.dispatch('completeList', {'name': this.section, 'data': []});
+                this.isLoading = false;
+                this.booking = response.payload.data;
+            },
+            errorHandler(){
+                window.location.href = this.route('dashboard')
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
new file mode 100644
index 00000000..78c23bdd
--- /dev/null
+++ b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
@@ -0,0 +1,150 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col p-r-5">
+                    <div class="row m-b-20">
+                        <div class="col-7">
+                            <div class="row m-b-15">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col-8 p-r-0">
+                                            <div class="btn btn-xs btn-outline-primary btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="selectedSupplier.status = !selectedSupplier.status">
+                                                <div class="row">
+                                                    <div class="col p-t-5 p-b-5">
+                                                        {{selectedSupplier.name}}
+                                                    </div>
+                                                    <div class="col-auto b-l b-success">
+                                                        <div class="row h-100 align-items-center">
+                                                            <div class="col">
+                                                                <i class="fa" :class="[{'fa-angle-down': !selectedSupplier.status}, {'fa-angle-up': selectedSupplier.status}]"></i>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="relative w-100">
+                                                <div class="absolute w-100 b-l b-b b-r b-primary" :class="[{'hide': !selectedSupplier.status}]" style="top: 100%; right: 0; z-index: 1;">
+                                                    <div class="row text-left no-margin bg-white">
+                                                        <div class="col no-padding">
+                                                            <div class="row no-margin" v-for="supplier in suppliers"  v-bind:key="supplier.id" :data="supplier">
+                                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10" :class="[{'bg-primary-light': selectedSupplier.id === supplier.id}, {'text-white': selectedSupplier.id === supplier.id}, {'hover-primary': selectedSupplier.id !== supplier.id}, {'pointer': selectedSupplier.id !== supplier.id}]" @click="updateSupplier(supplier)">
+                                                                    <div class="row align-items-center justify-content-center">
+                                                                        <div class="col">
+                                                                            <div class="font-heading fs-10">{{supplier.name}}</div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-4 p-r-0">
+                                            <div class="btn btn-xs btn-outline-primary btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="selectedCurrency.status = !selectedCurrency.status">
+                                                <div class="row">
+                                                    <div class="col p-t-5 p-b-5">
+                                                        {{selectedCurrency.short_code}}
+                                                    </div>
+                                                    <div class="col-auto b-l b-primary">
+                                                        <div class="row h-100 align-items-center">
+                                                            <div class="col">
+                                                                <i class="fa" :class="[{'fa-angle-down': !selectedCurrency.status}, {'fa-angle-up': selectedCurrency.status}]"></i>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="relative w-100">
+                                                <div class="absolute w-100 b-l b-b b-r b-success" v-show="selectedCurrency.status" style="top: 100%; right: 0; z-index: 1;">
+                                                    <div class="row text-left no-margin bg-white">
+                                                        <div class="col no-padding">
+                                                            <div class="row no-margin" v-for="currency in selectedSupplier.currencies"  v-bind:key="currency.id" :data="currency">
+                                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10" :class="[{'bg-primary-light': selectedCurrency.id === currency.id}, {'text-white': selectedCurrency.id === currency.id}, {'hover-primary': selectedCurrency.id !== currency.id}, {'pointer': selectedCurrency.id !== currency.id}]" @click="updateCurrency(currency)">
+                                                                    <div class="row align-items-center justify-content-center">
+                                                                        <div class="col">
+                                                                            <div class="font-heading fs-10">{{currency.short_code}}</div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <list-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list')" :options="{per_page: 10000, status: 2, type: 1, original_currency_id_in: [selectedCurrency.id]}">
+                                        <template slot="list" slot-scope="{data}">
+                                            <supplier-pending-order-component :data="data" v-on:input="updateOrder($event)"></supplier-pending-order-component>
+                                        </template>
+                                    </list-component>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col">
+                            <supplier-place-order-form-component :payments="payments" :currency="selectedCurrency" :supplier="selectedSupplier" section="pendingOrdersSection"></supplier-place-order-form-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        data(){
+            return {
+                suppliers: [],
+                selectedSupplier: {
+                    id: '',
+                    name: '',
+                    status: false
+                },
+                selectedCurrency: {
+                    id: 2,
+                    name: '',
+                    status: false
+                },
+                payments: []
+            }
+        },
+        created(){
+            this.submit(route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3}), 'get', 'pendingOrdersSection', false, false)
+        },
+        methods: {
+            successHandler(response){
+                this.suppliers = response.payload.data;
+                this.updateSupplier(this.suppliers[0]);
+                this.updateCurrency(this.suppliers[0].currencies[0]);
+            },
+            updateSupplier(supplier){
+                this.selectedSupplier = supplier;
+                this.selectedSupplier.status = false;
+                this.updateCurrency(supplier.currencies[0]);
+            },
+            updateCurrency(currency){
+
+                if(currency !== this.selectedCurrency){
+                    this.selectedCurrency = currency;
+                    this.$refs.pendingOrdersList.updateFilters({per_page: 10000, status: 2, type: 1, original_currency_id_in: [this.selectedCurrency.id]});
+                }
+
+                this.selectedCurrency.status = false;
+                this.payments = [];
+
+            },
+            updateOrder(payment){
+                this.payments.includes(payment) ? this.payments.splice(this.payments.indexOf(payment), 1) : this.payments.push(payment);
+            }
+        }
+
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
new file mode 100644
index 00000000..9c2521fa
--- /dev/null
+++ b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
@@ -0,0 +1,79 @@
+<template>
+    <div class="row align-items-center">
+        <div class="col-auto p-r-0">
+            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                 width="50" height="50"
+                 viewBox="0 0 172 172"
+                 style=" fill:#000000;"><defs><linearGradient x1="98.09375" y1="78.38631" x2="98.09375" y2="93.17294" gradientUnits="userSpaceOnUse" id="color-1_43985_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="73.90625" y1="78.38631" x2="73.90625" y2="93.17294" gradientUnits="userSpaceOnUse" id="color-2_43985_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="98.98869" x2="86" y2="111.08513" gradientUnits="userSpaceOnUse" id="color-3_43985_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="12.09375" x2="86" y2="158.68613" gradientUnits="userSpaceOnUse" id="color-4_43985_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M98.09375,79.28125c-3.71066,0 -6.71875,3.00809 -6.71875,6.71875c0,3.71066 3.00809,6.71875 6.71875,6.71875c3.71066,0 6.71875,-3.00809 6.71875,-6.71875c0,-3.71066 -3.00809,-6.71875 -6.71875,-6.71875z" fill="url(#color-1_43985_gr1)"></path><path d="M73.90625,79.28125c-3.71066,0 -6.71875,3.00809 -6.71875,6.71875c0,3.71066 3.00809,6.71875 6.71875,6.71875c3.71066,0 6.71875,-3.00809 6.71875,-6.71875c0,-3.71066 -3.00809,-6.71875 -6.71875,-6.71875z" fill="url(#color-2_43985_gr2)"></path><path d="M75.25,99.4375c0,5.93669 4.81331,10.75 10.75,10.75c5.93669,0 10.75,-4.81331 10.75,-10.75z" fill="url(#color-3_43985_gr3)"></path><path d="M86,16.125c-38.53069,0 -69.875,31.34431 -69.875,69.875c0,38.53069 31.34431,69.875 69.875,69.875c38.53069,0 69.875,-31.34431 69.875,-69.875c0,-38.53069 -31.34431,-69.875 -69.875,-69.875zM86,21.5c35.56369,0 64.5,28.93631 64.5,64.5c0,15.61975 -5.58463,29.96025 -14.85919,41.13219c-5.63569,-7.59756 -12.9,-13.76806 -21.29306,-18.10569c2.61762,-3.63619 4.54456,-7.78569 5.6115,-12.2765h0.97825c7.40944,0 13.4375,-6.02806 13.4375,-13.4375c0,-7.40944 -6.02806,-13.4375 -13.4375,-13.4375h-0.13706c-1.38137,-18.00894 -16.44481,-32.25 -34.80044,-32.25c-18.35562,0 -33.41906,14.24106 -34.80044,32.25h-0.13706c-7.40944,0 -13.4375,6.02806 -13.4375,13.4375c0,7.40944 6.02806,13.4375 13.4375,13.4375h0.97556c1.06694,4.4935 2.99656,8.64569 5.61688,12.28188c-8.39037,4.33762 -15.66275,10.50544 -21.29844,18.09763c-9.27187,-11.17194 -14.8565,-25.50975 -14.8565,-41.1295c0,-35.56369 28.93631,-64.5 64.5,-64.5zM61.28306,56.39181c0.17737,0.01075 0.34938,0.04569 0.52944,0.04569c5.72169,0 10.36838,-4.50156 10.68819,-10.14531c1.68775,-0.87075 3.46956,-1.58294 5.32663,-2.11775c0.04837,0.50256 0.11019,1.00512 0.11019,1.51306c0,8.89294 -7.23206,16.125 -16.125,16.125c-1.08844,0 -2.15537,-0.12094 -3.20081,-0.33056c0.72831,-1.78987 1.62325,-3.49375 2.67137,-5.09012zM108.26863,53.18025c-1.10188,0.37356 -2.26287,0.56975 -3.45612,0.56975c-5.5255,0 -10.03513,-4.20325 -10.63175,-9.57288c5.53625,1.59906 10.39794,4.77031 14.08788,9.00313zM88.69556,43.13706c0.07256,8.82844 7.27238,15.98794 16.11694,15.98794c2.33812,0 4.58488,-0.5375 6.66231,-1.48619c0.91106,1.548 1.677,3.182 2.29781,4.89394c-2.795,1.28194 -5.83456,1.96725 -8.96012,1.96725c-11.80887,0 -21.41937,-9.57288 -21.49194,-21.36294c0.88419,-0.08063 1.77375,-0.13706 2.67944,-0.13706c0.90838,0 1.806,0.05644 2.69556,0.13706zM56.4375,72.5625c0,-2.02369 0.20694,-3.999 0.59663,-5.90981c1.55337,0.35475 3.14975,0.53481 4.77837,0.53481c8.36888,0 15.61706,-4.816 19.16725,-11.81425c4.48812,8.60269 13.47781,14.50175 23.83275,14.50175c3.58513,0 7.06813,-0.76325 10.32269,-2.12313c0.258,1.5695 0.42731,3.16856 0.42731,4.81063v16.125c0,16.29969 -13.26281,29.5625 -29.5625,29.5625c-16.29969,0 -29.5625,-13.26281 -29.5625,-29.5625zM86,123.625c9.68844,0 18.46312,-3.96944 24.79756,-10.36031c1.91888,0.94063 3.78937,1.95919 5.57925,3.10138c-8.041,8.04369 -18.90925,12.63394 -30.37681,12.63394c-11.46487,0 -22.33313,-4.58756 -30.37681,-12.63394c1.78719,-1.14219 3.65769,-2.16612 5.57656,-3.10675c6.33444,6.39625 15.11181,10.36569 24.80025,10.36569zM120.9375,75.25c4.44512,0 8.0625,3.61737 8.0625,8.0625c0,4.44512 -3.61738,8.0625 -8.0625,8.0625v-2.6875zM51.0625,88.6875v2.6875c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625c0,-4.44512 3.61738,-8.0625 8.0625,-8.0625zM86,150.5c-17.96863,0 -34.23875,-7.39331 -45.9455,-19.28819c3.16319,-4.43438 6.91763,-8.3635 11.16388,-11.69063c9.10256,9.44119 21.58331,14.85381 34.78163,14.85381c13.201,0 25.68175,-5.41263 34.78163,-14.85381c4.24356,3.32712 8.00069,7.25356 11.16388,11.69063c-11.70944,11.89487 -27.97688,19.28819 -45.9455,19.28819z" fill="url(#color-4_43985_gr4)"></path></g></g></svg>
+        </div>
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row align-items-center">
+                        <div class="col-auto">
+                            <div class="row">
+                                <div class="col">
+                                    <div class="font-heading fs-14 bold">{{item.name}}</div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row align-items-center">
+                                        <div class="col-auto p-r-5">
+                                            <div class="font-heading fs-9 muted all-caps bold">
+                                                Marking
+                                            </div>
+                                        </div>
+                                        <div class="col-auto p-l-0">
+                                            <div class="font-heading fs-10 muted">
+                                                CIEF/{{item.reference}}
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-auto p-l-0">
+                            <div class="font-heading fs-10 all-caps p-t-5 p-b-5 p-l-10 p-r-15 btn-rounded" :class="[{'bg-danger': item.status === 5}, {'bg-master-lightest': item.status !== 5}]">
+                                <i class="fa fa-circle text-success m-r-5" :class="[{'text-success': item.status === 2}, {'text-danger-darker': item.status === 5}, {'text-danger': item.status !== 2 || item.status !== 5}]"></i>{{item.status === 2 ? 'Active' : item.status === 5 ? 'Suspended' : 'Inactive'}}
+                            </div>
+                        </div>
+                        <div class="col m-l-50">
+                            <div class="row align-items-center parentContainer">
+                                <div class="col-auto padding-5 b-a b-grey b-rad-lg pointer requestModal" data-type="assignSegment">
+                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                         width="30" height="30"
+                                         viewBox="0 0 172 172"
+                                         style=" fill:#000000;"><defs><linearGradient x1="86" y1="97.08594" x2="86" y2="105.31775" gradientUnits="userSpaceOnUse" id="color-1_43991_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="94.0625" y1="85.83338" x2="94.0625" y2="93.89588" gradientUnits="userSpaceOnUse" id="color-2_43991_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="77.9375" y1="85.83338" x2="77.9375" y2="93.89588" gradientUnits="userSpaceOnUse" id="color-3_43991_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="28.55469" x2="86" y2="143.10938" gradientUnits="userSpaceOnUse" id="color-4_43991_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M77.9375,96.75c0,4.45319 3.60931,8.0625 8.0625,8.0625c4.45319,0 8.0625,-3.60931 8.0625,-8.0625z" fill="url(#color-1_43991_gr1)"></path><path d="M94.0625,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-2_43991_gr2)"></path><path d="M77.9375,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-3_43991_gr3)"></path><path d="M147.8125,51.0625h-18.8125v-8.0625c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-11.2445c-1.11263,-3.12019 -4.06888,-5.375 -7.568,-5.375h-32.25c-3.49912,0 -6.45538,2.25481 -7.568,5.375h-11.2445c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v8.0625h-18.8125c-4.44513,0 -8.0625,3.61738 -8.0625,8.0625v59.125c0,4.44512 3.61737,8.0625 8.0625,8.0625h18.8125v8.0625c0,4.44512 3.61738,8.0625 8.0625,8.0625h69.875c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-8.0625h18.8125c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-59.125c0,-4.44512 -3.61737,-8.0625 -8.0625,-8.0625zM147.8125,56.4375c1.4835,0 2.6875,1.20669 2.6875,2.6875v51.0625h-2.88637c-0.80625,-6.09525 -4.28119,-11.78469 -9.47612,-15.25425c0.99437,-1.87319 1.6125,-3.98019 1.6125,-6.24575v-5.375c0,-6.48763 -4.62519,-11.91638 -10.75,-13.16606v-13.70894zM134.375,88.6875c0,3.49912 -2.25213,6.45538 -5.375,7.568v-20.50831c3.12287,1.11262 5.375,4.06887 5.375,7.568zM134.6545,99.1365c3.913,2.48056 6.62469,6.84506 7.47125,11.051h-13.12575v-8.33394c2.12044,-0.43269 4.02319,-1.41094 5.6545,-2.71706zM67.1875,37.625c0,-1.48081 1.204,-2.6875 2.6875,-2.6875h32.25c1.4835,0 2.6875,1.20669 2.6875,2.6875v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875h-32.25c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875zM51.0625,40.3125h10.75c0,4.44512 3.61737,8.0625 8.0625,8.0625h32.25c4.44512,0 8.0625,-3.61738 8.0625,-8.0625h10.75c1.4835,0 2.6875,1.20669 2.6875,2.6875v83.3125h-3.34056c-1.73881,-9.23963 -7.19444,-17.45531 -15.06344,-22.66906c1.44319,-2.88906 2.279,-6.13556 2.279,-9.58094v-10.75c0,-11.85456 -9.64544,-21.5 -21.5,-21.5c-11.85456,0 -21.5,9.64544 -21.5,21.5v10.75c0,3.44537 0.83581,6.69188 2.28169,9.58094c-7.869,5.21375 -13.32463,13.42675 -15.06344,22.66906h-3.34325v-83.3125c0,-1.48081 1.204,-2.6875 2.6875,-2.6875zM102.125,94.0625c0,8.89294 -7.23206,16.125 -16.125,16.125c-8.89294,0 -16.125,-7.23206 -16.125,-16.125v-10.75c0,-8.89294 7.23206,-16.125 16.125,-16.125c8.89294,0 16.125,7.23206 16.125,16.125zM86,115.5625c6.48494,0 12.29531,-2.89981 16.24056,-7.45513c6.39088,4.22744 10.93006,10.77956 12.59363,18.20513h-57.66837c1.66356,-7.42556 6.20275,-13.97769 12.59631,-18.20244c3.94256,4.55531 9.75294,7.45244 16.23787,7.45244zM43,96.2555c-3.12288,-1.11263 -5.375,-4.06888 -5.375,-7.568v-5.375c0,-3.49912 2.25212,-6.45538 5.375,-7.568zM37.32669,99.12306c1.634,1.31419 3.54481,2.29512 5.67331,2.7305v8.33394h-13.18487c0.78475,-4.57412 3.526,-8.63225 7.51156,-11.06444zM24.1875,56.4375h18.8125v13.70894c-6.12481,1.24969 -10.75,6.67575 -10.75,13.16606v5.375c0,2.26287 0.61544,4.36719 1.60981,6.24038c-5.21106,3.44806 -8.686,9.05688 -9.47613,15.25963h-2.88369v-51.0625c0,-1.48081 1.204,-2.6875 2.6875,-2.6875zM24.1875,120.9375c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875v-2.6875h21.5v5.375zM120.9375,137.0625h-69.875c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875v-2.6875h75.25v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875zM147.8125,120.9375h-18.8125v-5.375h21.5v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875z" fill="url(#color-4_43991_gr4)"></path></g></g></svg>
+                                </div>
+                                <div class="col">
+                                    <div class="row no-margin">
+                                        <div class="col-auto no-padding m-r-10 m-b-5 m-t-5"  v-for="segment in item.segments" v-bind:key="segment.id" v-if="segment.id !== 1">
+                                            <div class="font-heading fs-10 lh-20 p-l-10 p-r-10 bg-master-lightest btn-rounded">
+                                                {{segment.name}}
+                                                <i class="fa fa-times muted m-l-10 pointer requestModal" data-type="detachSegment" ></i>
+                                            </div>
+                                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="detachSegment">
+                                                <detach-segment-form-component :data="segment" :company_id="item.id" section="customerProfileSection"></detach-segment-form-component>
+                                            </modal-component>
+                                        </div>
+                                    </div>
+                                </div>
+                                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="assignSegment">
+                                    <assign-segment-form-component :data="data" section="customerProfileSection"></assign-segment-form-component>
+                                </modal-component>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue b/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue
new file mode 100644
index 00000000..3c139e5d
--- /dev/null
+++ b/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue
@@ -0,0 +1,176 @@
+<template>
+    <div class="row m-b-10" :class="[{'b-b': !expanded}, {'b-primary': !expanded}]">
+        <div class="col bg-white">
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+            <div class="row" v-show="!isLoading">
+                <div class="col">
+                    <div class="row align-items-center">
+                        <div class="col p-t-10 p-b-10">
+                            <div class="row">
+                                <div class="col">
+                                    <div class="text-primary fs-11">{{item.owner.reference}}</div>
+                                </div>
+                            </div>
+                            <div class="row align-items-center">
+                                <div class="col-auto p-r-0">
+                                    <i class="fa fa-address-card fs-12 m-b-5 muted"></i>
+                                </div>
+                                <div class="col p-l-5">
+                                    <div class="muted bold fs-10">+{{item.owner.contact.country_code}} {{parseInt(item.owner.contact.phone, 10)}}</div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-auto">
+                            <button class="btn btn-sm btn-default bg-master-lightest b-rad-none no-border" @click="expanded = !expanded">
+                                <i class="fa" :class="[{'fa-times': expanded}, {'text-danger': expanded}, {'fa-angle-down': !expanded}]"></i>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="row b-t b-grey" :class="[{'hide': !expanded}]">
+                        <div class="col p-t-10">
+                            <div class="row m-b-15">
+                                <div class="col">
+                                    <div class="row m-b-5">
+                                        <div class="col">
+                                            <div class="fs-8 all-caps muted">Customer Name</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="fs-11 bold">{{item.owner.employee.name}}</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-b-15" v-if="item.owner.type === 1">
+                                <div class="col">
+                                    <div class="row m-b-5">
+                                        <div class="col">
+                                            <div class="fs-8 all-caps muted">Company Name</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="fs-11 text-primary">{{item.owner.name}}</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-b-10">
+                                <div class="col">
+                                    <div class="row m-b-5">
+                                        <div class="col">
+                                            <div class="fs-8 all-caps muted">{{ item.owner.type === 0 ? 'IC' : 'SSM Registration' }} Number</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="fs-11 text-primary bold">{{item.reference}}</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-b-10">
+                                <div class="col">
+                                    <div class="row m-b-5">
+                                        <div class="col">
+                                            <div class="fs-8 all-caps muted">{{ item.owner.type === 0 ? 'IC' : 'SSM Registration' }} Document</div>
+                                        </div>
+                                    </div>
+                                    <div class="row no-margin">
+                                        <div v-for="file in item.files" v-bind:key="file.id"  class="col-auto no-padding m-r-5">
+                                            <document-file-viewr-component :file="file"></document-file-viewr-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-t-20 parentContainer">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col no-padding">
+                                            <button class="btn btn-md btn-block btn-danger b-rad-none p-t-10 p-b-10 requestModal" data-type="rejectDocument">
+                                                <i class="fa fa-times"></i>
+                                            </button>
+                                        </div>
+                                        <modal-component small type="rejectDocument">
+                                            <div class="row">
+                                                <div class="col text-center">
+                                                    <div class="row">
+                                                        <div class="col text-center">
+                                                            <div class="row m-b-20">
+                                                                <div class="col">
+                                                                    <h5 class="all-caps">Reject Document</h5>
+                                                                    <div class="fs-11">Are you sure you want to reject this customer's identification?</div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col p-r-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                                                                </div>
+                                                                <div class="col p-l-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="approveDocument('reject')">Reject</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </modal-component>
+                                        <div class="col no-padding ml-auto">
+                                            <button class="btn btn-md btn-block btn-success b-rad-none p-t-10 p-b-10 requestModal" data-type="approveDocument">
+                                                <i class="fa fa-check"></i>
+                                            </button>
+                                        </div>
+                                        <modal-component small type="approveDocument">
+                                            <div class="row">
+                                                <div class="col text-center">
+                                                    <div class="row">
+                                                        <div class="col text-center">
+                                                            <div class="row m-b-20">
+                                                                <div class="col">
+                                                                    <h5 class="all-caps">Approve Document</h5>
+                                                                    <div class="fs-11">Are you sure you want to approve this customer's identification?</div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col p-r-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                                                                </div>
+                                                                <div class="col p-l-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-success btn-block b-rad-none" @click="approveDocument('approve')">Approve</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </modal-component>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import staticFormHandler from '../../../general/mixins/staticFormHandler'
+    export default {
+        data() {
+            return {
+                expanded: false
+            }
+        },
+        methods: {
+            approveDocument(status){
+                this.isLoading = true;
+                this.submit(this.route('api.company.identification.approval', this.item.owner.id, this.item.id, status), 'put', 'identificationVerificationSection', true, true);
+            },
+        },
+        mixins: [componentHandler, staticFormHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/companies/elements/SupplierComponent.vue b/resources/assets/vue/components/companies/elements/SupplierComponent.vue
new file mode 100644
index 00000000..6b2961c2
--- /dev/null
+++ b/resources/assets/vue/components/companies/elements/SupplierComponent.vue
@@ -0,0 +1,109 @@
+<template>
+    <div class="row m-b-15 parentContainer">
+        <div class="col">
+            <div class="row align-items-center">
+                <div class="col-auto p-r-0">
+                    <div class="padding-5 bg-master-lightest">
+                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                             width="30" height="30"
+                             viewBox="0 0 172 172"
+                             style=" fill:#000000;"><defs><linearGradient x1="86" y1="67.85938" x2="86" y2="98.7495" gradientUnits="userSpaceOnUse" id="color-1_44784_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="13.77344" x2="86" y2="157.88525" gradientUnits="userSpaceOnUse" id="color-2_44784_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M72.5625,83.3125c0,-7.42019 6.01731,-13.4375 13.4375,-13.4375c7.42019,0 13.4375,6.01731 13.4375,13.4375c0,7.42019 -6.01731,13.4375 -13.4375,13.4375c-0.91912,0 -1.81944,-0.09137 -2.6875,-0.26875v-10.48125l-10.75,-2.6875" fill="url(#color-1_44784_gr1)"></path><path d="M134.375,48.375h-5.375c0,-5.92862 -4.82137,-10.75 -10.75,-10.75c-1.96725,0 -3.78669,0.56975 -5.375,1.49425v-4.18175c0,-7.40944 -6.02806,-13.4375 -13.4375,-13.4375c-3.43731,0 -6.54675,1.33569 -8.92519,3.46687c-1.88663,-5.14119 -6.78594,-8.84187 -12.57481,-8.84187c-6.58169,0 -12.04806,4.76494 -13.19294,11.02144c-2.29513,-1.82481 -5.15731,-2.95894 -8.30706,-2.95894c-7.40944,0 -13.4375,6.02806 -13.4375,13.4375v10.75h-5.375c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v53.75c0,4.44512 3.61738,8.0625 8.0625,8.0625h5.59c0.62619,4.33762 2.72781,8.19419 5.78887,11.051c-3.44537,0.91644 -6.00387,4.03125 -6.00387,7.7615v10.75c0,4.44512 3.61738,8.0625 8.0625,8.0625h69.875c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-10.75c0,-3.73025 -2.5585,-6.84506 -6.00119,-7.7615c3.06106,-2.85681 5.16269,-6.71337 5.78887,-11.051h5.58731c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-53.75c0,-4.44512 -3.61737,-8.0625 -8.0625,-8.0625zM134.375,53.75c1.4835,0 2.6875,1.204 2.6875,2.6875v10.75h-2.6875c-5.92863,0 -10.75,-4.82138 -10.75,-10.75v-2.6875zM118.25,110.1875v2.6875h-34.77625c-1.634,-3.27875 -3.98825,-6.14094 -6.8585,-8.36619c5.36694,-1.23356 9.38475,-6.05225 9.38475,-11.79006c0,-6.66769 -5.42606,-12.09375 -12.09375,-12.09375h-17.46875c-7.40944,0 -13.4375,6.02806 -13.4375,13.4375v0.93525c-1.70925,-0.60469 -3.51525,-0.93525 -5.375,-0.93525h-2.6875v-21.5h2.6875c8.89294,0 16.125,-7.23206 16.125,-16.125v-2.6875h64.5v2.6875c0,8.89294 7.23206,16.125 16.125,16.125h2.6875v21.5h-2.6875c-8.89294,0 -16.125,7.23206 -16.125,16.125zM118.25,43c2.96431,0 5.375,2.41069 5.375,5.375h-10.75c0,-2.96431 2.41069,-5.375 5.375,-5.375zM99.4375,26.875c4.44512,0 8.0625,3.61737 8.0625,8.0625v13.4375h-16.125v-13.4375c0,-4.44513 3.61737,-8.0625 8.0625,-8.0625zM69.875,29.5625c0,-4.44513 3.61737,-8.0625 8.0625,-8.0625c4.44513,0 8.0625,3.61737 8.0625,8.0625v18.8125h-16.125v-10.75zM48.375,37.625c0,-4.44512 3.61738,-8.0625 8.0625,-8.0625c4.44512,0 8.0625,3.61738 8.0625,8.0625v10.75h-16.125zM37.625,53.75h10.75v2.6875c0,5.92862 -4.82138,10.75 -10.75,10.75h-2.6875v-10.75c0,-1.4835 1.204,-2.6875 2.6875,-2.6875zM34.9375,110.1875v-10.75h2.6875c1.91619,0 3.74369,0.52138 5.375,1.46738v11.97012h-5.375c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875zM120.9375,134.375c1.4835,0 2.6875,1.204 2.6875,2.6875v2.6875h-10.75v5.375h10.75v2.6875c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-69.875c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-10.75c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h10.75h5.375zM110.1875,129h-43h-5.375c-7.40944,0 -13.4375,-6.02806 -13.4375,-13.4375v-2.6875v-18.8125c0,-4.44512 3.61738,-8.0625 8.0625,-8.0625h17.46875c3.70606,0 6.71875,3.01269 6.71875,6.71875c0,3.70606 -3.01269,6.71875 -6.71875,6.71875h-14.78125v5.375h2.6875c10.37106,0 18.8125,8.44144 18.8125,18.8125h5.375c0,-1.849 -0.22306,-3.64425 -0.61544,-5.375h37.969c-1.24969,6.12481 -6.67575,10.75 -13.16606,10.75zM134.375,112.875h-10.75v-2.6875c0,-5.92863 4.82137,-10.75 10.75,-10.75h2.6875v10.75c0,1.4835 -1.204,2.6875 -2.6875,2.6875z" fill="url(#color-2_44784_gr2)"></path></g></g></svg>
+                    </div>
+                </div>
+                <div class="col-4">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Name</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">{{item.name}}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Currencies</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">{{stringifyCurrencies}}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto">
+                    <div class="row">
+                        <div class="col">
+                            <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="deleteSupplier">
+                                <i class="fa fa-times"></i>
+                            </button>
+                            <button class="btn btn-xs btn-complete p-l-10 p-r-10 b-rad-none" @click="expanded = !expanded">
+                                <i class="fa" :class="[{'fa-angle-up': expanded}, {'fa-angle-down': !expanded}]"></i>
+                            </button>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteSupplier">
+                                <delete-supplier-form-component :data="item" section="suppliersSection" class="text-center"></delete-supplier-form-component>
+                            </modal-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row" v-if="expanded">
+                <div class="col-1"></div>
+                <div class="col p-l-10 p-t-10 p-b-10">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <div class="row m-l-0 m-b-10 align-items-center parentContainer">
+                                <div class="col p-l-0">
+                                    <div class="font-heading all-caps fs-10 hint-text muted">
+                                        Bank Accounts
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-r-0" v-for="bank in item.personal_banks" v-bind:key="bank.id" :data="bank">
+                                <div class="col">
+                                    <bank-account-component :data="bank" section="suppliersSection"></bank-account-component>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <button class="btn btn-xs btn-outline-primary b-rad-none requestModal" data-type="createModal">
+                                        <i class="fa fa-plus m-r-5"></i>
+                                        Add New Bank Account
+                                    </button>
+                                    <modal-form-component section="suppliersSection">
+                                        <template slot="form" slot-scope="{section}">
+                                            <bank-account-form-component :section="section" :company_id="item.id"></bank-account-form-component>
+                                        </template>
+                                    </modal-form-component>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <supplier-currencies-section-component section="suppliersSection" :data="item"></supplier-currencies-section-component>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                expanded: false,
+            }
+        },
+        computed: {
+            stringifyCurrencies(){
+                return this.data.currencies.map(function(value){
+                    return value.short_code;
+                }).join(', ')
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/companies/elements/VerificationWarningComponent.vue b/resources/assets/vue/components/companies/elements/VerificationWarningComponent.vue
new file mode 100644
index 00000000..b5b598be
--- /dev/null
+++ b/resources/assets/vue/components/companies/elements/VerificationWarningComponent.vue
@@ -0,0 +1,65 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row" v-if="item.employee.status !== 2">
+                <div class="col">
+                    <div class="alert alert-warning padding-15" role="alert">
+                        <div class="row m-b-15">
+                            <div class="col">
+                                <div class="font-heading text-danger fs-12">You are unable to make payments and complete your transfer requests until you complete your email address confirmation!</div>
+                            </div>
+                        </div>
+                        <email-verification-form-component section="resendEmailVerificationSection"></email-verification-form-component>
+                    </div>
+                </div>
+            </div>
+            <div class="row parentContainer" v-if="item.status !== 2">
+                <div class="col">
+                    <div class="row no-margin">
+                        <div class="col" :class="[{'bg-danger-lighter': item.status !== 1}, {'bg-master-lighter': item.status === 1}]">
+                            <div class="row align-items-center">
+                                <div class="col-auto p-r-0 p-t-15 p-b-15">
+                                    <div class="icon-thumbnail fs-20 icon-35 btn-rounded" :class="[{'bg-danger-light': item.status !== 1}, {'bg-master-light': item.status === 1}]">
+                                        <i class="fa fs-20" :class="[{'fa-times': item.status !== 1}, {'text-white': item.status !== 1}, {'fa-spinner': item.status === 1}]"></i>
+                                    </div>
+                                </div>
+                                <div class="col p-l-0">
+                                    <div class="font-heading bold fs-10" :class="[{'text-danger': item.status !== 1}]">Identification Verification</div>
+                                    <div class="font-heading fs-10" :class="[{'text-danger': item.status !== 1}, {'muted': item.status === 1}]" v-text="item.status !== 1 ? 'Verification request rejected':'Approval in progress...'"></div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col p-b-15">
+                                    <div class="font-heading text-danger fs-10" v-if="item.status !== 1">You are unable to create new transfer requests or make payments until you have successfully verified your identity!</div>
+                                    <div class="font-heading fs-11" v-if="item.status === 1">You are unable to make payments until your identification is approved!</div>
+                                </div>
+                            </div>
+                            <div class="row" v-if="item.status === 1">
+                                <div class="col no-padding">
+                                    <div class="progress m-b-0">
+                                        <div class="progress-bar progress-bar-primary" style="width:75%"></div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row" v-if="item.status !== 1">
+                                <div class="col no-padding">
+                                    <button class="btn btn-sm btn-danger btn-block b-rad-none requestModal" data-type="identificationVerificationModal">Re-submit Identification</button>
+                                </div>
+                            </div>
+                            <modal-component type="identificationVerificationModal" v-if="item.status !== 1">
+                                <identification-verification-form-component section="identificationVerificationSection" :data="item"></identification-verification-form-component>
+                            </modal-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/companies/forms/AssignSegmentFormComponent.vue b/resources/assets/vue/components/companies/forms/AssignSegmentFormComponent.vue
new file mode 100644
index 00000000..e77a633d
--- /dev/null
+++ b/resources/assets/vue/components/companies/forms/AssignSegmentFormComponent.vue
@@ -0,0 +1,67 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <h3 class="all-caps m-b-5 bold no-margin">Assign Segment</h3>
+                            <div class="fs-11">Select a segment to {{parameters.name}}</div>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component selecatable :validator="$v.parameters.segment_id">
+                                <label class="muted">Segment</label>
+                                <selectable-component :endpoint="route('api.segment.list') + '?filters=' + JSON.stringify({'id_not_in': currentSegmentIds})" section="segmentsListSection" valueColumn="id" :labelColumn="['name']" v-model="parameters.segment_id"></selectable-component>
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Not Now</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.company.segment.assign', data.id), 'post', section, true, false)">Assign Segment</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+    export default {
+        data(){
+            return {
+                parameters: {
+                    segment_id: ''
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                segment_id: {
+                    required
+                }
+            }
+        },
+        computed: {
+            currentSegmentIds(){
+                return this.parameters.segments.map(function (value){
+                    return value.id;
+                })
+            }
+        },
+        mixins: [ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/companies/forms/DeleteSupplierFormComponent.vue b/resources/assets/vue/components/companies/forms/DeleteSupplierFormComponent.vue
new file mode 100644
index 00000000..2f39dc4e
--- /dev/null
+++ b/resources/assets/vue/components/companies/forms/DeleteSupplierFormComponent.vue
@@ -0,0 +1,33 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to delete <b>{{item.name}}</b> currency supplier?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.company.delete', item.id), 'delete', section, true, true)">Delete</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/companies/forms/DetachSegmentFormComponent.vue b/resources/assets/vue/components/companies/forms/DetachSegmentFormComponent.vue
new file mode 100644
index 00000000..7e87816d
--- /dev/null
+++ b/resources/assets/vue/components/companies/forms/DetachSegmentFormComponent.vue
@@ -0,0 +1,44 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                <div class="col">
+                    <small class="bold fs-10 text-danger">{{error}}</small>
+                </div>
+            </div>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to detach custom from <span class="bold">{{this.item.name}}</span> segment?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.company.segment.detach', company_id, item.id), 'delete', 'customerProfileSection', true, true)">Remove Segment</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        props: {
+            company_id: {
+                required: true,
+                type: Number
+            }
+        },
+
+        mixins: [componentHandler, ModalFormHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/companies/forms/IdentificationVerificationFormComponent.vue b/resources/assets/vue/components/companies/forms/IdentificationVerificationFormComponent.vue
new file mode 100644
index 00000000..2c1bfdea
--- /dev/null
+++ b/resources/assets/vue/components/companies/forms/IdentificationVerificationFormComponent.vue
@@ -0,0 +1,144 @@
+<template>
+    <div class="row" @keyup.enter="submitForm">
+        <div class="col">
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-16 all-caps bold m-b-15">Identification Verification</div>
+                        </div>
+                    </div>
+                    <error-message-component class="m-b-20" :error="error"></error-message-component>
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.identification_no">
+                                <label class="text-primary">{{ data.type === 0 ? 'IC/Passport' : 'SSM Registration' }} Number</label>
+                                <div class="controls">
+                                    <input type="text" class="form-control fs-12" v-model="parameters.identification_no">
+                                </div>
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <file-input-component :validator="$v.parameters.files" v-model="parameters.files">
+                                <template slot="label">
+                                    <div class="font-heading fs-11 text-primary all-caps">{{ data.type === 0 ? 'IC Photo' : 'SSM Registration Photo' }}</div>
+                                </template>
+                                <template slot="tips">
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row m-b-20">
+                                                <div class="col">
+                                                    <div class="font-heading fs-11 text-warning m-b-10">{{ data.type === 0 ? 'IC': 'SSM registration'}} number shown in the photo should tally with {{ data.type === 0 ? 'IC': 'SSM registration'}} number provided above.</div>
+                                                    <div class="font-heading fs-11 muted">Tips on how your photo should look</div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row m-b-15">
+                                                        <div class="col">
+                                                            <div class="row m-b-5">
+                                                                <div class="col">
+                                                                    <div class="b-a b-danger b-thick">
+                                                                        <div class="absolute" style="right: -10px; top: -10px;">
+                                                                            <div class="icon-thumbnail btn-rounded icon-25 bg-danger fs-12"><i class="fa fa-times text-white fs-12"></i></div>
+                                                                        </div>
+                                                                        <img v-if="data.type === 0" src="https://i.pinimg.com/originals/c2/18/96/c218966593d1baacae525934835d847d.jpg" class="w-100">
+                                                                        <img v-if="data.type === 1" src="https://2.bp.blogspot.com/-uElNIO5qSEI/VE4I_f2Ai-I/AAAAAAAAJdA/zJbbBr7NRzI/s1600/ssm-notice-facebook-page.png" class="w-100">
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row text-center">
+                                                                <div class="col">
+                                                                    <div class="font-heading fs-11">Covered</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col">
+                                                            <div class="row m-b-5">
+                                                                <div class="col">
+                                                                    <div class="b-a b-danger b-thick">
+                                                                        <div class="absolute" style="right: -10px; top: -10px;">
+                                                                            <div class="icon-thumbnail btn-rounded icon-25 bg-danger fs-12"><i class="fa fa-times text-white fs-12"></i></div>
+                                                                        </div>
+                                                                        <img v-if="data.type === 0" src="https://i.pinimg.com/originals/c2/18/96/c218966593d1baacae525934835d847d.jpg" class="w-100">
+                                                                        <img v-if="data.type === 1" src="https://2.bp.blogspot.com/-uElNIO5qSEI/VE4I_f2Ai-I/AAAAAAAAJdA/zJbbBr7NRzI/s1600/ssm-notice-facebook-page.png" class="w-100">
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row text-center">
+                                                                <div class="col">
+                                                                    <div class="font-heading fs-11">Blurry</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col">
+                                                            <div class="row m-b-5">
+                                                                <div class="col">
+                                                                    <div class="b-a b-success b-thick">
+                                                                        <div class="absolute" style="right: -10px; top: -10px;">
+                                                                            <div class="icon-thumbnail btn-rounded icon-25 bg-success fs-12"><i class="fa fa-check text-white fs-12"></i></div>
+                                                                        </div>
+                                                                        <img v-if="data.type === 0" src="https://i.pinimg.com/originals/c2/18/96/c218966593d1baacae525934835d847d.jpg" class="w-100">
+                                                                        <img v-if="data.type === 1" src="https://2.bp.blogspot.com/-uElNIO5qSEI/VE4I_f2Ai-I/AAAAAAAAJdA/zJbbBr7NRzI/s1600/ssm-notice-facebook-page.png" class="w-100">
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row text-center">
+                                                                <div class="col">
+                                                                    <div class="font-heading fs-11">This is right!</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </template>
+                            </file-input-component>
+                        </div>
+                    </div>
+                    <div class="row m-t-20">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col-auto">
+                                    <button type="button" class="btn btn-sm bg-master-lighter p-t-10 p-b-10 p-r-35 p-l-35 btn-default b-rad-none" data-dismiss="modal">Cancel</button>
+                                </div>
+                                <div class="col text-right">
+                                    <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-success b-rad-none" @click="submitForm">Save and continue</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import identificationVerificationFormValidation from '../../../general/mixins/companies/validation/identificationVerificationFormValidation'
+    export default {
+        data(){
+            return {
+                parameters: {
+                    identification_no: '',
+                    files: []
+                }
+            }
+        },
+        methods: {
+            submitForm(){
+                this.submit(this.route('api.company.identification.create', this.data.id), 'post', this.section, true, false)
+            }
+        },
+        mixins: [identificationVerificationFormValidation]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/companies/forms/SupplierFormComponent.vue b/resources/assets/vue/components/companies/forms/SupplierFormComponent.vue
new file mode 100644
index 00000000..20681a78
--- /dev/null
+++ b/resources/assets/vue/components/companies/forms/SupplierFormComponent.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">Create Supplier</h6>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.company_name">
+                                <label class="muted">Supplier Name</label>
+                                <input type="text" class="form-control" v-model="parameters.company_name">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.company.create'), 'post', section, true, false)">Create Supplier</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required, requiredIf } from "vuelidate/lib/validators";
+    export default {
+        data(){
+            return {
+                parameters: {
+                    company_name: '',
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                company_name: {
+                    required: true
+                }
+            }
+        },
+        mixins: [ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
new file mode 100644
index 00000000..54a6b6d6
--- /dev/null
+++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
@@ -0,0 +1,225 @@
+<template>
+    <div class="row d-none" :class="[{'d-flex': $store.getters.isAdmin}]" v-if="$store.getters.isAdmin && company" >
+        <div class="col-8">
+            <div class="row m-b-20">
+                <div class="col bg-white p-t-10 p-b-15 p-r-20 shadow-sm">
+                    <customer-profile-component :data="company"></customer-profile-component>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col no-padding">
+                    <div class="row">
+                        <div class="col">
+                            <div class="row tabsContainer">
+                                <div class="col">
+                                    <div class="row m-l-0 m-r-0 d-none d-md-flex">
+                                        <div class="col-7">
+                                            <div class="row">
+                                                <div class="col m-r-5">
+                                                    <div class="row fs-12 text-center">
+                                                        <div class="col p-t-15 p-b-15 bg-master-lighter active tabButton" tab-name="transfers">
+                                                            <div class="row justify-content-center">
+                                                                <div class="col-auto">
+                                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                         width="35" height="35"
+                                                                         viewBox="0 0 172 172"
+                                                                         style=" fill:#000000;"><defs><linearGradient x1="86" y1="104.14063" x2="86" y2="140.57775" gradientUnits="userSpaceOnUse" id="color-1_44825_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="16.125" x2="86" y2="159.93044" gradientUnits="userSpaceOnUse" id="color-2_44825_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M121.41588,139.75h-70.83175c-2.53431,0 -3.66575,-3.18469 -1.6985,-4.78106l33.72544,-27.40175c1.97531,-1.60444 4.80256,-1.60444 6.77787,0l33.72544,27.40175c1.96725,1.59638 0.83581,4.78106 -1.6985,4.78106z" fill="url(#color-1_44825_gr1)"></path><path d="M148.135,71.77238l-8.385,-8.385v-28.42031c0,-4.46125 -3.63081,-8.09206 -8.09206,-8.09206h-2.65794v-2.65794c0,-4.46125 -3.63081,-8.09206 -8.09206,-8.09206h-69.81587c-4.46125,0 -8.09206,3.63081 -8.09206,8.09206v2.65794h-2.65794c-4.46125,0 -8.09206,3.63081 -8.09206,8.09206v28.42031l-8.385,8.385c-1.5265,1.52381 -2.365,3.55019 -2.365,5.70825v64.95688c0,7.40944 6.02806,13.4375 13.4375,13.4375h102.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-64.95688c0,-2.15806 -0.84119,-4.18444 -2.365,-5.70825zM77.60156,91.96356l-0.30906,0.24725c-1.28731,-1.79525 -2.0425,-3.92375 -2.0425,-6.21081c0,-5.92862 4.82138,-10.75 10.75,-10.75c5.92863,0 10.75,4.82138 10.75,10.75c0,2.26287 -0.70413,4.41019 -2.01294,6.235l-0.34131,-0.27412c-4.93962,-3.95063 -11.84919,-3.95063 -16.79419,0.00269zM86,69.875c-8.89294,0 -16.125,7.23206 -16.125,16.125c0,3.53406 1.14487,6.85581 3.18738,9.59438l-10.578,8.46025l-3.35937,-2.6875v-55.88388c6.95256,-1.06963 12.16094,-6.28069 13.23325,-13.23325h27.2835c1.06963,6.95256 6.28069,12.16094 13.23325,13.23325v55.88656l-3.35937,2.6875l-10.56994,-8.45488c2.07744,-2.79231 3.17931,-6.10869 3.17931,-9.60244c0,-8.89294 -7.23206,-16.125 -16.125,-16.125zM58.179,107.5l-31.304,25.04481v-50.08694zM145.125,82.45519v50.08963l-31.30669,-25.04481zM144.33488,75.5725c0.11825,0.11825 0.18006,0.27412 0.27412,0.4085l-4.859,3.88612v-8.8795zM131.65794,32.25c1.49962,0 2.71706,1.21744 2.71706,2.71706v49.20275l-5.375,4.3v-56.21981zM51.09206,21.5h69.81856c1.49694,0 2.71438,1.21744 2.71438,2.71706v68.55275l-5.375,4.3v-56.75731h-2.6875c-6.22694,0 -10.75,-4.52306 -10.75,-10.75v-2.6875h-37.625v2.6875c0,6.22694 -4.52306,10.75 -10.75,10.75h-2.6875v56.75731l-5.375,-4.3v-68.55275c0,-1.49962 1.21744,-2.71706 2.71706,-2.71706zM40.34206,32.25h2.65794v56.21981l-5.375,-4.3v-49.20275c0,-1.49963 1.21744,-2.71706 2.71706,-2.71706zM32.25,70.98763v8.88219l-4.859,-3.88881c0.09406,-0.13438 0.15587,-0.29025 0.27412,-0.4085zM137.0625,150.5h-102.125c-4.44513,0 -8.0625,-3.61738 -8.0625,-8.0625v-3.00463l54.08325,-43.27144c2.96969,-2.37306 7.11381,-2.37306 10.08081,0l54.08594,43.26875v3.00731c0,4.44513 -3.61737,8.0625 -8.0625,8.0625z" fill="url(#color-2_44825_gr2)"></path></g></g></svg>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col">
+                                                                    <div class="fs-12 m-t-5">Transfers</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="col m-r-5">
+                                                    <div class="row fs-12 text-center">
+                                                        <div class="col p-t-15 p-b-15 bg-master-lighter tabButton" tab-name="PO">
+                                                            <div class="row justify-content-center">
+                                                                <div class="col-auto">
+                                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                         width="35" height="35"
+                                                                         viewBox="0 0 172 172"
+                                                                         style=" fill:#000000;"><defs><linearGradient x1="112.875" y1="81.96875" x2="112.875" y2="105.71013" gradientUnits="userSpaceOnUse" id="color-1_44814_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="15.67619" x2="86" y2="158.96562" gradientUnits="userSpaceOnUse" id="color-2_44814_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="72.5625" y1="15.67619" x2="72.5625" y2="158.96562" gradientUnits="userSpaceOnUse" id="color-3_44814_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="45.6875" y1="15.67619" x2="45.6875" y2="158.96562" gradientUnits="userSpaceOnUse" id="color-4_44814_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="45.6875" y1="15.67619" x2="45.6875" y2="158.96562" gradientUnits="userSpaceOnUse" id="color-5_44814_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M123.625,94.0625c0,5.93669 -4.81331,10.75 -10.75,10.75v0c-5.93669,0 -10.75,-4.81331 -10.75,-10.75v0c0,-5.93669 4.81331,-10.75 10.75,-10.75v0c5.93669,0 10.75,4.81331 10.75,10.75z" fill="url(#color-1_44814_gr1)"></path><path d="M150.5,53.75h-21.5v-29.5625c0,-4.44513 -3.61738,-8.0625 -8.0625,-8.0625h-96.75c-4.44513,0 -8.0625,3.61737 -8.0625,8.0625v110.1875v2.6875v10.75c0,4.44512 3.61737,8.0625 8.0625,8.0625h96.75c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-10.75v-2.6875v-10.75h21.5c2.96431,0 5.375,-2.41069 5.375,-5.375v-48.375v-10.75c0,-2.96431 -2.41069,-5.375 -5.375,-5.375zM150.5,64.5h-75.25v-5.375h75.25zM150.5,85.785v16.555c-8.22106,1.18519 -14.72481,7.68894 -15.91,15.91h-43.43c-1.18519,-8.22106 -7.68894,-14.72481 -15.91,-15.91v-16.555c8.22106,-1.18519 14.72481,-7.68894 15.91,-15.91h43.43c1.18519,8.22106 7.68894,14.72481 15.91,15.91zM75.25,69.875h10.47856c-1.07231,5.25675 -5.22181,9.40625 -10.47856,10.47856v-7.79106zM75.25,107.77144c5.25675,1.07231 9.40625,5.22181 10.47856,10.47856h-10.47856zM120.9375,150.5h-96.75c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-3.182c0.84388,0.301 1.7415,0.4945 2.6875,0.4945h96.75c0.946,0 1.84363,-0.1935 2.6875,-0.4945v3.182c0,1.4835 -1.204,2.6875 -2.6875,2.6875zM123.625,134.375v2.6875c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-96.75c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-2.6875v-110.1875c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h96.75c1.4835,0 2.6875,1.204 2.6875,2.6875v29.5625h-48.375c-2.96431,0 -5.375,2.41069 -5.375,5.375v10.75v2.6875v45.6875c0,2.96431 2.41069,5.375 5.375,5.375h48.375zM140.02144,118.25c1.07231,-5.25675 5.22181,-9.40625 10.47856,-10.47856v10.47856zM150.5,80.35356c-5.25675,-1.07231 -9.40625,-5.22181 -10.47856,-10.47856h10.47856z" fill="url(#color-2_44814_gr2)"></path><path d="M32.25,37.625h80.625v5.375h-80.625z" fill="url(#color-3_44814_gr3)"></path><path d="M32.25,59.125v43c0,2.96431 2.41069,5.375 5.375,5.375h21.5v-53.75h-21.5c-2.96431,0 -5.375,2.41069 -5.375,5.375zM37.625,75.25h16.125v10.75h-16.125zM37.625,102.125v-10.75h16.125v10.75zM53.75,69.875h-16.125v-10.75h16.125z" fill="url(#color-4_44814_gr4)"></path><path d="M32.25,118.25h26.875v5.375h-26.875z" fill="url(#color-5_44814_gr5)"></path></g></g></svg>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col">
+                                                                    <div class="fs-12 m-t-5">Billing</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="col">
+                                                    <div class="row fs-12 text-center">
+                                                        <div class="col p-t-15 p-b-15 bg-master-lighter tabButton" tab-name="transfers">
+                                                            <div class="row justify-content-center">
+                                                                <div class="col-auto">
+                                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                         width="35" height="35"
+                                                                         viewBox="0 0 172 172"
+                                                                         style=" fill:#000000;"><defs><linearGradient x1="131.6875" y1="110.58794" x2="131.6875" y2="150.61556" gradientUnits="userSpaceOnUse" id="color-1_DhXzKyWAbozd_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="86.74444" x2="86" y2="148.45481" gradientUnits="userSpaceOnUse" id="color-2_DhXzKyWAbozd_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="22.41375" x2="86" y2="32.92994" gradientUnits="userSpaceOnUse" id="color-3_DhXzKyWAbozd_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="40.3125" y1="65.12888" x2="40.3125" y2="74.98125" gradientUnits="userSpaceOnUse" id="color-4_DhXzKyWAbozd_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="131.6875" y1="45.40262" x2="131.6875" y2="56.24131" gradientUnits="userSpaceOnUse" id="color-5_DhXzKyWAbozd_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86.00269" y1="16.40988" x2="86.00269" y2="161.42738" gradientUnits="userSpaceOnUse" id="color-6_DhXzKyWAbozd_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="16.40988" x2="86" y2="161.42738" gradientUnits="userSpaceOnUse" id="color-7_DhXzKyWAbozd_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="40.31519" y1="16.40988" x2="40.31519" y2="161.42738" gradientUnits="userSpaceOnUse" id="color-8_DhXzKyWAbozd_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="131.69019" y1="16.40988" x2="131.69019" y2="161.42738" gradientUnits="userSpaceOnUse" id="color-9_DhXzKyWAbozd_gr9"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="40.3125" y1="128.94356" x2="40.3125" y2="150.2205" gradientUnits="userSpaceOnUse" id="color-10_DhXzKyWAbozd_gr10"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><rect x="48" y="41" transform="scale(2.6875,2.6875)" width="2" height="16" fill="url(#color-1_DhXzKyWAbozd_gr1)"></rect><rect x="31" y="32" transform="scale(2.6875,2.6875)" width="2" height="25" fill="url(#color-2_DhXzKyWAbozd_gr2)"></rect><path d="M83.06525,20.30675l-7.54113,12.15287c-0.73637,1.07231 0.09675,2.47788 1.46738,2.47788h18.01431c1.37331,0 2.20375,-1.40556 1.46738,-2.47788l-7.54112,-12.15287c-1.36525,-1.99144 -4.49887,-1.99144 -5.86681,0z" fill="url(#color-3_DhXzKyWAbozd_gr3)"></path><path d="M37.37775,63.30675l-7.54112,12.15288c-0.73638,1.07231 0.09675,2.47787 1.46737,2.47787h18.01431c1.37331,0 2.20375,-1.40556 1.46737,-2.47787l-7.54113,-12.15288c-1.36525,-1.99144 -4.49887,-1.99144 -5.86681,0z" fill="url(#color-4_DhXzKyWAbozd_gr4)"></path><path d="M128.75275,44.49425l-7.54112,12.15288c-0.73638,1.07231 0.09675,2.47787 1.46737,2.47787h18.01431c1.37331,0 2.20375,-1.40556 1.46738,-2.47788l-7.54112,-12.15288c-1.36525,-1.99144 -4.49888,-1.99144 -5.86681,0z" fill="url(#color-5_DhXzKyWAbozd_gr5)"></path><path d="M76.9915,37.625h6.321v16.125h5.375v-16.125h6.321c1.67162,0 3.182,-0.89494 3.94256,-2.34081c0.72831,-1.38406 0.63156,-3.04763 -0.19081,-4.24356l-7.60831,-12.25769c-1.14487,-1.66356 -3.07181,-2.65794 -5.15194,-2.65794c-2.08013,0 -4.00706,0.99438 -5.15194,2.65794c-0.02419,0.03494 -0.04838,0.06987 -0.06719,0.10481l-7.47394,12.05075c-0.88688,1.29537 -0.98631,2.96163 -0.25531,4.343c0.76056,1.44856 2.27094,2.3435 3.93988,2.3435zM85.30125,21.79562c0.215,-0.27413 0.58588,-0.29562 0.69875,-0.29562c0.11556,0 0.51062,0.02419 0.65306,0.22306l6.53331,10.52694h-14.37006z" fill="url(#color-6_DhXzKyWAbozd_gr6)"></path><path d="M150.5,150.5v-61.8125c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-26.875c-2.96431,0 -5.375,2.41069 -5.375,5.375v61.8125h-8.0625v-86c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-26.875c-2.96431,0 -5.375,2.41069 -5.375,5.375v86h-8.0625v-43c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-26.875c-2.96431,0 -5.375,2.41069 -5.375,5.375v43h-5.375v5.375h8.0625h32.25h13.4375h32.25h16.125h26.875h10.75v-5.375zM99.4375,64.5v5.375h-26.875v-5.375zM53.75,107.5v5.375h-26.875v-5.375zM26.875,150.5v-32.25h26.875v32.25zM72.5625,150.5v-75.25h26.875v75.25zM145.125,88.6875v5.375h-26.875v-5.375zM118.25,150.5v-51.0625h26.875l0.00269,51.0625z" fill="url(#color-7_DhXzKyWAbozd_gr7)"></path><path d="M31.304,80.625h6.321v16.125h5.375v-16.125h6.321c1.67163,0 3.182,-0.89494 3.94256,-2.34081c0.72831,-1.38406 0.63156,-3.04762 -0.19081,-4.24356l-7.60831,-12.25769c-1.14487,-1.66356 -3.07181,-2.65794 -5.15194,-2.65794c-2.08012,0 -4.00706,0.99438 -5.15194,2.65794c-0.02419,0.03494 -0.04838,0.06987 -0.06719,0.10481l-7.47394,12.05075c-0.88687,1.29537 -0.98631,2.96162 -0.25531,4.343c0.76056,1.44856 2.27094,2.3435 3.93988,2.3435zM39.61375,64.79563c0.215,-0.27412 0.58587,-0.29563 0.69875,-0.29563c0.11556,0 0.51062,0.02419 0.65306,0.22306l6.53331,10.52694h-14.37006z" fill="url(#color-8_DhXzKyWAbozd_gr8)"></path><path d="M122.679,61.8125h6.321v16.125h5.375v-16.125h6.321c1.67163,0 3.182,-0.89494 3.94256,-2.34081c0.72831,-1.38406 0.63156,-3.04762 -0.19081,-4.24356l-7.60831,-12.25769c-1.14487,-1.66356 -3.07181,-2.65794 -5.15194,-2.65794c-2.08013,0 -4.00706,0.99437 -5.15194,2.65794c-0.02419,0.03494 -0.04838,0.06987 -0.06719,0.10481l-7.47394,12.05075c-0.88688,1.29537 -0.98631,2.96162 -0.25531,4.343c0.76056,1.44856 2.27094,2.3435 3.93988,2.3435zM130.98875,45.98313c0.215,-0.27413 0.58587,-0.29563 0.69875,-0.29563c0.11556,0 0.51063,0.02419 0.65306,0.22306l6.53331,10.52694h-14.37006z" fill="url(#color-9_DhXzKyWAbozd_gr9)"></path><rect x="14" y="48" transform="scale(2.6875,2.6875)" width="2" height="8" fill="url(#color-10_DhXzKyWAbozd_gr10)"></rect></g></g></svg>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col">
+                                                                    <div class="fs-12 m-t-5">Credit Profile</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col">
+                                            <div class="row justify-content-end">
+                                                <div class="col-6">
+                                                    <div class="row fs-12 text-center">
+                                                        <div class="col p-t-15 p-b-15 bg-master-lighter tabButton" tab-name="transfers">
+                                                            <div class="row justify-content-center">
+                                                                <div class="col-auto">
+                                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                         width="35" height="35"
+                                                                         viewBox="0 0 172 172"
+                                                                         style=" fill:#000000;"><defs><linearGradient x1="98.09375" y1="78.38631" x2="98.09375" y2="93.17294" gradientUnits="userSpaceOnUse" id="color-1_43985_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="73.90625" y1="78.38631" x2="73.90625" y2="93.17294" gradientUnits="userSpaceOnUse" id="color-2_43985_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="98.98869" x2="86" y2="111.08513" gradientUnits="userSpaceOnUse" id="color-3_43985_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="12.09375" x2="86" y2="158.68613" gradientUnits="userSpaceOnUse" id="color-4_43985_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M98.09375,79.28125c-3.71066,0 -6.71875,3.00809 -6.71875,6.71875c0,3.71066 3.00809,6.71875 6.71875,6.71875c3.71066,0 6.71875,-3.00809 6.71875,-6.71875c0,-3.71066 -3.00809,-6.71875 -6.71875,-6.71875z" fill="url(#color-1_43985_gr1)"></path><path d="M73.90625,79.28125c-3.71066,0 -6.71875,3.00809 -6.71875,6.71875c0,3.71066 3.00809,6.71875 6.71875,6.71875c3.71066,0 6.71875,-3.00809 6.71875,-6.71875c0,-3.71066 -3.00809,-6.71875 -6.71875,-6.71875z" fill="url(#color-2_43985_gr2)"></path><path d="M75.25,99.4375c0,5.93669 4.81331,10.75 10.75,10.75c5.93669,0 10.75,-4.81331 10.75,-10.75z" fill="url(#color-3_43985_gr3)"></path><path d="M86,16.125c-38.53069,0 -69.875,31.34431 -69.875,69.875c0,38.53069 31.34431,69.875 69.875,69.875c38.53069,0 69.875,-31.34431 69.875,-69.875c0,-38.53069 -31.34431,-69.875 -69.875,-69.875zM86,21.5c35.56369,0 64.5,28.93631 64.5,64.5c0,15.61975 -5.58463,29.96025 -14.85919,41.13219c-5.63569,-7.59756 -12.9,-13.76806 -21.29306,-18.10569c2.61762,-3.63619 4.54456,-7.78569 5.6115,-12.2765h0.97825c7.40944,0 13.4375,-6.02806 13.4375,-13.4375c0,-7.40944 -6.02806,-13.4375 -13.4375,-13.4375h-0.13706c-1.38137,-18.00894 -16.44481,-32.25 -34.80044,-32.25c-18.35562,0 -33.41906,14.24106 -34.80044,32.25h-0.13706c-7.40944,0 -13.4375,6.02806 -13.4375,13.4375c0,7.40944 6.02806,13.4375 13.4375,13.4375h0.97556c1.06694,4.4935 2.99656,8.64569 5.61688,12.28188c-8.39037,4.33762 -15.66275,10.50544 -21.29844,18.09763c-9.27187,-11.17194 -14.8565,-25.50975 -14.8565,-41.1295c0,-35.56369 28.93631,-64.5 64.5,-64.5zM61.28306,56.39181c0.17737,0.01075 0.34938,0.04569 0.52944,0.04569c5.72169,0 10.36838,-4.50156 10.68819,-10.14531c1.68775,-0.87075 3.46956,-1.58294 5.32663,-2.11775c0.04837,0.50256 0.11019,1.00512 0.11019,1.51306c0,8.89294 -7.23206,16.125 -16.125,16.125c-1.08844,0 -2.15537,-0.12094 -3.20081,-0.33056c0.72831,-1.78987 1.62325,-3.49375 2.67137,-5.09012zM108.26863,53.18025c-1.10188,0.37356 -2.26287,0.56975 -3.45612,0.56975c-5.5255,0 -10.03513,-4.20325 -10.63175,-9.57288c5.53625,1.59906 10.39794,4.77031 14.08788,9.00313zM88.69556,43.13706c0.07256,8.82844 7.27238,15.98794 16.11694,15.98794c2.33812,0 4.58488,-0.5375 6.66231,-1.48619c0.91106,1.548 1.677,3.182 2.29781,4.89394c-2.795,1.28194 -5.83456,1.96725 -8.96012,1.96725c-11.80887,0 -21.41937,-9.57288 -21.49194,-21.36294c0.88419,-0.08063 1.77375,-0.13706 2.67944,-0.13706c0.90838,0 1.806,0.05644 2.69556,0.13706zM56.4375,72.5625c0,-2.02369 0.20694,-3.999 0.59663,-5.90981c1.55337,0.35475 3.14975,0.53481 4.77837,0.53481c8.36888,0 15.61706,-4.816 19.16725,-11.81425c4.48812,8.60269 13.47781,14.50175 23.83275,14.50175c3.58513,0 7.06813,-0.76325 10.32269,-2.12313c0.258,1.5695 0.42731,3.16856 0.42731,4.81063v16.125c0,16.29969 -13.26281,29.5625 -29.5625,29.5625c-16.29969,0 -29.5625,-13.26281 -29.5625,-29.5625zM86,123.625c9.68844,0 18.46312,-3.96944 24.79756,-10.36031c1.91888,0.94063 3.78937,1.95919 5.57925,3.10138c-8.041,8.04369 -18.90925,12.63394 -30.37681,12.63394c-11.46487,0 -22.33313,-4.58756 -30.37681,-12.63394c1.78719,-1.14219 3.65769,-2.16612 5.57656,-3.10675c6.33444,6.39625 15.11181,10.36569 24.80025,10.36569zM120.9375,75.25c4.44512,0 8.0625,3.61737 8.0625,8.0625c0,4.44512 -3.61738,8.0625 -8.0625,8.0625v-2.6875zM51.0625,88.6875v2.6875c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625c0,-4.44512 3.61738,-8.0625 8.0625,-8.0625zM86,150.5c-17.96863,0 -34.23875,-7.39331 -45.9455,-19.28819c3.16319,-4.43438 6.91763,-8.3635 11.16388,-11.69063c9.10256,9.44119 21.58331,14.85381 34.78163,14.85381c13.201,0 25.68175,-5.41263 34.78163,-14.85381c4.24356,3.32712 8.00069,7.25356 11.16388,11.69063c-11.70944,11.89487 -27.97688,19.28819 -45.9455,19.28819z" fill="url(#color-4_43985_gr4)"></path></g></g></svg>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col">
+                                                                    <div class="fs-12 m-t-5">Customer Profile</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row no-margin">
+                                        <div class="col bg-white padding-25">
+                                            <div class="row tabsContainer tabContent" tab-name="transfers">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="row">
+                                                                <div class="col">
+                                                                    <booking-component v-for="booking in filteredBookings" v-bind:key="booking.id" v-if="" :data="booking"></booking-component>
+                                                                    <div class="row align-items-center justify-content-center p-t-50 p-b-50"  v-show="!filteredBookings.length">
+                                                                        <div class="col-10">
+                                                                            <div class="row align-items-center justify-content-center  hint-text">
+                                                                                <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
+                                                                            </div>
+                                                                            <div class="row text-center">
+                                                                                <div class="col">
+                                                                                    <div class="row m-t-20">
+                                                                                        <div class="col">
+                                                                                            <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here</p>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                    <div class="row m-t-5 align-items-center justify-content-center">
+                                                                                        <div class="col">
+                                                                                            <small class="fs-9 muted all-caps font-lato" style="letter-spacing: 2px">There is no results found, Try adjusting your filters to find what you are looking for.</small>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row tabsContainer hide tabContent" tab-name="PO">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="row">
+                                                                <div class="col">
+                                                                    <list-component key="2" section="purchaseOrderSection" :endpoint="route('api.address.list')">
+                                                                        <template slot="list" slot-scope="{data}">
+                                                                            <address-component :data="data"></address-component>
+                                                                        </template>
+                                                                    </list-component>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-3">
+            <booking-form-component :data="company" section="customerProfileSection"></booking-form-component>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            id: {
+                type: Number,
+                required: true
+            }
+        },
+        data(){
+            return {
+                section: 'customerProfileSection',
+                company: null,
+                bookingFilters: {
+                    reference: '',
+                    type: 0,
+                    currency: 0,
+                    created_before: '',
+                    created_after: '',
+                    status: ''
+                }
+            }
+        },
+        computed: {
+            pendingQueue () {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            },
+            filteredBookings() {
+                return this.company.bookings.filter(booking => {
+                    return (this.bookingFilters.reference.trim() ? booking.marking.toLowerCase().includes(this.bookingFilters.reference.toLowerCase()) : true)
+                        && (this.bookingFilters.type !== 0 ? booking.service.id === this.bookingFilters.type : true)
+                        && (this.bookingFilters.currency !== 0 ? booking.convertible_currency.id === this.bookingFilters.currency : true )
+                        && (this.bookingFilters.created_before.trim() ? Date.parse(booking.created_at.replace( /(\d{2})-(\d{2})-(\d{4})/, "$2/$1/$3")) < Date.parse(this.bookingFilters.created_before.replace( /(\d{2})-(\d{2})-(\d{4})/, "$2/$1/$3")) : true)
+                        && (this.bookingFilters.created_before.trim() ? Date.parse(booking.created_at.replace( /(\d{2})-(\d{2})-(\d{4})/, "$2/$1/$3")) > Date.parse(this.bookingFilters.created_after.replace( /(\d{2})-(\d{2})-(\d{4})/, "$2/$1/$3")) : true)
+                })
+            }
+        },
+        watch: {
+            pendingQueue(inComplete){
+                if(inComplete){
+                    this.fetchCompany();
+                }
+            }
+        },
+        created(){
+            this.$store.dispatch('updateListQueue', {'name': this.section});
+        },
+        methods: {
+            fetchCompany(){
+                this.submit(route('api.company.show', this.id), 'get', this.section, false, false)
+            },
+            successHandler(response){
+                this.$store.dispatch('completeList', {'name': this.section, 'data': []});
+                this.company = response.payload.data;
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/companies/sections/SupplierCurrenciesSectionComponent.vue b/resources/assets/vue/components/companies/sections/SupplierCurrenciesSectionComponent.vue
new file mode 100644
index 00000000..cc25208e
--- /dev/null
+++ b/resources/assets/vue/components/companies/sections/SupplierCurrenciesSectionComponent.vue
@@ -0,0 +1,82 @@
+<template>
+    <div class="row no-margin">
+        <div class="col">
+            <div class="row m-b-10 align-items-center parentContainer">
+                <div class="col p-l-0">
+                    <div class="font-heading all-caps fs-10 hint-text muted">
+                        Supplier Currencies
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-3 m-r-15 m-b-15 b-a pointer p-t-20 p-b-20" :class="[{'b-success': parameters.currencies.includes(item.id)}, {'b-grey': !parameters.currencies.includes(item.id)}]" v-for="item in $store.getters.getListData('convertibleCurrenciesSection')" v-bind:key="item.id" @click="toggleCurrencies(item.id)">
+                    <div class="absolute" style="top: -12px; right: -27px;" v-if="parameters.currencies.includes(item.id)">
+                        <div class="icon-thumbnail icon-25 bg-success text-white btn-rounded fs-10">
+                            <i class="fa fs-10 fa-check"></i>
+                        </div>
+                    </div>
+                    <currency-component :deleteable="false" section="suppliersSection" :data="item"></currency-component>
+                </div>
+            </div>
+            <div class="row" v-show="currenciesChanged">
+                <div class="col-9 no-padding">
+                    <button class="btn btn-xs btn-default bg-master-lighter b-rad-none" @click="resetCurrencies()">Reset Changes</button>
+                    <button class="btn btn-xs btn-success b-rad-none" @click="submit(route('api.company.supplier.currencies.update', item.id), 'put', section, true, true)">Save Changes</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        props: {
+          section: {
+              required: true
+          }
+        },
+        data(){
+            return {
+                originalCurrencies: [],
+                parameters: {
+                    currencies: this.convertCurrenciesToArray(this.data.currencies)
+                }
+            }
+        },
+        created() {
+            this.originalCurrencies = this.staticCurrencies(this.convertCurrenciesToArray(this.data.currencies));
+        },
+        computed: {
+            currenciesChanged(){
+                let vm = this;
+                return !(vm.originalCurrencies.length === vm.parameters.currencies.length && vm.originalCurrencies.every(function(element, index) { return element === vm.parameters.currencies[index]}))
+            }
+        },
+        methods: {
+            toggleCurrencies(value) {
+                let index = this.parameters.currencies.indexOf(value);
+                index === -1 ? this.parameters.currencies.push(value) :
+                    this.parameters.currencies.splice(index,1);
+            },
+            convertCurrenciesToArray(currencies){
+                return currencies.map(function(value){
+                    return value.id;
+                })
+            },
+            resetCurrencies(){
+                this.parameters.currencies = this.staticCurrencies(this.originalCurrencies);
+            },
+            staticCurrencies(currencies){
+                return currencies.length ? currencies.join(', ').split(', ').map(function(value) {
+                    return parseInt(value);
+                }): []
+            },
+            successHandler(){
+                this.originalCurrencies = this.staticCurrencies(this.parameters.currencies)
+                this.updateList();
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue b/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
new file mode 100644
index 00000000..e4c6e109
--- /dev/null
+++ b/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
@@ -0,0 +1,181 @@
+<template>
+    <div class="row">
+        <div class="col-3">
+            <div class="row">
+                <div class="col no-padding">
+                    <div class="absolute b-a b-success b-thick padding-5 animate__animated animate__infinite animate__pulse w-100 h-100" v-if="attention" style="top:0; left:0; z-index: -1;">
+                        <div class="b-a b-thick b-success h-100"></div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <booking-form-component :data="company" section="customerProfileSection" v-if="company" v-on:click.native="attention = false"></booking-form-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+        <div class="col">
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+            <div class="row" v-if="!isLoading">
+                <div class="col">
+                    <div class="row m-l-0 m-r-0" v-show="!company.status || !company.bookings.length">
+                        <div class="col">
+                            <onboarding-section-component :data="company" v-on:attention="attention = true"></onboarding-section-component>
+                        </div>
+                    </div>
+                    <div class="row tabsContainer" v-show="(company.status === 2 || company.status === 1) && company.bookings.length">
+                        <div class="col">
+                            <div class="row m-l-0 m-r-0 d-none d-md-flex">
+                                <div class="col-3">
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter active tabButton" tab-name="transfers">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                 width="35" height="35"
+                                                                 viewBox="0 0 172 172"
+                                                                 style=" fill:#000000;"><defs><linearGradient x1="86" y1="104.14063" x2="86" y2="140.57775" gradientUnits="userSpaceOnUse" id="color-1_44825_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="16.125" x2="86" y2="159.93044" gradientUnits="userSpaceOnUse" id="color-2_44825_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M121.41588,139.75h-70.83175c-2.53431,0 -3.66575,-3.18469 -1.6985,-4.78106l33.72544,-27.40175c1.97531,-1.60444 4.80256,-1.60444 6.77787,0l33.72544,27.40175c1.96725,1.59638 0.83581,4.78106 -1.6985,4.78106z" fill="url(#color-1_44825_gr1)"></path><path d="M148.135,71.77238l-8.385,-8.385v-28.42031c0,-4.46125 -3.63081,-8.09206 -8.09206,-8.09206h-2.65794v-2.65794c0,-4.46125 -3.63081,-8.09206 -8.09206,-8.09206h-69.81587c-4.46125,0 -8.09206,3.63081 -8.09206,8.09206v2.65794h-2.65794c-4.46125,0 -8.09206,3.63081 -8.09206,8.09206v28.42031l-8.385,8.385c-1.5265,1.52381 -2.365,3.55019 -2.365,5.70825v64.95688c0,7.40944 6.02806,13.4375 13.4375,13.4375h102.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-64.95688c0,-2.15806 -0.84119,-4.18444 -2.365,-5.70825zM77.60156,91.96356l-0.30906,0.24725c-1.28731,-1.79525 -2.0425,-3.92375 -2.0425,-6.21081c0,-5.92862 4.82138,-10.75 10.75,-10.75c5.92863,0 10.75,4.82138 10.75,10.75c0,2.26287 -0.70413,4.41019 -2.01294,6.235l-0.34131,-0.27412c-4.93962,-3.95063 -11.84919,-3.95063 -16.79419,0.00269zM86,69.875c-8.89294,0 -16.125,7.23206 -16.125,16.125c0,3.53406 1.14487,6.85581 3.18738,9.59438l-10.578,8.46025l-3.35937,-2.6875v-55.88388c6.95256,-1.06963 12.16094,-6.28069 13.23325,-13.23325h27.2835c1.06963,6.95256 6.28069,12.16094 13.23325,13.23325v55.88656l-3.35937,2.6875l-10.56994,-8.45488c2.07744,-2.79231 3.17931,-6.10869 3.17931,-9.60244c0,-8.89294 -7.23206,-16.125 -16.125,-16.125zM58.179,107.5l-31.304,25.04481v-50.08694zM145.125,82.45519v50.08963l-31.30669,-25.04481zM144.33488,75.5725c0.11825,0.11825 0.18006,0.27412 0.27412,0.4085l-4.859,3.88612v-8.8795zM131.65794,32.25c1.49962,0 2.71706,1.21744 2.71706,2.71706v49.20275l-5.375,4.3v-56.21981zM51.09206,21.5h69.81856c1.49694,0 2.71438,1.21744 2.71438,2.71706v68.55275l-5.375,4.3v-56.75731h-2.6875c-6.22694,0 -10.75,-4.52306 -10.75,-10.75v-2.6875h-37.625v2.6875c0,6.22694 -4.52306,10.75 -10.75,10.75h-2.6875v56.75731l-5.375,-4.3v-68.55275c0,-1.49962 1.21744,-2.71706 2.71706,-2.71706zM40.34206,32.25h2.65794v56.21981l-5.375,-4.3v-49.20275c0,-1.49963 1.21744,-2.71706 2.71706,-2.71706zM32.25,70.98763v8.88219l-4.859,-3.88881c0.09406,-0.13438 0.15587,-0.29025 0.27412,-0.4085zM137.0625,150.5h-102.125c-4.44513,0 -8.0625,-3.61738 -8.0625,-8.0625v-3.00463l54.08325,-43.27144c2.96969,-2.37306 7.11381,-2.37306 10.08081,0l54.08594,43.26875v3.00731c0,4.44513 -3.61737,8.0625 -8.0625,8.0625z" fill="url(#color-2_44825_gr2)"></path></g></g></svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5">My Transfers</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col">
+                                    <div class="row justify-content-end">
+                                        <div class="col-3 m-r-5">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="PO">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                 width="35" height="35"
+                                                                 viewBox="0 0 172 172"
+                                                                 style=" fill:#000000;"><defs><linearGradient x1="86" y1="15.84013" x2="86" y2="42.59956" gradientUnits="userSpaceOnUse" id="color-1_1GEnKV6fhh62_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="75.30644" y1="14.46681" x2="75.30644" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-2_1GEnKV6fhh62_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="65.84106" y1="14.46681" x2="65.84106" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-3_1GEnKV6fhh62_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="75.30644" y1="14.46681" x2="75.30644" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-4_1GEnKV6fhh62_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="65.84106" y1="14.46681" x2="65.84106" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-5_1GEnKV6fhh62_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="75.30644" y1="14.46681" x2="75.30644" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-6_1GEnKV6fhh62_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="116.90625" y1="14.46681" x2="116.90625" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-7_1GEnKV6fhh62_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="116.90625" y1="14.46681" x2="116.90625" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-8_1GEnKV6fhh62_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="116.90625" y1="14.46681" x2="116.90625" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-9_1GEnKV6fhh62_gr9"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="65.84106" y1="14.46681" x2="65.84106" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-10_1GEnKV6fhh62_gr10"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="14.46681" x2="86" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-11_1GEnKV6fhh62_gr11"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g id="original-icon"><path d="M95.40625,45.6875h-18.8125v-17.46875c0,-5.19494 4.21131,-9.40625 9.40625,-9.40625v0c5.19494,0 9.40625,4.21131 9.40625,9.40625z" fill="url(#color-1_1GEnKV6fhh62_gr1)"></path><rect x="19.043" y="33" transform="scale(2.6875,2.6875)" width="17.957" height="2" fill="url(#color-2_1GEnKV6fhh62_gr2)"></rect><rect x="19.043" y="37" transform="scale(2.6875,2.6875)" width="10.912" height="2" fill="url(#color-3_1GEnKV6fhh62_gr3)"></rect><rect x="19.043" y="42" transform="scale(2.6875,2.6875)" width="17.957" height="2" fill="url(#color-4_1GEnKV6fhh62_gr4)"></rect><rect x="19.043" y="46" transform="scale(2.6875,2.6875)" width="10.912" height="2" fill="url(#color-5_1GEnKV6fhh62_gr5)"></rect><rect x="19.043" y="24" transform="scale(2.6875,2.6875)" width="17.957" height="2" fill="url(#color-6_1GEnKV6fhh62_gr6)"></rect><rect x="42" y="33" transform="scale(2.6875,2.6875)" width="3" height="2" fill="url(#color-7_1GEnKV6fhh62_gr7)"></rect><rect x="42" y="42" transform="scale(2.6875,2.6875)" width="3" height="2" fill="url(#color-8_1GEnKV6fhh62_gr8)"></rect><rect x="42" y="24" transform="scale(2.6875,2.6875)" width="3" height="2" fill="url(#color-9_1GEnKV6fhh62_gr9)"></rect><rect x="19.043" y="28" transform="scale(2.6875,2.6875)" width="10.912" height="2" fill="url(#color-10_1GEnKV6fhh62_gr10)"></rect><path d="M131.6875,32.7445v-0.4945c0,-4.44513 -3.61738,-8.0625 -8.0625,-8.0625h-18.8125h-7.4605c-1.67163,-4.68163 -6.10331,-8.0625 -11.352,-8.0625c-5.24869,0 -9.68037,3.38087 -11.352,8.0625h-26.273c-4.44512,0 -8.0625,3.61737 -8.0625,8.0625v0.4945c-3.12288,1.11531 -5.375,4.06887 -5.375,7.568v107.5c0,4.44512 3.61738,8.0625 8.0625,8.0625h86c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-107.5c0,-3.49912 -2.25213,-6.45269 -5.375,-7.568zM123.625,29.5625c1.4835,0 2.6875,1.204 2.6875,2.6875h-21.5h-6.71875v-2.6875h6.71875zM79.28125,28.21875c0,-3.70606 3.01269,-6.71875 6.71875,-6.71875c3.70606,0 6.71875,3.01269 6.71875,6.71875v14.78125h-13.4375zM48.375,29.5625h25.53125v2.6875h-28.21875c0,-1.4835 1.204,-2.6875 2.6875,-2.6875zM131.6875,147.8125c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-10.75v-10.75c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h10.75zM131.6875,131.6875h-10.75c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v10.75h-69.875c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-107.5c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h30.90625v10.75h24.1875v-10.75h6.71875h24.1875c1.4835,0 2.6875,1.204 2.6875,2.6875z" fill="url(#color-11_1GEnKV6fhh62_gr11)"></path></g></g></svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5">Purchase Orders</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-3">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="transfers">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                 width="35" height="35"
+                                                                 viewBox="0 0 172 172"
+                                                                 style=" fill:#000000;"><defs><linearGradient x1="96.75" y1="71.30475" x2="96.75" y2="95.57556" gradientUnits="userSpaceOnUse" id="color-1_6AytYvfD4mxm_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="68.53125" y1="69.47456" x2="68.53125" y2="93.72119" gradientUnits="userSpaceOnUse" id="color-2_6AytYvfD4mxm_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="32.25" y1="16.06856" x2="32.25" y2="137.557" gradientUnits="userSpaceOnUse" id="color-3_6AytYvfD4mxm_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="32.25" y1="16.06856" x2="32.25" y2="137.557" gradientUnits="userSpaceOnUse" id="color-4_6AytYvfD4mxm_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="45.6875" y1="16.06856" x2="45.6875" y2="137.557" gradientUnits="userSpaceOnUse" id="color-5_6AytYvfD4mxm_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="45.6875" y1="16.06856" x2="45.6875" y2="137.557" gradientUnits="userSpaceOnUse" id="color-6_6AytYvfD4mxm_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="45.6875" y1="16.06856" x2="45.6875" y2="137.557" gradientUnits="userSpaceOnUse" id="color-7_6AytYvfD4mxm_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="45.6875" y1="16.06856" x2="45.6875" y2="137.557" gradientUnits="userSpaceOnUse" id="color-8_6AytYvfD4mxm_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="72.5625" y1="16.06856" x2="72.5625" y2="137.557" gradientUnits="userSpaceOnUse" id="color-9_6AytYvfD4mxm_gr9"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="61.8125" y1="16.06856" x2="61.8125" y2="137.557" gradientUnits="userSpaceOnUse" id="color-10_6AytYvfD4mxm_gr10"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="153.1875" y1="16.06856" x2="153.1875" y2="137.557" gradientUnits="userSpaceOnUse" id="color-11_6AytYvfD4mxm_gr11"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="79.28125" y1="16.06856" x2="79.28125" y2="137.557" gradientUnits="userSpaceOnUse" id="color-12_6AytYvfD4mxm_gr12"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M86,86c0,5.93669 4.81331,10.75 10.75,10.75c5.93669,0 10.75,-4.81331 10.75,-10.75c0,-5.93669 -4.81331,-10.75 -10.75,-10.75c-5.93669,0 -10.75,4.81331 -10.75,10.75z" fill="url(#color-1_6AytYvfD4mxm_gr1)"></path><path d="M61.8125,94.67794v-17.35587c0,-1.14487 0.92719,-2.07206 2.07206,-2.07206h9.29337c1.14487,0 2.07206,0.92719 2.07206,2.07206v17.35587c0,1.14487 -0.92719,2.07206 -2.07206,2.07206h-9.29337c-1.14488,0 -2.07206,-0.92719 -2.07206,-2.07206z" fill="url(#color-2_6AytYvfD4mxm_gr2)"></path><rect x="11" y="28" transform="scale(2.6875,2.6875)" width="2" height="11" fill="url(#color-3_6AytYvfD4mxm_gr3)"></rect><rect x="11" y="42" transform="scale(2.6875,2.6875)" width="2" height="12" fill="url(#color-4_6AytYvfD4mxm_gr4)"></rect><rect x="16" y="28" transform="scale(2.6875,2.6875)" width="2" height="5" fill="url(#color-5_6AytYvfD4mxm_gr5)"></rect><rect x="16" y="35" transform="scale(2.6875,2.6875)" width="2" height="5" fill="url(#color-6_6AytYvfD4mxm_gr6)"></rect><rect x="16" y="42" transform="scale(2.6875,2.6875)" width="2" height="5" fill="url(#color-7_6AytYvfD4mxm_gr7)"></rect><rect x="16" y="49" transform="scale(2.6875,2.6875)" width="2" height="5" fill="url(#color-8_6AytYvfD4mxm_gr8)"></rect><rect x="26" y="46" transform="scale(2.6875,2.6875)" width="2" height="8" fill="url(#color-9_6AytYvfD4mxm_gr9)"></rect><rect x="22" y="46" transform="scale(2.6875,2.6875)" width="2" height="8" fill="url(#color-10_6AytYvfD4mxm_gr10)"></rect><rect x="56" y="8" transform="scale(2.6875,2.6875)" width="2" height="48" fill="url(#color-11_6AytYvfD4mxm_gr11)"></rect><path d="M134.375,13.4375h-75.25c-4.44512,0 -8.0625,3.61737 -8.0625,8.0625v40.3125h-26.95294c-4.40212,0 -7.98456,3.58244 -7.98456,7.98456v80.78087c0,4.40213 3.58244,7.98456 7.98456,7.98456h110.26544c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-129c0,-4.44513 -3.61737,-8.0625 -8.0625,-8.0625zM80.70294,153.1875h-56.59338c-1.43781,0 -2.60956,-1.17175 -2.60956,-2.60956v-80.78088c0,-1.43781 1.17175,-2.60956 2.60956,-2.60956h56.59338c1.43781,0 2.60956,1.17175 2.60956,2.60956v80.78087c0,1.43781 -1.17175,2.60956 -2.60956,2.60956zM88.6875,72.09219c2.37575,-1.38944 5.117,-2.21719 8.0625,-2.21719c8.89294,0 16.125,7.23206 16.125,16.125c0,8.89294 -7.23206,16.125 -16.125,16.125c-2.9455,0 -5.68675,-0.82775 -8.0625,-2.21719zM88.6875,105.89825c2.49131,1.02125 5.20569,1.60175 8.0625,1.60175c11.85456,0 21.5,-9.64544 21.5,-21.5c0,-11.85456 -9.64544,-21.5 -21.5,-21.5c-3.15244,0 -6.1275,0.72025 -8.82306,1.94844c-1.27119,-2.72781 -4.0205,-4.63594 -7.224,-4.63594h-13.51544v-19.03825c6.74294,-1.13681 12.07762,-6.4715 13.21444,-13.21444h32.69612c1.13681,6.74294 6.4715,12.08031 13.21444,13.21444v86.44881c-6.74294,1.13681 -12.07762,6.4715 -13.21444,13.21444h-24.41056zM137.0625,150.5c0,1.48081 -1.204,2.6875 -2.6875,2.6875h-46.16319c0.28756,-0.82237 0.47569,-1.69044 0.47569,-2.60956v-2.76544h29.5625v-2.6875c0,-5.92863 4.82137,-10.75 10.75,-10.75h2.6875v-96.75h-2.6875c-5.92863,0 -10.75,-4.82138 -10.75,-10.75v-2.6875h-43v2.6875c0,5.92862 -4.82138,10.75 -10.75,10.75h-2.6875v24.1875h-5.375v-40.3125c0,-1.48081 1.204,-2.6875 2.6875,-2.6875h75.25c1.4835,0 2.6875,1.20669 2.6875,2.6875z" fill="url(#color-12_6AytYvfD4mxm_gr12)"></path></g></g></svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5">Pending Payments</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row no-margin">
+                                <div class="col bg-white padding-25">
+                                    <div class="row tabsContainer tabContent active" tab-name="transfers">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <list-component key="2" section="transferSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, status: 2}">
+                                                                <template slot="list" slot-scope="{data}">
+                                                                    <booking-component :data="data"></booking-component>
+                                                                </template>
+                                                            </list-component>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row tabsContainer hide tabContent" tab-name="PO">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <list-component key="2" section="purchaseOrderSection" :endpoint="route('api.address.list')">
+                                                                <template slot="list" slot-scope="{data}">
+                                                                    <address-component :data="data"></address-component>
+                                                                </template>
+                                                            </list-component>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-2 p-l-0 p-r-0">
+            <verification-warning-component v-if="!isLoading && company.bookings.length"  :data="company"></verification-warning-component>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        data(){
+            return {
+                section: 'customerProfileSection',
+                isLoading: true,
+                company: null,
+                attention: false
+            }
+        },
+        computed: {
+            pendingQueue () {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            }
+        },
+        watch: {
+            pendingQueue(inComplete){
+                if(inComplete){
+                    this.fetchCompany();
+                }
+            }
+        },
+        created(){
+            this.$store.dispatch('updateListQueue', {'name': this.section});
+        },
+        methods: {
+            fetchCompany(){
+                this.isLoading = true;
+                this.submit(route('api.company.show', this.$store.getters.getCompanyId), 'get', this.section, false, false)
+            },
+            successHandler(response){
+                this.$store.dispatch('completeList', {'name': this.section, 'data': []});
+                this.isLoading = false;
+                this.company = response.payload.data;
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/general/elements/DocumentFileViewrComponent.vue b/resources/assets/vue/components/general/elements/DocumentFileViewrComponent.vue
new file mode 100644
index 00000000..6a3ca700
--- /dev/null
+++ b/resources/assets/vue/components/general/elements/DocumentFileViewrComponent.vue
@@ -0,0 +1,107 @@
+<template>
+    <div class="row parentContainer">
+        <div class="col">
+            <div class="icon-thumbnail fs-11 text-white icon-25 bg-primary btn-rounded float-left m-r-5 requestModal pointer" @click="loadFile" data-type="filePreview">
+                <i class="fa fa-file-image-o fs-10"></i>
+            </div>
+            <modal-component styleType="fill-in" type="filePreview">
+                <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+                <div class="row">
+                    <div class="col text-center">
+                        <img :src="src" class="w-100" v-if="type !== 'pdf'">
+                        <canvas ref="canvas" v-if="type === 'pdf'" />
+                    </div>
+                </div>
+            </modal-component>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            file: {
+                type: Object,
+                required: true
+            },
+
+        },
+        data(){
+            return {
+                isLoading: false,
+                loaded: false,
+                src: ''
+            }
+        },
+        computed: {
+            type() {
+                return this.file.file.mime_type === 'application/pdf' ? 'pdf' : 'image'
+            }
+        },
+        methods:{
+            loadFile(){
+                if(!this.loaded) {
+                    this.isLoading = true;
+                    let filePath = this.type === 'pdf' ? this.file.file.file_info.original.file : this.file.file.file_info[0].original.file;
+                    this.submit(this.route('api.storage.document.file', filePath), 'get', 'imagePreviewSection', false, false)
+                }
+            },
+            renderPdf() {
+                this.isLoading = true;
+                var pdfjsLib = window['pdfjs-dist/build/pdf'];
+
+                pdfjsLib.GlobalWorkerOptions.workerSrc = '//mozilla.github.io/pdf.js/build/pdf.worker.js';
+
+                var loadingTask = pdfjsLib.getDocument({data: this.src});
+                loadingTask.promise.then(function(pdf) {
+
+                    // Fetch the first page
+                    var pageNumber = 1;
+                    pdf.getPage(pageNumber).then(function(page) {
+
+                        var scale = 1.5;
+                        var viewport = page.getViewport({scale: scale});
+
+                        // Prepare canvas using PDF page dimensions
+                        var canvas = $(this.$refs.canvas);
+                        var context = canvas.getContext('2d');
+                        canvas.height = viewport.height;
+                        canvas.width = viewport.width;
+
+                        // Render PDF page into canvas context
+                        var renderContext = {
+                            canvasContext: context,
+                            viewport: viewport
+                        };
+                        var renderTask = page.render(renderContext);
+                        renderTask.promise.then(function () {
+                            console.log('Page rendered');
+                        });
+                    });
+                }, function (reason) {
+                    // PDF loading error
+                    console.error(reason);
+                });
+            },
+            successHandler(response){
+                this.loaded = true;
+                this.src = response.payload.src;
+                this.isLoading = false;
+
+                if(this.type === 'pdf'){
+                    this.renderPdf()
+                }
+
+            },
+            errorHandler(error, statusCode){
+                this.src = statusCode === 404 ? 'images/3231370.jpg' : 'images/2942005.jpg'
+                this.isLoading = false;
+            }
+        },
+
+    }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/resources/assets/vue/components/general/elements/ErrorMessageComponent.vue b/resources/assets/vue/components/general/elements/ErrorMessageComponent.vue
new file mode 100644
index 00000000..36b0a72d
--- /dev/null
+++ b/resources/assets/vue/components/general/elements/ErrorMessageComponent.vue
@@ -0,0 +1,17 @@
+<template>
+    <div class="row animate__animated animate__fadeInUpBig animate__fast align-items-center" v-if="error">
+        <div class="col">
+            <small class="bold fs-10 text-danger">{{error}}</small>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            error: {
+                required: true
+            }
+        }
+    }
+</script>
diff --git a/resources/assets/vue/components/general/elements/ListComponent.vue b/resources/assets/vue/components/general/elements/ListComponent.vue
index 5887025e..f2e0cfa4 100644
--- a/resources/assets/vue/components/general/elements/ListComponent.vue
+++ b/resources/assets/vue/components/general/elements/ListComponent.vue
@@ -1,25 +1,25 @@
 <template>
-    <transition-component group enter-class="animated fadeInRightBig delay-1 faster" leave-class="animated fadeOutRightBig faster">
+    <transition-component group enter-class="animate__animated animate__fadeInUp animate__delay-1 animate__faster p-r-30" leave-class="animate__animated animate__fadeOutDown animate__faster p-r-30" style="min-height: 300px;">
         <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
         <div class="row" key="2" v-show="!$store.getters.isLoading(section)">
             <div class="col">
                 <div class="row">
                     <div class="col">
-                        <div class="row align-items-center justify-content-center p-t-50 p-b-50"  v-show="!$store.getters.getListData(section).length">
+                        <div class="row align-items-center justify-content-center p-t-50 p-b-50"  v-show="!$store.getters.getListData(section).length && !$store.getters.isLoading(section)">
                             <div class="col-10">
                                 <div class="row align-items-center justify-content-center  hint-text">
-                                    <div class="col-6 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
+                                    <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
                                 </div>
                                 <div class="row text-center">
                                     <div class="col">
                                         <div class="row m-t-20">
                                             <div class="col">
-                                                <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">No Results Found</p>
+                                                <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here</p>
                                             </div>
                                         </div>
                                         <div class="row m-t-5 align-items-center justify-content-center">
                                             <div class="col">
-                                                <small class="fs-9 muted all-caps font-lato" style="letter-spacing: 2px">Try adjusting your filters to find what you are looking for.</small>
+                                                <small class="fs-9 muted all-caps font-lato" style="letter-spacing: 2px">There is no results found, Try adjusting your filters to find what you are looking for.</small>
                                             </div>
                                         </div>
                                     </div>
@@ -29,7 +29,7 @@
                         <div class="row">
                             <div class="col">
                                 <div class="list disable-text-selection" data-check-all="checkAll">
-                                    <div class="row" v-for="item in $store.getters.getListData(section)" v-bind:key="item.id" :data="item">
+                                    <div class="row" ref="list" v-for="item in $store.getters.getListData(section)" v-bind:key="item.id" :data="item">
                                         <div class="col">
                                             <slot name="list" :data="item"></slot>
                                         </div>
@@ -71,7 +71,6 @@
                 filters: this.options
             }
         },
-        validations: {},
         created(){
             this.setDecoratorDefault();
             this.$store.dispatch('updateListQueue', {'name': this.section, 'page': 1, 'filters': this.filters});
@@ -93,6 +92,11 @@
                 let listDecorators = this.$store.getters.getListDetails(this.section);
                 this.submit(this.endpoint + '?page=' + listDecorators.page + '&filters=' + JSON.stringify(listDecorators.filters), 'get', this.section, false, false)
             },
+            updateFilters(filters){
+                this.filters = filters;
+                this.setDecoratorDefault();
+                this.submit(this.endpoint + '?page=1&filters=' + JSON.stringify(this.filters), 'get', this.section, false, false)
+            },
             successHandler(response){
                 this.$store.dispatch('completeList', {'name': this.section, 'data': response.payload.data});
                 this.$refs.pagination.makePagination(response.payload.meta, response.payload.links);
diff --git a/resources/assets/vue/components/general/elements/LoadingComponent.vue b/resources/assets/vue/components/general/elements/LoadingComponent.vue
index b9121546..febe188a 100644
--- a/resources/assets/vue/components/general/elements/LoadingComponent.vue
+++ b/resources/assets/vue/components/general/elements/LoadingComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="row align-items-center justify-content-center absolute w-100" style="left: 15px;">
+    <div class="row align-items-center justify-content-center w-100" style="left: 15px;">
         <div class="col">
             <hollow-dots-spinner :animation-duration="1000" :dots-num="5" :color="getColor" class="m-auto"></hollow-dots-spinner>
         </div>
@@ -22,11 +22,15 @@
             getColor(){
                switch (this.color) {
                    case 'primary':
-                       return '#ff1d5e';
+                       return '#00baa4';
                    case 'success':
-                       return '#47b5ab';
+                       return '#1ac86f';
                    case 'danger':
-                       return '#ff3738'
+                       return '#ed5335';
+                   case 'white':
+                       return '#ffffff';
+                   case 'black':
+                       return '#000000'
                }
             }
         }
diff --git a/resources/assets/vue/components/general/elements/ModalComponent.vue b/resources/assets/vue/components/general/elements/ModalComponent.vue
index e350a7c7..72b91e0b 100644
--- a/resources/assets/vue/components/general/elements/ModalComponent.vue
+++ b/resources/assets/vue/components/general/elements/ModalComponent.vue
@@ -1,6 +1,6 @@
 <template>
-    <div class="modal modalContainer" :data-type="this.type">
-        <div class="modal-dialog"  v-bind:class="[{'modal-lg': this.large}, {'modal-sm': this.small}]">
+    <div class="modal modalContainer fade" :class="styleType" :data-type="type">
+        <div class="modal-dialog"  v-bind:class="[{'modal-lg': size === 'large'}, {'modal-sm': size === 'small'}]">
             <div class="modal-content">
                 <div class="modal-body">
                     <slot></slot>
@@ -12,19 +12,15 @@
 <script>
     export default {
         props: {
-            'type': {
+            type: {
                 type: String,
                 required: true
             },
-            'large': {
-                type: Boolean,
-                default: false
+            size: {
+                type: String,
+                default: ''
             },
-            'small': {
-                type: Boolean,
-                default: false
-            },
-            'effect': {
+            styleType: {
                 type: String,
                 default: "stick-up"
             }
diff --git a/resources/assets/vue/components/general/elements/PaginationComponent.vue b/resources/assets/vue/components/general/elements/PaginationComponent.vue
index c00a240e..be60c2e7 100644
--- a/resources/assets/vue/components/general/elements/PaginationComponent.vue
+++ b/resources/assets/vue/components/general/elements/PaginationComponent.vue
@@ -1,11 +1,11 @@
 <template>
-    <div class="row no-margin" v-if="Object.keys(pagination).length === 0">
-        <div class="col">
+    <div class="row no-margin" v-if="Object.keys(pagination).length > 0">
+        <div class="col no-padding">
             <div class="row justify-content-end" v-if="pagination.last_page !== 1">
                 <div class="col-auto b-a p-t-5 p-b-5 m-l-5 pointer b-grey pointer" @click="callPage(1)" v-if="pagination.current_page !== 1 && !pageNumbers().includes(1)">
                     <i class="fa fa-angle-double-left fs-14 muted lh-16"></i>
                 </div>
-                <div class="col-auto b-a p-t-5 p-b-5 m-l-5" v-for="n in pageNumbers()" @click="callPage(n)" :class="[{'b-grey': n !== pagination.current_page}, {'pointer': n !== pagination.current_page}, {'b-info': n === pagination.current_page}, {'bg-info': n === pagination.current_page}]">
+                <div class="col-auto b-a p-t-5 p-b-5 m-l-5" v-for="n in pageNumbers()" @click="callPage(n)" :class="[{'b-grey': n !== pagination.current_page}, {'pointer': n !== pagination.current_page}, {'b-complete': n === pagination.current_page}, {'bg-complete': n === pagination.current_page}]">
                     <small class="fs-11" :class="[{'muted': n !== pagination.current_page}, {'text-white': n === pagination.current_page}, {'bold': n === pagination.current_page}]">{{n}}</small>
                 </div>
                 <div class="col-auto b-a p-t-5 p-b-5 m-l-5 pointer b-grey pointer" @click="callPage(pagination.last_page)" v-if="pagination.current_page !== pagination.last_page && !pageNumbers().includes(pagination.last_page)">
diff --git a/resources/assets/vue/components/general/elements/PdfViewerComponent.vue b/resources/assets/vue/components/general/elements/PdfViewerComponent.vue
new file mode 100644
index 00000000..52c0e56a
--- /dev/null
+++ b/resources/assets/vue/components/general/elements/PdfViewerComponent.vue
@@ -0,0 +1,56 @@
+<template>
+    <div>
+        <div class="row">
+            <div class="col-sm-4">
+                <a :href="fileUrl">
+                    <canvas ref="canvas" />
+                </a>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import * as pdfjsLib from 'pdfjs-dist/es5/build/pdf.js';
+    pdfjsLib.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjsLib.version}/pdf.worker.js`;
+
+    export default {
+        props: {
+            fileUrl: {
+                type: String,
+            },
+            width: {
+                type: Number,
+                default: 200,
+            },
+            height: {
+                type: Number,
+                default: 200,
+            },
+        },
+        mounted() {
+            this.renderThumbnails()
+        },
+        methods: {
+            async renderThumbnails() {
+                const worker = new pdfjsLib.PDFWorker();
+
+                let pdf = await pdfjsLib
+                    .getDocument({ data: this.src, worker: worker })
+                    .promise.then((pdf) => pdf);
+
+                const page = await pdf.getPage(1);
+
+                let viewport = page.getViewport({ scale: 1.0 });
+                viewport = page.getViewport({ scale: this.width / viewport.width });
+
+                let canvas = $(this.$refs.canvas);
+                canvas.height = viewport.height;
+                canvas.width = viewport.width;
+
+                const context = canvas.getContext('2d');
+
+                await page.render({ canvasContext: context, viewport: viewport })
+            },
+        },
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/general/elements/SearchComponent.vue b/resources/assets/vue/components/general/elements/SearchComponent.vue
index b8375cf5..36bddce1 100644
--- a/resources/assets/vue/components/general/elements/SearchComponent.vue
+++ b/resources/assets/vue/components/general/elements/SearchComponent.vue
@@ -33,7 +33,9 @@
                     </div>
                     <div class="row m-t-10 text-center">
                         <div class="col">
-                            <small class="all-caps fs-9 text-danger pointer" @click="resetForm();updateFilters()">Clear Filters</small>
+                            <small class="all-caps fs-9 text-danger pointer" @click="resetForm();updateFilters()">Clear
+                                Filters
+                            </small>
                         </div>
                     </div>
                 </div>
@@ -57,8 +59,7 @@
         },
         methods:{
             updateFilters(){
-                this.$store.getters.isInQueue(this.section) ? this.filters = this.$store.getters.getListDetails(this.section).filters : this.setDecoratorDefault();;
-
+                this.$store.getters.isInQueue(this.section) ? this.filters = this.$store.getters.getListDetails(this.section).filters : this.setDecoratorDefault();
                 let vm = this;
 
                 $.each(this.$refs.filters_form.parameters, function(key, value) {
diff --git a/resources/assets/vue/components/general/elements/ValidationErrorComponent.vue b/resources/assets/vue/components/general/elements/ValidationErrorComponent.vue
index 9e6e9abf..b389cb95 100644
--- a/resources/assets/vue/components/general/elements/ValidationErrorComponent.vue
+++ b/resources/assets/vue/components/general/elements/ValidationErrorComponent.vue
@@ -1,8 +1,8 @@
 <template>
     <div v-if="validator.$error" class="text-danger">
-        <small class="bold" v-for="(object, param) in validator.$params" v-if="!validator[param]">
-            {{errorMessages[param]}}
+        <small class="bold" v-for="(object, param) in validator.$params">
             <span v-if="object.type === 'minLength'">{{object.min}} characters</span>
+            <span v-if="object.type === 'minValue'">{{object.min}}</span>
             <span v-if="object.type === 'sameAs'">{{object.eq}} field</span>
         </small>
     </div>
@@ -21,12 +21,15 @@
                     required: 'this field is required',
                     email: 'enter a valid email address',
                     minLength: 'this field must have at least',
-                    sameAs: 'this field must match the'
+                    sameAs: 'this field must match the',
+                    minValue: 'this field must at least be',
                 },
             }
         },
-        methods: {
-
+        computed: {
+            Validation(){
+                return this.validator;
+            }
         }
     }
 </script>
diff --git a/resources/assets/vue/components/general/elements/bearComponent.vue b/resources/assets/vue/components/general/elements/bearComponent.vue
new file mode 100644
index 00000000..4f92caa7
--- /dev/null
+++ b/resources/assets/vue/components/general/elements/bearComponent.vue
@@ -0,0 +1,24 @@
+<template>
+    <div class="row bear parentContainer">
+        <div class="col">
+            <div class="absolute" style="width: 50px;top: 73px;right: 15px;"><img src="/images/easter-egg.png" class="w-100 pointer requestModal" data-type="openBear" ></div>
+            <modal-component class="animate__animated animate__fast animate__fadeIn" size="small" styleType="fill-in" type="openBear">
+                <div class="row">
+                    <div class="col p-t-50 p-b-50">
+
+                    </div>
+                </div>
+            </modal-component>
+        </div>
+    </div>
+</template>
+
+<script>
+    import ModalComponent from "./ModalComponent";
+    export default {
+        components: {ModalComponent},
+        methods:{
+
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/general/forms/FileInputComponent.vue b/resources/assets/vue/components/general/forms/FileInputComponent.vue
new file mode 100644
index 00000000..45ef8a1e
--- /dev/null
+++ b/resources/assets/vue/components/general/forms/FileInputComponent.vue
@@ -0,0 +1,53 @@
+<template>
+    <div class="row no-margin">
+        <div class="col b-a " :class="[{'b-grey': !validator.$error}, {'b-danger': validator.$error}]">
+            <div class="row align-items-center b-b b-grey b-dashed">
+                <div class="col p-t-10 p-b-10">
+                    <slot name="label"></slot>
+                </div>
+                <div class="col-auto">
+                    <div class="row align-items-center">
+                        <div class="col-auto no-padding">
+                            <validation-error-component :validator="validator"></validation-error-component>
+                        </div>
+                        <div class="col-auto">
+                            <div class="fs-12 icon-thumbnail btn-rounded icon-25 m-r-0" :class="[{'bg-master-lightest': !validator.$error}, {'bg-danger': validator.$error}, {'text-white': validator.$error}]" v-show="!files.length">!</div>
+                            <div class="bg-success fs-11 text-white icon-thumbnail btn-rounded icon-25 m-r-0" v-show="!!files.length">
+                                <i class="fa fa-check fs-11"></i>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col p-t-15 p-b-15">
+                    <div class="row"  v-show="!files.length">
+                        <div class="col">
+                            <slot name="tips"></slot>
+                        </div>
+                    </div>
+                    <file-upload-component v-model="files" :value="value" v-on:input="$emit('input', $event)"></file-upload-component>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            value: {
+                type: Array,
+                required: false
+            },
+            validator: {
+                required: true
+            }
+        },
+        data(){
+            return {
+                files: []
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/general/forms/FileUploadComponent.vue b/resources/assets/vue/components/general/forms/FileUploadComponent.vue
new file mode 100644
index 00000000..0a940557
--- /dev/null
+++ b/resources/assets/vue/components/general/forms/FileUploadComponent.vue
@@ -0,0 +1,149 @@
+<template>
+    <div class="dropzone no-border no-padding text-center" style="min-height: auto;">
+        <div class="dz-message hide"></div>
+        <div class="dragzone row m-l-0 m-r-0 bg-master-lightest" :class="[{'m-b-15': hasFile}]" style="border-width: 1px;">
+            <div class="col">
+                <loading-component style="height: 200px; top: 0;" color="success" v-show="isLoading"></loading-component>
+                <div class="row" v-show="!isLoading">
+                    <div class="col">
+                        <div class="row p-b-20 p-t-15" v-show="!hasFile" style="min-height: 150px;">
+                            <div class="col">
+                                <div class="row justify-content-center m-b-10 m-t-10">
+                                    <div class="col-auto">
+                                        <div class="icon-thumbnail bg-transparent">
+                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                 viewBox="0 0 172 172"
+                                                 style=" fill:#000000;"><defs><linearGradient x1="86" y1="79.28125" x2="86" y2="149.85769" gradientUnits="userSpaceOnUse" id="color-1_48264_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="19.48438" x2="86" y2="131.01831" gradientUnits="userSpaceOnUse" id="color-2_48264_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M104.8125,104.8125l-16.60337,-23.71987c-1.075,-1.53456 -3.34594,-1.53456 -4.41825,0l-16.60338,23.71988h13.4375v40.3125c0,1.4835 1.204,2.6875 2.6875,2.6875h5.375c1.4835,0 2.6875,-1.204 2.6875,-2.6875v-40.3125z" fill="url(#color-1_48264_gr1)"></path><path d="M137.60269,67.97763c1.41362,-3.66575 2.14731,-7.53037 2.14731,-11.54013c0,-17.78319 -14.46681,-32.25 -32.25,-32.25c-13.87287,0 -25.95319,8.82306 -30.41444,21.55912c-0.16394,-0.13437 -0.34937,-0.23919 -0.516,-0.36819c-0.52406,-0.40581 -1.05888,-0.79281 -1.61519,-1.15563c-0.35206,-0.22844 -0.7095,-0.44344 -1.06963,-0.65306c-0.52137,-0.301 -1.05619,-0.57781 -1.60175,-0.84119c-0.31712,-0.15319 -0.62619,-0.3225 -0.95137,-0.45956c-0.8385,-0.36012 -1.70119,-0.66919 -2.58537,-0.93256c-0.29025,-0.086 -0.58588,-0.1505 -0.87881,-0.22575c-0.69875,-0.18006 -1.40825,-0.33325 -2.13119,-0.44881c-0.301,-0.05106 -0.59663,-0.10213 -0.90031,-0.13706c-0.99438,-0.12631 -1.99681,-0.21231 -3.02344,-0.21231c-13.33537,0 -24.1875,10.84944 -24.1875,24.1875v8.0625c-11.85456,0 -21.5,9.64544 -21.5,21.5c0,11.85456 9.64544,21.5 21.5,21.5h2.6875v2.6875c0,4.44512 3.61738,8.0625 8.0625,8.0625h24.1875v-5.375h-24.1875c-1.48081,0 -2.6875,-1.204 -2.6875,-2.6875v-2.6875h26.875v-5.375h-34.9375c-8.89294,0 -16.125,-7.23206 -16.125,-16.125c0,-8.89294 7.23206,-16.125 16.125,-16.125h10.75v-5.375h-5.375v-8.0625c0,-10.37106 8.43875,-18.8125 18.8125,-18.8125c0.7955,0 1.57756,0.06719 2.35156,0.16394c0.23112,0.02956 0.45956,0.06719 0.688,0.1075c0.56975,0.09406 1.12875,0.21231 1.68238,0.35475c0.22037,0.05644 0.44075,0.10481 0.65844,0.16931c0.69338,0.20694 1.37063,0.44881 2.03175,0.73369c0.23381,0.10213 0.45956,0.22306 0.688,0.33325c0.44613,0.215 0.88688,0.44344 1.31419,0.69069c0.26337,0.15319 0.52406,0.30906 0.77669,0.473c0.47569,0.30906 0.93794,0.63963 1.38406,0.99169c0.19081,0.1505 0.38431,0.29831 0.56975,0.45688c0.50525,0.43 0.98631,0.88687 1.44319,1.37063c0.14781,0.15588 0.28756,0.31444 0.43,0.473c0.47837,0.5375 0.93525,1.0965 1.3545,1.69312c0.02419,0.03225 0.04838,0.06181 0.06987,0.09406c0.48375,0.69875 0.92181,1.43781 1.31419,2.21181c1.30612,2.55313 2.05594,5.43413 2.05594,8.49519h5.375c0,-3.913 -0.95406,-7.59756 -2.60956,-10.86825l0.00806,-0.00269c-0.01613,-0.02956 -0.03494,-0.05644 -0.05106,-0.086c-0.4945,-0.96481 -1.04006,-1.89738 -1.6555,-2.78425c-0.05644,-0.08331 -0.12363,-0.15856 -0.18275,-0.24188c-0.05106,-0.06987 -0.10481,-0.13975 -0.15587,-0.20962c2.81919,-12.09106 13.60144,-20.74481 26.14669,-20.74481c14.81888,0 26.875,12.05613 26.875,26.875c0,3.77056 -0.80088,7.3745 -2.29512,10.7715l-8.4495,-0.0215l-0.01344,5.375l8.44144,0.0215c10.1695,0.19888 18.44163,8.62956 18.44163,18.791c0,10.37106 -8.43875,18.8125 -18.8125,18.8125h-32.25v5.375h26.875v2.6875c0,1.4835 -1.20669,2.6875 -2.6875,2.6875h-24.1875v5.375h24.1875c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-2.6875c13.33538,0 24.1875,-10.84944 24.1875,-24.1875c0,-11.18537 -7.80181,-20.71256 -18.27231,-23.39737z" fill="url(#color-2_48264_gr2)"></path></g></g></svg>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row m-b-10">
+                                    <div class="col">
+                                        <div class="all-caps fs-12 hint-text" style="letter-spacing: 1px;">Drag and drop files here</div>
+                                    </div>
+                                </div>
+                                <div class="row m-b-10 justify-content-center">
+                                    <div class="col-4">
+                                        <div class="row align-items-center">
+                                            <div class="col b-t b-grey"></div>
+                                            <div class="col-auto all-caps fs-10 hint-text muted">Or</div>
+                                            <div class="col b-t b-grey"></div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col">
+                                        <div class="btn btn-sm btn-outline-complete b-rad-none pointer select-btn hint-text">Browse files</div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row text-left" v-show="hasFile">
+                            <div class="col p-b-15 p-t-15">
+                                <div class="all-caps fs-12 hint-text" style="letter-spacing: 1px;">Drag and drop files here</div>
+                            </div>
+                            <div class="col-2 no-padding">
+                                <div class="btn btn-xs btn-primary btn-block b-rad-none pointer select-btn h-100">
+                                    <div class="row align-items-center h-100">
+                                        <div class="col">
+                                            <i class="fa fa-plus"></i>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            value: {
+                type: Array,
+                required: false
+            }
+        },
+        data(){
+          return {
+              isLoading: false,
+              hasFile: false,
+              files: []
+          }
+        },
+        mounted(){
+            let vm = this;
+            Dropzone.autoDiscover = false;
+
+            var dropzone = new Dropzone(this.$el, {
+                url: '#',
+                autoQueue: false,
+                processQueue: false,
+                acceptedFiles: 'image/*, application/pdf',
+                uploadMultiple: true,
+                clickable: '.select-btn',
+                previewTemplate: '<div class="row m-l-0 m-r-0 align-items-center m-t-5 m-b-5 bg-master-lightest text-left p-t-10 p-b-10 "> <div class="col-auto p-r-0"> <img data-dz-thumbnail style="width: 35px; height: 35px;" /> </div> <div class="col"> <div class="row m-b-5"> <div class="col"> <div class="dz-filename fs-8 bold"><span data-dz-name></span></div> </div> </div> <div class="row"> <div class="col"> <div class="dz-size muted light fs-10" data-dz-size></div> </div> </div> </div> <div class="col-auto"><i class="fs-16 fa fa-times-circle pointer hint-text" data-dz-remove></i></div> </div>'
+            });
+
+            dropzone.on("removedfile", function() {
+                vm.updateFiles(dropzone.files);
+            });
+
+            dropzone.on("addedfile", function(file) {
+
+                vm.isLoading = true;
+
+                if(file.name.split('.').pop() === 'pdf'){
+                    $(file.previewElement).find("img[data-dz-thumbnail]").attr("src", "/images/icons/pdf.png");
+                }
+                if(file.name.split('.').pop().indexOf("xls") !== -1){
+                    $(file.previewElement).find("img[data-dz-thumbnail]").attr("src", "/images/icons/xlsx.png");
+                }
+
+                Promise.all(dropzone.files.map(function(file){
+                    return vm.fileToBase64(file).then(function(data){
+                        return data;
+                    })
+                })).then(function(files) {
+                    vm.isLoading = false;
+                    vm.updateFiles(files);
+                })
+
+            });
+
+            dropzone.on("dragover", function() {
+                $(vm.$el).find('.dragzone').css('opacity', 0.5)
+            });
+
+            dropzone.on("dragleave", function() {
+                $(vm.$el).find('.dragzone').css('opacity', 1)
+            });
+
+            dropzone.on("drop", function() {
+                $(vm.$el).find('.dragzone').css('opacity', 1)
+            });
+        },
+        methods: {
+            fileToBase64(file) {
+                return new Promise(resolve => {
+                    var reader = new FileReader();
+
+                    reader.onload = function(event) {
+                        resolve(event.target.result);
+                    };
+
+                    reader.readAsDataURL(file);
+                });
+            },
+            updateFiles(files){
+                this.hasFile =  !!files.length;
+                this.files =  files;
+                this.$emit('input', files)
+            }
+        }
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/general/forms/ModalFormComponent.vue b/resources/assets/vue/components/general/forms/ModalFormComponent.vue
index ad225cb0..57e38fba 100644
--- a/resources/assets/vue/components/general/forms/ModalFormComponent.vue
+++ b/resources/assets/vue/components/general/forms/ModalFormComponent.vue
@@ -1,6 +1,6 @@
 <template>
-    <modal-component class="animated fast fadeInDownBig" :type="data ? 'editModal' : 'createModal'">
-        <transition-component group enter-class="animated fadeInDown faster" leave-class="animated fadeOutUp faster">
+    <modal-component class="animate__animated animate__fast animate__fadeInDownBig" :size="size" :type="data ? 'editModal' : 'createModal'">
+        <transition-component group enter-class="animate__animated animate__fadeInDown animate__faster" leave-class="animate__animated animate__fadeOutUp animate__faster">
             <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section+'.form')" ></loading-component>
             <div class="row" key="2" v-show="!$store.getters.isLoading(section+'.form')">
                 <div class="col">
@@ -17,6 +17,10 @@
                 type: String,
                 required: true
             },
+            'size': {
+                type: String,
+                default: ''
+            },
             data: {
                 type: Object,
                 default: null
diff --git a/resources/assets/vue/components/general/forms/SelectComponent.vue b/resources/assets/vue/components/general/forms/SelectComponent.vue
index 3a4cfddf..394ec13b 100644
--- a/resources/assets/vue/components/general/forms/SelectComponent.vue
+++ b/resources/assets/vue/components/general/forms/SelectComponent.vue
@@ -25,11 +25,7 @@
             }).val(this.value).trigger("change").on('change', function(){
                 vm.$emit('input', this.value);
             }).on('select2:open', function(){
-                new PerfectScrollbar('.select2-results__options', {
-                    wheelSpeed: 1,
-                    wheelPropagation: true,
-                    minScrollbarLength: 10
-                })
+                $('.select2-results__options').scrollbar().addClass('scrollbar-macosx')
             })
         },
         watch: {
diff --git a/resources/assets/vue/components/general/forms/SelectableComponent.vue b/resources/assets/vue/components/general/forms/SelectableComponent.vue
new file mode 100644
index 00000000..ab0ed0b5
--- /dev/null
+++ b/resources/assets/vue/components/general/forms/SelectableComponent.vue
@@ -0,0 +1,54 @@
+<template>
+    <select-component  :options="$store.getters.getSelectableList(section)" :value="value" @input="(val) => {$emit('input', val)}"></select-component>
+</template>
+<script>
+
+    export default {
+        props: {
+            value: {
+                required: false
+            },
+            section: {
+                type: String,
+                required: true
+            },
+            endpoint: {
+                type: String,
+                required: true
+            },
+            labelColumn: {
+                type: Array,
+                required: true
+            },
+            valueColumn: {
+                type: String,
+                required: true
+            }
+        },
+        created(){
+            if(!this.$store.getters.isInQueue(this.section)){
+                this.$store.dispatch('updateListQueue', {name: this.section});
+                this.$store.dispatch('crudRequest', {endpoint: this.endpoint, method: 'get'}).then(response => {
+                    let success = response.ok;
+                    response.json().then(response => {
+                        if(!success){return;}
+
+                        let vm = this;
+                        let mappedList = $.map(response.payload.data, function(value){
+                            let preservedValue = value;
+                            return {'id': !isNaN(value[vm.valueColumn]) ? parseInt(value[vm.valueColumn]) : value[vm.valueColumn],
+                                'text': vm.labelColumn.map(function(label){
+                                    return preservedValue[label]
+                                }).join(': ')
+                            };
+                        });
+
+                        this.$store.dispatch('completeList', {name: this.section, data: mappedList})
+
+                    });
+                })
+            }
+        }
+    }
+</script>
+
diff --git a/resources/assets/vue/components/general/forms/ValidationWrapperComponent.vue b/resources/assets/vue/components/general/forms/ValidationWrapperComponent.vue
index da114e55..d30fdbaf 100644
--- a/resources/assets/vue/components/general/forms/ValidationWrapperComponent.vue
+++ b/resources/assets/vue/components/general/forms/ValidationWrapperComponent.vue
@@ -1,13 +1,13 @@
 <template>
-    <div class="animated m-b-10" :class="[{'shake': validator.$error}]">
+    <div class="animate__animated" :class="[{'animate__shake': validator.$error}]">
         <div class="row">
             <div class="col">
-                <div class="form-group no-margin form-group-default" :class="[{' has-error': validator.$error}]">
+                <div class="form-group no-margin form-group-default" :class="[{' has-error': validator.$error}, {'form-group-default-select2': selecatable}, {'p-b-5': selecatable}]">
                     <slot></slot>
                 </div>
             </div>
         </div>
-        <div class="row m-t-5">
+        <div class="row m-t-5" v-show="validator.$error">
             <div class="col">
                 <validation-error-component :validator="validator"></validation-error-component>
             </div>
@@ -20,6 +20,10 @@
         props: {
             validator: {
                 required: true
+            },
+            selecatable: {
+                type: Boolean,
+                default: false
             }
         }
     }
diff --git a/resources/assets/vue/components/settings/elements/ConvertibleCurrenciesComponent.vue b/resources/assets/vue/components/settings/elements/ConvertibleCurrenciesComponent.vue
new file mode 100644
index 00000000..53028475
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/ConvertibleCurrenciesComponent.vue
@@ -0,0 +1,54 @@
+<template>
+    <div class="row parentContainer">
+        <div class="col-3 m-r-5 m-b-10 b-a b-grey p-t-20 p-b-20"  v-for="item in $store.getters.getListData('convertibleCurrenciesSection')" v-bind:key="item.id" >
+            <currency-component :section="section" :data="item"></currency-component>
+        </div>
+        <div class="col-3 b-a b-grey b-dashed pointer requestModal m-b-10" data-type="addCurrency" style="min-height: 127px;">
+            <div class="row h-100 align-items-center text-center">
+                <div class="col">
+                    <div class="m-b-10 hint-text">
+                        <i class="fa fa-plus fs-30 muted hint-text"></i>
+                    </div>
+                    <div class="font-heading fs-10 all-caps muted">Add Currency</div>
+                </div>
+            </div>
+            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="addCurrency">
+                <add-currency-form-component :section="section"></add-currency-form-component>
+            </modal-component>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        data(){
+          return {
+              section: 'convertibleCurrenciesSection'
+          }
+        },
+        created(){
+            this.$store.dispatch('updateListQueue', {'name': this.section, 'page': 1, 'filters': {}});
+        },
+        computed: {
+            pendingList () {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            }
+        },
+        watch: {
+            pendingList(inComplete){
+                if(inComplete){
+                    this.fetchList();
+                }
+            }
+        },
+        methods: {
+            fetchList(){
+                this.submit(this.route('api.currency.list') + '?filters=' + JSON.stringify({'id_not': 1}), 'get', this.section, false, false)
+            },
+            successHandler(response){
+                this.$store.dispatch('completeList', {'name': this.section, 'data': response.payload.data});
+            }
+        }
+
+    }
+</script>
diff --git a/resources/assets/vue/components/settings/elements/CurrenciesListComponent.vue b/resources/assets/vue/components/settings/elements/CurrenciesListComponent.vue
new file mode 100644
index 00000000..dd88254a
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/CurrenciesListComponent.vue
@@ -0,0 +1,218 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row m-b-15" v-for="(item, index) in serviceCurrencies" v-bind:key="item.id">
+                <div class="col">
+                    <div class="row">
+                        <div class="col-3 b-a pointer p-t-20 p-b-20" :class="[{'b-success': item.active}, {'b-grey': !item.active}]" @click="item.active = !item.active">
+                            <div class="absolute" style="top: -10px; right: -27px;" v-if="item.active">
+                                <div class="icon-thumbnail icon-25 bg-success text-white btn-rounded fs-10">
+                                    <i class="fa fs-10 fa-check"></i>
+                                </div>
+                            </div>
+                            <currency-component :deleteable="false" :section="section" :data="item.currency_object"></currency-component>
+                        </div>
+                        <div class="col">
+                            <div class="row h-100 m-r-0 align-items-end" v-show="item.active">
+                                <div class="col p-t-15 b-t b-r b-success bg-master-lightest">
+                                    <div class="row m-b-10">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                                Purchase Limits
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row m-r-0">
+                                        <div class="col m-r-10 p-r-5">
+                                            <div class="row">
+                                                <div class="col p-r-0">
+                                                    <validation-wrapper-component class="no-border" :validator="$v.parameters.currencies.$each[index].minimum_limit.value">
+                                                        <label class="muted">Minimum Limit</label>
+                                                        <input type="text" class="form-control" v-model.lazy="item.minimum_limit.value" v-money="money" :disabled="!item.active">
+                                                    </validation-wrapper-component>
+                                                </div>
+                                                <div class="col-auto bg-white b-t b-r b-b b-grey">
+                                                    <div class="row h-100 align-items-center">
+                                                        <div class="col">
+                                                            <div class="font-heading fs-10 muted">{{item.currency_object.short_code}}</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col p-l-5">
+                                            <div class="row">
+                                                <div class="col p-r-0">
+                                                    <validation-wrapper-component :validator="$v.parameters.currencies.$each[index].maximum_limit.value">
+                                                        <label class="muted">Maximum Limit</label>
+                                                        <input type="text" class="form-control" v-model.lazy="item.maximum_limit.value" v-money="money" :disabled="!item.active">
+                                                    </validation-wrapper-component>
+                                                </div>
+                                                <div class="col-auto bg-white b-t b-r b-b b-grey">
+                                                    <div class="row h-100 align-items-center">
+                                                        <div class="col">
+                                                            <div class="font-heading fs-10 muted">{{item.currency_object.short_code}}</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-r-0" v-show="item.active">
+                        <div class="col p-b-15 bg-master-lightest b-r b-b b-l b-success">
+                            <div class="row">
+                                <div class="col p-r-25 p-l-25">
+                                    <div class="row m-b-10 m-t-10">
+                                        <div class="col p-l-5">
+                                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                                Exchange Rates
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-4 p-l-5 p-r-5 m-b-10" v-for="(rate, method) in item.rates">
+                                            <validation-wrapper-component :validator="$v.parameters.currencies.$each[index].rates.$each[method].selling.value" :class="[{'hint-text': rate.payment_method === 'wallet' || rate.payment_method === 'payment gateway'}]">
+                                                <label class="muted all-caps">{{rate.payment_method}}</label>
+                                                <input type="text" class="form-control" v-model.lazy="rate.selling.value" v-money="exchangeRate" :disabled="!item.active || rate.payment_method === 'wallet' || rate.payment_method === 'payment gateway'">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import formHandler from "../../../general/mixins/formHandler";
+    import { required, requiredIf, minValue, maxValue, decimal} from "vuelidate/lib/validators";
+    export default {
+        data(){
+            return {
+                parameters: {
+                    currencies: []
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                currencies: {
+                    $each: {
+                        maximum_limit: {
+                            value:{
+                                required: requiredIf(function (currency) { return currency.active}),
+                            }
+                        },
+                        minimum_limit: {
+                            value:{
+                                required: requiredIf(function (currency) { return currency.active })
+                            }
+                        },
+                        rates: {
+                            required: true,
+                            $each: {
+                                selling: {
+                                    value:{
+                                        required: requiredIf(function (currency) { return currency.active }),
+                                        minValue: minValue(0)
+                                    }
+
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        computed: {
+            convertibleCurrencies() {
+                let vm = this;
+                return this.$store.getters.getListData('convertibleCurrenciesSection').forEach(function(value){
+                    vm.addInactiveCurrency(value)
+                });
+            },
+            serviceCurrencies: function(){
+                return this.data.currencies;
+            }
+        },
+        watch: {
+            convertibleCurrencies(){
+                this.convertibleCurrencies();
+            },
+            serviceCurrencies(currencies){
+                this.$emit('input', currencies)
+            }
+        },
+        methods: {
+            inArray(element){
+                return this.parameters.currencies.some(currency => currency.id === element.id);
+            },
+            pushIfNotExist(element){
+                if (!this.inArray(element)) {
+                    this.parameters.currencies.push(element);
+                }
+            },
+            addInactiveCurrency(element){
+                this.pushIfNotExist({
+                    currency_object: element,
+                    active: false,
+                    id: element.id,
+                    maximum_limit: {
+                        type: 'fixed_amount',
+                        value: 0
+                    },
+                    minimum_limit: {
+                        type: 'fixed_amount',
+                        value: 0
+                    },
+                    rates: [
+                        {
+                            payment_method: 'cash',
+                            selling: {
+                                type: 'rate',
+                                value: 0
+                            }
+                        },
+                        {
+                            payment_method: 'cheque',
+                            selling: {
+                                type: 'rate',
+                                value: 0
+                            }
+                        },
+                        {
+                            payment_method: 'ba',
+                            selling: {
+                                type: 'rate',
+                                value: 0
+                            }
+                        },
+                        {
+                            payment_method: 'wallet',
+                            selling: {
+                                type: 'rate',
+                                value: 0
+                            }
+                        },
+                        {
+                            payment_method: 'payment gateway',
+                            selling: {
+                                type: 'rate',
+                                value: 0
+                            }
+                        }
+                    ]
+                });
+            }
+        },
+        mixins: [formHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/elements/CurrencyComponent.vue b/resources/assets/vue/components/settings/elements/CurrencyComponent.vue
new file mode 100644
index 00000000..20b8e04c
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/CurrencyComponent.vue
@@ -0,0 +1,39 @@
+<template>
+    <div class="row h-100 align-items-center text-center">
+        <div class="absolute w-100 parentContainer" style="top:0px;" v-if="!primary && item.short_code !== 'RMB' && deleteable">
+            <div class="row">
+                <div class="col"></div>
+                <div class="col-auto p-r-0" >
+                    <div class="icon-thumbnail pointer hint-text fs-10 icon-25 bg-master-lighter requestModal" data-type="deleteCurrency">
+                        <i class="fa fa-times fs-10 m-b-5"></i>
+                    </div>
+                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteCurrency">
+                        <delete-currency-form-component :data="item" :section="section"></delete-currency-form-component>
+                    </modal-component>
+                </div>
+            </div>
+        </div>
+        <div class="col">
+            <div class="m-b-10"><span class="flag-icon fs-40" :class="'flag-icon-'+item.country.short_code.toLowerCase()"></span></div>
+            <div class="font-heading bold">{{this.item.short_code}}</div>
+            <div class="font-heading fs-10 all-caps">{{this.item.country.name}}</div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        props: {
+            primary: {
+                type: Boolean,
+                default: false
+            },
+            deleteable: {
+                type: Boolean,
+                default: true
+            }
+        },
+        mixins: [componentHandler, ModalFormHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/settings/elements/PaymentAttemptComponent.vue b/resources/assets/vue/components/settings/elements/PaymentAttemptComponent.vue
new file mode 100644
index 00000000..6266afbe
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/PaymentAttemptComponent.vue
@@ -0,0 +1,151 @@
+<template>
+    <div class="row no-margin">
+        <div class="col p-t-5 p-b-5 b-grey b-a">
+            <div class="row text-center">
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading font-orbitron text-danger-light">{{timer.days}}</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-7 muted">Days</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto no-padding">
+                    <div class="font-heading p-b-5">:</div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading font-orbitron text-danger-light">{{timer.hours}}</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-7 muted">Hours</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto no-padding">
+                    <div class="font-heading p-b-5">:</div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading font-orbitron text-danger-light">{{timer.minutes}}</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-7 muted">Minutes</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-auto b-t b-b b-r b-grey pointer requestModal" data-type="paymentAttempt">
+            <div class="row h-100 align-items-center">
+                <div class="col p-l-10 p-r-10">
+                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                         width="25" height="25"
+                         viewBox="0 0 172 172"
+                         style=" fill:#000000;"><defs><linearGradient x1="64.5" y1="40.25606" x2="64.5" y2="86.92719" gradientUnits="userSpaceOnUse" id="color-1_VhrilWh3UcXU_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.80644" x2="86" y2="157.19456" gradientUnits="userSpaceOnUse" id="color-2_VhrilWh3UcXU_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="10.80644" x2="86" y2="157.19456" gradientUnits="userSpaceOnUse" id="color-3_VhrilWh3UcXU_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M86,75.25v-32.25c-23.74944,0 -43,19.25056 -43,43h32.25c0,-5.93669 4.81331,-10.75 10.75,-10.75z" fill="url(#color-1_VhrilWh3UcXU_gr1)"></path><path d="M86,16.125c-38.53069,0 -69.875,31.34431 -69.875,69.875c0,38.53069 31.34431,69.875 69.875,69.875c38.53069,0 69.875,-31.34431 69.875,-69.875c0,-38.53069 -31.34431,-69.875 -69.875,-69.875zM86,150.5c-35.56369,0 -64.5,-28.93631 -64.5,-64.5c0,-35.56369 28.93631,-64.5 64.5,-64.5c35.56369,0 64.5,28.93631 64.5,64.5c0,35.56369 -28.93631,64.5 -64.5,64.5z" fill="url(#color-2_VhrilWh3UcXU_gr2)"></path><path d="M86,26.875c-32.60206,0 -59.125,26.52294 -59.125,59.125c0,32.60206 26.52294,59.125 59.125,59.125c32.60206,0 59.125,-26.52294 59.125,-59.125c0,-32.60206 -26.52294,-59.125 -59.125,-59.125zM139.61294,88.6875c-0.63694,12.78981 -5.74319,24.39444 -13.81375,33.31156l-5.59269,-5.59269l-3.80013,3.80013l5.59269,5.59269c-8.91712,8.07325 -20.51906,13.17681 -33.31156,13.81375v-7.92544h-5.375v7.92544c-12.78981,-0.63694 -24.39444,-5.74319 -33.31156,-13.81375l5.59269,-5.59269l-3.80013,-3.80013l-5.59269,5.59269c-8.07325,-8.91712 -13.17681,-20.51906 -13.81375,-33.31156h40.44687c1.24969,6.12481 6.67575,10.75 13.16606,10.75c7.40944,0 13.4375,-6.02806 13.4375,-13.4375c0,-6.48763 -4.62519,-11.91638 -10.75,-13.16606v-40.44687c12.78981,0.63694 24.39444,5.74319 33.31156,13.81375l-5.59269,5.59269l3.80013,3.80013l5.59269,-5.59269c8.07325,8.91713 13.17681,20.51906 13.81375,33.31156h-7.92544v5.375zM86,77.9375c4.44512,0 8.0625,3.61737 8.0625,8.0625c0,4.44512 -3.61738,8.0625 -8.0625,8.0625c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625c0,-4.44512 3.61737,-8.0625 8.0625,-8.0625zM83.3125,32.38706v40.44687c-5.25675,1.07231 -9.40625,5.22181 -10.47856,10.47856h-40.44687c1.36794,-27.49044 23.435,-49.5575 50.92544,-50.92544z" fill="url(#color-3_VhrilWh3UcXU_gr3)"></path></g></g></svg>
+                </div>
+            </div>
+        </div>
+        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="paymentAttempt">
+            <payment-attempt-limit-form-component :data="{
+                    segment_id: this.segment_id,
+                    name: 'Payment Attempt Duration Limit',
+                    reference: this.reference,
+                    detail: {
+                        minutes: this.minutes
+                    }
+                }" section="paymentAttemptSection" class="text-center"></payment-attempt-limit-form-component>
+        </modal-component>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            segment_id: {
+                required: true,
+                type: Number,
+                default: 1
+            },
+            data:{
+                type: Number,
+                default: 0
+            }
+        },
+        data(){
+            return {
+                reference: 'PAYMENT_ATTEMPT_DURATION_LIMIT',
+                minutes: 0
+            }
+        },
+        computed: {
+            pendingQueue () {
+                return this.$store.getters.isInCompleteQueue(this.reference);
+            },
+            timer () {
+                return {
+                    days: ('00'+Math.floor(this.minutes / 1440)).substr(('00'+Math.floor(this.minutes / 1440)).length-2),
+                    hours: ('00'+(Math.floor(this.minutes / 60) % 24)).substr(('00'+(Math.floor(this.minutes / 60) % 24)).length-2),
+                    minutes: ('00'+Math.floor(this.minutes % 60)).substr(('00'+Math.floor(this.minutes % 60)).length-2)
+                };
+            }
+        },
+        watch: {
+            pendingQueue(inComplete){
+                if(inComplete){
+                    this.fetchTime();
+                }
+            },
+            'data': function () {
+                this.minutes = this.data
+            }
+        },
+        created(){
+            if(this.segment_id === 1){
+                this.$store.dispatch('updateListQueue', {'name': this.reference});
+                return;
+            }
+
+            if(this.data){
+                this.minutes = this.data
+            }
+
+        },
+        methods: {
+            fetchTime(){
+                return this.submit(route('api.segment.constant.show', this.segment_id, this.reference), 'get', '', false, false)
+            },
+            successHandler(response){
+                this.$store.dispatch('completeList', {'name': this.reference, 'data': response.payload.data});
+                this.minutes = response.payload.data.detail.hasOwnProperty('minutes') ? response.payload.data.detail.minutes:0;
+            }
+        }
+
+    }
+</script>
+<style>
+    .blink {
+        animation: blink-animation 1s steps(5, start) infinite;
+        -webkit-animation: blink-animation 1s steps(5, start) infinite;
+    }
+    @keyframes blink-animation {
+        to {
+            visibility: hidden;
+        }
+    }
+    @-webkit-keyframes blink-animation {
+        to {
+            visibility: hidden;
+        }
+    }
+</style>
diff --git a/resources/assets/vue/components/settings/elements/PrimaryCurrencyComponent.vue b/resources/assets/vue/components/settings/elements/PrimaryCurrencyComponent.vue
new file mode 100644
index 00000000..c2c430db
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/PrimaryCurrencyComponent.vue
@@ -0,0 +1,30 @@
+<template>
+    <currency-component section="PrimaryCurrenciesSection" primary :data="this.currency"></currency-component>
+</template>
+
+<script>
+    import CurrencyComponent from "./CurrencyComponent";
+    export default {
+        components: {CurrencyComponent},
+        data(){
+          return {
+              currency: {
+                  country: {
+                      name: '',
+                      short_code: ''
+                  },
+                  short_code: ''
+              },
+          }
+        },
+        created(){
+            this.submit(this.route('api.currency.primary.show'), 'get', 'PrimaryCurrenciesSection', false, false)
+        },
+        methods: {
+            successHandler(response){
+                this.currency = response.payload.data;
+            }
+        }
+
+    }
+</script>
diff --git a/resources/assets/vue/components/settings/elements/SegmentComponent.vue b/resources/assets/vue/components/settings/elements/SegmentComponent.vue
new file mode 100644
index 00000000..54dafd09
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/SegmentComponent.vue
@@ -0,0 +1,87 @@
+<template>
+    <div class="row m-b-15 parentContainer">
+        <div class="col">
+            <div class="row align-items-center">
+                <div class="col-auto p-r-0">
+                    <div class="padding-5 bg-master-lightest">
+                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                             width="30" height="30"
+                             viewBox="0 0 172 172"
+                             style=" fill:#000000;"><defs><linearGradient x1="86" y1="97.08594" x2="86" y2="105.31775" gradientUnits="userSpaceOnUse" id="color-1_43991_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="94.0625" y1="85.83338" x2="94.0625" y2="93.89588" gradientUnits="userSpaceOnUse" id="color-2_43991_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="77.9375" y1="85.83338" x2="77.9375" y2="93.89588" gradientUnits="userSpaceOnUse" id="color-3_43991_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="28.55469" x2="86" y2="143.10938" gradientUnits="userSpaceOnUse" id="color-4_43991_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M77.9375,96.75c0,4.45319 3.60931,8.0625 8.0625,8.0625c4.45319,0 8.0625,-3.60931 8.0625,-8.0625z" fill="url(#color-1_43991_gr1)"></path><path d="M94.0625,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-2_43991_gr2)"></path><path d="M77.9375,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-3_43991_gr3)"></path><path d="M147.8125,51.0625h-18.8125v-8.0625c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-11.2445c-1.11263,-3.12019 -4.06888,-5.375 -7.568,-5.375h-32.25c-3.49912,0 -6.45538,2.25481 -7.568,5.375h-11.2445c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v8.0625h-18.8125c-4.44513,0 -8.0625,3.61738 -8.0625,8.0625v59.125c0,4.44512 3.61737,8.0625 8.0625,8.0625h18.8125v8.0625c0,4.44512 3.61738,8.0625 8.0625,8.0625h69.875c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-8.0625h18.8125c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-59.125c0,-4.44512 -3.61737,-8.0625 -8.0625,-8.0625zM147.8125,56.4375c1.4835,0 2.6875,1.20669 2.6875,2.6875v51.0625h-2.88637c-0.80625,-6.09525 -4.28119,-11.78469 -9.47612,-15.25425c0.99437,-1.87319 1.6125,-3.98019 1.6125,-6.24575v-5.375c0,-6.48763 -4.62519,-11.91638 -10.75,-13.16606v-13.70894zM134.375,88.6875c0,3.49912 -2.25213,6.45538 -5.375,7.568v-20.50831c3.12287,1.11262 5.375,4.06887 5.375,7.568zM134.6545,99.1365c3.913,2.48056 6.62469,6.84506 7.47125,11.051h-13.12575v-8.33394c2.12044,-0.43269 4.02319,-1.41094 5.6545,-2.71706zM67.1875,37.625c0,-1.48081 1.204,-2.6875 2.6875,-2.6875h32.25c1.4835,0 2.6875,1.20669 2.6875,2.6875v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875h-32.25c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875zM51.0625,40.3125h10.75c0,4.44512 3.61737,8.0625 8.0625,8.0625h32.25c4.44512,0 8.0625,-3.61738 8.0625,-8.0625h10.75c1.4835,0 2.6875,1.20669 2.6875,2.6875v83.3125h-3.34056c-1.73881,-9.23963 -7.19444,-17.45531 -15.06344,-22.66906c1.44319,-2.88906 2.279,-6.13556 2.279,-9.58094v-10.75c0,-11.85456 -9.64544,-21.5 -21.5,-21.5c-11.85456,0 -21.5,9.64544 -21.5,21.5v10.75c0,3.44537 0.83581,6.69188 2.28169,9.58094c-7.869,5.21375 -13.32463,13.42675 -15.06344,22.66906h-3.34325v-83.3125c0,-1.48081 1.204,-2.6875 2.6875,-2.6875zM102.125,94.0625c0,8.89294 -7.23206,16.125 -16.125,16.125c-8.89294,0 -16.125,-7.23206 -16.125,-16.125v-10.75c0,-8.89294 7.23206,-16.125 16.125,-16.125c8.89294,0 16.125,7.23206 16.125,16.125zM86,115.5625c6.48494,0 12.29531,-2.89981 16.24056,-7.45513c6.39088,4.22744 10.93006,10.77956 12.59363,18.20513h-57.66837c1.66356,-7.42556 6.20275,-13.97769 12.59631,-18.20244c3.94256,4.55531 9.75294,7.45244 16.23787,7.45244zM43,96.2555c-3.12288,-1.11263 -5.375,-4.06888 -5.375,-7.568v-5.375c0,-3.49912 2.25212,-6.45538 5.375,-7.568zM37.32669,99.12306c1.634,1.31419 3.54481,2.29512 5.67331,2.7305v8.33394h-13.18487c0.78475,-4.57412 3.526,-8.63225 7.51156,-11.06444zM24.1875,56.4375h18.8125v13.70894c-6.12481,1.24969 -10.75,6.67575 -10.75,13.16606v5.375c0,2.26287 0.61544,4.36719 1.60981,6.24038c-5.21106,3.44806 -8.686,9.05688 -9.47613,15.25963h-2.88369v-51.0625c0,-1.48081 1.204,-2.6875 2.6875,-2.6875zM24.1875,120.9375c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875v-2.6875h21.5v5.375zM120.9375,137.0625h-69.875c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875v-2.6875h75.25v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875zM147.8125,120.9375h-18.8125v-5.375h21.5v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875z" fill="url(#color-4_43991_gr4)"></path></g></g></svg>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Name</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">{{item.name}}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto">
+                    <div class="row">
+                        <div class="col">
+                            <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="deleteSupplier">
+                                <i class="fa fa-times"></i>
+                            </button>
+                            <div class="btn btn-xs  b-rad-none pointer btn-outline-warning requestModal hide" data-type="updateServiceStatus">Deactivate</div>
+                            <button class="btn btn-xs btn-default bg-master-lighter p-l-10 p-r-10 b-rad-none" @click="expanded = !expanded">
+                                <i class="fa" :class="[{'fa-angle-up': expanded}, {'fa-angle-down': !expanded}]"></i>
+                            </button>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteSupplier">
+                                <delete-segment-form-component :data="item" section="segmentsSection" class="text-center"></delete-segment-form-component>
+                            </modal-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row" v-if="expanded">
+                <div class="col-1"></div>
+                <div class="col p-l-10 p-t-10 p-b-10">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <div class="row m-b-20">
+                                <div class="col">
+                                    <div class="row align-items-center parentContainer">
+                                        <div class="col-auto m-r-50">
+                                            <div class="row m-b-5">
+                                                <div class="col">
+                                                    <div class="font-heading fs-9 all-caps muted">Payment Attempt Duration Limit</div>
+                                                </div>
+                                            </div>
+                                            <payment-attempt-component :segment_id="item.id" :data="item.time_limit ? item.time_limit.detail.minutes : 0"></payment-attempt-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-l-0 m-b-10 align-items-center parentContainer">
+                                <div class="col p-l-0">
+                                    <div class="font-heading all-caps fs-10 hint-text muted">
+                                        Segment Services
+                                    </div>
+                                </div>
+                            </div>
+                            <segment-service-list-component :data="item"></segment-service-list-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                expanded: false,
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/elements/SegmentServiceComponent.vue b/resources/assets/vue/components/settings/elements/SegmentServiceComponent.vue
new file mode 100644
index 00000000..43c7cdae
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/SegmentServiceComponent.vue
@@ -0,0 +1,66 @@
+<template>
+    <div class="row align-items-center m-b-15 parentContainer m-r-0">
+        <div class="col-auto p-r-0">
+            <div class="padding-5 bg-master-lightest">
+                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                     width="30" height="30"
+                     viewBox="0 0 172 172"
+                     style=" fill:#000000;"><defs><linearGradient x1="29.5625" y1="81.51994" x2="29.5625" y2="137.9655" gradientUnits="userSpaceOnUse" id="color-1_SZIOLhqepltk_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="112.875" y1="22.70131" x2="112.875" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-2_SZIOLhqepltk_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="22.70131" x2="86" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-3_SZIOLhqepltk_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="112.875" y1="22.70131" x2="112.875" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-4_SZIOLhqepltk_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="51.00606" y1="15.45313" x2="51.00606" y2="61.15944" gradientUnits="userSpaceOnUse" id="color-5_SZIOLhqepltk_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><rect x="8" y="31" transform="scale(2.6875,2.6875)" width="6" height="19" fill="url(#color-1_SZIOLhqepltk_gr1)"></rect><path d="M112.875,75.25c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-8.89294 -7.23206,-16.125 -16.125,-16.125c-8.89294,0 -16.125,7.23206 -16.125,16.125c0,8.89294 7.23206,16.125 16.125,16.125zM112.875,48.375c5.92863,0 10.75,4.82138 10.75,10.75c0,5.92862 -4.82137,10.75 -10.75,10.75c-5.92863,0 -10.75,-4.82138 -10.75,-10.75c0,-5.92862 4.82137,-10.75 10.75,-10.75z" fill="url(#color-2_SZIOLhqepltk_gr2)"></path><path d="M151.64756,104.31531c-2.51819,-1.86244 -5.88025,-2.40531 -9.23156,-1.47812l-41.08919,11.36006c0.50525,-1.247 0.79819,-2.60419 0.79819,-4.03394c0,-5.91519 -4.82137,-10.72581 -10.75,-10.72581h-25.20069c-1.78988,-2.6875 -6.34788,-10.75 -12.42431,-10.75h-10.75v-2.6875c0,-4.44513 -3.61738,-8.0625 -8.0625,-8.0625h-10.75c-4.44513,0 -8.0625,3.61737 -8.0625,8.0625v45.6875c0,4.44512 3.61737,8.0625 8.0625,8.0625h10.75c4.44512,0 8.0625,-3.61469 8.0625,-8.0625v-2.021l32.62356,22.04288c4.09575,2.7735 8.86338,4.16563 13.63906,4.16563c4.41287,0 8.83381,-1.18787 12.74412,-3.57706l48.83994,-29.83394c3.10138,-1.88931 5.02831,-5.32394 5.02831,-8.95744v-0.84119c0,-3.30831 -1.53994,-6.35056 -4.22744,-8.35006zM37.625,131.6875c0,1.4835 -1.20669,2.6875 -2.6875,2.6875h-2.6875v-10.75h-5.375v10.75h-2.6875c-1.48081,0 -2.6875,-1.204 -2.6875,-2.6875v-45.6875c0,-1.4835 1.20669,-2.6875 2.6875,-2.6875h10.75c1.48081,0 2.6875,1.20669 2.6875,2.6875zM150.5,113.50656c0,1.77375 -0.94063,3.44806 -2.45369,4.37256l-48.83994,29.83125c-6.35594,3.87806 -14.42919,3.70338 -20.57013,-0.45419l-35.63625,-24.07463v-29.11906h10.75c2.84606,0 6.63544,5.46637 8.299,9.16169l0.71487,1.58831h28.61113c2.96431,0 5.375,2.39994 5.375,5.34813c0,2.97775 -2.41069,5.40187 -5.375,5.40187h-26.875v5.375h26.875h5.375l47.09575,-12.91881c1.72269,-0.47837 3.44,-0.24994 4.59562,0.61544c1.30881,0.97019 2.05863,2.44025 2.05863,4.03125z" fill="url(#color-3_SZIOLhqepltk_gr3)"></path><path d="M86,69.875h0.9245l-0.65306,0.65306c-2.03175,2.02906 -3.14975,4.72731 -3.14975,7.60025c0,2.87025 1.118,5.5685 3.14975,7.60025c2.03175,2.03175 4.73,3.14975 7.60025,3.14975c2.87294,0 5.57119,-1.118 7.60025,-3.14975l0.65306,-0.65306v0.9245c0,5.92863 4.82137,10.75 10.75,10.75c5.92863,0 10.75,-4.82137 10.75,-10.75v-0.9245l0.65306,0.65306c2.02906,2.03175 4.72731,3.14975 7.60025,3.14975c2.87025,0 5.5685,-1.118 7.60025,-3.14975c2.03175,-2.03175 3.14975,-4.73 3.14975,-7.60025c0,-2.87294 -1.118,-5.57119 -3.14975,-7.60025l-0.65306,-0.65306h0.9245c5.92863,0 10.75,-4.82138 10.75,-10.75c0,-5.92862 -4.82137,-10.75 -10.75,-10.75h-0.9245l0.65306,-0.65306c2.03175,-2.02906 3.14975,-4.72731 3.14975,-7.60025c0,-2.87025 -1.118,-5.5685 -3.14975,-7.60025c-4.06619,-4.06619 -11.14506,-4.06081 -15.2005,0l-0.65306,0.65306v-0.9245c0,-5.92862 -4.82137,-10.75 -10.75,-10.75c-5.92863,0 -10.75,4.82138 -10.75,10.75v0.9245l-0.65306,-0.65306c-4.05544,-4.06081 -11.13969,-4.06619 -15.2005,0c-2.03175,2.03175 -3.14975,4.73 -3.14975,7.60025c0,2.87294 1.118,5.57119 3.14975,7.60025l0.65306,0.65306h-0.9245c-5.92862,0 -10.75,4.82138 -10.75,10.75c0,5.92862 4.82138,10.75 10.75,10.75zM97.67181,81.92844c-2.03175,2.03175 -5.5685,2.03175 -7.60025,0c-1.01587,-1.01588 -1.57487,-2.365 -1.57487,-3.80013c0,-1.43512 0.559,-2.78425 1.57487,-3.80013l0.40581,-0.40581c1.99412,3.02613 4.57412,5.60613 7.60025,7.60025zM135.67844,81.92844c-2.03175,2.03175 -5.5685,2.03175 -7.60025,0l-0.40581,-0.40581c3.02612,-1.99413 5.60612,-4.57413 7.60025,-7.60025l0.40581,0.40581c1.01587,1.01588 1.57487,2.365 1.57487,3.80013c0,1.43512 -0.559,2.78425 -1.57487,3.80012zM128.07819,36.32156c2.03175,-2.03175 5.5685,-2.03175 7.60025,0c1.01587,1.01588 1.57487,2.365 1.57487,3.80013c0,1.43512 -0.559,2.78425 -1.57487,3.80013l-0.40581,0.40581c-1.99412,-3.02612 -4.57412,-5.60612 -7.60025,-7.60025zM90.07156,36.32156c2.03175,-2.03175 5.5685,-2.03175 7.60025,0l0.40581,0.40581c-3.02612,1.99413 -5.60612,4.57413 -7.60025,7.60025l-0.40581,-0.40581c-1.01587,-1.01588 -1.57487,-2.365 -1.57487,-3.80013c0,-1.43512 0.559,-2.78425 1.57487,-3.80013zM86,53.75h5.99312l0.63156,-1.79256c2.17419,-6.13825 6.94181,-10.90856 13.08006,-13.08006l1.79525,-0.63425v-5.99312c0,-2.96431 2.41069,-5.375 5.375,-5.375c2.96431,0 5.375,2.41069 5.375,5.375v5.99312l1.79256,0.63156c6.13825,2.17419 10.90856,6.94181 13.08006,13.08006l0.63425,1.79525h5.99312c2.96431,0 5.375,2.41069 5.375,5.375c0,2.96431 -2.41069,5.375 -5.375,5.375h-5.99312l-0.63156,1.79256c-2.17419,6.13825 -6.94181,10.90856 -13.08006,13.08006l-1.79525,0.63425v5.99313c0,2.96431 -2.41069,5.375 -5.375,5.375c-2.96431,0 -5.375,-2.41069 -5.375,-5.375v-5.99313l-1.79256,-0.63156c-6.13825,-2.17419 -10.90856,-6.94181 -13.08006,-13.08006l-0.63425,-1.79525h-5.99312c-2.96431,0 -5.375,-2.41069 -5.375,-5.375c0,-2.96431 2.41069,-5.375 5.375,-5.375z" fill="url(#color-4_SZIOLhqepltk_gr4)"></path><path d="M68.47481,32.25h-0.56437c-1.45125,0 -2.17687,-1.74687 -1.15563,-2.76812l0.40312,-0.40313c1.58563,-1.58562 1.58563,-4.13875 0,-5.6975l-1.90812,-1.90812c-1.55875,-1.58563 -4.11188,-1.58563 -5.6975,0l-0.40312,0.40312c-1.02125,1.02125 -2.76812,0.29563 -2.76812,-1.15562v-0.56437c0,-2.23062 -1.80063,-4.03125 -4.03125,-4.03125h-2.6875c-2.23062,0 -4.03125,1.80063 -4.03125,4.03125v0.56437c0,1.45125 -1.74688,2.17687 -2.76813,1.15563l-0.40312,-0.40313c-1.58563,-1.58563 -4.13875,-1.58563 -5.6975,0l-1.90813,1.90812c-1.58562,1.55875 -1.58562,4.11187 0,5.6975l0.40313,0.40313c1.02125,1.02125 0.29563,2.76812 -1.15563,2.76812h-0.56437c-2.23062,0 -4.03125,1.80062 -4.03125,4.03125v2.6875c0,2.23063 1.80063,4.03125 4.03125,4.03125h0.56437c1.45125,0 2.17688,1.74687 1.15563,2.76813l-0.40313,0.40312c-1.58562,1.58563 -1.58562,4.13875 0,5.6975l1.90813,1.90813c1.55875,1.58563 4.11187,1.58563 5.6975,0l0.40312,-0.40312c1.02125,-1.02125 2.76813,-0.29563 2.76813,1.15563v0.56437c0,2.23062 1.80063,4.03125 4.03125,4.03125h2.6875c2.23062,0 4.03125,-1.80063 4.03125,-4.03125v-0.56437c0,-1.45125 1.74687,-2.17687 2.76812,-1.15563l0.40312,0.40312c1.58563,1.58563 4.13875,1.58563 5.6975,0l1.90812,-1.90813c1.58563,-1.55875 1.58563,-4.11187 0,-5.6975l-0.40312,-0.40312c-1.02125,-1.02125 -0.29563,-2.76813 1.15563,-2.76813h0.56437c2.23062,0 4.03125,-1.80062 4.03125,-4.03125v-2.6875c0,-2.23063 -1.80062,-4.03125 -4.03125,-4.03125zM51.00606,45.6875c-4.46125,0 -8.0625,-3.60125 -8.0625,-8.0625c0,-4.46125 3.60125,-8.0625 8.0625,-8.0625c4.46125,0 8.0625,3.60125 8.0625,8.0625c0,4.46125 -3.60125,8.0625 -8.0625,8.0625z" fill="url(#color-5_SZIOLhqepltk_gr5)"></path></g></g></svg>
+            </div>
+        </div>
+        <div class="col-4">
+            <div class="row">
+                <div class="col-auto p-r-10">
+                    <div class="font-heading all-caps fs-8 muted">Name</div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <div class="font-heading all-caps fs-10">{{item.name}}</div>
+                </div>
+            </div>
+        </div>
+        <div class="col">
+            <div class="row">
+                <div class="col-auto p-r-10">
+                    <div class="font-heading all-caps fs-8 muted">Configuration Status</div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <div class="font-heading all-caps fs-10" :class="[{'text-success': item.configurations.active}, {'text-danger': !item.configurations.active}]">{{item.configurations.active ? 'Active':'Inactive'}}</div>
+                </div>
+            </div>
+        </div>
+        <div class="col-auto parentContainer">
+            <div class="row align-items-center">
+                <div class="col-auto no-padding">
+                    <button class="btn btn-xs btn-complete b-rad-none requestModal" data-type="editModal">
+                        Customize Service
+                    </button>
+                </div>
+            </div>
+            <modal-form-component :data="data" size="large" :section="section">
+                <template slot="form" slot-scope="{section}">
+                    <segment-service-form-component :segment_id="segment_id" :data="data" :section="section"></segment-service-form-component>
+                </template>
+            </modal-form-component>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        props: {
+            section: {
+                default: 'segmentsSection'
+            },
+            segment_id: {
+                required: true,
+                type: Number
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/elements/SegmentServiceListComponent.vue b/resources/assets/vue/components/settings/elements/SegmentServiceListComponent.vue
new file mode 100644
index 00000000..d4a5a8d3
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/SegmentServiceListComponent.vue
@@ -0,0 +1,58 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row" v-for="service in segmentServices" v-bind:key="service.id" :data="service">
+                <div class="col">
+                    <segment-service-component :segment_id="item.id" :data="service" section="segmentsSection"></segment-service-component>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                parameters: this.data
+            }
+        },
+        computed: {
+            SystemServices() {
+                let vm = this;
+                return this.$store.getters.getListData('serviceTypeSection').forEach(function(value){
+                    vm.addInactiveServices(value)
+                });
+            },
+            segmentServices: function(){
+                return this.parameters.services;
+            }
+        },
+        watch: {
+            SystemServices(){
+                this.SystemServices();
+            }
+        },
+        methods: {
+            inArray(element){
+                return this.parameters.services.some(service => service.id === element.id);
+            },
+            pushIfNotExist(element){
+                if (!this.inArray(element)) {
+                    return this.parameters.services.push(element);
+                }
+            },
+            addInactiveServices(element){
+                this.pushIfNotExist({
+                    configurations: {
+                        active: false,
+                        currencies: []
+                    },
+                    id: element.id,
+                    name: element.name,
+                });
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/elements/ServiceComponent.vue b/resources/assets/vue/components/settings/elements/ServiceComponent.vue
new file mode 100644
index 00000000..c2db7146
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/ServiceComponent.vue
@@ -0,0 +1,76 @@
+<template>
+    <div class="row align-items-center m-b-15 parentContainer m-r-0">
+        <div class="col-auto p-r-0">
+            <div class="padding-5 bg-master-lightest">
+                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                     width="30" height="30"
+                     viewBox="0 0 172 172"
+                     style=" fill:#000000;"><defs><linearGradient x1="29.5625" y1="81.51994" x2="29.5625" y2="137.9655" gradientUnits="userSpaceOnUse" id="color-1_SZIOLhqepltk_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="112.875" y1="22.70131" x2="112.875" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-2_SZIOLhqepltk_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="22.70131" x2="86" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-3_SZIOLhqepltk_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="112.875" y1="22.70131" x2="112.875" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-4_SZIOLhqepltk_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="51.00606" y1="15.45313" x2="51.00606" y2="61.15944" gradientUnits="userSpaceOnUse" id="color-5_SZIOLhqepltk_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><rect x="8" y="31" transform="scale(2.6875,2.6875)" width="6" height="19" fill="url(#color-1_SZIOLhqepltk_gr1)"></rect><path d="M112.875,75.25c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-8.89294 -7.23206,-16.125 -16.125,-16.125c-8.89294,0 -16.125,7.23206 -16.125,16.125c0,8.89294 7.23206,16.125 16.125,16.125zM112.875,48.375c5.92863,0 10.75,4.82138 10.75,10.75c0,5.92862 -4.82137,10.75 -10.75,10.75c-5.92863,0 -10.75,-4.82138 -10.75,-10.75c0,-5.92862 4.82137,-10.75 10.75,-10.75z" fill="url(#color-2_SZIOLhqepltk_gr2)"></path><path d="M151.64756,104.31531c-2.51819,-1.86244 -5.88025,-2.40531 -9.23156,-1.47812l-41.08919,11.36006c0.50525,-1.247 0.79819,-2.60419 0.79819,-4.03394c0,-5.91519 -4.82137,-10.72581 -10.75,-10.72581h-25.20069c-1.78988,-2.6875 -6.34788,-10.75 -12.42431,-10.75h-10.75v-2.6875c0,-4.44513 -3.61738,-8.0625 -8.0625,-8.0625h-10.75c-4.44513,0 -8.0625,3.61737 -8.0625,8.0625v45.6875c0,4.44512 3.61737,8.0625 8.0625,8.0625h10.75c4.44512,0 8.0625,-3.61469 8.0625,-8.0625v-2.021l32.62356,22.04288c4.09575,2.7735 8.86338,4.16563 13.63906,4.16563c4.41287,0 8.83381,-1.18787 12.74412,-3.57706l48.83994,-29.83394c3.10138,-1.88931 5.02831,-5.32394 5.02831,-8.95744v-0.84119c0,-3.30831 -1.53994,-6.35056 -4.22744,-8.35006zM37.625,131.6875c0,1.4835 -1.20669,2.6875 -2.6875,2.6875h-2.6875v-10.75h-5.375v10.75h-2.6875c-1.48081,0 -2.6875,-1.204 -2.6875,-2.6875v-45.6875c0,-1.4835 1.20669,-2.6875 2.6875,-2.6875h10.75c1.48081,0 2.6875,1.20669 2.6875,2.6875zM150.5,113.50656c0,1.77375 -0.94063,3.44806 -2.45369,4.37256l-48.83994,29.83125c-6.35594,3.87806 -14.42919,3.70338 -20.57013,-0.45419l-35.63625,-24.07463v-29.11906h10.75c2.84606,0 6.63544,5.46637 8.299,9.16169l0.71487,1.58831h28.61113c2.96431,0 5.375,2.39994 5.375,5.34813c0,2.97775 -2.41069,5.40187 -5.375,5.40187h-26.875v5.375h26.875h5.375l47.09575,-12.91881c1.72269,-0.47837 3.44,-0.24994 4.59562,0.61544c1.30881,0.97019 2.05863,2.44025 2.05863,4.03125z" fill="url(#color-3_SZIOLhqepltk_gr3)"></path><path d="M86,69.875h0.9245l-0.65306,0.65306c-2.03175,2.02906 -3.14975,4.72731 -3.14975,7.60025c0,2.87025 1.118,5.5685 3.14975,7.60025c2.03175,2.03175 4.73,3.14975 7.60025,3.14975c2.87294,0 5.57119,-1.118 7.60025,-3.14975l0.65306,-0.65306v0.9245c0,5.92863 4.82137,10.75 10.75,10.75c5.92863,0 10.75,-4.82137 10.75,-10.75v-0.9245l0.65306,0.65306c2.02906,2.03175 4.72731,3.14975 7.60025,3.14975c2.87025,0 5.5685,-1.118 7.60025,-3.14975c2.03175,-2.03175 3.14975,-4.73 3.14975,-7.60025c0,-2.87294 -1.118,-5.57119 -3.14975,-7.60025l-0.65306,-0.65306h0.9245c5.92863,0 10.75,-4.82138 10.75,-10.75c0,-5.92862 -4.82137,-10.75 -10.75,-10.75h-0.9245l0.65306,-0.65306c2.03175,-2.02906 3.14975,-4.72731 3.14975,-7.60025c0,-2.87025 -1.118,-5.5685 -3.14975,-7.60025c-4.06619,-4.06619 -11.14506,-4.06081 -15.2005,0l-0.65306,0.65306v-0.9245c0,-5.92862 -4.82137,-10.75 -10.75,-10.75c-5.92863,0 -10.75,4.82138 -10.75,10.75v0.9245l-0.65306,-0.65306c-4.05544,-4.06081 -11.13969,-4.06619 -15.2005,0c-2.03175,2.03175 -3.14975,4.73 -3.14975,7.60025c0,2.87294 1.118,5.57119 3.14975,7.60025l0.65306,0.65306h-0.9245c-5.92862,0 -10.75,4.82138 -10.75,10.75c0,5.92862 4.82138,10.75 10.75,10.75zM97.67181,81.92844c-2.03175,2.03175 -5.5685,2.03175 -7.60025,0c-1.01587,-1.01588 -1.57487,-2.365 -1.57487,-3.80013c0,-1.43512 0.559,-2.78425 1.57487,-3.80013l0.40581,-0.40581c1.99412,3.02613 4.57412,5.60613 7.60025,7.60025zM135.67844,81.92844c-2.03175,2.03175 -5.5685,2.03175 -7.60025,0l-0.40581,-0.40581c3.02612,-1.99413 5.60612,-4.57413 7.60025,-7.60025l0.40581,0.40581c1.01587,1.01588 1.57487,2.365 1.57487,3.80013c0,1.43512 -0.559,2.78425 -1.57487,3.80012zM128.07819,36.32156c2.03175,-2.03175 5.5685,-2.03175 7.60025,0c1.01587,1.01588 1.57487,2.365 1.57487,3.80013c0,1.43512 -0.559,2.78425 -1.57487,3.80013l-0.40581,0.40581c-1.99412,-3.02612 -4.57412,-5.60612 -7.60025,-7.60025zM90.07156,36.32156c2.03175,-2.03175 5.5685,-2.03175 7.60025,0l0.40581,0.40581c-3.02612,1.99413 -5.60612,4.57413 -7.60025,7.60025l-0.40581,-0.40581c-1.01587,-1.01588 -1.57487,-2.365 -1.57487,-3.80013c0,-1.43512 0.559,-2.78425 1.57487,-3.80013zM86,53.75h5.99312l0.63156,-1.79256c2.17419,-6.13825 6.94181,-10.90856 13.08006,-13.08006l1.79525,-0.63425v-5.99312c0,-2.96431 2.41069,-5.375 5.375,-5.375c2.96431,0 5.375,2.41069 5.375,5.375v5.99312l1.79256,0.63156c6.13825,2.17419 10.90856,6.94181 13.08006,13.08006l0.63425,1.79525h5.99312c2.96431,0 5.375,2.41069 5.375,5.375c0,2.96431 -2.41069,5.375 -5.375,5.375h-5.99312l-0.63156,1.79256c-2.17419,6.13825 -6.94181,10.90856 -13.08006,13.08006l-1.79525,0.63425v5.99313c0,2.96431 -2.41069,5.375 -5.375,5.375c-2.96431,0 -5.375,-2.41069 -5.375,-5.375v-5.99313l-1.79256,-0.63156c-6.13825,-2.17419 -10.90856,-6.94181 -13.08006,-13.08006l-0.63425,-1.79525h-5.99312c-2.96431,0 -5.375,-2.41069 -5.375,-5.375c0,-2.96431 2.41069,-5.375 5.375,-5.375z" fill="url(#color-4_SZIOLhqepltk_gr4)"></path><path d="M68.47481,32.25h-0.56437c-1.45125,0 -2.17687,-1.74687 -1.15563,-2.76812l0.40312,-0.40313c1.58563,-1.58562 1.58563,-4.13875 0,-5.6975l-1.90812,-1.90812c-1.55875,-1.58563 -4.11188,-1.58563 -5.6975,0l-0.40312,0.40312c-1.02125,1.02125 -2.76812,0.29563 -2.76812,-1.15562v-0.56437c0,-2.23062 -1.80063,-4.03125 -4.03125,-4.03125h-2.6875c-2.23062,0 -4.03125,1.80063 -4.03125,4.03125v0.56437c0,1.45125 -1.74688,2.17687 -2.76813,1.15563l-0.40312,-0.40313c-1.58563,-1.58563 -4.13875,-1.58563 -5.6975,0l-1.90813,1.90812c-1.58562,1.55875 -1.58562,4.11187 0,5.6975l0.40313,0.40313c1.02125,1.02125 0.29563,2.76812 -1.15563,2.76812h-0.56437c-2.23062,0 -4.03125,1.80062 -4.03125,4.03125v2.6875c0,2.23063 1.80063,4.03125 4.03125,4.03125h0.56437c1.45125,0 2.17688,1.74687 1.15563,2.76813l-0.40313,0.40312c-1.58562,1.58563 -1.58562,4.13875 0,5.6975l1.90813,1.90813c1.55875,1.58563 4.11187,1.58563 5.6975,0l0.40312,-0.40312c1.02125,-1.02125 2.76813,-0.29563 2.76813,1.15563v0.56437c0,2.23062 1.80063,4.03125 4.03125,4.03125h2.6875c2.23062,0 4.03125,-1.80063 4.03125,-4.03125v-0.56437c0,-1.45125 1.74687,-2.17687 2.76812,-1.15563l0.40312,0.40312c1.58563,1.58563 4.13875,1.58563 5.6975,0l1.90812,-1.90813c1.58563,-1.55875 1.58563,-4.11187 0,-5.6975l-0.40312,-0.40312c-1.02125,-1.02125 -0.29563,-2.76813 1.15563,-2.76813h0.56437c2.23062,0 4.03125,-1.80062 4.03125,-4.03125v-2.6875c0,-2.23063 -1.80062,-4.03125 -4.03125,-4.03125zM51.00606,45.6875c-4.46125,0 -8.0625,-3.60125 -8.0625,-8.0625c0,-4.46125 3.60125,-8.0625 8.0625,-8.0625c4.46125,0 8.0625,3.60125 8.0625,8.0625c0,4.46125 -3.60125,8.0625 -8.0625,8.0625z" fill="url(#color-5_SZIOLhqepltk_gr5)"></path></g></g></svg>
+            </div>
+        </div>
+        <div class="col-3">
+            <div class="row">
+                <div class="col-auto p-r-10">
+                    <div class="font-heading all-caps fs-8 muted">Name</div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <div class="font-heading all-caps fs-10">{{item.name}}</div>
+                </div>
+            </div>
+        </div>
+        <div class="col">
+            <div class="row">
+                <div class="col-auto p-r-10">
+                    <div class="font-heading all-caps fs-8 muted">Default Segment</div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <div class="font-heading all-caps fs-10" :class="[{'text-success': item.configurations.active}, {'text-danger': !item.configurations.active}]">{{item.configurations.active ? 'Active':'Inactive'}}</div>
+                </div>
+            </div>
+        </div>
+        <div class="col-auto parentContainer">
+            <div class="row align-items-center">
+                <div class="col-auto no-padding m-r-5">
+                    <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="deleteService">
+                        <i class="fa fa-times"></i>
+                    </button>
+                </div>
+                <div class="col no-padding m-r-5">
+                    <div class="btn btn-xs  b-rad-none pointer requestModal" :class="[{'btn-outline-success': item.status !==2}, {'btn-outline-warning': item.status ===2}]" data-type="updateServiceStatus">{{ item.status !==2 ? 'Activate':'Deactivate'}}</div>
+                </div>
+                <div class="col-auto no-padding">
+                    <button class="btn btn-xs btn-complete b-rad-none m-r-5 requestModal" data-type="editModal">
+                        Configure Service
+                    </button>
+                </div>
+            </div>
+            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteService">
+                <delete-service-form-component :data="item" :section="section" class="text-center"></delete-service-form-component>
+            </modal-component>
+            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="updateServiceStatus">
+                <update-service-status-form-component :data="item" :section="section" class="text-center"></update-service-status-form-component>
+            </modal-component>
+            <modal-form-component :data="data" size="large" section="serviceTypeSection">
+                <template slot="form" slot-scope="{section}">
+                    <service-form-component :data="data" :section="section"></service-form-component>
+                </template>
+            </modal-form-component>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        props: {
+            section: {
+                default: 'serviceTypeSection'
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/AddCurrencyFormComponent.vue b/resources/assets/vue/components/settings/forms/AddCurrencyFormComponent.vue
new file mode 100644
index 00000000..a720679b
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/AddCurrencyFormComponent.vue
@@ -0,0 +1,65 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <h3 class="all-caps m-b-5 bold no-margin">New Currency</h3>
+                            <div class="fs-11">Select a country below to add its currency to the system</div>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component selecatable :validator="$v.parameters.country_short_code">
+                                <label class="muted">Currency</label>
+                                <selectable-component :endpoint="route('api.service.list.countries')" section="countriesListSection" valueColumn="iso_3166_1_alpha2" :labelColumn="['currency', 'name']" v-model="parameters.country_short_code"></selectable-component>
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-5">
+                        <div class="col text-right">
+                            <div class="fs-8 muted">** Added currencies need to be activate for services before they become transferable</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Not Now</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.currency.create'), 'post', section, true, false)">Add Currency</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+    export default {
+        data(){
+            return {
+                parameters: {
+                    country_short_code: ''
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                country_short_code: {
+                    required
+                }
+            }
+        },
+        mixins: [ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/DeleteCurrencyFormComponent.vue b/resources/assets/vue/components/settings/forms/DeleteCurrencyFormComponent.vue
new file mode 100644
index 00000000..d4d659b0
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/DeleteCurrencyFormComponent.vue
@@ -0,0 +1,37 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                <div class="col">
+                    <small class="bold fs-10 text-danger">{{error}}</small>
+                </div>
+            </div>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to delete the <span class="bold">{{this.item.name}}</span> currency?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.currency.delete',item.id), 'delete', 'convertibleCurrenciesSection', true, true)">Delete</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [componentHandler, ModalFormHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/DeleteSegmentFormComponent.vue b/resources/assets/vue/components/settings/forms/DeleteSegmentFormComponent.vue
new file mode 100644
index 00000000..c6d932b4
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/DeleteSegmentFormComponent.vue
@@ -0,0 +1,33 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to delete <b>{{item.name}}</b> segment?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.segment.delete', item.id), 'delete', section, true, true)">Delete</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/DeleteServiceFormComponent.vue b/resources/assets/vue/components/settings/forms/DeleteServiceFormComponent.vue
new file mode 100644
index 00000000..0d017b95
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/DeleteServiceFormComponent.vue
@@ -0,0 +1,33 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to delete <b>{{item.name}}</b> service?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.service_type.delete', item.id), 'delete', section, true, true)">Delete</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/PaymentAttemptLimitFormComponent.vue b/resources/assets/vue/components/settings/forms/PaymentAttemptLimitFormComponent.vue
new file mode 100644
index 00000000..63be0142
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/PaymentAttemptLimitFormComponent.vue
@@ -0,0 +1,111 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <h6 class="all-caps m-b-0 bold">Payment Attempt Limit</h6>
+                            <div class="font-heading fs-10 all-caps muted">Set the payment grace duration before the attempts expires</div>
+                        </div>
+                    </div>
+                    <div class="row  justify-content-center m-b-20">
+                        <div class="col-8 bg-master-dark padding-15 b-rad-lg">
+                            <div class="row justify-content-center">
+                                <div class="col-3 p-r-5 p-l-5">
+                                    <div class="form-group no-margin form-group-default bg-master b-rad-lg p-r-0 p-l-0 p-b-10">
+                                        <label class="muted fade fs-8 lh-10 p-b-10">Days</label>
+                                        <input type="text" class="form-control text-center text-success font-orbitron fs-25" v-model.lazy="days" v-mask="'##'">
+                                    </div>
+                                </div>
+                                <div class="col-auto p-r-5 p-l-5">
+                                    <div class="row h-100 align-items-center">
+                                        <div class="col">
+                                            <div class="font-heading fs-25 p-b-10 blink text-white">:</div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-3 p-l-5 p-r-5">
+                                    <div class="form-group no-margin form-group-default bg-master b-rad-lg p-r-0 p-l-0 p-b-10">
+                                        <label class="muted fade fs-8 lh-10 p-b-10">Hours</label>
+                                        <input type="text" class="form-control text-center text-success font-orbitron fs-25" v-model.lazy="hours" v-mask="'##'">
+                                    </div>
+                                </div>
+                                <div class="col-auto p-r-5 p-l-5">
+                                    <div class="row h-100 align-items-center">
+                                        <div class="col">
+                                            <div class="font-heading fs-25 p-b-10 blink text-white">:</div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-3 p-l-5 p-r-5">
+                                    <div class="form-group no-margin form-group-default bg-master b-rad-lg p-r-0 p-l-0 p-b-10">
+                                        <label class="muted fade fs-8 lh-10 p-b-10">Minutes</label>
+                                        <input class="form-control text-center text-success font-orbitron fs-25" v-model.lazy="minutes" v-mask="'##'" />
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.segment.constant.update', data.segment_id), 'put', section, true, true)">Update</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import {TheMask} from 'vue-the-mask'
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        components: {TheMask},
+        data(){
+            return {
+                minutes: '00',
+                hours: '00',
+                days: '00',
+                parameters: {}
+
+            }
+        },
+        watch: {
+            'days' : function (value) {
+                this.days = this.formatTime(value);
+                this.updateMinutes()
+            },
+            'hours' : function (value) {
+                if(value > 23){ value = value - 24; this.days = parseInt(this.days) + 1 }
+                this.hours = this.formatTime(value);
+                this.updateMinutes()
+            },
+            'minutes' : function (value) {
+                if(value > 59){ value = value - 60; this.hours = parseInt(this.hours) + 1 }
+                this.minutes = this.formatTime(value);
+                this.updateMinutes()
+            },
+            'data' : function () {
+                this.days = Math.floor(this.data.detail.minutes / 1440);
+                this.hours = Math.floor(this.data.detail.minutes / 60) % 24;
+                this.minutes = Math.floor(this.data.detail.minutes % 60);
+            }
+        },
+        methods: {
+            updateMinutes(){
+                this.parameters.detail.minutes = parseInt((parseInt(this.days) * 1440) + (parseInt(this.hours) * 60) + parseInt(this.minutes));
+            },
+            formatTime(value){
+                return ('00'+value).substr(('00'+value).length-2)
+            }
+        },
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/SegmentFormComponent.vue b/resources/assets/vue/components/settings/forms/SegmentFormComponent.vue
new file mode 100644
index 00000000..cc24b2c8
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/SegmentFormComponent.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">Create Custom Segment</h6>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.name">
+                                <label class="muted">Segment Name</label>
+                                <input type="text" class="form-control" v-model="parameters.name">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.segment.create'), 'post', section, true, false)">Create Segment</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required, requiredIf } from "vuelidate/lib/validators";
+    export default {
+        data(){
+            return {
+                parameters: {
+                    name: '',
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                name: {
+                    required: true
+                }
+            }
+        },
+        mixins: [ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/SegmentServiceFormComponent.vue b/resources/assets/vue/components/settings/forms/SegmentServiceFormComponent.vue
new file mode 100644
index 00000000..92498f2d
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/SegmentServiceFormComponent.vue
@@ -0,0 +1,293 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">Create Service</h6>
+                            <div class="font-heading fs-10 muted">Create a new exchange service</div>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-l-0 m-r-0 m-b-20">
+                        <div class="col-auto pointer bg-master-lightest p-t-15 p-b-15" v-if="data" @click="parameters.configurations.active = !parameters.configurations.active">
+                            <div class="row h-100 align-items-center">
+                                <div class="col-auto p-r-0">
+                                    <div class="icon-thumbnail fs-12 icon-25 btn-rounded" :class="[{'bg-success': parameters.configurations.active}, {'bg-white': !parameters.configurations.active}]">
+                                        <i class="fa fa-check fs-12 text-white"></i>
+                                    </div>
+                                </div>
+                                <div class="col p-l-0 p-r-25">
+                                    <div class="font-heading fs-8 all-caps muted">Active For this</div>
+                                    <div class="font-heading fs-8 all-caps">Segment's Customers</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                Service Configurations
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-20 m-l-0 m-r-0">
+                        <div class="col p-l-10 p-r-10">
+                            <div class="row">
+                                <div class="col p-l-5 p-r-5">
+                                    <div class="row">
+                                        <div class="col-5 p-r-0">
+                                            <validation-wrapper-component selecatable :validator="$v.custom_field">
+                                                <label class="muted">Custom Fields</label>
+                                                <select-component :options="inActiveFields" v-model="custom_field"></select-component>
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <div class="col-auto p-l-25 p-r-25 bg-success pointer" @click="activateCustomField(custom_field, true)">
+                                            <div class="row align-items-center h-100">
+                                                <div class="col">
+                                                    <i class="fa fa-plus text-white"></i>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col p-l-5">
+                                    <div class="row no-margin">
+                                        <div class="col padding-10 bg-master-lightest">
+                                            <div class="row m-l-0 m-r-0 m-b-10">
+                                                <div class="col-4 p-l-5 p-r-5" v-show="custom_fields.tax.active">
+                                                    <validation-wrapper-component :validator="$v.parameters.configurations.tax" >
+                                                        <label class="muted">Tax</label>
+                                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.tax"  v-money="percentage">
+                                                        <div class="absolute lh-10" style="top: 0; right: 0;">
+                                                            <i class="fa fa-times text-white pointer fs-12 bg-danger padding-5" @click="activateCustomField('tax', false)"></i>
+                                                        </div>
+                                                    </validation-wrapper-component>
+                                                </div>
+                                            </div>
+                                            <div class="row m-l-0 m-r-0 m-b-10">
+                                                <div class="col-4 p-l-5 p-r-5" v-show="custom_fields.service_charge.active">
+                                                    <validation-wrapper-component :validator="$v.parameters.configurations.service_charge" >
+                                                        <label class="muted">Service Charge</label>
+                                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.service_charge"  v-money="percentage">
+                                                        <div class="absolute lh-10" style="top: 0; right: 0;">
+                                                            <i class="fa fa-times text-white pointer fs-12 bg-danger padding-5" @click="activateCustomField('service_charge', false)"></i>
+                                                        </div>
+                                                    </validation-wrapper-component>
+                                                </div>
+                                                <div class="col-5 p-l-5 p-r-5" v-show="custom_fields.minimum_charge.active">
+                                                    <div class="row">
+                                                        <div class="col p-r-0">
+                                                            <validation-wrapper-component :validator="$v.parameters.configurations.minimum_charge" >
+                                                                <label class="muted">Minimum Charge</label>
+                                                                <input type="text" class="form-control" v-model.lazy="parameters.configurations.minimum_charge"  v-money="money">
+                                                                <div class="absolute lh-10" style="top: 0; right: 0;">
+                                                                    <i class="fa fa-times text-white pointer fs-12 bg-danger padding-5" @click="activateCustomField('minimum_charge', false)"></i>
+                                                                </div>
+                                                            </validation-wrapper-component>
+                                                        </div>
+                                                        <div class="col-auto bg-white b-t b-r b-b b-grey">
+                                                            <div class="row h-100 align-items-center">
+                                                                <div class="col">
+                                                                    <div class="font-heading fs-10 muted">MYR</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row m-l-0 m-r-0 m-b-5">
+                                                <div class="col-5 p-l-5 p-r-5" v-show="custom_fields.po_limit.active">
+                                                    <validation-wrapper-component :validator="$v.parameters.configurations.po_limit" >
+                                                        <label class="muted">Abandoned PO Limit **</label>
+                                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.po_limit" v-money="integer">
+                                                        <div class="absolute lh-10" style="top: 0; right: 0;">
+                                                            <i class="fa fa-times text-white pointer fs-12 bg-danger padding-5" @click="activateCustomField('po_limit', false)"></i>
+                                                        </div>
+                                                    </validation-wrapper-component>
+                                                </div>
+                                                <div class="col-7 p-l-5 p-r-5" v-show="custom_fields.bank_id.active">
+                                                    <validation-wrapper-component selecatable :validator="$v.parameters.configurations.bank_id" >
+                                                        <label class="muted">Receivable Bank Account</label>
+                                                        <selectable-component :endpoint="route('api.bank.list')+'?filters={%22company_id%22:1}'" section="BankAccountListSection" valueColumn="id" :labelColumn="['bank_name', 'account_no']" v-model="parameters.configurations.bank_id"></selectable-component>
+                                                        <div class="absolute lh-10" style="top: 0; right: 0;">
+                                                            <i class="fa fa-times text-white pointer fs-12 bg-danger padding-5" @click="activateCustomField('bank_id', false)"></i>
+                                                        </div>
+                                                    </validation-wrapper-component>
+                                                </div>
+                                            </div>
+                                            <div class="row m-l-0 m-r-0 m-b-10" v-show="custom_fields.po_limit.active">
+                                                <div class="col p-l-5 p-r-5">
+                                                    <div class="fs-8 muted">** Abandoned PO's limit is only applicable to transfers that have been paid in full.</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                Currencies Settings
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-l-0 m-r-0 m-b-10">
+                        <div class="col p-r-0">
+                            <currencies-list-component :data="parameters.configurations" :section="section" v-model="parameters.configurations.currencies"></currencies-list-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">{{this.data ? 'Update' : 'Create'}} Service</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required, requiredIf, minValue, decimal} from "vuelidate/lib/validators";
+    export default {
+        props: {
+            segment_id: {
+                required: true,
+                type: Number
+            }
+        },
+        data(){
+            return {
+                custom_fields: {
+                    bank_id: {
+                        name: 'Receivable Bank Account',
+                        active: false
+                    },
+                    po_limit: {
+                        name: 'Abandoned PO Limit',
+                        active: false
+                    },
+                    tax: {
+                        name: 'Tax',
+                        active: false
+                    },
+                    minimum_charge: {
+                        name: 'Minimum Charge',
+                        active: false
+                    },
+                    service_charge: {
+                        name: 'Service Charge',
+                        active: false
+                    }
+                },
+                custom_field: '',
+                parameters: {
+                    id: null,
+                    configurations: {
+                        active: false,
+                        bank_id: '',
+                        service_charge: {
+                            value: 0
+                        },
+                        minimum_charge: {
+                            value: 0
+                        },
+                        tax: {
+                            value: 0
+                        },
+                        po_limit: {
+                            value: 0
+                        },
+                        currencies: [],
+                    }
+                }
+            }
+        },
+        validations: {
+            custom_field: {},
+            parameters: {
+                configurations: {
+                    bank_id: {},
+                    service_charge: {},
+                    minimum_charge: {},
+                    tax: {},
+                    po_limit: {}
+                }
+            }
+        },
+        watch: {
+            'data': function() {
+                this.updateActiveCustomFields();
+            }
+        },
+        created(){
+            this.updateActiveCustomFields();
+        },
+        computed: {
+            inActiveFields(){
+                return Object.keys(this.custom_fields).map(function(key) {
+                    return {id: key, text: this.custom_fields[key].name}
+                }, this);
+            }
+        },
+        methods: {
+            submitForm(){
+                this.parameters.custom_fields = {
+                    bank_id: this.custom_fields.bank_id.active ? this.parameters.configurations.bank_id : null,
+                    service_charge: this.custom_fields.service_charge.active ? {type: 'percentage', value: this.parameters.configurations.service_charge} : null,
+                    minimum_charge: this.custom_fields.minimum_charge.active ? {type: 'fixed_amount', value: this.parameters.configurations.minimum_charge} : null,
+                    tax: this.custom_fields.tax.active ? {type: 'percentage', value: this.parameters.configurations.tax} : null,
+                    po_limit: this.custom_fields.po_limit.active ? {type: 'fixed_amount', value: this.parameters.configurations.po_limit}: null,
+                };
+
+                this.submit(this.route('api.segment.constant.service.update', this.segment_id, this.parameters.id), 'put', 'segmentSection', true, true)
+            },
+            activateCustomField(fieldName, status){
+                if(fieldName !== ''){
+                    this.custom_fields[fieldName].active = status
+                    if(!status) this.parameters[fieldName] = '';
+                }
+            },
+            updateActiveCustomFields() {
+
+                if(this.data.detail){
+                    Object.keys(this.data.detail).forEach((key) => {
+                        if(this.custom_fields.hasOwnProperty(key)){
+                            this.custom_fields[key].active = true;
+                        }
+                    });
+                }
+
+                if(this.data.configurations){
+                    this.parameters.configurations = {
+                        active: this.data.configurations.hasOwnProperty('active') ? this.data.configurations.active : false,
+                        bank_id: this.data.configurations.hasOwnProperty('bank_id') ? this.data.configurations.bank_id : '',
+                        service_charge: this.data.configurations.hasOwnProperty('service_charge') ? this.data.configurations.service_charge.value : 0,
+                        minimum_charge: this.data.configurations.hasOwnProperty('minimum_charge') ? this.data.configurations.minimum_charge.value : 0,
+                        tax: this.data.configurations.hasOwnProperty('tax') ? this.data.configurations.tax.value : 0,
+                        po_limit: this.data.configurations.hasOwnProperty('po_limit') ? this.data.configurations.po_limit.value : 0,
+                        currencies: this.data.configurations.hasOwnProperty('currencies') ? this.data.configurations.currencies : []
+                    };
+                }
+
+            }
+        },
+        mixins: [ModalFormHandler],
+
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/ServiceFormComponent.vue b/resources/assets/vue/components/settings/forms/ServiceFormComponent.vue
new file mode 100644
index 00000000..6aad7fd4
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/ServiceFormComponent.vue
@@ -0,0 +1,212 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">Create Service</h6>
+                            <div class="font-heading fs-10 muted">Create a new exchange service</div>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-20">
+                        <div class="col-5 p-r-10">
+                            <validation-wrapper-component :validator="$v.parameters.name">
+                                <label class="muted">Service Name</label>
+                                <input type="text" class="form-control" v-model="parameters.name">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-auto pointer bg-master-lightest m-r-10" @click="parameters.configurations.billable = !parameters.configurations.billable">
+                            <div class="row h-100 align-items-center">
+                                <div class="col-auto p-r-0">
+                                    <div class="icon-thumbnail fs-12 icon-25 btn-rounded" :class="[{'bg-success': parameters.configurations.billable}, {'bg-white': !parameters.configurations.billable}]">
+                                        <i class="fa fa-check fs-12 text-white"></i>
+                                    </div>
+                                </div>
+                                <div class="col p-l-0 p-r-25">
+                                    <div class="font-heading fs-8 all-caps muted">Billable Service</div>
+                                    <div class="font-heading fs-8 all-caps">Include Billing</div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-auto pointer bg-master-lightest" v-if="data" @click="parameters.configurations.active = !parameters.configurations.active">
+                            <div class="row h-100 align-items-center">
+                                <div class="col-auto p-r-0">
+                                    <div class="icon-thumbnail fs-12 icon-25 btn-rounded" :class="[{'bg-success': parameters.configurations.active}, {'bg-white': !parameters.configurations.active}]">
+                                        <i class="fa fa-check fs-12 text-white"></i>
+                                    </div>
+                                </div>
+                                <div class="col p-l-0 p-r-25">
+                                    <div class="font-heading fs-8 all-caps muted">Active For Default</div>
+                                    <div class="font-heading fs-8 all-caps">Customer segment</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                Service Configurations
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <div class="row m-b-10">
+                                <div class="col p-r-5">
+                                    <validation-wrapper-component :validator="$v.parameters.configurations.service_charge.value">
+                                        <label class="muted">Service Charge</label>
+                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.service_charge.value"  v-money="percentage">
+                                    </validation-wrapper-component>
+                                </div>
+                                <div class="col p-l-5 p-r-20">
+                                    <div class="row">
+                                        <div class="col p-r-0">
+                                            <validation-wrapper-component :validator="$v.parameters.configurations.minimum_charge.value">
+                                                <label class="muted">Minimum Charge</label>
+                                                <input type="text" class="form-control" v-model.lazy="parameters.configurations.minimum_charge.value"  v-money="money">
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <div class="col-auto bg-white b-t b-r b-b b-grey">
+                                            <div class="row h-100 align-items-center">
+                                                <div class="col">
+                                                    <div class="font-heading fs-10 muted">MYR</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col p-l-5" v-show="parameters.configurations.billable">
+                                    <validation-wrapper-component :validator="$v.parameters.configurations.tax.value">
+                                        <label class="muted">Tax</label>
+                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.tax.value"  v-money="percentage">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row m-b-5">
+                                <div class="col-5 p-r-0" v-show="parameters.configurations.billable">
+                                    <validation-wrapper-component :validator="$v.parameters.configurations.po_limit.value">
+                                        <label class="muted">Abandoned PO Limit **</label>
+                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.po_limit.value" >
+                                    </validation-wrapper-component>
+                                </div>
+                                <div class="col">
+                                    <validation-wrapper-component selecatable :validator="$v.parameters.configurations.bank_id">
+                                        <label class="muted">Receivable Bank Account</label>
+                                        <selectable-component :endpoint="route('api.bank.list')+'?filters={%22company_id%22:1}'" section="BankAccountListSection" valueColumn="id" :labelColumn="['bank_name', 'account_no']" v-model="parameters.configurations.bank_id"></selectable-component>
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row m-b-10" v-show="parameters.configurations.billable">
+                                <div class="col">
+                                    <div class="fs-8 muted">** Abandoned PO's limit is only applicable to transfers that have been paid in full.</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                Currencies Settings
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-l-0 m-r-0 m-b-10">
+                        <div class="col p-r-0">
+                            <currencies-list-component :data="parameters.configurations" :section="section" v-model="parameters.configurations.currencies"></currencies-list-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">{{this.data ? 'Update' : 'Create'}} Service</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required, requiredIf, minValue, decimal} from "vuelidate/lib/validators";
+    export default {
+        data(){
+            return {
+                parameters: {
+                    name: '',
+                    configurations: {
+                        bank_id: '',
+                        service_charge: {
+                            type: 'percentage',
+                            value: 0
+                        },
+                        minimum_charge: {
+                            type: 'fixed_amount',
+                            value: 0
+                        },
+                        tax: {
+                            type: 'percentage',
+                            value: 0
+                        },
+                        po_limit: {
+                            type: 'fixed_amount',
+                            value: 1
+                        },
+                        billable: true,
+                        currencies: []
+                    },
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                name: {
+                    required
+                },
+                configurations: {
+                    bank_id: {
+                        required
+                    },
+                    service_charge: {
+                        value:{
+                            required
+                        }
+                    },
+                    minimum_charge: {
+                        value:{
+                            required
+                        }
+                    },
+                    tax: {
+                        value:{
+                            required
+                        }
+                    },
+                    po_limit: {
+                        value:{
+                            required,
+                            minValue: minValue(1)
+                        }
+                    }
+                }
+            }
+        },
+        methods: {
+            submitForm(){
+                this.submit((this.data ? this.route('api.service_type.update', this.data.id) : this.route('api.service_type.create')), (this.data ? 'put' : 'post'), this.section, true, true)
+            }
+        },
+        mixins: [ModalFormHandler],
+
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/UpdateServiceStatusFormComponent.vue b/resources/assets/vue/components/settings/forms/UpdateServiceStatusFormComponent.vue
new file mode 100644
index 00000000..aef5b89f
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/UpdateServiceStatusFormComponent.vue
@@ -0,0 +1,33 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to {{item.status !== 2 ? 'Activate':'Deactivate'}} <b>{{item.name}}</b> service?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-block b-rad-none" :class="[{'btn-danger': item.status === 2}, {'btn-success': item.status !== 2}]" @click="submit(route('api.service_type.status', item.id, item.status === 2 ? 'inactive' : 'active'), 'put', section, true, true)">{{item.status !== 2 ? 'Activate':'Deactivate'}}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/user/elements/UserComponent.vue b/resources/assets/vue/components/user/elements/UserComponent.vue
index 5cdd0861..410e16d9 100644
--- a/resources/assets/vue/components/user/elements/UserComponent.vue
+++ b/resources/assets/vue/components/user/elements/UserComponent.vue
@@ -29,9 +29,9 @@
                         <div class="col-auto text-right">
                             <div class="row no-margin">
                                 <div class="col-auto no-padding">
-                                    <div class="p-t-5 p-b-5 p-r-10 p-l-10 muted h-100 pointer animated slow" ref="button" @click="actions = !actions" :class="[{'bg-white': actions}, {'flipInX': actions}, {' bg-master-lighter': !actions}]"><i class="fa fa-ellipsis-h lh-16 fs-10"></i></div>
+                                    <div class="p-t-5 p-b-5 p-r-10 p-l-10 muted h-100 pointer animate__animated animate__slow" ref="button" @click="actions = !actions" :class="[{'bg-white': actions}, {'flipInX': actions}, {' bg-master-lighter': !actions}]"><i class="fa fa-ellipsis-h lh-16 fs-10"></i></div>
                                 </div>
-                                <div class="absolute animated flipInX fast" v-closable="{ exclude: ['button'], handler: 'onClose'}" :class="[{'hide': !actions}]" style="width: 130px; top: 100%; right: 15px; z-index: 1;">
+                                <div class="absolute animate__animated animate__flipInX animate__fast" v-closable="{ exclude: ['button'], handler: 'onClose'}" :class="[{'hide': !actions}]" style="width: 130px; top: 100%; right: 15px; z-index: 1;">
                                     <div class="row text-left no-margin bg-white" style=" border-radius: 10px 0 10px 10px; ">
                                         <div class="col p-r-10 p-l-10">
                                             <div class="row no-margin">
diff --git a/resources/assets/vue/general/directives/closable.js b/resources/assets/vue/general/directives/closable.js
new file mode 100644
index 00000000..a4d31d89
--- /dev/null
+++ b/resources/assets/vue/general/directives/closable.js
@@ -0,0 +1,39 @@
+
+let handleOutsideClick;
+
+export const closable = {
+    bind (el, binding, vnode) {
+        handleOutsideClick = (e) => {
+
+            e.stopPropagation();
+
+            const { handler, exclude } = binding.value;
+
+            let clickedOnExcludedEl = false;
+
+            exclude.forEach(refName => {
+                if (!clickedOnExcludedEl) {
+                    const excludedEl = vnode.context.$refs[refName];
+
+
+                    if (excludedEl) {
+                        clickedOnExcludedEl = excludedEl.contains(e.target)
+                    }
+
+                }
+            });
+
+            if (!el.contains(e.target) && !clickedOnExcludedEl) {
+                vnode.context[handler]()
+            }
+        };
+        document.addEventListener('click', handleOutsideClick);
+        document.addEventListener('touchstart', handleOutsideClick)
+    },
+    unbind () {
+        document.removeEventListener('click', handleOutsideClick);
+        document.removeEventListener('touchstart', handleOutsideClick)
+    }
+};
+
+export default { closable }
\ No newline at end of file
diff --git a/resources/assets/js/route.js b/resources/assets/vue/general/functions/router.js
similarity index 100%
rename from resources/assets/js/route.js
rename to resources/assets/vue/general/functions/router.js
diff --git a/resources/assets/vue/general/mixins/accounts/authenticationHandler.js b/resources/assets/vue/general/mixins/accounts/authenticationHandler.js
new file mode 100644
index 00000000..29f33f7e
--- /dev/null
+++ b/resources/assets/vue/general/mixins/accounts/authenticationHandler.js
@@ -0,0 +1,16 @@
+import errorMessageHandler from "../errorMessageHandler";
+import formHandler from "../formHandler";
+
+export default {
+    methods: {
+        successHandler(response){
+            this.formHandler('');
+            this.$store.dispatch('userAuthentication', {access_token: response.payload.access_token, redirect_url: response.payload.redirect_url});
+        },
+        errorHandler(error){
+            this.formHandler(error.message);
+        }
+    },
+    mixins: [errorMessageHandler, formHandler]
+
+}
\ No newline at end of file
diff --git a/resources/assets/vue/general/mixins/accounts/validation/loginFormValidation.js b/resources/assets/vue/general/mixins/accounts/validation/loginFormValidation.js
new file mode 100644
index 00000000..1cbc6fff
--- /dev/null
+++ b/resources/assets/vue/general/mixins/accounts/validation/loginFormValidation.js
@@ -0,0 +1,11 @@
+import { required, email } from "vuelidate/lib/validators";
+import authenticationHandler from '../authenticationHandler'
+export default {
+    validations: {
+        parameters: {
+            email: { required, email },
+            password: { required }
+        }
+    },
+    mixins: [authenticationHandler]
+}
\ No newline at end of file
diff --git a/resources/assets/vue/general/mixins/accounts/validation/registrationFormValidation.js b/resources/assets/vue/general/mixins/accounts/validation/registrationFormValidation.js
new file mode 100644
index 00000000..a280739d
--- /dev/null
+++ b/resources/assets/vue/general/mixins/accounts/validation/registrationFormValidation.js
@@ -0,0 +1,30 @@
+import { required, email, numeric, sameAs, requiredUnless, requiredIf } from "vuelidate/lib/validators";
+import authenticationHandler from '../authenticationHandler'
+export default {
+    validations: {
+        parameters: {
+            name: {
+                required
+            },
+            email: {
+                required: requiredIf(function () { return this.step === 2 }),
+                email
+            },
+            company_name: {
+                required: requiredIf(function () { return this.parameters.type === 1 })
+            },
+            phone: {
+                required,
+                numeric
+            },
+            password: {
+                required: requiredIf(function () { return this.step === 2 }),
+            },
+            password_confirmation: {
+                required: requiredIf(function () { return this.step === 2 }),
+                sameAs: sameAs('password')
+            }
+        }
+    },
+    mixins: [authenticationHandler]
+}
\ No newline at end of file
diff --git a/resources/assets/vue/general/mixins/companies/validation/identificationVerificationFormValidation.js b/resources/assets/vue/general/mixins/companies/validation/identificationVerificationFormValidation.js
new file mode 100644
index 00000000..3804ca18
--- /dev/null
+++ b/resources/assets/vue/general/mixins/companies/validation/identificationVerificationFormValidation.js
@@ -0,0 +1,16 @@
+import ModalFromHandler from '../../modalFormHandler'
+import { required } from "vuelidate/lib/validators";
+
+export default {
+    validations: {
+        parameters: {
+            identification_no: {
+                required
+            },
+            files: {
+                required
+            }
+        }
+    },
+    mixins: [ModalFromHandler]
+}
\ No newline at end of file
diff --git a/resources/assets/vue/general/mixins/componentHandler.js b/resources/assets/vue/general/mixins/componentHandler.js
new file mode 100644
index 00000000..05980215
--- /dev/null
+++ b/resources/assets/vue/general/mixins/componentHandler.js
@@ -0,0 +1,18 @@
+export default {
+    props: {
+        'data': {
+            type: Object,
+        }
+    },
+    data() {
+        return {
+            item: this.data
+        }
+    },
+    watch: {
+        'data': function() {
+            this.item = this.data;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/resources/assets/vue/mixins/crudMixin.js b/resources/assets/vue/general/mixins/crudHandler.js
similarity index 81%
rename from resources/assets/vue/mixins/crudMixin.js
rename to resources/assets/vue/general/mixins/crudHandler.js
index 58df58b4..583629c9 100644
--- a/resources/assets/vue/mixins/crudMixin.js
+++ b/resources/assets/vue/general/mixins/crudHandler.js
@@ -7,9 +7,8 @@ export default {
 
         },
         resetForm(){
-            if(!this.data) {
-                Object.assign(this.$data, this.$options.data.call(this));
-            }
+            if(this.$v){ this.$v.$reset() }
+            if(!this.data) { Object.assign(this.$data, this.$options.data.call(this)) }
         },
         updateFilters(){
             if(this.$store.getters.isInQueue(this.section)){
@@ -29,14 +28,10 @@ export default {
             this.$store.dispatch('reloadList', {'name': this.section});
         },
         closeModal(){
-
-            if(this.$v){
-                this.$v.$reset();
-            }
-
-            $(this.$el).parents('.modal').modal('hide');
-
-            this.resetForm();
+            $(this.$el).closest('.modal').modal('hide');
+        },
+        openModal(){
+            $(this.$el).closest('.modal').modal('show');
         },
         setDecoratorDefault(){
             this.filters.per_page = this.filters.per_page !== undefined ? this.filters.per_page : 10;
diff --git a/resources/assets/vue/general/mixins/errorMessageHandler.js b/resources/assets/vue/general/mixins/errorMessageHandler.js
new file mode 100644
index 00000000..b95bcbb7
--- /dev/null
+++ b/resources/assets/vue/general/mixins/errorMessageHandler.js
@@ -0,0 +1,13 @@
+export default {
+    data(){
+        return {
+            error: '',
+        }
+    },
+    methods: {
+        errorMessageHandler(errorMessage){
+            this.error = errorMessage;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/resources/assets/vue/general/mixins/formHandler.js b/resources/assets/vue/general/mixins/formHandler.js
new file mode 100644
index 00000000..6446c391
--- /dev/null
+++ b/resources/assets/vue/general/mixins/formHandler.js
@@ -0,0 +1,47 @@
+import errorMessageHandler from "./errorMessageHandler";
+import {VMoney} from 'v-money'
+
+export default {
+    props: {
+        section:{
+            type: String,
+            required: true
+        },
+        data: {
+            type: Object,
+            default: null
+        }
+    },
+    created() {
+        if(this.data){
+            this.parameters = this.data;
+        }
+
+    },
+    watch: {
+        'data': function() {
+            this.parameters = this.data;
+        }
+    },
+    data() {
+        return {
+            isLoading: false,
+            error: '',
+            money: {decimal: '.',thousands: ',', precision: 2},
+            exchangeRate: {decimal: '.', thousands: '', precision: 5},
+            percentage: {decimal: '.', thousands: '', precision: 2, suffix: '%'},
+            integer: {decimal: '', thousands: '', precision: 0},
+
+        }
+    },
+    methods: {
+        formHandler(errorMessage){
+            this.isLoading = false;
+            this.updateList();
+            this.errorMessageHandler(errorMessage);
+        }
+    },
+    mixins: [errorMessageHandler],
+    directives: {money: VMoney}
+
+}
\ No newline at end of file
diff --git a/resources/assets/vue/general/mixins/guards.js b/resources/assets/vue/general/mixins/guards.js
new file mode 100644
index 00000000..3dbf7f8d
--- /dev/null
+++ b/resources/assets/vue/general/mixins/guards.js
@@ -0,0 +1,13 @@
+export default {
+    methods: {
+        routesGuard(){
+            (!this.$store.getters.isAuthenticated && this.isProtectedRoute()) ? window.location.href = this.route('login') : '';
+            (this.$store.getters.isAuthenticated && !this.isProtectedRoute()) ? window.location.href = this.route('dashboard') : '';
+        },
+        isProtectedRoute(){
+            const unprotectedRoutes = [this.route('login'), this.route('account.email.verification')];
+            return !unprotectedRoutes.includes(window.location.href);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/resources/assets/vue/general/mixins/modalFormHandler.js b/resources/assets/vue/general/mixins/modalFormHandler.js
new file mode 100644
index 00000000..50a9e4a2
--- /dev/null
+++ b/resources/assets/vue/general/mixins/modalFormHandler.js
@@ -0,0 +1,15 @@
+import formHandler from "./formHandler";
+
+export default {
+    methods: {
+        successHandler(){
+            this.closeModal();
+            this.formHandler();
+        },
+        errorHandler(error){
+            this.formHandler(error.message);
+        }
+    },
+    mixins: [formHandler]
+
+}
\ No newline at end of file
diff --git a/resources/assets/vue/mixins/requestMixin.js b/resources/assets/vue/general/mixins/request.js
similarity index 72%
rename from resources/assets/vue/mixins/requestMixin.js
rename to resources/assets/vue/general/mixins/request.js
index d402a2d6..84b9ccb4 100644
--- a/resources/assets/vue/mixins/requestMixin.js
+++ b/resources/assets/vue/general/mixins/request.js
@@ -2,20 +2,23 @@ export default {
     methods: {
         submit(url, method, section, successNotification = true, errorNotification = true){
             if(!this.validate()){ return; }
-            if(section){ this.$store.dispatch('toggleLoading', {name: section, status: true}) };
+            if (section) {
+                this.$store.dispatch('toggleLoading', {name: section, status: true})
+            }
             this.$store.dispatch('crudRequest', {
                 endpoint: url,
                 method: method,
                 parameters: this.parameters
             }).then(response => {
-                let success = response.ok;
+                let statusCode = response.status,
+                    success = response.ok;
 
                 response.json().then(response => {
 
                     if(!success){
-
+                        this.openModal();
                         errorNotification ? this.$store.dispatch('createNotification', {title: response.title, message: response.message, type: 'error'}): null;
-                        this.errorHandler(response); return;
+                        this.errorHandler(response, statusCode); return;
                     }
 
                     successNotification ? this.$store.dispatch('createNotification', {title: response.title, message: response.message, type: 'success'}): null;
@@ -24,9 +27,12 @@ export default {
 
                 });
             }).catch((error) => {
+                console.log(error);
                 this.$store.dispatch('createNotification', {title: 'Unexpected Error', message: 'An unexpected error has occurred. Try again!', type: 'error'});
             }).then(() => {
-                if(section){ this.$store.dispatch('toggleLoading', {name: section, status: false}) };
+                if (section) {
+                    this.$store.dispatch('toggleLoading', {name: section, status: false})
+                }
             })
 
         },
diff --git a/resources/assets/vue/general/mixins/staticFormHandler.js b/resources/assets/vue/general/mixins/staticFormHandler.js
new file mode 100644
index 00000000..c65307cb
--- /dev/null
+++ b/resources/assets/vue/general/mixins/staticFormHandler.js
@@ -0,0 +1,14 @@
+import formHandler from "./formHandler";
+
+export default {
+    methods: {
+        successHandler(){
+            this.formHandler();
+        },
+        errorHandler(error){
+            this.formHandler(error.message);
+        }
+    },
+    mixins: [formHandler]
+
+}
\ No newline at end of file
diff --git a/resources/assets/vue/vuex/modules/authentication.js b/resources/assets/vue/vuex/modules/authentication.js
index 7f847b8c..2fa04b86 100644
--- a/resources/assets/vue/vuex/modules/authentication.js
+++ b/resources/assets/vue/vuex/modules/authentication.js
@@ -1,3 +1,4 @@
+import jwt_decode from "jwt-decode";
 export default {
     state: {
         resetPasswordEmail: '',
@@ -8,6 +9,31 @@ export default {
     getters: {
         isAuthenticated: state => !!state.authentication.access_token,
         getAccessToken: state => state.authentication.access_token,
+
+        isSuperAdmin: (state, getters) => getters.getDecodedAccessToken.user.type === 0 || getters.getDecodedAccessToken.user.type === 1,
+        isAdmin: (state, getters) => getters.getDecodedAccessToken.user.type === 0 || getters.getDecodedAccessToken.user.type === 1 || getters.getDecodedAccessToken.user.type === 2,
+        getUserName: (state, getters) => getters.getDecodedAccessToken.user.name,
+        getUserId: (state, getters) => getters.getDecodedAccessToken.user.id,
+        getUserEmail: (state, getters) => getters.getDecodedAccessToken.user.email,
+        getCompanyId: (state, getters) => getters.getDecodedAccessToken.user.company_id,
+
+        getDecodedAccessToken(state) {
+            try{
+                return jwt_decode(state.authentication.access_token);
+            }
+            catch(Error){
+                return {
+                    user: {
+                        id: '',
+                        name: '',
+                        role: '',
+                        status: 0,
+                    }
+
+                };
+            }
+        },
+
         getResetPasswordEmail: state => state.resetPasswordEmail
     },
     mutations: {
@@ -19,8 +45,23 @@ export default {
         }
     },
     actions: {
-        userAuthentication(store, {access_token}){
+        userAuthentication(store, {access_token, redirect_url}){
+            localStorage.setItem('user-token', access_token);
+
             store.commit('SET_AUTHENTICATION', {access_token});
+
+            store.dispatch('toggleLoading', {name: 'loginSection', status: true});
+
+            setTimeout(function(){
+                window.location.href = redirect_url;
+            }, 2000);
+        },
+        updateToken(store, {access_token}){
+
+            localStorage.setItem('user-token', access_token);
+
+            store.commit('SET_AUTHENTICATION', {access_token});
+
         },
         passwordResetEmail(store, {email}){
             store.commit('SET_PASSWORD_RESET_EMAIL', {email});
diff --git a/resources/assets/vue/vuex/modules/crudRequest.js b/resources/assets/vue/vuex/modules/crudRequest.js
index baa5b4e3..f4f6c37f 100644
--- a/resources/assets/vue/vuex/modules/crudRequest.js
+++ b/resources/assets/vue/vuex/modules/crudRequest.js
@@ -1,6 +1,6 @@
 export default {
     actions: {
-        crudRequest({getters},  {endpoint, method, parameters}){
+        crudRequest({getters, dispatch},  {endpoint, method, parameters}){
             return fetch(endpoint, {
                 method: method,
                 responseType: 'json',
@@ -11,7 +11,9 @@ export default {
                 }
             }).then(response => {
 
-                if(response.status === 401){ window.location.href = route('login') }
+                if(response.status === 401 && window.location.href !== route('login')){
+                    dispatch('userAuthentication', {access_token: '', redirect_url: '/'});
+                }
 
                 return response;
 
diff --git a/resources/views/emails/accounts/layout/base.blade.php b/resources/views/emails/accounts/layout/base.blade.php
new file mode 100644
index 00000000..20e97722
--- /dev/null
+++ b/resources/views/emails/accounts/layout/base.blade.php
@@ -0,0 +1,135 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <link href='http://fonts.googleapis.com/css?family=Lato:100,300,400,700,900' rel='stylesheet' type='text/css'>
+    <style>
+        body {
+            margin: 0 !important;
+            padding: 0 !important;
+            font-family: 'Lato', sans-serif;
+            font-size: 16px;
+        }
+        .font-lato {
+            font-family: 'Lato', sans-serif;
+            font-weight: 400;
+        }
+        .background {
+            background-blend-mode: multiply; -webkit-background-size: cover;
+            background-size: cover;
+            background: #202020 url({{asset('/images/iStock-976354264_Malaysia.jpg')}}) no-repeat center center;
+        }
+        .container {
+            width: 600px;
+        }
+        .sm-hide {
+            display: block;
+        }
+        @media only screen and (max-width: 600px) {
+            body {
+                font-size: 10px;
+            }
+            .container {
+                width: 100%;
+            }
+            .sm-hide {
+                display: none;
+            }
+        }
+        .content {
+            width: 100%;
+            padding: 30px;
+            box-sizing: border-box;
+        }
+        a {
+            color: #009add;
+        }
+        .btn {
+            padding: 15px 2em;
+        }
+        .bg-primary {
+            background-color: #00baa4;
+        }
+        .bg-white {
+            background-color: #FFFFFF;
+        }
+        .align-center {
+            margin: auto;
+        }
+        .text-center {
+            text-align: center;
+        }
+        .text-left {
+            text-align: left;
+        }
+        .w-100 {
+            width: 100%;
+        }
+        .all-caps {
+            text-transform: uppercase;
+        }
+        .hint-text {
+            opacity: 0.7;
+        }
+        .muted {
+            color: #9c9c9c;
+        }
+        .text-white {
+            color: #FFFFFF;
+        }
+        .text-primary {
+            color: #00baa4;
+        }
+        .pointer {
+            cursor: pointer;
+        }
+        .text-complete {
+            color: #009add;
+        }
+        .lightest {
+            font-weight: 100 !important;
+        }
+        .light {
+            font-weight: 300 !important;
+        }
+        .normal {
+            font-weight: 400 !important;
+        }
+        .bold {
+            font-weight: 700 !important;
+        }
+        .bolder {
+            font-weight: 900 !important;
+        }
+        .no-border {
+            border: none !important;
+        }
+        .no-padding {
+            padding: 0 !important;
+        }
+        .no-margin {
+            margin: 0 !important;
+        }
+    </style>
+</head>
+<body>
+<div class="w-100">
+    <div class="background text-center">
+        <div class="sm-hide" style="height: 50px;"></div>
+        <div class="container align-center">
+            @include('emails.accounts.layout.header')
+            <div class="bg-white text-left">
+                <div class="content">
+                    @yield('content')
+                    <div class="muted all-caps" style="margin-top: 30px; font-size: 0.6em">You're receiving this email because of your account on <a href="{{route('login')}}" class="bold text-primary" style="margin-left: 5px;">{{route('login')}}</a>.</div>
+
+                </div>
+            </div>
+        </div>
+        <div class="text-center text-white all-caps" style="margin-top: 30px;">
+            <small style="font-size: 0.6em; letter-spacing: 3px;">&copy;2021 CIEF Worldwide Snd Bhd. All rights reserved</small>
+        </div>
+        <div style="height: 30px;"></div>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/resources/views/emails/accounts/layout/header.blade.php b/resources/views/emails/accounts/layout/header.blade.php
new file mode 100644
index 00000000..d9fe805d
--- /dev/null
+++ b/resources/views/emails/accounts/layout/header.blade.php
@@ -0,0 +1,5 @@
+<div class="bg-primary content">
+    <h1 class="no-margin font-lato lightest text-white all-caps" style="font-size: 3em; letter-spacing: 20px; line-height: 40px" >Exchange</h1>
+    <div style="height: 15px;"></div>
+    <small class="no-margin font-lato light text-white all-caps" style="letter-spacing: 5px;">Currency Exchange Vendor</small>
+</div>
\ No newline at end of file
diff --git a/resources/views/emails/accounts/reset_password.blade.php b/resources/views/emails/accounts/reset_password.blade.php
new file mode 100644
index 00000000..0a56193c
--- /dev/null
+++ b/resources/views/emails/accounts/reset_password.blade.php
@@ -0,0 +1,11 @@
+@extends('emails.accounts.layout.base')
+
+@section('content')
+    <h4 style="font-size: 1em;">Hello, {{ $user->first_name.' '.$user->last_name }}</h4>
+    <p style="font-size: 0.9em">We have received a request to reset the the password for your account on <a href="https://www.izyim.com/" class="bold">https://www.izyim.com</a></p>
+    <p style="margin-top: 30px; font-size: 0.8em">Click the link below to complete the process. Note that the link expires in 24 hours</p>
+    <div style="margin-top: 20px;">
+        <a href="{{route('account.password.reset', ['token' => $attempt->token])}}"><button class="btn all-caps bg-primary no-border text-white pointer" style="font-size: 0.8em">Reset password</button></a>
+    </div>
+    <div class="all-caps hint-text" style="margin-top: 20px;"><small style="font-size: 0.7em">If you didn't perform this request you can safely ignore this email.</small></div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/emails/accounts/user_verification.blade.php b/resources/views/emails/accounts/user_verification.blade.php
new file mode 100644
index 00000000..2f544697
--- /dev/null
+++ b/resources/views/emails/accounts/user_verification.blade.php
@@ -0,0 +1,11 @@
+@extends('emails.accounts.layout.base')
+
+@section('content')
+    <h4 style="font-size: 1em;">Hello, {{$user->name}}</h4>
+    <p style="font-size: 0.9em">verify your email to finish your account registration on <a href="{{route('login')}}" class="bold">{{route('login')}}</a></p>
+<p style="margin-top: 30px; font-size: 0.8em">Please confirm that <b>{{$user->email}}</b> is your email address by clicking on the button below or use this link <a href="{{route('account.email.verification', $attempt->token)}}">{{route('account.email.verification', $attempt->token)}}</a> within 48 hours</p>
+    <div style="margin-top: 20px;">
+        <a href="{{route('account.email.verification', $attempt->token)}}"><button class="btn all-caps bg-primary no-border text-white pointer" style="font-size: 0.8em" >Verify</button></a>
+    </div>
+    <div class="all-caps hint-text" style="margin-top: 20px;"><small style="font-size: 0.7em">If you didn't perform this request you can safely ignore this email.</small></div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 0a41062a..e293e78a 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -3,7 +3,7 @@
 <head>
     @include('vendor/head')
 </head>
-<body class="fixed-header horizontal-menu horizontal-app-menu bg-master-lightest">
+<body class="horizontal-menu horizontal-app-menu bg-master-lightest overflow-hidden">
     <div id="app" style="min-height: 100%;">
         @yield('content')
     </div>
diff --git a/resources/views/layouts/base_login.blade.php b/resources/views/layouts/base_login.blade.php
index 583ca00b..2b5f977b 100644
--- a/resources/views/layouts/base_login.blade.php
+++ b/resources/views/layouts/base_login.blade.php
@@ -1,66 +1,28 @@
 @extends('layouts.base')
 
 @section('content')
-    <div class="fluid-container h-100">
-        <div class="row h-100">
-            <div class="col bg-primary-light no-padding d-none d-md-block" style=" background-image: url(https://10.0.0.24/images/shipping_bg.jpeg); background-size: cover; background-blend-mode: multiply; ">
-                <div class="row h-100 m-auto text-right">
-                    <div class="col-3"></div>
-                    <div class="col d-flex align-items-end flex-column">
-                        <div class="row">
-                            <div class="col-auto p-l-0 p-r-0 ml-auto" style="background-color: rgba(255,255,255,0.2);">
-                                <div class="text-white font-lato lightest animated fadeInDownBig" style=" font-size: 150px; font-weight: 100; margin-right: -18px; margin-left: -183px; ">IZYIM</div>
-                            </div>
-                        </div>
-                        <div class="row mt-auto animated fadeInUpBig slow">
-                            <div class="col all-caps p-r-50">
-                                <h3 class="text-white font-lato lightest" style=" line-height: 50px; letter-spacing: 5px; ">Logistic's tough.<br> Luckily you've just<br> found your wingman.</h3>
-                            </div>
-                        </div>
-                        <div class="row mt-auto text-white m-b-25 animated fadeInLeftBig">
-                            <div class="col font-lato p-r-50">
-                                <div class="row">
-                                    <div class="col">
-                                        <p class="all-caps fs-10 light m-b-5" style=" letter-spacing: 3px; ">Browser Recommendations:</p>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <p class="light all-caps no-margin fs-8 lh-18" style="letter-spacing: 3px;">To use IZYIM portal, we presently require<br>Microsoft Internet Explorer 7.x or higher</p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col bg-master-lightest no-padding h-100">
-                <div class="row h-100">
-                    <div class="col h-100" style="padding-bottom: 120px;">
-                        <div class="page-container">
-                            <div class="page-content-wrapper">
-                                <div class="content p-t-0 overflow-hidden">
-                                    @yield('inner_content')
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="row m-l-0 m-r-0 w-100 p-b-25 p-t-15 animated fadeInRightBig bg-master-lightest absolute" style="bottom: 0;">
-                    <div class="col font-lato p-l-50">
-                        <div class="row">
-                            <div class="col">
-                                <p class="all-caps fs-10 m-b-5" style="letter-spacing: 2px;">Support:</p>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col">
-                                <p class="all-caps no-margin fs-8 lh-18" style="letter-spacing: 2px;">To obtain access to this site or for any questions about its<br>use submit an email message to <span class="text-underline text-primary bold">info@izyim.com</span></p>
-                            </div>
+    <div class="header light bg-white p-t-15 p-b-15 p-l-0 p-r-0">
+        <div class="container">
+            <div class="row align-items-center justify-content-center">
+                <div class="col-10 p-l-0">
+                    <div class="row">
+                        <div class="col">
+                            <img src="{{ asset('images/logo-gradient.png') }}" alt="logo" width="180">
                         </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
+    <div class="page-container">
+        <div class="login-wrapper d-flex p-t-0 p-b-50">
+            <div class="container p-t-25 p-b-30">
+                <div class="row align-items-center justify-content-center h-100">
+                    <div class="col-10">
+                        @yield('inner_content')
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 @endsection
\ No newline at end of file
diff --git a/resources/views/layouts/base_pdf.blade.php b/resources/views/layouts/base_pdf.blade.php
new file mode 100644
index 00000000..dbc034fd
--- /dev/null
+++ b/resources/views/layouts/base_pdf.blade.php
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+        @font-face {
+            font-family: SimHei;
+            src: url('{{base_path().'/public/'}}simhei.ttf') format('truetype');
+        }
+        * {
+            font-family: SimHei, serif ;
+        }
+    </style>
+</head>
+
+<body>
+@yield('inner_content')
+</body>
+
+</html>
\ No newline at end of file
diff --git a/resources/views/layouts/base_portal.blade.php b/resources/views/layouts/base_portal.blade.php
index 71125146..583dcc37 100644
--- a/resources/views/layouts/base_portal.blade.php
+++ b/resources/views/layouts/base_portal.blade.php
@@ -3,10 +3,14 @@
 @section('content')
     @include('partials.header')
     <div class="page-container">
-        <div class="page-content-wrapper p-b-50">
+        <div class="page-content-wrapper p-b-50" style="padding-top: 70px;">
             <div class="content pt-md-auto pt-4">
-                <div class="container container-fixed-lg">
-                    @yield('inner_content')
+                <div class="container-fluid p-l-30 p-r-30 container-fixed-lg">
+                    <div class="row no-margin">
+                        <div class="col">
+                            @yield('inner_content')
+                        </div>
+                    </div>
                 </div>
             </div>
             @include('partials.footer')
diff --git a/resources/views/pages/accounts/authentication/login.blade.php b/resources/views/pages/accounts/authentication/login.blade.php
deleted file mode 100644
index 1a217cac..00000000
--- a/resources/views/pages/accounts/authentication/login.blade.php
+++ /dev/null
@@ -1,93 +0,0 @@
-@extends('layouts.base_login')
-
-@section('inner_content')
-    <transition-component group enter-class="animated fadeInRightBig faster" leave-class="animated fadeOutRightBig" class="h-100">
-        <div class="row h-100 m-auto" key="1" v-show="!$store.getters.isShowing('loginSuccess') && !$store.getters.isShowing('forgetPasswordSuccess')">
-            <div class="col d-flex align-items-start flex-column">
-                <div class="row invisible" v-if="!$store.getters.isShowing('registrationForm')">
-                    <div class="col-auto p-l-0 p-r-0 ml-auto" style="background-color: rgba(255,255,255,0.2);">
-                        <div class="text-white font-lato lightest" style=" font-size: 150px; font-weight: 100; margin-right: -17px; margin-left: -183px; ">...</div>
-                    </div>
-                </div>
-                <div class="row w-100">
-                    <div class="col">
-                        <div class="row">
-                            <div class="col no-padding relative">
-                                <transition-component group enter-class="animated fadeInUpBig faster" leave-class="animated fadeOutRightBig">
-                                    <loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('loginSection')"></loading-component>
-                                    <transition-component key="2" group enter-class="animated fadeInRightBig faster" leave-class="animated fadeOutUpBig" v-show="!$store.getters.isLoading('loginSection')">
-                                        <div class="row" key="1" v-show="!$store.getters.isShowing('forgetPassword')" >
-                                            <div class="col all-caps">
-                                                <login-section-component section="loginSection"></login-section-component>
-                                            </div>
-                                        </div>
-                                        <div class="row" key="2" v-show="$store.getters.isShowing('forgetPassword')" >
-                                            <div class="col all-caps">
-                                                <div class="row  m-l-0">
-                                                    <div class="col p-l-50">
-                                                        <h5 class="font-lato light lh-40 animated fadeInLeftBig slow" style="letter-spacing: 5px; ">Did you forget your password?</h5>
-                                                    </div>
-                                                </div>
-                                                <div class="row  m-l-0 m-b-20  animated fadeInRightBig slow">
-                                                    <div class="col p-l-50">
-                                                        <p class="muted font-lato light lh-25" style="letter-spacing: 2px; ">Enter your email address you're using for your account below<br>and we will send you a password reset link</p>
-                                                    </div>
-                                                </div>
-                                                <forget-password-form-component section="loginSection"></forget-password-form-component>
-                                            </div>
-                                        </div>
-                                    </transition-component>
-                                </transition-component>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row align-items-center justify-content-center h-100 bg-white text-center" key="2" v-show="$store.getters.isShowing('loginSuccess')">
-            <div class="col">
-                <div class="row m-b-20 animated fadeInRightBig">
-                    <div class="col">
-                        <i class="fa fa-user-circle-o animated pulse slower infinite fs-60 text-success"></i>
-                    </div>
-                </div>
-                <div class="row animated fadeInLeftBig" style="height: 50px;">
-                    <div class="col">
-                        <loading-component style="height: 40px;" key="1" color="success"></loading-component>
-                    </div>
-                </div>
-                <div class="row animated fadeInUpBig fast">
-                    <div class="col">
-                        <h5 class="all-caps fs-35 m-b-15 text-success">Login Successful</h5>
-                    </div>
-                </div>
-                <div class="row animated fadeInUpBig">
-                    <div class="col">
-                        <small class="muted font-lato all-caps">Please wait for redirect</small>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row align-items-center justify-content-center h-100 bg-white text-center" key="3" v-show="$store.getters.isShowing('forgetPasswordSuccess')">
-            <div class="col-10">
-                <div class="row m-b-20 animated fadeInDownBig">
-                    <div class="col"><i class="fa fa-lock animated swing slower infinite fs-80 text-primary"></i></div>
-                </div>
-                <div class="row animated fadeInLeftBig">
-                    <div class="col">
-                        <h5 class="all-caps fs-35 m-b-15 text-primary" style="letter-spacing: 2px;">reset your password</h5>
-                    </div>
-                </div>
-                <div class="row animated fadeInRightBig">
-                    <div class="col"><small class="font-lato all-caps light" style="letter-spacing: 2px;">we have sent a reset password email to <span class="text-success" v-text="$store.getters.getResetPasswordEmail"></span><br>Please click the reset password link to set your new password.</small></div>
-                </div>
-                <div class="row m-t-30 animated fadeInUpBig slow">
-                    <div class="col"><small class="hint-text font-lato all-caps fs-10" style="letter-spacing: 1px;"><span class="text-danger bold m-r-5">didn't receive the email yet ?</span> Please check your spam folder, or <span class="text-success text-underline bold pointer" @click="$store.dispatch('toggleSection', {name: 'forgetPasswordSuccess', status: false})">resend the email</span></small></div>
-                </div>
-                <div class="row m-t-50 animated fadeInUpBig slower">
-                    <div class="col"><small class="hint-text font-lato all-caps fs-10" style="letter-spacing: 1px;">Did you remember your password? Go back to <span class="text-underline text-primary bold pointer" @click="$store.dispatch('toggleSection', {name: 'forgetPasswordSuccess', status: false});$store.dispatch('toggleSection', {name: 'forgetPassword', status: false})">login</span></small></div>
-                </div>
-            </div>
-        </div>
-    </transition-component>
-@endsection
\ No newline at end of file
diff --git a/resources/views/pages/accounts/email_verified.blade.php b/resources/views/pages/accounts/email_verified.blade.php
new file mode 100644
index 00000000..86cf0405
--- /dev/null
+++ b/resources/views/pages/accounts/email_verified.blade.php
@@ -0,0 +1,13 @@
+@extends('layouts.base_login')
+
+@section('inner_content')
+    <div class="row">
+        <div class="col p-l-0 p-r-0 p-t-15 p-b-15">
+            <div class="row  justify-content-center h-100">
+                <div class="col-8 p-t-50 p-b-50 bg-primary">
+                    <email-verification-component token="{{$token}}"></email-verification-component>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/accounts/login.blade.php b/resources/views/pages/accounts/login.blade.php
new file mode 100644
index 00000000..755074f5
--- /dev/null
+++ b/resources/views/pages/accounts/login.blade.php
@@ -0,0 +1,86 @@
+@extends('layouts.base_login')
+
+@section('inner_content')
+    <transition-component group enter-class="animate__animated animate__fadeInRightBig animate__faster" leave-class="animate__animated animate__fadeOutRightBig">
+        <div class="row" key="1">
+            <div class="col no-padding" v-show="!$store.getters.isShowing('registrationForm')">
+                <div class="padding-50 bg-white h-100">
+                    <div class="row">
+                        <div class="col">
+                            <loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('loginSection')"></loading-component>
+                            <div class="row" v-show="!$store.getters.isLoading('loginSection')">
+                                <div class="col">
+                                    <div class="row m-b-15">
+                                        <div class="col">
+                                            <div class="inline v-align-middle">
+                                                <div class="font-heading fs-20 all-caps text-primary no-margin lh-28 bold">Welcome Back</div>
+                                                <p class="no-margin fs-11 muted light">To keep connected with us please login with your personal info</p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <login-form-component section="loginSection"></login-form-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col p-l-0 p-r-0 p-t-15 p-b-15">
+                <div class="h-100" :class="[{'bg-master-dark': !$store.getters.isShowing('registrationForm')}, {'bg-white': $store.getters.isShowing('registrationForm')}]">
+                    <div class="row align-items-center justify-content-center h-100" v-show="!$store.getters.isShowing('registrationForm')">
+                        <div class="col text-white p-l-50 p-r-50 p-t-30 p-b-30 ">
+                            <div class="row">
+                                <div class="col">
+                                    <div class="font-heading text-white fs-20 light m-b-10">New Customer</div>
+                                    <p class="no-margin light fs-11">Create an account with us to join our fast growing community and start making transfers overseas at a competitive exchange rates today.</p>
+                                </div>
+                            </div>
+                            <div class="row m-t-15">
+                                <div class="col">
+                                    <a href="#">
+                                        <button class="btn btn-sm btn-outline-success bold b-rad-none b-thick" @click="$store.dispatch('toggleSection', {name: 'registrationForm', status: true})">Create Account</button>
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-l-0" v-show="$store.getters.isShowing('registrationForm')">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col-4 padding-25 bg-primary">
+                                    <div class="row h-100 align-items-center justify-content-center text-center">
+                                        <div class="col">
+                                            <div class="row m-b-10">
+                                                <div class="col">
+                                                    <div class="font-heading text-white fs-20 all-caps bold lh-25">We Are Glad</div>
+                                                    <div class="font-heading text-white fs-12 all-caps m-b-20 lh-25">You've Decided To join Us</div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <img src="{{asset('/images/2853457.png')}}" class="w-100"/>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col p-l-50 p-r-50 p-t-30 p-b-30">
+                                    <loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('loginSection')"></loading-component>
+                                    <div class="row" v-show="!$store.getters.isLoading('loginSection')">
+                                        <div class="col">
+                                            <registration-form-component section="loginSection"></registration-form-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </transition-component>
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/accounts/registration.blade.php b/resources/views/pages/accounts/registration.blade.php
deleted file mode 100644
index 7635b6de..00000000
--- a/resources/views/pages/accounts/registration.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-@extends('layouts.base_login')
-@section('inner_content')
-    <registration-form-component ref="registration" :section="'RegistrationSection'"></registration-form-component>
-@endSection
\ No newline at end of file
diff --git a/resources/views/pages/accounts/registration_step_2.blade.php b/resources/views/pages/accounts/registration_step_2.blade.php
deleted file mode 100644
index 8f6ff010..00000000
--- a/resources/views/pages/accounts/registration_step_2.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-@extends('layouts.base_login')
-@section('inner_content')
-    <registration-step-2-form-component ref="registration-step-2" :section="'RegistrationSectionStep2'"></registration-step-2-form-component>
-@endSection
\ No newline at end of file
diff --git a/resources/views/pages/accounts/authentication/reset_password.blade.php b/resources/views/pages/accounts/reset_password.blade.php
similarity index 81%
rename from resources/views/pages/accounts/authentication/reset_password.blade.php
rename to resources/views/pages/accounts/reset_password.blade.php
index 5a5d77ed..4fae44b7 100644
--- a/resources/views/pages/accounts/authentication/reset_password.blade.php
+++ b/resources/views/pages/accounts/reset_password.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.base_login')
 
 @section('inner_content')
-    <transition-component group enter-class="animated fadeInRightBig faster" leave-class="animated fadeOutRightBig" class="h-100">
+    <transition-component group enter-class="animate__animated animate__fadeInRightBig animate__faster" leave-class="animate__animated animate__fadeOutRightBig" class="h-100">
         <div class="row h-100 m-auto" key="1" v-show="!$store.getters.isShowing('resetPasswordSuccess')">
             <div class="col d-flex align-items-start flex-column">
                 <div class="row invisible">
@@ -13,13 +13,13 @@
                     <div class="col">
                         <div class="row">
                             <div class="col no-padding relative">
-                                <transition-component group enter-class="animated fadeInUpBig faster" leave-class="animated fadeOutRightBig">
+                                <transition-component group enter-class="animate__animated animate__fadeInUpBig animate__faster" leave-class="animate__animated animate__fadeOutRightBig">
                                     <loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('resetPasswordSection')"></loading-component>
                                     <div class="row" key="2" v-show="!$store.getters.isLoading('resetPasswordSection')">
                                         <div class="col all-caps">
                                             <div class="row  m-l-0">
                                                 <div class="col p-l-50">
-                                                    <h5 class="font-lato light animated fadeInRightBig slow" style=" line-height: 50px; letter-spacing: 5px; ">Reset your password</h5>
+                                                    <h5 class="font-lato light animate__animated animate__fadeInRightBig animate__slow" style=" line-height: 50px; letter-spacing: 5px; ">Reset your password</h5>
                                                 </div>
                                             </div>
                                             <reset-password-form-component section="resetPasswordSection" token="{{$token}}"></reset-password-form-component>
@@ -48,22 +48,22 @@
         </div>
         <div class="row align-items-center justify-content-center h-100 bg-white text-center" key="2" v-show="$store.getters.isShowing('resetPasswordSuccess')">
             <div class="col">
-                <div class="row m-b-20 animated fadeInDownBig">
+                <div class="row m-b-20 animate__animated animate__fadeInDownBig">
                     <div class="col">
-                        <i class="fa fa-check-circle animated tada slower infinite fs-70 text-success"></i>
+                        <i class="fa fa-check-circle animate__animated animate__tada animate__slower animate__infinite fs-70 text-success"></i>
                     </div>
                 </div>
-                <div class="row animated fadeInLeftBig">
+                <div class="row animate__animated animate__fadeInLeftBig">
                     <div class="col">
                         <h5 class="all-caps fs-35 m-b-15 text-success">Password Changed</h5>
                     </div>
                 </div>
-                <div class="row animated fadeInRightBig">
+                <div class="row animate__animated animate__fadeInRightBig">
                     <div class="col">
                         <small class="muted font-lato all-caps">Your password has been changed successfully</small>
                     </div>
                 </div>
-                <div class="row m-t-30 animated fadeInUpBig slow">
+                <div class="row m-t-30 animate__animated animate__fadeInUpBig animate__slow">
                     <div class="col">
                         <a :href="route('login')" @click="$store.dispatch('toggleSection', {name: 'resetPasswordSuccess', status: false});$store.dispatch('toggleLoading', {name: 'resetPasswordSection', status: true})"><small class="b-a b-thick b-success text-success all-caps p-t-10 p-b-10 p-r-35 p-l-35 inline bold">Go to login</small></a>
                     </div>
diff --git a/resources/views/pages/booking_details.blade.php b/resources/views/pages/booking_details.blade.php
new file mode 100644
index 00000000..d664e48d
--- /dev/null
+++ b/resources/views/pages/booking_details.blade.php
@@ -0,0 +1,8 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <div class="row">
+        <div class="col">
+            <booking-details-section-component :marking={{$marking}}></booking-details-section-component>
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/customers.blade.php b/resources/views/pages/customers.blade.php
new file mode 100644
index 00000000..1cdf273f
--- /dev/null
+++ b/resources/views/pages/customers.blade.php
@@ -0,0 +1,9 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('customerProfileSection')"></loading-component>
+            <customer-profile-section-component id="{{$id}}" v-show="!$store.getters.isLoading('customerProfileSection')"></customer-profile-section-component>
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/dashboards/admin.blade.php b/resources/views/pages/dashboards/admin.blade.php
new file mode 100644
index 00000000..fd00d494
--- /dev/null
+++ b/resources/views/pages/dashboards/admin.blade.php
@@ -0,0 +1,438 @@
+<div class="row d-none" :class="[{'d-flex': $store.getters.isAdmin}]" v-if="$store.getters.isAdmin">
+    <div class="col-4 p-l-0">
+        <div class="row">
+            <div class="col">
+                <div class="row tabsContainer">
+                    <div class="col">
+                        <div class="row m-l-0 m-r-0 d-none d-md-flex">
+                            <div class="col">
+                                <div class="row justify-content-end">
+                                    <div class="col">
+                                        <div class="row fs-12 text-center">
+                                            <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="payments">
+                                                <div class="row justify-content-center m-b-5">
+                                                    <div class="col-auto">
+                                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                             width="35" height="35"
+                                                             viewBox="0 0 172 172"
+                                                             style=" fill:#000000;"><defs><linearGradient x1="107.5" y1="43" x2="107.5" y2="80.625" gradientUnits="userSpaceOnUse" id="color-1_kzdcLBHUWdkz_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="107.5" y1="1.20131" x2="107.5" y2="131.08013" gradientUnits="userSpaceOnUse" id="color-2_kzdcLBHUWdkz_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="91.375" y1="1.20131" x2="91.375" y2="131.08013" gradientUnits="userSpaceOnUse" id="color-3_kzdcLBHUWdkz_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="77.9375" y1="1.20131" x2="77.9375" y2="131.08013" gradientUnits="userSpaceOnUse" id="color-4_kzdcLBHUWdkz_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="123.625" y1="1.20131" x2="123.625" y2="131.08013" gradientUnits="userSpaceOnUse" id="color-5_kzdcLBHUWdkz_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="137.0625" y1="1.20131" x2="137.0625" y2="131.08013" gradientUnits="userSpaceOnUse" id="color-6_kzdcLBHUWdkz_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="1.20131" x2="86" y2="131.08013" gradientUnits="userSpaceOnUse" id="color-7_kzdcLBHUWdkz_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="107.5" y1="1.20131" x2="107.5" y2="131.08013" gradientUnits="userSpaceOnUse" id="color-8_kzdcLBHUWdkz_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M110.1875,80.625v-5.375h2.6875c2.96431,0 5.375,-2.41069 5.375,-5.375v-5.375c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-10.75v-5.375h16.125v-5.375h-8.0625v-5.375h-5.375v5.375h-2.6875c-2.96431,0 -5.375,2.41069 -5.375,5.375v5.375c0,2.96431 2.41069,5.375 5.375,5.375h10.75v5.375h-16.125v5.375h8.0625v5.375z" fill="url(#color-1_kzdcLBHUWdkz_gr1)"></path><rect x="39" y="0" transform="scale(2.6875,2.6875)" width="2" height="7" fill="url(#color-2_kzdcLBHUWdkz_gr2)"></rect><rect x="33" y="2" transform="scale(2.6875,2.6875)" width="2" height="7" fill="url(#color-3_kzdcLBHUWdkz_gr3)"></rect><rect x="28" y="7" transform="scale(2.6875,2.6875)" width="2" height="7" fill="url(#color-4_kzdcLBHUWdkz_gr4)"></rect><rect x="45" y="2" transform="scale(2.6875,2.6875)" width="2" height="7" fill="url(#color-5_kzdcLBHUWdkz_gr5)"></rect><rect x="50" y="7" transform="scale(2.6875,2.6875)" width="2" height="7" fill="url(#color-6_kzdcLBHUWdkz_gr6)"></rect><path d="M151.65025,104.318c-2.5155,-1.86513 -5.88025,-2.40531 -9.23425,-1.48081l-41.08919,11.35738c0.50525,-1.247 0.7955,-2.60419 0.7955,-4.03125c0.00269,-5.9125 -4.81869,-10.72581 -10.74731,-10.72581h-24.46162c-0.91912,-4.71387 -4.35644,-10.75 -13.16338,-10.75h-10.75c0,-4.44513 -3.61738,-8.0625 -8.0625,-8.0625h-10.75c-4.44513,0 -8.0625,3.61737 -8.0625,8.0625v43c0,4.44512 3.61737,8.0625 8.0625,8.0625h10.75c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-2.02369l32.62625,22.04287c4.09306,2.7735 8.86069,4.16831 13.63638,4.16831c4.41287,0 8.83113,-1.18787 12.74412,-3.57706l48.84263,-29.83394c3.09869,-1.89469 5.02562,-5.32663 5.02562,-8.96013v-0.8385c0,-3.31369 -1.53994,-6.35594 -4.22475,-8.34737zM37.625,131.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875h-2.6875v-10.75h-5.375v10.75h-2.6875c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875v-43c0,-1.48081 1.204,-2.6875 2.6875,-2.6875h10.75c1.4835,0 2.6875,1.20669 2.6875,2.6875zM150.5,113.50388c0,1.77375 -0.94063,3.45075 -2.45369,4.37256l-48.84263,29.83394c-6.35594,3.87806 -14.4265,3.70338 -20.56744,-0.45419l-35.63625,-24.07731v-29.11638h10.75c7.58681,0 8.04637,6.72681 8.0625,8.0625v2.6875h29.5625c2.96431,0 5.375,2.39994 5.375,5.34813c0,2.97775 -2.41069,5.40187 -5.375,5.40187h-13.4375h-13.4375v5.375h13.4375h13.4375h5.375l47.09844,-12.91881c1.72,-0.47837 3.43463,-0.24725 4.59563,0.61544c1.30612,0.9675 2.05594,2.43756 2.05594,4.03125z" fill="url(#color-7_kzdcLBHUWdkz_gr7)"></path><path d="M107.5,94.0625c17.78319,0 32.25,-14.46681 32.25,-32.25c0,-17.78319 -14.46681,-32.25 -32.25,-32.25c-17.78319,0 -32.25,14.46681 -32.25,32.25c0,17.78319 14.46681,32.25 32.25,32.25zM107.5,34.9375c14.81888,0 26.875,12.05613 26.875,26.875c0,14.81887 -12.05612,26.875 -26.875,26.875c-14.81888,0 -26.875,-12.05613 -26.875,-26.875c0,-14.81887 12.05612,-26.875 26.875,-26.875z" fill="url(#color-8_kzdcLBHUWdkz_gr8)"></path></g></g></svg>
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col">
+                                                        <div class="fs-12 m-t-5 all-caps">Payments</div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col">
+                                <div class="row justify-content-end">
+                                    <div class="col">
+                                        <div class="row fs-12 text-center">
+                                            <div class="col p-t-20 p-b-20 bg-master-lighter" tab-name="transactions">
+                                                <div class="row justify-content-center m-b-5">
+                                                    <div class="col-auto">
+                                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                             width="35" height="35"
+                                                             viewBox="0 0 172 172"
+                                                             style=" fill:#000000;"><defs><linearGradient x1="86" y1="45.01563" x2="86" y2="152.92681" gradientUnits="userSpaceOnUse" id="color-1_48314_gr1"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="45.01563" x2="86" y2="152.92681" gradientUnits="userSpaceOnUse" id="color-2_48314_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="16.79688" x2="86" y2="92.05225" gradientUnits="userSpaceOnUse" id="color-3_48314_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="45.01563" x2="86" y2="152.92681" gradientUnits="userSpaceOnUse" id="color-4_48314_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M147.8125,48.375h-32.25v5.375h32.25c1.50769,0 2.6875,1.12875 2.6875,2.56925v75.25c0,1.51844 -1.23087,2.80575 -2.6875,2.80575h-123.625c-1.45662,0 -2.6875,-1.28731 -2.6875,-2.80575v-75.25c0,-1.4405 1.17981,-2.56925 2.6875,-2.56925h32.25v-5.375h-32.25c-4.52038,0 -8.0625,3.49106 -8.0625,7.94425v75.25c0,3.55019 2.25481,6.54944 5.375,7.67819v3.07181c0,4.51231 3.61737,8.18075 8.0625,8.18075h112.875c4.44512,0 8.0625,-3.66844 8.0625,-8.18075v-3.07181c3.12019,-1.12875 5.375,-4.128 5.375,-7.67819v-75.25c0,-4.45319 -3.54212,-7.94425 -8.0625,-7.94425zM142.4375,145.125h-112.875c-1.45662,0 -2.6875,-1.28731 -2.6875,-2.80575v-2.56925h118.25v2.56925c0,1.51844 -1.23087,2.80575 -2.6875,2.80575z" fill="url(#color-1_48314_gr1)"></path><path d="M126.3125,129h-83.3125v-2.6875c0,-7.51425 -6.02806,-13.4375 -13.4375,-13.4375h-2.6875v-37.625h2.6875c6.3425,0 13.4375,-5.79156 13.4375,-13.46706v-2.70363l13.4375,0.04569v5.375l-8.2775,-0.01613c-1.26044,7.95231 -7.94425,14.61731 -15.91,15.86969v27.219c8.25869,1.18788 14.80006,7.76956 15.94762,16.05244h75.6155c1.17444,-8.30438 7.70238,-14.85112 15.93688,-16.03631v-27.262c-7.96844,-1.247 -14.65494,-7.89587 -15.91269,-15.82669h-8.27481v-5.375h13.4375v2.6875c0,6.30219 5.74587,13.4375 13.4375,13.4375h2.6875v37.50675l-2.6875,0.01613c-7.40944,0 -13.4375,6.03344 -13.4375,13.45094v2.6875z" fill="url(#color-2_48314_gr2)"></path><path d="M104.8125,53.75h-8.0625c-1.4835,0 -2.6875,1.14487 -2.6875,2.63106v29.61356c0,1.48619 -1.204,2.69288 -2.6875,2.69288h-10.75c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.69288v-29.61356c0,-1.48619 -1.204,-2.63106 -2.6875,-2.63106h-8.0625c-2.2145,0 -3.47763,-2.881 -2.15,-4.87781l16.65175,-25.04481c2.05056,-3.08256 6.57094,-3.08794 8.6215,-0.00806l16.65175,25.05556c1.32762,1.99681 0.0645,4.87512 -2.15,4.87512z" fill="url(#color-3_48314_gr3)"></path><path d="M86,112.875c-10.37375,0 -18.8125,-8.0625 -18.8125,-18.8125h5.375c0,8.0625 6.02806,13.4375 13.4375,13.4375c7.40944,0 13.4375,-5.375 13.4375,-13.4375h5.375c0,10.75 -8.43875,18.8125 -18.8125,18.8125z" fill="url(#color-4_48314_gr4)"></path></g></g></svg>
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col">
+                                                        <div class="fs-12 m-t-5 all-caps">Supplier Bills</div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row no-margin">
+                            <div class="col bg-white padding-25">
+                                <div class="row tabsContainer tabContent active" tab-name="payments">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="row">
+                                                    <div class="col">
+                                                        <list-component key="2" section="paymentVerificationSection" :endpoint="route('api.transaction.list')" :options="{'status': 1}">
+                                                            <template slot="list" slot-scope="{data}">
+                                                                <payment-verification-component section="paymentVerificationSection" :data="data"></payment-verification-component>
+                                                            </template>
+                                                        </list-component>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row tabsContainer tabContent hide" tab-name="transactions">
+                                    <div class="col no-padding">
+                                        <div class="widget-11-2 card no-border card-condensed no-margin widget-loader-circle d-flex flex-column align-self-stretch">
+                                            <div class="card-header top-right">
+                                                <div class="card-controls">
+                                                    <ul>
+                                                        <li><a data-toggle="refresh" class="portlet-refresh text-black" href="#"><i
+                                                                        class="portlet-icon portlet-icon-refresh"></i></a>
+                                                        </li>
+                                                    </ul>
+                                                </div>
+                                            </div>
+                                            <div class="padding-25">
+                                                <div class="pull-left">
+                                                    <h2 class="text-success no-margin">webarch</h2>
+                                                    <p class="no-margin">Today's sales</p>
+                                                </div>
+                                                <h3 class="pull-right semi-bold"><sup>
+                                                        <small class="semi-bold">MYR</small>
+                                                    </sup> 102,967
+                                                </h3>
+                                                <div class="clearfix"></div>
+                                            </div>
+                                            <div class="overflow-hidden scrollable widget-11-2-table">
+                                                <table class="table table-condensed table-hover">
+                                                    <tbody>
+                                                    <tr>
+                                                        <td class="font-montserrat all-caps fs-12 w-50">Purchase CODE #2345</td>
+                                                        <td class="text-right hidden-lg">
+                                                            <span class="hint-text small">dewdrops</span>
+                                                        </td>
+                                                        <td class="text-right b-r b-dashed b-grey w-25">
+                                                            <span class="hint-text small">Qty 1</span>
+                                                        </td>
+                                                        <td class="w-25">
+                                                            <span class="font-montserrat fs-18">27 RM</span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="font-montserrat all-caps fs-12 w-50">Purchase CODE #2345</td>
+                                                        <td class="text-right hidden-lg">
+                                                            <span class="hint-text small">dewdrops</span>
+                                                        </td>
+                                                        <td class="text-right b-r b-dashed b-grey w-25">
+                                                            <span class="hint-text small">Qty 1</span>
+                                                        </td>
+                                                        <td class="w-25">
+                                                            <span class="font-montserrat fs-18">27 RM</span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="font-montserrat all-caps fs-12 w-50">Purchase CODE #2345</td>
+                                                        <td class="text-right hidden-lg">
+                                                            <span class="hint-text small">dewdrops</span>
+                                                        </td>
+                                                        <td class="text-right b-r b-dashed b-grey w-25">
+                                                            <span class="hint-text small">Qty 1</span>
+                                                        </td>
+                                                        <td class="w-25">
+                                                            <span class="font-montserrat fs-18">27 RM</span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="font-montserrat all-caps fs-12 w-50">Purchase CODE #2345</td>
+                                                        <td class="text-right hidden-lg">
+                                                            <span class="hint-text small">dewdrops</span>
+                                                        </td>
+                                                        <td class="text-right b-r b-dashed b-grey w-25">
+                                                            <span class="hint-text small">Qty 1</span>
+                                                        </td>
+                                                        <td class="w-25">
+                                                            <span class="font-montserrat fs-18">27 RM</span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="font-montserrat all-caps fs-12 w-50">Purchase CODE #2345</td>
+                                                        <td class="text-right hidden-lg">
+                                                            <span class="hint-text small">dewdrops</span>
+                                                        </td>
+                                                        <td class="text-right b-r b-dashed b-grey w-25">
+                                                            <span class="hint-text small">Qty 1</span>
+                                                        </td>
+                                                        <td class="w-25">
+                                                            <span class="font-montserrat fs-18">27 RM</span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="font-montserrat all-caps fs-12 w-50">Purchase CODE #2345</td>
+                                                        <td class="text-right hidden-lg">
+                                                            <span class="hint-text small">dewdrops</span>
+                                                        </td>
+                                                        <td class="text-right b-r b-dashed b-grey w-25">
+                                                            <span class="hint-text small">Qty 1</span>
+                                                        </td>
+                                                        <td class="w-25">
+                                                            <span class="font-montserrat fs-18">27 RM</span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="font-montserrat all-caps fs-12 w-50">Purchase CODE #2345</td>
+                                                        <td class="text-right hidden-lg">
+                                                            <span class="hint-text small">dewdrops</span>
+                                                        </td>
+                                                        <td class="text-right b-r b-dashed b-grey w-25">
+                                                            <span class="hint-text small">Qty 1</span>
+                                                        </td>
+                                                        <td class="w-25">
+                                                            <span class="font-montserrat fs-18">27 RM</span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="font-montserrat all-caps fs-12 w-50">Purchase CODE #2345</td>
+                                                        <td class="text-right hidden-lg">
+                                                            <span class="hint-text small">dewdrops</span>
+                                                        </td>
+                                                        <td class="text-right b-r b-dashed b-grey w-25">
+                                                            <span class="hint-text small">Qty 1</span>
+                                                        </td>
+                                                        <td class="w-25">
+                                                            <span class="font-montserrat fs-18">27 RM</span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="font-montserrat all-caps fs-12 w-50">Purchase CODE #2345</td>
+                                                        <td class="text-right hidden-lg">
+                                                            <span class="hint-text small">dewdrops</span>
+                                                        </td>
+                                                        <td class="text-right b-r b-dashed b-grey w-25">
+                                                            <span class="hint-text small">Qty 1</span>
+                                                        </td>
+                                                        <td class="w-25">
+                                                            <span class="font-montserrat fs-18">27 RM</span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="font-montserrat all-caps fs-12 w-50">Purchase CODE #2345</td>
+                                                        <td class="text-right hidden-lg">
+                                                            <span class="hint-text small">dewdrops</span>
+                                                        </td>
+                                                        <td class="text-right b-r b-dashed b-grey w-25">
+                                                            <span class="hint-text small">Qty 1</span>
+                                                        </td>
+                                                        <td class="w-25">
+                                                            <span class="font-montserrat fs-18">27 RM</span>
+                                                        </td>
+                                                    </tr>
+                                                    </tbody>
+                                                </table>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row tabsContainer hide tabContent" tab-name="PO">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="row">
+                                                    <div class="col">
+                                                        {{--<list-component key="2" section="purchaseOrderSection" :endpoint="route('api.address.list')">--}}
+                                                            {{--<template slot="list" slot-scope="{data}">--}}
+                                                                {{--<address-component :data="data"></address-component>--}}
+                                                            {{--</template>--}}
+                                                        {{--</list-component>--}}
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col p-l-0 p-r-0">
+        <div class="row">
+            <div class="col">
+                <div class="row tabsContainer">
+                    <div class="col">
+                        <div class="row m-l-0 m-r-0 d-none d-md-flex">
+                            <div class="col m-r-5">
+                                <div class="row fs-12 text-center">
+                                    <div class="col p-t-20 p-b-20 bg-master-lighter active tabButton" tab-name="pendingOrders">
+                                        <div class="row justify-content-center m-b-5">
+                                            <div class="col-auto">
+                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                     width="35" height="35"
+                                                     viewBox="0 0 172 172"
+                                                     style=" fill:#000000;"><defs><linearGradient x1="26.77825" y1="66.15819" x2="26.77825" y2="84.23969" gradientUnits="userSpaceOnUse" id="color-1_uJmX0kgpNx8M_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="145.02825" y1="89.0315" x2="145.02825" y2="102.52813" gradientUnits="userSpaceOnUse" id="color-2_uJmX0kgpNx8M_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="83.3125" y1="104.47656" x2="83.3125" y2="143.78125" gradientUnits="userSpaceOnUse" id="color-3_uJmX0kgpNx8M_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="93.02512" y1="18.8125" x2="93.02512" y2="154.75969" gradientUnits="userSpaceOnUse" id="color-4_uJmX0kgpNx8M_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="78.87813" y1="18.8125" x2="78.87813" y2="154.75969" gradientUnits="userSpaceOnUse" id="color-5_uJmX0kgpNx8M_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="28.89063" x2="86" y2="68.58231" gradientUnits="userSpaceOnUse" id="color-6_uJmX0kgpNx8M_gr6"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M22.17725,66.74944l-9.159,15.17363c-1.08306,1.79256 0.20694,4.07694 2.3005,4.07694h22.92169c2.09087,0 3.38087,-2.28437 2.3005,-4.07694l-9.159,-15.17363c-2.09088,-3.46419 -7.11381,-3.46419 -9.20469,0z" fill="url(#color-1_uJmX0kgpNx8M_gr1)"></path><path d="M140.42725,104.90388l-9.159,-15.17363c-1.08038,-1.78987 0.20963,-4.07694 2.3005,-4.07694h22.92169c2.09088,0 3.38088,2.28437 2.3005,4.07694l-9.159,15.17363c-2.09087,3.4615 -7.11381,3.4615 -9.20469,0z" fill="url(#color-2_uJmX0kgpNx8M_gr2)"></path><path d="M83.3125,110.1875h13.4375v-5.375h-13.4375c-4.44513,0 -8.0625,3.61738 -8.0625,8.0625v2.6875h-5.375v5.375h5.375v5.375h-5.375v5.375h5.375v2.6875c0,4.44512 3.61737,8.0625 8.0625,8.0625h13.4375v-5.375h-13.4375c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-2.6875h8.0625v-5.375h-8.0625v-5.375h8.0625v-5.375h-8.0625v-2.6875c0,-1.4835 1.204,-2.6875 2.6875,-2.6875z" fill="url(#color-3_uJmX0kgpNx8M_gr3)"></path><path d="M161.16938,85.69631c-0.95138,-1.68506 -2.74394,-2.73319 -4.68162,-2.73319h-8.67525v-23.83813c0,-10.37375 -8.43875,-18.8125 -18.8125,-18.8125h-11.81156c-3.59319,-13.88631 -16.19488,-24.1875 -31.18844,-24.1875c-14.99356,0 -27.59525,10.30119 -31.18844,24.1875h-14.84575c-8.69944,0 -15.77831,7.07888 -15.77831,15.77831h5.375c0,-5.73781 4.6655,-10.40331 10.40331,-10.40331h13.92125c-0.07525,0.88956 -0.13706,1.77913 -0.13706,2.6875c0,17.78319 14.46681,32.25 32.25,32.25c17.78319,0 32.25,-14.46681 32.25,-32.25c0,-0.90837 -0.06181,-1.79794 -0.13706,-2.6875h10.88706c7.40944,0 13.4375,6.02806 13.4375,13.4375v23.83812h-8.86875c-1.935,0 -3.73025,1.04812 -4.68162,2.73319c-0.95138,1.68506 -0.92181,3.7625 0.08062,5.42069l9.159,15.17363c1.47275,2.44025 4.05275,3.89688 6.9015,3.89688c2.85144,0 5.43144,-1.45663 6.9015,-3.89688l9.159,-15.17363c1.00244,-1.65819 1.032,-3.73294 0.08062,-5.42069zM86,75.25c-14.81887,0 -26.875,-12.05613 -26.875,-26.875c0,-14.81887 12.05613,-26.875 26.875,-26.875c14.81887,0 26.875,12.05613 26.875,26.875c0,14.81887 -12.05612,26.875 -26.875,26.875zM147.32875,103.51444c-0.70681,1.17175 -1.84363,1.29806 -2.3005,1.29806c-0.45419,0 -1.59369,-0.12631 -2.3005,-1.29806l-9.159,-15.17631h22.92169z" fill="url(#color-4_uJmX0kgpNx8M_gr4)"></path><path d="M142.4375,115.90919c0,5.73781 -4.6655,10.40331 -10.40331,10.40331h-13.90781c0.07525,-0.89494 0.12363,-1.78987 0.12363,-2.6875c0,-17.78319 -14.46681,-32.25 -32.25,-32.25c-17.78319,0 -32.25,14.46681 -32.25,32.25c0,0.90838 0.06181,1.79794 0.13706,2.6875h-10.88706c-7.40944,0 -13.4375,-6.02806 -13.4375,-13.4375v-24.1875h8.67794c1.935,0 3.73025,-1.04812 4.68163,-2.73319c0.95137,-1.68506 0.92181,-3.7625 -0.08062,-5.418l-9.159,-15.17363c-1.47275,-2.44025 -4.05275,-3.89687 -6.9015,-3.89687c-2.84875,0 -5.42875,1.45663 -6.9015,3.89687l-9.159,15.17363c-1.00244,1.6555 -1.032,3.73294 -0.08062,5.418c0.94869,1.68506 2.74125,2.73319 4.67894,2.73319h8.86875v24.1875c0,10.37375 8.43875,18.8125 18.8125,18.8125h11.81156c3.59319,13.88631 16.19488,24.1875 31.18844,24.1875c14.80812,0 27.57913,-10.04856 31.20994,-24.1875h14.82425c8.69944,0 15.77831,-7.07619 15.77831,-15.77831v-0.34669h-5.375zM24.47775,68.13888c0.70681,-1.17175 1.84631,-1.29806 2.3005,-1.29806c0.45688,0 1.59369,0.12631 2.3005,1.29806l9.16169,15.17363h-22.92169zM112.43156,128.51625c-2.34081,12.73875 -13.45631,21.98375 -26.43156,21.98375c-14.81887,0 -26.875,-12.05612 -26.875,-26.875c0,-14.81888 12.05613,-26.875 26.875,-26.875c14.81887,0 26.875,12.05612 26.875,26.875c0,1.63938 -0.1505,3.28681 -0.44344,4.89125z" fill="url(#color-5_uJmX0kgpNx8M_gr5)"></path><path d="M96.75,40.3125v-5.375h-8.0625v-5.375h-5.375v5.375h-2.6875c-2.96431,0 -5.375,2.41069 -5.375,5.375v5.375c0,2.96431 2.41069,5.375 5.375,5.375h10.75v5.375h-16.125v5.375h8.0625v5.375h5.375v-5.375h2.6875c2.96431,0 5.375,-2.41069 5.375,-5.375v-5.375c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-10.75v-5.375z" fill="url(#color-6_uJmX0kgpNx8M_gr6)"></path></g></g></svg>
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="fs-12 m-t-5 all-caps">Currency Orders</div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col m-r-5">
+                                <div class="row fs-12 text-center">
+                                    <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="paymentProof">
+                                        <div class="row justify-content-center m-b-5">
+                                            <div class="col-auto">
+                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                     width="35" height="35"
+                                                     viewBox="0 0 172 172"
+                                                     style=" fill:#000000;"><defs><linearGradient x1="51.06235" y1="44.46182" x2="51.06235" y2="63.99445" gradientUnits="userSpaceOnUse" id="color-1_h1V3zyLIDjuF_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="126.3122" y1="44.46182" x2="126.3122" y2="63.99445" gradientUnits="userSpaceOnUse" id="color-2_h1V3zyLIDjuF_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="131.6875" y1="98.66888" x2="131.6875" y2="144.03119" gradientUnits="userSpaceOnUse" id="color-3_h1V3zyLIDjuF_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="44.34375" y1="17.43919" x2="44.34375" y2="154.21681" gradientUnits="userSpaceOnUse" id="color-4_h1V3zyLIDjuF_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="72.5625" y1="17.43919" x2="72.5625" y2="154.21681" gradientUnits="userSpaceOnUse" id="color-5_h1V3zyLIDjuF_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="99.4375" y1="17.43919" x2="99.4375" y2="154.21681" gradientUnits="userSpaceOnUse" id="color-6_h1V3zyLIDjuF_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="126.3125" y1="17.43919" x2="126.3125" y2="154.21681" gradientUnits="userSpaceOnUse" id="color-7_h1V3zyLIDjuF_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="51.0625" y1="17.43919" x2="51.0625" y2="154.21681" gradientUnits="userSpaceOnUse" id="color-8_h1V3zyLIDjuF_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="45.6875" y1="17.43919" x2="45.6875" y2="154.21681" gradientUnits="userSpaceOnUse" id="color-9_h1V3zyLIDjuF_gr9"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="17.43919" x2="86" y2="154.21681" gradientUnits="userSpaceOnUse" id="color-10_h1V3zyLIDjuF_gr10"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="91.375" y1="17.43919" x2="91.375" y2="154.21681" gradientUnits="userSpaceOnUse" id="color-11_h1V3zyLIDjuF_gr11"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g id="Layer_2"><path d="M69.875,59.125v-10.75c0,-1.6125 -1.075,-2.6875 -2.6875,-2.6875h-32.25c-1.6125,0 -2.6875,1.075 -2.6875,2.6875v10.75c0,1.6125 1.075,2.6875 2.6875,2.6875h32.25c1.6125,0 2.6875,-1.075 2.6875,-2.6875z" fill="url(#color-1_h1V3zyLIDjuF_gr1)"></path><path d="M139.75,59.125v-10.75c0,-1.6125 -1.075,-2.6875 -2.6875,-2.6875h-21.5c-1.6125,0 -2.6875,1.075 -2.6875,2.6875v10.75c0,1.6125 1.075,2.6875 2.6875,2.6875h21.5c1.6125,0 2.6875,-1.075 2.6875,-2.6875z" fill="url(#color-2_h1V3zyLIDjuF_gr2)"></path><path d="M145.125,110.1875v-5.375h-10.75v-5.375h-5.375v5.375h-5.375c-2.95625,0 -5.375,2.41875 -5.375,5.375v8.0625c0,2.95625 2.41875,5.375 5.375,5.375h16.125v8.0625h-21.5v5.375h10.75v5.375h5.375v-5.375h5.375c2.95625,0 5.375,-2.41875 5.375,-5.375v-8.0625c0,-2.95625 -2.41875,-5.375 -5.375,-5.375h-16.125v-8.0625z" fill="url(#color-3_h1V3zyLIDjuF_gr3)"></path><rect x="12" y="27" transform="scale(2.6875,2.6875)" width="9" height="2" fill="url(#color-4_h1V3zyLIDjuF_gr4)"></rect><rect x="23" y="27" transform="scale(2.6875,2.6875)" width="8" height="2" fill="url(#color-5_h1V3zyLIDjuF_gr5)"></rect><rect x="33" y="27" transform="scale(2.6875,2.6875)" width="8" height="2" fill="url(#color-6_h1V3zyLIDjuF_gr6)"></rect><rect x="43" y="27" transform="scale(2.6875,2.6875)" width="8" height="2" fill="url(#color-7_h1V3zyLIDjuF_gr7)"></rect><rect x="12" y="35" transform="scale(2.6875,2.6875)" width="14" height="2" fill="url(#color-8_h1V3zyLIDjuF_gr8)"></rect><rect x="12" y="39" transform="scale(2.6875,2.6875)" width="10" height="2" fill="url(#color-9_h1V3zyLIDjuF_gr9)"></rect><rect x="10" y="7" transform="scale(2.6875,2.6875)" width="44" height="2" fill="url(#color-10_h1V3zyLIDjuF_gr10)"></rect><path d="M155.875,95.675v-58.05c0,-4.56875 -3.49375,-8.0625 -8.0625,-8.0625h-123.625c-4.56875,0 -8.0625,3.49375 -8.0625,8.0625v80.625c0,4.3 3.49375,8.0625 8.0625,8.0625h73.1c2.6875,16.6625 16.93125,29.5625 34.4,29.5625c19.35,0 34.9375,-15.5875 34.9375,-34.9375c0,-9.94375 -4.03125,-18.8125 -10.75,-25.2625zM96.75,120.9375h-72.5625c-1.34375,0 -2.6875,-1.34375 -2.6875,-2.6875v-80.625c0,-1.34375 1.34375,-2.6875 2.6875,-2.6875h123.625c1.34375,0 2.6875,1.34375 2.6875,2.6875v54.01875c-5.375,-3.49375 -11.825,-5.64375 -18.8125,-5.64375c-19.35,0 -34.9375,15.5875 -34.9375,34.9375zM131.6875,150.5c-16.39375,0 -29.5625,-13.16875 -29.5625,-29.5625c0,-16.39375 13.16875,-29.5625 29.5625,-29.5625c16.39375,0 29.5625,13.16875 29.5625,29.5625c0,16.39375 -13.16875,29.5625 -29.5625,29.5625z" fill="url(#color-11_h1V3zyLIDjuF_gr11)"></path></g></g></svg>
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="fs-12 m-t-5 all-caps">Payment Proof</div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col">
+                                <div class="row fs-12 text-center">
+                                    <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="purchaseOrders">
+                                        <div class="row justify-content-center m-b-5">
+                                            <div class="col-auto">
+                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                     width="35" height="35"
+                                                     viewBox="0 0 172 172"
+                                                     style=" fill:#000000;"><defs><linearGradient x1="69.875" y1="96.52694" x2="69.875" y2="108.37075" gradientUnits="userSpaceOnUse" id="color-1_44039_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="21.05119" x2="86" y2="153.19019" gradientUnits="userSpaceOnUse" id="color-2_44039_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="80.625" y1="21.05119" x2="80.625" y2="153.19019" gradientUnits="userSpaceOnUse" id="color-3_44039_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="75.25" y1="21.05119" x2="75.25" y2="153.19019" gradientUnits="userSpaceOnUse" id="color-4_44039_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="69.875" y1="21.05119" x2="69.875" y2="153.19019" gradientUnits="userSpaceOnUse" id="color-5_44039_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="129" y1="21.05119" x2="129" y2="153.19019" gradientUnits="userSpaceOnUse" id="color-6_44039_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="139.75" y1="21.05119" x2="139.75" y2="153.19019" gradientUnits="userSpaceOnUse" id="color-7_44039_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="118.25" y1="21.05119" x2="118.25" y2="153.19019" gradientUnits="userSpaceOnUse" id="color-8_44039_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M86,104.8125c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-26.875c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-5.375c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h26.875c1.4835,0 2.6875,1.204 2.6875,2.6875z" fill="url(#color-1_44039_gr1)"></path><path d="M154.0045,83.57856c-1.58025,-1.87856 -3.913,-2.95356 -6.407,-2.95356h-5.16v-8.0625c0,-4.44513 -4.03125,-8.0625 -8.0625,-8.0625v-26.875c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-38.65162l-3.88881,-7.77762c-0.91375,-1.83288 -2.75469,-2.97237 -4.80794,-2.97237h-18.17825h-1.66088h-18.8125c-2.96431,0 -5.375,2.41069 -5.375,5.375v96.75h-21.5v13.4375c0,7.40944 6.02806,13.4375 13.4375,13.4375h91.375c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-18.8125h4.74344c6.80475,0 12.55869,-4.71119 13.68475,-11.20419l2.95625,-17.02263c0.39775,-2.29512 -0.23919,-4.644 -1.75494,-6.44463zM137.0625,72.5625v8.0625h-16.125v-8.0625c0,-1.4835 1.20669,-2.6875 2.6875,-2.6875h10.75c1.4835,0 2.6875,1.204 2.6875,2.6875zM129,43h-5.375v-5.375h5.375zM81.65163,26.875l2.6875,5.375h-15.49344l-2.6875,-5.375zM60.15163,26.875l3.88881,7.78031c0.91913,1.83019 2.76275,2.96969 4.81063,2.96969h49.39894v5.375h-75.25v-16.125zM29.5625,145.125c-4.44513,0 -8.0625,-3.61469 -8.0625,-8.0625v-8.0625h86v8.0625c0,3.02344 1.00244,5.375 2.69288,8.0625zM129,137.0625c0,4.44512 -3.61738,8.0625 -8.0625,8.0625c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-13.4375h-69.875v-75.25h86v16.125h-5.375c-4.44512,0 -8.0625,3.61737 -8.0625,8.0625v8.0625h-5.16c-2.494,0 -4.82675,1.075 -6.407,2.95356c-1.51306,1.80062 -2.15269,4.1495 -1.75225,6.44194l2.95625,17.02531c1.12606,6.493 6.87731,11.20419 13.68475,11.20419h10.11575zM150.46237,89.10138l-2.95625,17.02531c-0.67725,3.91031 -4.20325,6.74831 -8.38769,6.74831h-20.23419c-4.18444,0 -7.71044,-2.838 -8.38769,-6.74831l-2.95625,-17.028c-0.172,-0.99706 0.28219,-1.72 0.57244,-2.064c0.55362,-0.65575 1.38675,-1.03469 2.28975,-1.03469h37.195c0.903,0 1.73613,0.37894 2.29244,1.03738c0.28756,0.344 0.74444,1.06425 0.57244,2.064z" fill="url(#color-2_44039_gr2)"></path><path d="M53.75,59.125h53.75v5.375h-53.75z" fill="url(#color-3_44039_gr3)"></path><path d="M53.75,69.875h43v5.375h-43z" fill="url(#color-4_44039_gr4)"></path><path d="M53.75,80.625h32.25v5.375h-32.25z" fill="url(#color-5_44039_gr5)"></path><path d="M126.3125,91.375h5.375v16.125h-5.375z" fill="url(#color-6_44039_gr6)"></path><path d="M137.0625,91.375h5.375v10.75h-5.375z" fill="url(#color-7_44039_gr7)"></path><path d="M115.5625,91.375h5.375v10.75h-5.375z" fill="url(#color-8_44039_gr8)"></path></g></g></svg>
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="fs-12 m-t-5 all-caps">Purchase Orders</div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row no-margin">
+                            <div class="col bg-white padding-25">
+                                <div class="row tabsContainer tabContent" tab-name="pendingOrders">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col">
+                                                <supplier-pending-orders-section-component></supplier-pending-orders-section-component>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row tabsContainer hide tabContent" tab-name="paymentProof">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="row">
+                                                    <div class="col">
+                                                        <list-component ref="paymentProofList" section="paymentProofSection" :endpoint="route('api.transaction.list')" :options="{status: 2, type: 3}">
+                                                            <template slot="list" slot-scope="{data}">
+                                                                <payment-proof-component :data="data"></payment-proof-component>
+                                                            </template>
+                                                        </list-component>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row tabsContainer hide tabContent" tab-name="purchaseOrders">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="row">
+                                                    <div class="col-10">
+                                                        <list-component key="2" section="transferSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, status: 2}">
+                                                            <template slot="list" slot-scope="{data}">
+                                                                <booking-component :data="data"></booking-component>
+                                                            </template>
+                                                        </list-component>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-2 p-r-0">
+        <div class="row">
+            <div class="col">
+                <div class="row">
+                    <div class="col">
+                        <div class="row m-l-0 m-r-0 d-none d-md-flex m-b-30 hide">
+                            <div class="col bg-master p-t-20" style="background-image: linear-gradient(rgb(63, 63, 63) 0.01em, transparent 0.1em), linear-gradient(90deg, rgb(63, 63, 63) 0.1em, transparent 0.1em); background-size: 2em 2em;">
+                                <div class="row">
+                                    <div class="col">
+                                        <div class="row fs-12 text-center m-b-20">
+                                            <div class="col">
+                                                <div class="row m-b-5">
+                                                    <div class="col">
+                                                        <div class="font-heading text-white fs-24 all-caps">1.5810</div>
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col">
+                                                        <div class="fs-12 text-warning bold">- 0.0%
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row justify-content-center">
+                                            <div class="col-auto m-r-5 p-b-10 b-b b-complete" style="border-bottom-width: 3px;">
+                                                <div class="fs-12 bold text-white">RMB</div>
+                                            </div>
+                                            <div class="col-auto m-r-5 p-b-10 b-b hint-text" style="border-bottom-width: 3px; border-bottom-color: transparent;">
+                                                <div class="fs-12 hint-text text-white">USD</div>
+                                            </div>
+                                            <div class="col-auto p-b-10 b-b hint-text" style="border-bottom-width: 3px; border-bottom-color: transparent;">
+                                                <div class="fs-12 hint-text text-white">SGD</div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row no-margin">
+                            <div class="col">
+                                <div class="row m-b-10">
+                                    <div class="col b-a b-grey p-t-5 p-b-5">
+                                        <div class="row align-items-center">
+                                            <div class="col">
+                                                <div class="font-heading fs-10 all-caps text-complete-light">Customer Verification</div>
+                                            </div>
+                                            <div class="col-auto p-r-10">
+                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                     width="40" height="40"
+                                                     viewBox="0 0 172 172"
+                                                     style=" fill:#000000;"><defs><linearGradient x1="86" y1="18.8125" x2="86" y2="150.07" gradientUnits="userSpaceOnUse" id="color-1_44031_gr1"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="130.34375" y1="18.8125" x2="130.34375" y2="150.07" gradientUnits="userSpaceOnUse" id="color-2_44031_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="53.86019" y1="18.8125" x2="53.86019" y2="150.07" gradientUnits="userSpaceOnUse" id="color-3_44031_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="53.75" y1="65.17188" x2="53.75" y2="92.10063" gradientUnits="userSpaceOnUse" id="color-4_44031_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="102.125" y1="65.17188" x2="102.125" y2="92.10063" gradientUnits="userSpaceOnUse" id="color-5_44031_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="77.9375" y1="93.72656" x2="77.9375" y2="121.2815" gradientUnits="userSpaceOnUse" id="color-6_44031_gr6"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g id="original-icon"><path d="M147.80175,100.63613c-2.61762,-2.76812 -5.676,-4.93425 -9.00581,-6.48763c0.62887,-3.56362 0.95406,-7.19444 0.95406,-10.836c0,-34.08556 -27.72694,-61.8125 -61.8125,-61.8125c-34.08556,0 -61.8125,27.72694 -61.8125,61.8125c0,34.08556 27.72694,61.8125 61.8125,61.8125c8.9225,0 17.4795,-1.85975 25.49094,-5.50131c5.42606,6.63275 13.66594,10.87631 22.88406,10.87631c16.29969,0 29.5625,-13.26281 29.5625,-29.5625c0,-7.57875 -2.86488,-14.78931 -8.07325,-20.30138zM77.9375,139.75c-31.11856,0 -56.4375,-25.31894 -56.4375,-56.4375c0,-31.11856 25.31894,-56.4375 56.4375,-56.4375c31.11856,0 56.4375,25.31894 56.4375,56.4375c0,3.02612 -0.25531,6.03881 -0.731,9.0085c-2.365,-0.602 -4.816,-0.946 -7.3315,-0.946c-16.29969,0 -29.5625,13.26281 -29.5625,29.5625c0,5.13312 1.31956,9.95988 3.62812,14.17119c-7.07081,3.07719 -14.60388,4.64131 -22.44062,4.64131zM126.3125,145.125c-13.33806,0 -24.1875,-10.84944 -24.1875,-24.1875c0,-13.33806 10.84944,-24.1875 24.1875,-24.1875c6.71875,0 12.9645,2.69019 17.58431,7.57606c4.257,4.51231 6.60319,10.40869 6.60319,16.61144c0,13.33806 -10.84944,24.1875 -24.1875,24.1875z" fill="url(#color-1_44031_gr1)"></path><path d="M141.88119,112.31869l-15.56869,15.56869l-7.50619,-7.50619l-3.80013,3.80013l11.30631,11.30631l19.36881,-19.36881z" fill="url(#color-2_44031_gr2)"></path><path d="M29.78288,66.29256l5.06594,1.78988c4.55531,-12.88925 14.96938,-23.30331 27.86131,-27.85863c4.8805,-1.72538 10.00556,-2.59881 15.22737,-2.59881v-5.375c-5.83456,0 -11.56162,0.97825 -17.01725,2.90788c-14.40769,5.09013 -26.04725,16.72969 -31.13737,31.13469z" fill="url(#color-3_44031_gr3)"></path><path d="M53.75,67.1875c-5.93706,0 -10.75,4.81294 -10.75,10.75c0,5.93706 4.81294,10.75 10.75,10.75c5.93706,0 10.75,-4.81294 10.75,-10.75c0,-5.93706 -4.81294,-10.75 -10.75,-10.75z" fill="url(#color-4_44031_gr4)"></path><path d="M102.125,67.1875c-5.93706,0 -10.75,4.81294 -10.75,10.75c0,5.93706 4.81294,10.75 10.75,10.75c5.93706,0 10.75,-4.81294 10.75,-10.75c0,-5.93706 -4.81294,-10.75 -10.75,-10.75z" fill="url(#color-5_44031_gr5)"></path><path d="M91.375,96.75h-26.875c-1.4835,0 -2.6875,1.204 -2.6875,2.6875v2.6875c0,8.90637 7.21863,16.125 16.125,16.125c8.90637,0 16.125,-7.21863 16.125,-16.125v-2.6875c0,-1.4835 -1.204,-2.6875 -2.6875,-2.6875z" fill="url(#color-6_44031_gr6)"></path></g></g></svg>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col">
+                                        <list-component key="2" section="identificationVerificationSection" :options="{'per_page': 5, 'document_type_in': ['SSM_REGISTRATION', 'IDENTITY_CARD'], 'status': 1, 'with_company': true}"  :endpoint="route('api.document.list')">
+                                            <template slot="list" slot-scope="{data}">
+                                                <identification-verification-component section="identificationVerificationSection" :data="data"></identification-verification-component>
+                                            </template>
+                                        </list-component>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/pages/dashboards/admin_profile.blade.php b/resources/views/pages/dashboards/admin_profile.blade.php
deleted file mode 100644
index 0ff2ad6f..00000000
--- a/resources/views/pages/dashboards/admin_profile.blade.php
+++ /dev/null
@@ -1,254 +0,0 @@
-@extends('layouts.base_portal')
-@section('inner_content')
-<div class="row m-t-30">
-    <div class="col-9 p-t-20 p-b-20">
-        <div class="row align-items-end">
-            <div class="col">
-                <div class="row m-b-40 animated fadeInLeftBig">
-                    <div class="col">
-                        <div class="row">
-                            <div class="col">
-                                <h3 class="all-caps bold hint-text">Accounts</h3>
-                            </div>
-                        </div>
-                        <div class="row fs-13">
-                            <div class="col">
-                                <small class="muted all-caps">Here you manage all the system users & businesses</small>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col animated fadeInDownBig text-right">
-                <img src="{{asset('images/admin-dashboard-illustration.png')}}" class="w-100" />
-            </div>
-        </div>
-        <div class="row no-margin animated fadeInUpBig faster">
-            <div class="col">
-                <div class="row m-b-20">
-                    <div class="col pointer">
-                        <div class="row fs-12 text-center">
-                            <div class="col padding-25 bg-white">
-                                <div class="row justify-content-center m-b-10">
-                                    <div class="col-auto">
-                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                             width="35" height="35"
-                                             viewBox="0 0 172 172"
-                                             style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g id="Layer_1"><g><g><g fill="none"><path d="M135.85313,141.9c-9.94375,-17.33438 -28.4875,-29.025 -49.85313,-29.025v0c-21.36562,0 -39.90938,11.69062 -49.85312,29.025l0.13437,4.56875h99.4375z"></path></g><g fill="#444b54"><path d="M105.8875,120.53438c-0.40313,0 -0.94063,-0.13437 -1.34375,-0.26875c-5.9125,-2.15 -12.09375,-3.35937 -18.54375,-3.35937c-2.28437,0 -4.03125,-1.74688 -4.03125,-4.03125c0,-2.28437 1.74688,-4.03125 4.03125,-4.03125c7.39063,0 14.5125,1.34375 21.36563,3.7625c2.15,0.80625 3.09062,3.09062 2.41875,5.24062c-0.67187,1.6125 -2.28437,2.6875 -3.89687,2.6875z"></path></g><g fill="#444b54"><path d="M36.14688,145.93125c-0.67187,0 -1.34375,-0.13438 -2.01562,-0.5375c-1.88125,-1.075 -2.55313,-3.49375 -1.47813,-5.50937c10.88438,-19.08125 31.30938,-31.04063 53.34688,-31.04063c2.28437,0 4.03125,1.74688 4.03125,4.03125c0,2.28437 -1.74688,4.03125 -4.03125,4.03125c-19.08125,0 -36.81875,10.34687 -46.35937,27.00938c-0.67187,1.20937 -2.01562,2.01563 -3.49375,2.01563z"></path></g><g fill="none"><circle cx="64" cy="50" transform="scale(1.34375,1.34375)" r="20"></circle></g><g fill="#444b54"><path d="M86,98.09375c-17.06562,0 -30.90625,-13.84063 -30.90625,-30.90625c0,-17.06563 13.84063,-30.90625 30.90625,-30.90625c17.06562,0 30.90625,13.84062 30.90625,30.90625c0,17.06562 -13.84063,30.90625 -30.90625,30.90625zM86,44.34375c-12.63125,0 -22.84375,10.2125 -22.84375,22.84375c0,12.63125 10.2125,22.84375 22.84375,22.84375c12.63125,0 22.84375,-10.2125 22.84375,-22.84375c0,-12.63125 -10.2125,-22.84375 -22.84375,-22.84375z"></path></g></g><g fill="none"><g><g><path d="M144.99063,146.46875h-18.8125c-2.28438,0 -4.03125,-1.74687 -4.03125,-4.03125c0,-2.28438 1.74687,-4.03125 4.03125,-4.03125h18.8125c2.28438,0 4.03125,1.74687 4.03125,4.03125c0,2.28438 -1.74687,4.03125 -4.03125,4.03125z"></path></g></g></g><g><g><g><path d="M159.90625,126.3125h-1.47813c0,-0.26875 0.13438,-0.40313 0.13438,-0.67187v-11.42187c0,-10.34687 -8.46562,-18.8125 -18.8125,-18.8125c-10.34688,0 -18.8125,8.46563 -18.8125,18.8125v12.09375h-1.34375c-3.7625,0 -6.71875,2.95625 -6.71875,6.71875v9.40625c0,14.78125 12.09375,26.875 26.875,26.875c14.78125,0 26.875,-12.09375 26.875,-26.875v-9.40625c0,-3.7625 -2.95625,-6.71875 -6.71875,-6.71875zM129,126.3125v-12.09375c0,-5.9125 4.8375,-10.75 10.75,-10.75c5.9125,0 10.75,4.8375 10.75,10.75v11.42188c0,0.26875 0,0.40313 0.13438,0.67188z" fill="#71c2ff"></path><g fill="none"><path d="M139.75,148.75313c-2.28438,0 -4.03125,-1.74688 -4.03125,-4.03125v-0.26875c0,-2.28438 1.74687,-4.03125 4.03125,-4.03125c2.28438,0 4.03125,1.74687 4.03125,4.03125v0.26875c0,2.28437 -1.74687,4.03125 -4.03125,4.03125z"></path></g></g></g></g></g></g></g></svg>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <p class="bold all-caps m-t-5 m-b-0 lh-15">Users</p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col">
-                        <div class="row fs-12 text-center">
-                            <div class="col padding-25 bg-master-lighter b-r hint-text" style=" border-color: #d2d2d2; ">
-                                <div class="row justify-content-center m-b-10">
-                                    <div class="col-auto">
-                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                             width="35" height="35"
-                                             viewBox="0 0 172 172"
-                                             style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M86,79.28125c-11.13199,0 -20.15625,9.02426 -20.15625,20.15625c0,11.13199 9.02426,20.15625 20.15625,20.15625c11.13199,0 20.15625,-9.02426 20.15625,-20.15625c0,-11.13199 -9.02426,-20.15625 -20.15625,-20.15625zM86,17.46875c-7.42133,0 -13.4375,6.01617 -13.4375,13.4375c0,7.42133 6.01617,13.4375 13.4375,13.4375c7.42133,0 13.4375,-6.01617 13.4375,-13.4375c0,-7.42133 -6.01617,-13.4375 -13.4375,-13.4375zM146.46875,120.9375c-7.42133,0 -13.4375,6.01617 -13.4375,13.4375c0,7.42133 6.01617,13.4375 13.4375,13.4375c7.42133,0 13.4375,-6.01617 13.4375,-13.4375c0,-7.42133 -6.01617,-13.4375 -13.4375,-13.4375zM146.46875,51.0625c-7.42133,0 -13.4375,6.01617 -13.4375,13.4375c0,7.42133 6.01617,13.4375 13.4375,13.4375c7.42133,0 13.4375,-6.01617 13.4375,-13.4375c0,-7.42133 -6.01617,-13.4375 -13.4375,-13.4375zM25.53125,51.0625c-7.42133,0 -13.4375,6.01617 -13.4375,13.4375c0,7.42133 6.01617,13.4375 13.4375,13.4375c7.42133,0 13.4375,-6.01617 13.4375,-13.4375c0,-7.42133 -6.01617,-13.4375 -13.4375,-13.4375zM25.53125,120.9375c-7.42133,0 -13.4375,6.01617 -13.4375,13.4375c0,7.42133 6.01617,13.4375 13.4375,13.4375c7.42133,0 13.4375,-6.01617 13.4375,-13.4375c0,-7.42133 -6.01617,-13.4375 -13.4375,-13.4375z" ></path><path d="M49.45,116.77188l-10.48125,6.31562c-3.225,-3.7625 -8.0625,-6.18125 -13.4375,-6.18125c-9.675,0 -17.46875,7.79375 -17.46875,17.46875c0,9.675 7.79375,17.46875 17.46875,17.46875c9.675,0 17.46875,-7.79375 17.46875,-17.46875c0,-1.34375 -0.13437,-2.6875 -0.5375,-4.03125l11.01875,-6.71875c1.88125,-1.20938 2.55313,-3.62812 1.34375,-5.50937c-1.075,-1.88125 -3.49375,-2.41875 -5.375,-1.34375zM25.53125,143.78125c-5.24063,0 -9.40625,-4.16563 -9.40625,-9.40625c0,-5.24062 4.16562,-9.40625 9.40625,-9.40625c5.24062,0 9.40625,4.16563 9.40625,9.40625c0,5.24062 -4.16563,9.40625 -9.40625,9.40625zM123.0875,83.04375l11.01875,-6.31563c3.225,3.225 7.525,5.10625 12.3625,5.10625c9.675,0 17.46875,-7.79375 17.46875,-17.46875c0,-9.675 -7.79375,-17.46875 -17.46875,-17.46875c-9.675,0 -17.46875,7.79375 -17.46875,17.46875c0,1.88125 0.26875,3.7625 0.94063,5.50937l-10.75,6.04688c-1.88125,1.075 -2.55312,3.49375 -1.47812,5.50938c0.94062,2.01563 3.35937,2.82188 5.375,1.6125zM146.46875,55.09375c5.24062,0 9.40625,4.16562 9.40625,9.40625c0,5.24062 -4.16563,9.40625 -9.40625,9.40625c-5.24062,0 -9.40625,-4.16563 -9.40625,-9.40625c0,-5.24063 4.16563,-9.40625 9.40625,-9.40625zM86,13.4375c-9.675,0 -17.46875,7.79375 -17.46875,17.46875c0,8.19687 5.77813,15.18437 13.4375,16.93125v11.2875c0,2.28438 1.74688,4.03125 4.03125,4.03125c2.28437,0 4.03125,-1.74687 4.03125,-4.03125v-11.2875c7.65937,-1.88125 13.4375,-8.73437 13.4375,-16.93125c0,-9.675 -7.79375,-17.46875 -17.46875,-17.46875zM86,40.3125c-5.24062,0 -9.40625,-4.16562 -9.40625,-9.40625c0,-5.24062 4.16563,-9.40625 9.40625,-9.40625c5.24063,0 9.40625,4.16563 9.40625,9.40625c0,5.24063 -4.16562,9.40625 -9.40625,9.40625zM146.46875,116.90625c-5.375,0 -10.07812,2.41875 -13.30312,6.18125l-10.48125,-6.31562c-1.88125,-1.20938 -4.43438,-0.5375 -5.50938,1.34375c-1.20937,1.88125 -0.5375,4.43437 1.34375,5.50937l11.01875,6.71875c-0.26875,1.34375 -0.5375,2.6875 -0.5375,4.03125c0,9.675 7.79375,17.46875 17.46875,17.46875c9.675,0 17.46875,-7.79375 17.46875,-17.46875c0,-9.675 -7.79375,-17.46875 -17.46875,-17.46875zM146.46875,143.78125c-5.24062,0 -9.40625,-4.16563 -9.40625,-9.40625c0,-5.24062 4.16563,-9.40625 9.40625,-9.40625c5.24062,0 9.40625,4.16563 9.40625,9.40625c0,5.24062 -4.16563,9.40625 -9.40625,9.40625zM25.53125,81.96875c4.97188,0 9.40625,-2.15 12.63125,-5.375l10.88437,6.31562c1.88125,1.075 4.43437,0.40313 5.50937,-1.47812c1.075,-1.88125 0.40313,-4.43438 -1.47812,-5.50938l-10.88437,-6.18125c0.5375,-1.6125 0.80625,-3.35937 0.80625,-5.10625c0,-9.675 -7.79375,-17.46875 -17.46875,-17.46875c-9.675,0 -17.46875,7.65937 -17.46875,17.33438c0,9.675 7.79375,17.46875 17.46875,17.46875zM25.53125,55.09375c5.24062,0 9.40625,4.16562 9.40625,9.40625c0,5.24062 -4.16563,9.40625 -9.40625,9.40625c-5.24062,0 -9.40625,-4.16563 -9.40625,-9.40625c0,-5.24063 4.16562,-9.40625 9.40625,-9.40625z" fill="#71c2ff"></path><g fill="#444b54"><path d="M86,123.625c-13.30312,0 -24.1875,-10.88437 -24.1875,-24.1875c0,-13.30313 10.88438,-24.1875 24.1875,-24.1875c13.30313,0 24.1875,10.88437 24.1875,24.1875c0,13.30313 -10.88437,24.1875 -24.1875,24.1875zM86,83.3125c-8.86875,0 -16.125,7.25625 -16.125,16.125c0,8.86875 7.25625,16.125 16.125,16.125c8.86875,0 16.125,-7.25625 16.125,-16.125c0,-8.86875 -7.25625,-16.125 -16.125,-16.125z"></path></g><g><path d="M123.625,158.69688c-7.39062,-13.03438 -21.5,-21.90313 -37.625,-21.90313v0c-16.125,0 -30.23437,8.86875 -37.625,21.90313l0.13437,3.49375h75.11562z" ></path><path d="M48.375,162.72813c-0.67187,0 -1.34375,-0.13438 -2.01562,-0.5375c-1.88125,-1.075 -2.55313,-3.49375 -1.47812,-5.50937c8.33125,-14.78125 24.1875,-23.91875 41.11875,-23.91875c16.93125,0 32.7875,9.1375 41.11875,23.91875c1.075,1.88125 0.40313,4.43437 -1.47812,5.50937c-1.88125,1.075 -4.43438,0.40312 -5.50937,-1.47812c-6.9875,-12.22813 -20.02188,-19.8875 -34.13125,-19.8875c-14.10937,0 -27.14375,7.65938 -34.13125,19.8875c-0.67187,1.34375 -2.15,2.01563 -3.49375,2.01563z" fill="#444b54"></path></g></g></g></svg>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <p class="all-caps m-t-5 m-b-0 lh-15">Forwarders</p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col pointer">
-                        <div class="row fs-12 text-center">
-                            <div class="col padding-25 bg-master-lighter b-r hint-text" style=" border-color: #d2d2d2; ">
-                                <div class="row justify-content-center m-b-10">
-                                    <div class="col-auto">
-                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                             width="35" height="35"
-                                             viewBox="0 0 172 172"
-                                             style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g id="Layer_1"><g><g fill="none"><path d="M110.1875,67.1875c0,-7.39062 -6.04687,-13.4375 -13.4375,-13.4375h-21.5h-1.6125c-6.71875,0 -12.49688,5.10625 -13.30313,11.825l-5.24063,41.925h14.78125v59.125h32.25v-59.125v0c4.43438,0 8.0625,-3.62812 8.0625,-8.0625z"></path></g><g fill="none"><path d="M49.71875,61.8125h-21.5c-7.39062,0 -13.4375,6.04688 -13.4375,13.4375v29.5625c0,4.97187 3.49375,9.1375 8.0625,10.34687v43.40313c0,4.43437 3.62813,8.0625 8.0625,8.0625c4.43438,0 11.69062,0 16.125,0c4.43437,0 8.0625,-3.62813 8.0625,-8.0625v-43h8.0625v-40.3125c0,-7.39062 -6.04687,-13.4375 -13.4375,-13.4375z"></path></g><g fill="none"><circle cx="29" cy="26" transform="scale(1.34375,1.34375)" r="10"></circle></g><g fill="none"><path d="M143.78125,61.8125h-21.5c-7.39062,0 -13.4375,6.04688 -13.4375,13.4375v29.5625c0,4.97187 3.49375,9.1375 8.0625,10.34687v43c0,4.43437 3.35938,8.33125 7.79375,8.33125c4.56875,0.13438 12.09375,0.13438 16.6625,0c4.43437,-0.13437 7.79375,-4.03125 7.79375,-8.33125v-42.59688v0c4.43437,0 8.0625,-3.62812 8.0625,-8.0625v-32.25c0,-7.39062 -6.04687,-13.4375 -13.4375,-13.4375z"></path></g><g fill="none"><circle cx="99" cy="26" transform="scale(1.34375,1.34375)" r="10"></circle></g><g fill="#71c2ff"><path d="M22.84375,170.65625c-2.28438,0 -4.03125,-1.74687 -4.03125,-4.03125v-48.64375c-4.8375,-2.41875 -8.0625,-7.525 -8.0625,-13.16875v-29.5625c0,-9.675 7.79375,-17.46875 17.46875,-17.46875h21.5c2.28438,0 4.03125,1.74687 4.03125,4.03125c0,2.28437 -1.74687,4.03125 -4.03125,4.03125h-21.5c-5.24062,0 -9.40625,4.16563 -9.40625,9.40625v29.5625c0,3.09063 2.01563,5.77813 4.97188,6.45c1.74687,0.40312 3.09062,2.01563 3.09062,3.89687v51.46563c0,2.28438 -1.74687,4.03125 -4.03125,4.03125z"></path></g><g fill="#71c2ff"><path d="M38.96875,52.40625c-9.675,0 -17.46875,-7.79375 -17.46875,-17.46875c0,-9.675 7.79375,-17.46875 17.46875,-17.46875c9.675,0 17.46875,7.79375 17.46875,17.46875c0,9.675 -7.79375,17.46875 -17.46875,17.46875zM38.96875,25.53125c-5.24063,0 -9.40625,4.16563 -9.40625,9.40625c0,5.24063 4.16562,9.40625 9.40625,9.40625c5.24063,0 9.40625,-4.16562 9.40625,-9.40625c0,-5.24062 -4.16562,-9.40625 -9.40625,-9.40625z"></path></g><g fill="#71c2ff"><path d="M116.90625,170.65625c-2.28437,0 -4.03125,-1.74687 -4.03125,-4.03125v-38.02812c0,-2.28438 1.74688,-4.03125 4.03125,-4.03125c2.28437,0 4.03125,1.74688 4.03125,4.03125v38.02812c0,2.28438 -1.74688,4.03125 -4.03125,4.03125z"></path></g><g fill="#71c2ff"><path d="M149.15625,170.25313c-2.28438,0 -4.03125,-1.74688 -4.03125,-4.03125v-50.65938c0,-2.28437 1.74687,-4.03125 4.03125,-4.03125c2.28438,0 4.03125,-1.74688 4.03125,-4.03125v-32.25c0,-5.24062 -4.16563,-9.40625 -9.40625,-9.40625h-21.5c-2.28437,0 -4.03125,-1.74688 -4.03125,-4.03125c0,-2.28438 1.74688,-4.03125 4.03125,-4.03125h21.5c9.675,0 17.46875,7.79375 17.46875,17.46875v32.25c0,5.24063 -3.35937,9.675 -8.0625,11.42188v47.43437c0,2.15 -1.74687,3.89688 -4.03125,3.89688z"></path></g><g fill="#71c2ff"><path d="M133.03125,52.40625c-9.675,0 -17.46875,-7.79375 -17.46875,-17.46875c0,-9.675 7.79375,-17.46875 17.46875,-17.46875c9.675,0 17.46875,7.79375 17.46875,17.46875c0,9.675 -7.79375,17.46875 -17.46875,17.46875zM133.03125,25.53125c-5.24063,0 -9.40625,4.16563 -9.40625,9.40625c0,5.24063 4.16562,9.40625 9.40625,9.40625c5.24062,0 9.40625,-4.16562 9.40625,-9.40625c0,-5.24062 -4.16563,-9.40625 -9.40625,-9.40625z"></path></g><g fill="#444b54"><path d="M55.09375,143.78125c-2.28438,0 -4.03125,-1.74687 -4.03125,-4.03125v-18.8125c0,-2.28437 1.74687,-4.03125 4.03125,-4.03125c2.28438,0 4.03125,1.74688 4.03125,4.03125v18.8125c0,2.28438 -1.74687,4.03125 -4.03125,4.03125z"></path></g><g fill="none"><circle cx="64" cy="20" transform="scale(1.34375,1.34375)" r="10"></circle></g><g fill="#444b54"><path d="M86,44.34375c-9.675,0 -17.46875,-7.79375 -17.46875,-17.46875c0,-9.675 7.79375,-17.46875 17.46875,-17.46875c9.675,0 17.46875,7.79375 17.46875,17.46875c0,9.675 -7.79375,17.46875 -17.46875,17.46875zM86,17.46875c-5.24062,0 -9.40625,4.16563 -9.40625,9.40625c0,5.24063 4.16563,9.40625 9.40625,9.40625c5.24063,0 9.40625,-4.16562 9.40625,-9.40625c0,-5.24062 -4.16562,-9.40625 -9.40625,-9.40625z"></path></g><path d="M127.65625,162.59375h-21.5v-45.95625v-1.075v-4.70312c4.70313,-1.6125 8.0625,-6.18125 8.0625,-11.42187v-24.1875c0,-6.04687 -1.20938,-25.53125 -17.46875,-25.53125h-23.1125c-8.73437,0 -16.25938,6.58438 -17.33438,15.31875l-5.24063,41.925c-0.26875,2.15 1.34375,4.16562 3.49375,4.43438c2.15,0.26875 4.16563,-1.34375 4.43438,-3.49375l5.24063,-41.925c0.5375,-4.70312 4.56875,-8.19687 9.27187,-8.19687h23.24688c8.19687,0 9.40625,10.88437 9.40625,17.46875v24.1875c0,2.28437 -1.74688,4.03125 -4.03125,4.03125c-2.28437,0 -4.03125,1.74688 -4.03125,4.03125v8.0625v1.075v45.95625h-8.0625v-47.03125c0,-2.28437 -1.74688,-4.03125 -4.03125,-4.03125c-2.28437,0 -4.03125,1.74688 -4.03125,4.03125v47.03125h-8.0625v-55.09375c0,-2.28437 -1.74688,-4.03125 -4.03125,-4.03125c-2.28437,0 -4.03125,1.74688 -4.03125,4.03125v55.09375h-21.5c-2.28437,0 -4.03125,1.74687 -4.03125,4.03125c0,2.28438 1.74688,4.03125 4.03125,4.03125h83.3125c2.28438,0 4.03125,-1.74687 4.03125,-4.03125c0,-2.28438 -1.74687,-4.03125 -4.03125,-4.03125z" fill="#444b54"></path></g></g></g></svg>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <p class="all-caps m-t-5 m-b-0 lh-15">Importers</p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col pointer">
-                        <div class="row fs-12 text-center">
-                            <div class="col padding-25 bg-master-lighter hint-text">
-                                <div class="row justify-content-center m-b-10">
-                                    <div class="col-auto">
-                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                             width="35" height="35"
-                                             viewBox="0 0 172 172"
-                                             style=" fill:#000000;">
-                                            <g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#34495e"><path d="M86,12.78242l-70.95,24.38066v17.35957l2.78828,-0.87344l1.51172,-0.47031v99.47109h19.35v-64.5h94.6v62.35h19.35v-97.32109l4.3,1.34375v-17.35957zM86,17.31758l66.65,22.91934v7.31504h-3.59453l-63.05547,-19.70274l-66.65,20.82813v-8.44043zM86,32.35078l62.35,19.48438v94.36484h-10.75v-59.83887c0.04199,-0.23516 0.04199,-0.47031 0,-0.69707v-23.31406h-4.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15v17.2h-94.6v-17.2c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15h-4.3v23.28887c-0.04199,0.23516 -0.04199,0.47031 0,0.69707v62.01406h-10.75v-96.51484zM47.3,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM55.9,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM64.5,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM81.7,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM107.5,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM116.1,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,75.25c-0.77266,-0.0084 -1.49492,0.39473 -1.88965,1.0666c-0.38633,0.67188 -0.38633,1.49492 0,2.1668c0.39473,0.67188 1.11699,1.075 1.88965,1.0666h17.2c0.77266,0.0084 1.49492,-0.39473 1.88965,-1.0666c0.38633,-0.67187 0.38633,-1.49492 0,-2.1668c-0.39472,-0.67187 -1.11699,-1.075 -1.88965,-1.0666z"></path></g><g fill="#71c2ff"><g><path d="M77.9375,122.28125h-6.71875c-0.80625,0 -1.34375,0.5375 -1.34375,1.34375v5.375c0,2.28438 -8.0625,2.28438 -8.0625,0v-5.375c0,-0.80625 -0.5375,-1.34375 -1.34375,-1.34375h-6.71875c-2.28438,0 -4.03125,1.74688 -4.03125,4.03125v24.1875c0,2.28438 1.74687,4.03125 4.03125,4.03125h24.1875c2.28437,0 4.03125,-1.74687 4.03125,-4.03125v-24.1875c0,-2.28437 -1.74688,-4.03125 -4.03125,-4.03125z"></path></g></g><g fill="#71c2ff"><g><path d="M118.25,122.28125h-6.71875c-0.80625,0 -1.34375,0.5375 -1.34375,1.34375v5.375c0,2.28438 -8.0625,2.28438 -8.0625,0v-5.375c0,-0.80625 -0.5375,-1.34375 -1.34375,-1.34375h-6.71875c-2.28437,0 -4.03125,1.74688 -4.03125,4.03125v24.1875c0,2.28438 1.74688,4.03125 4.03125,4.03125h24.1875c2.28437,0 4.03125,-1.74687 4.03125,-4.03125v-24.1875c0,-2.28437 -1.74688,-4.03125 -4.03125,-4.03125z"></path></g></g></g></svg>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <p class="all-caps m-t-5 m-b-0 lh-15">Warehouses</p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col">
-                        <div class="row">
-                            <div class="col bg-white">
-                                <div class="row">
-                                    <div class="bg-master-lighter" :class="[{'col-3': !$store.getters.isShowing('admin.users.menu.minimize')}, {'col-auto': $store.getters.isShowing('admin.users.menu.minimize')}]">
-                                        <div class="row fs-12 bg-info-darker text-white">
-                                            <div class="col p-t-10 p-b-10 b-b" style="border-bottom-color: #d4d4d4;">
-                                                <div class="row align-items-center">
-                                                    <div class="col p-r-0" v-if="!$store.getters.isShowing('admin.users.menu.minimize')">
-                                                        <small class="all-caps m-t-5 m-b-0 lh-15">Navigation</small>
-                                                    </div>
-                                                    <div class="col-auto pointer" @click="$store.dispatch('toggleSection', {name: 'admin.users.menu.minimize', status: !$store.getters.isShowing('admin.users.menu.minimize')})">
-                                                        <i class="fa fs-14 fa-fw" :class="[{'fa-compress': !$store.getters.isShowing('admin.users.menu.minimize')}, {'fa-expand': $store.getters.isShowing('admin.users.menu.minimize')}]"  style=" margin-top: 6px; "></i>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="row fs-12">
-                                            <div class="col p-t-15 p-b-15"
-                                                 :class="[{'text-primary': !$store.getters.isShowing('admin.users.blocked') && !$store.getters.isShowing('admin.users.invites') && !$store.getters.isShowing('admin.users.reports')},
-                                                        {'bg-white': !$store.getters.isShowing('admin.users.blocked') && !$store.getters.isShowing('admin.users.invites') && !$store.getters.isShowing('admin.users.reports')},
-                                                        {'pointer': $store.getters.isShowing('admin.users.blocked') || $store.getters.isShowing('admin.users.invites') || $store.getters.isShowing('admin.users.reports')},
-                                                        {'hint-text': $store.getters.isShowing('admin.users.blocked') || $store.getters.isShowing('admin.users.invites') || $store.getters.isShowing('admin.users.reports')}]"
-                                                 @click="$store.dispatch('toggleSection', {name: 'admin.users.active', status: true});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.blocked', status: false});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.invites', status: false});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.reports', status: false})"
-                                                 :style="[ !$store.getters.isShowing('admin.users.blocked') && !$store.getters.isShowing('admin.users.invites') && !$store.getters.isShowing('admin.users.reports') ? {'border-bottom': 'solid 3px'} : {},
-                                                        $store.getters.isShowing('admin.users.blocked') || $store.getters.isShowing('admin.users.invites') || $store.getters.isShowing('admin.users.reports') ? {'border-bottom': 'solid 1px #d4d4d4'} : {}]">
-                                                <div class="row align-items-center">
-                                                    <div class="col-auto">
-                                                        <i class="fa fa-check-circle-o fs-16 fa-fw" style=" margin-top: 6px; "></i>
-                                                    </div>
-                                                    <div class="col p-l-0" v-if="!$store.getters.isShowing('admin.users.menu.minimize')">
-                                                        <p class="all-caps m-t-5 m-b-0 lh-15 fs-12">Active Users</p>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="row fs-12">
-                                            <div class="col p-t-15 p-b-15"
-                                                 :class="[{'text-primary': $store.getters.isShowing('admin.users.blocked')},
-                                                        {'bg-white': $store.getters.isShowing('admin.users.blocked')},
-                                                        {'pointer': !$store.getters.isShowing('admin.users.blocked')},
-                                                        {'hint-text': !$store.getters.isShowing('admin.users.blocked')}]"
-                                                 @click="$store.dispatch('toggleSection', {name: 'admin.users.blocked', status: true});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.active', status: false});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.invites', status: false});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.reports', status: false})"
-                                                 :style="[$store.getters.isShowing('admin.users.blocked') ? {'border-bottom': 'solid 3px'} : {},
-                                                        !$store.getters.isShowing('admin.users.blocked') ? {'border-bottom': 'solid 1px #d4d4d4'} : {}]">
-                                                <div class="row align-items-center">
-                                                    <div class="col-auto">
-                                                        <i class="fa fa-ban fs-16 fa-fw" style=" margin-top: 6px; "></i>
-                                                    </div>
-                                                    <div class="col p-l-0" v-if="!$store.getters.isShowing('admin.users.menu.minimize')">
-                                                        <p class="all-caps m-t-5 m-b-0 lh-15 fs-12">Blocked Users</p>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="row fs-12">
-                                            <div class="col p-t-15 p-b-15"
-                                                 :class="[{'text-primary': $store.getters.isShowing('admin.users.invites')},
-                                                        {'bg-white': $store.getters.isShowing('admin.users.invites')},
-                                                        {'pointer': !$store.getters.isShowing('admin.users.invites')},
-                                                        {'hint-text': !$store.getters.isShowing('admin.users.invites')}]"
-                                                 @click="$store.dispatch('toggleSection', {name: 'admin.users.invites', status: true});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.active', status: false});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.blocked', status: false});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.reports', status: false})"
-                                                 :style="[$store.getters.isShowing('admin.users.invites') ? {'border-bottom': 'solid 3px'} : {},
-                                                        !$store.getters.isShowing('admin.users.invites') ? {'border-bottom': 'solid 1px #d4d4d4'} : {}]">
-                                                <div class="row align-items-center">
-                                                    <div class="col-auto">
-                                                        <i class="fa fa-envelope-o fs-15 fa-fw" style=" margin-top: 6px; "></i>
-                                                    </div>
-                                                    <div class="col p-l-0" v-if="!$store.getters.isShowing('admin.users.menu.minimize')">
-                                                        <p class="all-caps m-t-5 m-b-0 lh-15 fs-12">User Invites</p>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="row fs-12">
-                                            <div class="col p-t-15 p-b-15"
-                                                 :class="[{'text-primary': $store.getters.isShowing('admin.users.reports')},
-                                                        {'bg-white': $store.getters.isShowing('admin.users.reports')},
-                                                        {'pointer': !$store.getters.isShowing('admin.users.reports')},
-                                                        {'hint-text': !$store.getters.isShowing('admin.users.reports')}]"
-                                                 @click="$store.dispatch('toggleSection', {name: 'admin.users.reports', status: true});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.active', status: false});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.blocked', status: false});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.invites', status: false})"
-                                                 :style="[$store.getters.isShowing('admin.users.reports') ? {'border-bottom': 'solid 3px'} : {},
-                                                        !$store.getters.isShowing('admin.users.reports') ? {'border-bottom': 'solid 1px #d4d4d4'} : {}]">
-                                                <div class="row align-items-center">
-                                                    <div class="col-auto">
-                                                        <i class="fa fa-pie-chart fs-15 fa-fw" style=" margin-top: 6px; "></i>
-                                                    </div>
-                                                    <div class="col p-l-0" v-if="!$store.getters.isShowing('admin.users.menu.minimize')">
-                                                        <p class="all-caps m-t-5 m-b-0 lh-15 fs-12">Reports</p>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="col p-t-15 p-b-15">
-                                        <div class="row overflow-hidden">
-                                            <loading-component style="height: 100%; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('listUsersSection')"></loading-component>.
-                                            <div class="col">
-                                                <transition-component group enter-class="animated bounceInDown fast" leave-class="animated bounceOutUp faster">
-                                                    <list-component :options="{active: true}" key="2" section="listUsersSection" endpoint="{{ route('api.account.user.list') }}" v-show="!$store.getters.isShowing('admin.users.blocked') && !$store.getters.isLoading('listUsersSection')">
-                                                        <div class="row" slot="header">
-                                                            <div class="col">
-                                                                <div class="all-caps font-lato m-b-0 text-info bold fs-12">Active users</div>
-                                                                <p class="fs-9 all-caps light font-lato muted m-b-0">List of the system currently active users</p>
-                                                            </div>
-                                                        </div>
-                                                        <template slot="list" slot-scope="{data}">
-                                                            <user-component :data="data"></user-component>
-                                                        </template>
-                                                    </list-component>
-                                                    <list-component :options="{active: false}" key="3" section="listUsersSection" endpoint="{{ route('api.account.user.list') }}" v-show="$store.getters.isShowing('admin.users.blocked') && !$store.getters.isLoading('listUsersSection')">
-                                                        <div class="row" slot="header">
-                                                            <div class="col">
-                                                                <div class="all-caps font-lato m-b-0 text-info bold fs-12">Blocked users</div>
-                                                                <p class="fs-9 all-caps light font-lato muted m-b-0">List of the system currently inactive users</p>
-                                                            </div>
-                                                        </div>
-                                                        <template slot="list" slot-scope="{data}">
-                                                            <user-component :data="data"></user-component>
-                                                        </template>
-                                                    </list-component>
-                                                </transition-component>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-@endsection
\ No newline at end of file
diff --git a/resources/views/pages/dashboards/customer.blade.php b/resources/views/pages/dashboards/customer.blade.php
new file mode 100644
index 00000000..c5e842c2
--- /dev/null
+++ b/resources/views/pages/dashboards/customer.blade.php
@@ -0,0 +1,5 @@
+<div class="row d-none" :class="[{'d-flex': !$store.getters.isAdmin}]" v-if="!$store.getters.isAdmin">
+    <div class="col">
+        <customer-dashboard-section-component></customer-dashboard-section-component>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/pages/dashboards/forwarder_profile.blade.php b/resources/views/pages/dashboards/forwarder_profile.blade.php
deleted file mode 100644
index 84d22662..00000000
--- a/resources/views/pages/dashboards/forwarder_profile.blade.php
+++ /dev/null
@@ -1,238 +0,0 @@
-@extends('layouts.base_portal')
-@section('inner_content')
-<div class="row m-t-30">
-    <div class="col-9 p-t-20 p-b-20">
-        <div class="row animated fadeInUpBig faster">
-            <div class="col">
-                <div class="row m-b-20">
-                    <div class="col">
-                        <div class="row fs-12 text-center">
-                            <div class="col padding-25 bg-master-lighter b-r hint-text" style=" border-color: #d2d2d2; ">
-                                <div class="row justify-content-center m-b-10">
-                                    <div class="col-auto">
-                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                             width="35" height="35"
-                                             viewBox="0 0 172 172"
-                                             style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M150.5,45.6875l-64.5,-22.84375l-64.5,22.84375v80.625l64.5,22.84375l64.5,-22.84375z" ></path><path d="M150.5,45.6875l-64.5,-22.84375l-64.5,22.84375v80.625l64.5,22.84375l64.5,-22.84375zM150.5,45.6875l-64.5,-22.84375" ></path><path d="M86,153.1875c-0.40313,0 -0.94062,-0.13438 -1.34375,-0.26875l-64.5,-22.84375c-1.6125,-0.5375 -2.6875,-2.15 -2.6875,-3.7625v-80.625c0,-1.74687 1.075,-3.225 2.6875,-3.7625l64.5,-22.84375c2.15,-0.80625 4.43438,0.40312 5.10625,2.41875c0.80625,2.15 -0.40313,4.43437 -2.41875,5.10625l-61.8125,21.90313v74.98125l61.8125,21.90313c2.15,0.80625 3.225,3.09062 2.41875,5.10625c-0.5375,1.6125 -2.15,2.6875 -3.7625,2.6875z" fill="#444b54"></path><path d="M150.5,45.6875l-64.5,-22.84375M150.5,45.6875l-64.5,-22.84375" ></path><path d="M45.6875,71.08437v-14.5125c0,-1.74687 1.075,-3.225 2.6875,-3.7625l61.8125,-21.90313l16.125,5.375l-63.15625,21.90312c-1.6125,0.5375 -2.6875,2.15 -2.6875,3.7625v13.4375c0,1.88125 -1.88125,3.225 -3.62813,2.55312l-8.46562,-3.09062c-1.6125,-0.5375 -2.6875,-2.01562 -2.6875,-3.7625z" fill="#71c2ff"></path><path d="M154.53125,45.41875c0,-0.13437 0,-0.26875 0,-0.5375c0,0 0,0 0,-0.13438c0,-0.13437 -0.13438,-0.40312 -0.13438,-0.5375c-0.40312,-1.075 -1.34375,-2.01562 -2.28437,-2.41875c0,0 -0.13438,0 -0.13438,-0.13438l-64.5,-22.84375c0,0 0,0 -0.13437,0c-0.80625,-0.26875 -1.74687,-0.26875 -2.55312,0l-64.5,22.84375c-1.6125,0.5375 -2.6875,2.15 -2.6875,3.7625v80.625c0,1.74687 1.075,3.225 2.6875,3.7625l64.5,22.84375v0c0.40313,0.13437 0.94063,0.26875 1.34375,0.26875c0.40312,0 0.94062,-0.13437 1.34375,-0.26875l64.5,-22.84375c1.6125,-0.5375 2.6875,-2.15 2.6875,-3.7625v-80.35625c-0.13438,-0.13437 -0.13438,-0.13437 -0.13438,-0.26875zM25.53125,48.50938l60.46875,-21.36562l52.40625,18.54375l-53.75,19.08125c0,0 0,0 -0.13438,0c-1.47812,0.5375 -2.55312,2.01563 -2.55312,3.7625v74.98125l-56.4375,-20.02187zM90.03125,143.5125v-72.15937l56.4375,-20.02188v72.025z" fill="#444b54"></path></g></g></svg>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <p class="all-caps m-t-5 m-b-0 lh-15">Orders</p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col pointer">
-                        <div class="row fs-12 text-center">
-                            <div class="col padding-25 bg-master-lighter b-r hint-text" style=" border-color: #d2d2d2; ">
-                                <div class="row justify-content-center m-b-10">
-                                    <div class="col-auto">
-                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                             width="35" height="35"
-                                             viewBox="0 0 172 172"
-                                             style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g id="Layer_1"><path d="M13.4375,5.375h102.125v161.25h-102.125z" ></path><path d="M99.4375,143.78125h-26.875c-2.28437,0 -4.03125,-1.74687 -4.03125,-4.03125v-40.3125c0,-2.28437 1.74688,-4.03125 4.03125,-4.03125h26.875c2.28437,0 4.03125,1.74688 4.03125,4.03125v40.3125c0,2.28438 -1.74688,4.03125 -4.03125,4.03125zM76.59375,135.71875h18.8125v-32.25h-18.8125zM17.46875,9.40625h94.0625v8.0625h-94.0625zM9.40625,40.3125c0,2.28437 1.74688,4.03125 4.03125,4.03125c2.28437,0 4.03125,-1.74688 4.03125,-4.03125v-22.84375h-8.0625z" fill="#454b54"></path><path d="M150.5,162.59375h-4.03125v-145.125h-34.9375v145.125h-51.0625v-63.15625c0,-2.28437 -1.74687,-4.03125 -4.03125,-4.03125h-26.875c-2.28438,0 -4.03125,1.74688 -4.03125,4.03125v63.15625h-8.0625v-63.15625c0,-2.28437 -1.74688,-4.03125 -4.03125,-4.03125c-2.28437,0 -4.03125,1.74688 -4.03125,4.03125v63.15625h-4.03125c-2.28438,0 -4.03125,1.74687 -4.03125,4.03125c0,2.28438 1.74687,4.03125 4.03125,4.03125h145.125c2.28438,0 4.03125,-1.74687 4.03125,-4.03125c0,-2.28438 -1.74687,-4.03125 -4.03125,-4.03125zM33.59375,162.59375v-59.125h18.8125v59.125z" fill="#454b54"></path><path d="M5.375,5.375h145.25938v16.125h-145.25937z" ></path><path d="M150.63438,1.34375h-145.25937c-2.28438,0 -4.03125,1.74687 -4.03125,4.03125v16.125c0,2.28438 1.74687,4.03125 4.03125,4.03125h145.25938c2.28437,0 4.03125,-1.74687 4.03125,-4.03125v-16.125c0,-2.28438 -1.88125,-4.03125 -4.03125,-4.03125zM9.40625,9.40625h108.97813v8.0625h-108.97812zM146.60313,17.46875h-20.15625v-8.0625h20.15625z" fill="#454b54"></path><path d="M127.79063,53.61563c-0.67187,-0.80625 -1.74687,-1.20938 -2.82187,-1.20938h-120.9375c-2.28437,0 -4.03125,1.74687 -4.03125,4.03125v24.1875c0,1.075 0.40312,2.15 1.20938,2.82188c2.55312,2.55312 5.9125,4.03125 9.54063,4.03125c3.62812,0 6.9875,-1.34375 9.54062,-4.03125c1.075,-1.075 2.41875,-1.6125 3.89688,-1.6125c1.47813,0 2.82188,0.5375 3.89687,1.6125c2.55312,2.55312 5.9125,4.03125 9.54063,4.03125c3.62813,0 6.9875,-1.34375 9.54062,-4.03125l0.13438,-0.13438c2.01563,-2.01562 5.375,-2.01562 7.39063,0l0.26875,0.26875c2.55312,2.55312 5.9125,3.89687 9.40625,3.89687c3.49375,0 6.85313,-1.34375 9.40625,-3.89687l0.26875,-0.26875c2.01563,-2.01562 5.375,-2.01562 7.39063,0l0.26875,0.26875c2.55312,2.55312 5.9125,3.89687 9.40625,3.89687c3.49375,0 6.85312,-1.34375 9.40625,-3.89687l0.26875,-0.26875c2.01563,-2.01562 5.375,-2.01562 7.39063,0c2.55313,2.55313 6.04688,4.03125 9.675,3.89688c3.62812,-0.13437 7.12187,-1.6125 9.54062,-4.3c0.67188,-0.67187 1.075,-1.74687 1.075,-2.6875l0.5375,-23.78437c0,-1.075 -0.40312,-2.01562 -1.20938,-2.82187z" fill="#71c2ff"></path><path d="M166.625,162.59375c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="#454b54"></path></g></g></svg>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <p class="all-caps m-t-5 m-b-0 lh-15">Customers</p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col pointer">
-                        <div class="row fs-12 text-center">
-                            <div class="col padding-25 bg-master-lighter b-r hint-text" style=" border-color: #d2d2d2; ">
-                                <div class="row justify-content-center m-b-10">
-                                    <div class="col-auto">
-                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                             width="35" height="35"
-                                             viewBox="0 0 172 172"
-                                             style=" fill:#000000;">
-                                            <g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#34495e"><path d="M86,12.78242l-70.95,24.38066v17.35957l2.78828,-0.87344l1.51172,-0.47031v99.47109h19.35v-64.5h94.6v62.35h19.35v-97.32109l4.3,1.34375v-17.35957zM86,17.31758l66.65,22.91934v7.31504h-3.59453l-63.05547,-19.70274l-66.65,20.82813v-8.44043zM86,32.35078l62.35,19.48438v94.36484h-10.75v-59.83887c0.04199,-0.23516 0.04199,-0.47031 0,-0.69707v-23.31406h-4.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15v17.2h-94.6v-17.2c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15h-4.3v23.28887c-0.04199,0.23516 -0.04199,0.47031 0,0.69707v62.01406h-10.75v-96.51484zM47.3,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM55.9,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM64.5,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM81.7,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM107.5,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM116.1,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,75.25c-0.77266,-0.0084 -1.49492,0.39473 -1.88965,1.0666c-0.38633,0.67188 -0.38633,1.49492 0,2.1668c0.39473,0.67188 1.11699,1.075 1.88965,1.0666h17.2c0.77266,0.0084 1.49492,-0.39473 1.88965,-1.0666c0.38633,-0.67187 0.38633,-1.49492 0,-2.1668c-0.39472,-0.67187 -1.11699,-1.075 -1.88965,-1.0666z"></path></g><g fill="#71c2ff"><g><path d="M77.9375,122.28125h-6.71875c-0.80625,0 -1.34375,0.5375 -1.34375,1.34375v5.375c0,2.28438 -8.0625,2.28438 -8.0625,0v-5.375c0,-0.80625 -0.5375,-1.34375 -1.34375,-1.34375h-6.71875c-2.28438,0 -4.03125,1.74688 -4.03125,4.03125v24.1875c0,2.28438 1.74687,4.03125 4.03125,4.03125h24.1875c2.28437,0 4.03125,-1.74687 4.03125,-4.03125v-24.1875c0,-2.28437 -1.74688,-4.03125 -4.03125,-4.03125z"></path></g></g><g fill="#71c2ff"><g><path d="M118.25,122.28125h-6.71875c-0.80625,0 -1.34375,0.5375 -1.34375,1.34375v5.375c0,2.28438 -8.0625,2.28438 -8.0625,0v-5.375c0,-0.80625 -0.5375,-1.34375 -1.34375,-1.34375h-6.71875c-2.28437,0 -4.03125,1.74688 -4.03125,4.03125v24.1875c0,2.28438 1.74688,4.03125 4.03125,4.03125h24.1875c2.28437,0 4.03125,-1.74687 4.03125,-4.03125v-24.1875c0,-2.28437 -1.74688,-4.03125 -4.03125,-4.03125z"></path></g></g></g></svg>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <p class="all-caps m-t-5 m-b-0 lh-15">Warehouses</p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col pointer">
-                        <div class="row fs-12 text-center">
-                            <div class="col padding-25 bg-master-lighter hint-text" >
-                                <div class="row justify-content-center m-b-10">
-                                    <div class="col-auto">
-                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                             width="35" height="35"
-                                             viewBox="0 0 172 172"
-                                             style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g id="Layer_1"><g><g fill="none"><path d="M110.1875,67.1875c0,-7.39062 -6.04687,-13.4375 -13.4375,-13.4375h-21.5h-1.6125c-6.71875,0 -12.49688,5.10625 -13.30313,11.825l-5.24063,41.925h14.78125v59.125h32.25v-59.125v0c4.43438,0 8.0625,-3.62812 8.0625,-8.0625z"></path></g><g fill="none"><path d="M49.71875,61.8125h-21.5c-7.39062,0 -13.4375,6.04688 -13.4375,13.4375v29.5625c0,4.97187 3.49375,9.1375 8.0625,10.34687v43.40313c0,4.43437 3.62813,8.0625 8.0625,8.0625c4.43438,0 11.69062,0 16.125,0c4.43437,0 8.0625,-3.62813 8.0625,-8.0625v-43h8.0625v-40.3125c0,-7.39062 -6.04687,-13.4375 -13.4375,-13.4375z"></path></g><g fill="none"><circle cx="29" cy="26" transform="scale(1.34375,1.34375)" r="10"></circle></g><g fill="none"><path d="M143.78125,61.8125h-21.5c-7.39062,0 -13.4375,6.04688 -13.4375,13.4375v29.5625c0,4.97187 3.49375,9.1375 8.0625,10.34687v43c0,4.43437 3.35938,8.33125 7.79375,8.33125c4.56875,0.13438 12.09375,0.13438 16.6625,0c4.43437,-0.13437 7.79375,-4.03125 7.79375,-8.33125v-42.59688v0c4.43437,0 8.0625,-3.62812 8.0625,-8.0625v-32.25c0,-7.39062 -6.04687,-13.4375 -13.4375,-13.4375z"></path></g><g fill="none"><circle cx="99" cy="26" transform="scale(1.34375,1.34375)" r="10"></circle></g><g fill="#71c2ff"><path d="M22.84375,170.65625c-2.28438,0 -4.03125,-1.74687 -4.03125,-4.03125v-48.64375c-4.8375,-2.41875 -8.0625,-7.525 -8.0625,-13.16875v-29.5625c0,-9.675 7.79375,-17.46875 17.46875,-17.46875h21.5c2.28438,0 4.03125,1.74687 4.03125,4.03125c0,2.28437 -1.74687,4.03125 -4.03125,4.03125h-21.5c-5.24062,0 -9.40625,4.16563 -9.40625,9.40625v29.5625c0,3.09063 2.01563,5.77813 4.97188,6.45c1.74687,0.40312 3.09062,2.01563 3.09062,3.89687v51.46563c0,2.28438 -1.74687,4.03125 -4.03125,4.03125z"></path></g><g fill="#71c2ff"><path d="M38.96875,52.40625c-9.675,0 -17.46875,-7.79375 -17.46875,-17.46875c0,-9.675 7.79375,-17.46875 17.46875,-17.46875c9.675,0 17.46875,7.79375 17.46875,17.46875c0,9.675 -7.79375,17.46875 -17.46875,17.46875zM38.96875,25.53125c-5.24063,0 -9.40625,4.16563 -9.40625,9.40625c0,5.24063 4.16562,9.40625 9.40625,9.40625c5.24063,0 9.40625,-4.16562 9.40625,-9.40625c0,-5.24062 -4.16562,-9.40625 -9.40625,-9.40625z"></path></g><g fill="#71c2ff"><path d="M116.90625,170.65625c-2.28437,0 -4.03125,-1.74687 -4.03125,-4.03125v-38.02812c0,-2.28438 1.74688,-4.03125 4.03125,-4.03125c2.28437,0 4.03125,1.74688 4.03125,4.03125v38.02812c0,2.28438 -1.74688,4.03125 -4.03125,4.03125z"></path></g><g fill="#71c2ff"><path d="M149.15625,170.25313c-2.28438,0 -4.03125,-1.74688 -4.03125,-4.03125v-50.65938c0,-2.28437 1.74687,-4.03125 4.03125,-4.03125c2.28438,0 4.03125,-1.74688 4.03125,-4.03125v-32.25c0,-5.24062 -4.16563,-9.40625 -9.40625,-9.40625h-21.5c-2.28437,0 -4.03125,-1.74688 -4.03125,-4.03125c0,-2.28438 1.74688,-4.03125 4.03125,-4.03125h21.5c9.675,0 17.46875,7.79375 17.46875,17.46875v32.25c0,5.24063 -3.35937,9.675 -8.0625,11.42188v47.43437c0,2.15 -1.74687,3.89688 -4.03125,3.89688z"></path></g><g fill="#71c2ff"><path d="M133.03125,52.40625c-9.675,0 -17.46875,-7.79375 -17.46875,-17.46875c0,-9.675 7.79375,-17.46875 17.46875,-17.46875c9.675,0 17.46875,7.79375 17.46875,17.46875c0,9.675 -7.79375,17.46875 -17.46875,17.46875zM133.03125,25.53125c-5.24063,0 -9.40625,4.16563 -9.40625,9.40625c0,5.24063 4.16562,9.40625 9.40625,9.40625c5.24062,0 9.40625,-4.16562 9.40625,-9.40625c0,-5.24062 -4.16563,-9.40625 -9.40625,-9.40625z"></path></g><g fill="#444b54"><path d="M55.09375,143.78125c-2.28438,0 -4.03125,-1.74687 -4.03125,-4.03125v-18.8125c0,-2.28437 1.74687,-4.03125 4.03125,-4.03125c2.28438,0 4.03125,1.74688 4.03125,4.03125v18.8125c0,2.28438 -1.74687,4.03125 -4.03125,4.03125z"></path></g><g fill="none"><circle cx="64" cy="20" transform="scale(1.34375,1.34375)" r="10"></circle></g><g fill="#444b54"><path d="M86,44.34375c-9.675,0 -17.46875,-7.79375 -17.46875,-17.46875c0,-9.675 7.79375,-17.46875 17.46875,-17.46875c9.675,0 17.46875,7.79375 17.46875,17.46875c0,9.675 -7.79375,17.46875 -17.46875,17.46875zM86,17.46875c-5.24062,0 -9.40625,4.16563 -9.40625,9.40625c0,5.24063 4.16563,9.40625 9.40625,9.40625c5.24063,0 9.40625,-4.16562 9.40625,-9.40625c0,-5.24062 -4.16562,-9.40625 -9.40625,-9.40625z"></path></g><path d="M127.65625,162.59375h-21.5v-45.95625v-1.075v-4.70312c4.70313,-1.6125 8.0625,-6.18125 8.0625,-11.42187v-24.1875c0,-6.04687 -1.20938,-25.53125 -17.46875,-25.53125h-23.1125c-8.73437,0 -16.25938,6.58438 -17.33438,15.31875l-5.24063,41.925c-0.26875,2.15 1.34375,4.16562 3.49375,4.43438c2.15,0.26875 4.16563,-1.34375 4.43438,-3.49375l5.24063,-41.925c0.5375,-4.70312 4.56875,-8.19687 9.27187,-8.19687h23.24688c8.19687,0 9.40625,10.88437 9.40625,17.46875v24.1875c0,2.28437 -1.74688,4.03125 -4.03125,4.03125c-2.28437,0 -4.03125,1.74688 -4.03125,4.03125v8.0625v1.075v45.95625h-8.0625v-47.03125c0,-2.28437 -1.74688,-4.03125 -4.03125,-4.03125c-2.28437,0 -4.03125,1.74688 -4.03125,4.03125v47.03125h-8.0625v-55.09375c0,-2.28437 -1.74688,-4.03125 -4.03125,-4.03125c-2.28437,0 -4.03125,1.74688 -4.03125,4.03125v55.09375h-21.5c-2.28437,0 -4.03125,1.74687 -4.03125,4.03125c0,2.28438 1.74688,4.03125 4.03125,4.03125h83.3125c2.28438,0 4.03125,-1.74687 4.03125,-4.03125c0,-2.28438 -1.74687,-4.03125 -4.03125,-4.03125z" fill="#444b54"></path></g></g></g></svg>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <p class="all-caps m-t-5 m-b-0 lh-15">Employees</p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col">
-                        <div class="row">
-
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-7">
-                <list-component key="2" section="importerSection" endpoint="{{ route('api.company.list') }}" :options='{"Importer":"true"}'>
-                    <template slot="list" slot-scope="{data}">
-                        <company-component :data="data"></company-component>
-                    </template>
-                </list-component>
-            </div>
-        </div>
-        <div class="row d-none">
-            <div class="col">
-                <div class="row">
-                    <div class="col bg-white">
-                        <div class="row">
-                            <div class="bg-master-lighter" :class="[{'col-3': !$store.getters.isShowing('admin.users.menu.minimize')}, {'col-auto': $store.getters.isShowing('admin.users.menu.minimize')}]">
-                                <div class="row fs-12 bg-info-darker text-white">
-                                    <div class="col p-t-10 p-b-10 b-b" style="border-bottom-color: #d4d4d4;">
-                                        <div class="row align-items-center">
-                                            <div class="col p-r-0" v-if="!$store.getters.isShowing('admin.users.menu.minimize')">
-                                                <small class="all-caps m-t-5 m-b-0 lh-15">Navigation</small>
-                                            </div>
-                                            <div class="col-auto pointer" @click="$store.dispatch('toggleSection', {name: 'admin.users.menu.minimize', status: !$store.getters.isShowing('admin.users.menu.minimize')})">
-                                                <i class="fa fs-14 fa-fw" :class="[{'fa-compress': !$store.getters.isShowing('admin.users.menu.minimize')}, {'fa-expand': $store.getters.isShowing('admin.users.menu.minimize')}]"  style=" margin-top: 6px; "></i>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="row fs-12">
-                                    <div class="col p-t-15 p-b-15"
-                                         :class="[{'text-primary': !$store.getters.isShowing('admin.users.blocked') && !$store.getters.isShowing('admin.users.invites') && !$store.getters.isShowing('admin.users.reports')},
-                                                        {'bg-white': !$store.getters.isShowing('admin.users.blocked') && !$store.getters.isShowing('admin.users.invites') && !$store.getters.isShowing('admin.users.reports')},
-                                                        {'pointer': $store.getters.isShowing('admin.users.blocked') || $store.getters.isShowing('admin.users.invites') || $store.getters.isShowing('admin.users.reports')},
-                                                        {'hint-text': $store.getters.isShowing('admin.users.blocked') || $store.getters.isShowing('admin.users.invites') || $store.getters.isShowing('admin.users.reports')}]"
-                                         @click="$store.dispatch('toggleSection', {name: 'admin.users.active', status: true});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.blocked', status: false});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.invites', status: false});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.reports', status: false})"
-                                         :style="[ !$store.getters.isShowing('admin.users.blocked') && !$store.getters.isShowing('admin.users.invites') && !$store.getters.isShowing('admin.users.reports') ? {'border-bottom': 'solid 3px'} : {},
-                                                        $store.getters.isShowing('admin.users.blocked') || $store.getters.isShowing('admin.users.invites') || $store.getters.isShowing('admin.users.reports') ? {'border-bottom': 'solid 1px #d4d4d4'} : {}]">
-                                        <div class="row align-items-center">
-                                            <div class="col-auto">
-                                                <i class="fa fa-check-circle-o fs-16 fa-fw" style=" margin-top: 6px; "></i>
-                                            </div>
-                                            <div class="col p-l-0" v-if="!$store.getters.isShowing('admin.users.menu.minimize')">
-                                                <p class="all-caps m-t-5 m-b-0 lh-15 fs-12">Active Users</p>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="row fs-12">
-                                    <div class="col p-t-15 p-b-15"
-                                         :class="[{'text-primary': $store.getters.isShowing('admin.users.blocked')},
-                                                        {'bg-white': $store.getters.isShowing('admin.users.blocked')},
-                                                        {'pointer': !$store.getters.isShowing('admin.users.blocked')},
-                                                        {'hint-text': !$store.getters.isShowing('admin.users.blocked')}]"
-                                         @click="$store.dispatch('toggleSection', {name: 'admin.users.blocked', status: true});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.active', status: false});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.invites', status: false});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.reports', status: false})"
-                                         :style="[$store.getters.isShowing('admin.users.blocked') ? {'border-bottom': 'solid 3px'} : {},
-                                                        !$store.getters.isShowing('admin.users.blocked') ? {'border-bottom': 'solid 1px #d4d4d4'} : {}]">
-                                        <div class="row align-items-center">
-                                            <div class="col-auto">
-                                                <i class="fa fa-ban fs-16 fa-fw" style=" margin-top: 6px; "></i>
-                                            </div>
-                                            <div class="col p-l-0" v-if="!$store.getters.isShowing('admin.users.menu.minimize')">
-                                                <p class="all-caps m-t-5 m-b-0 lh-15 fs-12">Blocked Users</p>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="row fs-12">
-                                    <div class="col p-t-15 p-b-15"
-                                         :class="[{'text-primary': $store.getters.isShowing('admin.users.invites')},
-                                                        {'bg-white': $store.getters.isShowing('admin.users.invites')},
-                                                        {'pointer': !$store.getters.isShowing('admin.users.invites')},
-                                                        {'hint-text': !$store.getters.isShowing('admin.users.invites')}]"
-                                         @click="$store.dispatch('toggleSection', {name: 'admin.users.invites', status: true});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.active', status: false});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.blocked', status: false});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.reports', status: false})"
-                                         :style="[$store.getters.isShowing('admin.users.invites') ? {'border-bottom': 'solid 3px'} : {},
-                                                        !$store.getters.isShowing('admin.users.invites') ? {'border-bottom': 'solid 1px #d4d4d4'} : {}]">
-                                        <div class="row align-items-center">
-                                            <div class="col-auto">
-                                                <i class="fa fa-envelope-o fs-15 fa-fw" style=" margin-top: 6px; "></i>
-                                            </div>
-                                            <div class="col p-l-0" v-if="!$store.getters.isShowing('admin.users.menu.minimize')">
-                                                <p class="all-caps m-t-5 m-b-0 lh-15 fs-12">User Invites</p>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="row fs-12">
-                                    <div class="col p-t-15 p-b-15"
-                                         :class="[{'text-primary': $store.getters.isShowing('admin.users.reports')},
-                                                        {'bg-white': $store.getters.isShowing('admin.users.reports')},
-                                                        {'pointer': !$store.getters.isShowing('admin.users.reports')},
-                                                        {'hint-text': !$store.getters.isShowing('admin.users.reports')}]"
-                                         @click="$store.dispatch('toggleSection', {name: 'admin.users.reports', status: true});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.active', status: false});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.blocked', status: false});
-                                                        $store.dispatch('toggleSection', {name: 'admin.users.invites', status: false})"
-                                         :style="[$store.getters.isShowing('admin.users.reports') ? {'border-bottom': 'solid 3px'} : {},
-                                                        !$store.getters.isShowing('admin.users.reports') ? {'border-bottom': 'solid 1px #d4d4d4'} : {}]">
-                                        <div class="row align-items-center">
-                                            <div class="col-auto">
-                                                <i class="fa fa-pie-chart fs-15 fa-fw" style=" margin-top: 6px; "></i>
-                                            </div>
-                                            <div class="col p-l-0" v-if="!$store.getters.isShowing('admin.users.menu.minimize')">
-                                                <p class="all-caps m-t-5 m-b-0 lh-15 fs-12">Reports</p>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col p-t-15 p-b-0">
-                                <div class="row overflow-hidden p-b-50">
-                                    <div class="col-7">
-                                        <list-component key="2" section="userSection" endpoint="{{ route('api.account.user.list') }}">
-                                            <template slot="list" slot-scope="{data}">
-                                                <user-component :data="data"></user-component>
-                                            </template>
-                                        </list-component>
-                                    </div>
-                                    <div class="col">
-                                        <div class="row">
-                                            <div class="col">
-                                                <div class="all-caps font-lato m-b-0 text-info bold fs-12">Active users</div>
-                                                <p class="fs-9 all-caps light font-lato muted m-b-0">List of the system currently active users</p>
-                                            </div>
-                                        </div>
-                                        <search-component section="userSection"></search-component>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-@endsection
\ No newline at end of file
diff --git a/resources/views/pages/dashboards/importer_profile.blade.php b/resources/views/pages/dashboards/importer_profile.blade.php
deleted file mode 100644
index a9638d0f..00000000
--- a/resources/views/pages/dashboards/importer_profile.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-@extends('layouts.base_portal')
-@section('inner_content')
-    <div class="row">
-        <div class="col">
-            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('companyProfile')"></loading-component>
-            <importer-dashboard-component :id={{$id}} section="companyProfile" v-show="!$store.getters.isLoading('companyProfile')"></importer-dashboard-component>
-        </div>
-    </div>
-@endsection
\ No newline at end of file
diff --git a/resources/views/pages/dashboards/index.blade.php b/resources/views/pages/dashboards/index.blade.php
new file mode 100644
index 00000000..496640e4
--- /dev/null
+++ b/resources/views/pages/dashboards/index.blade.php
@@ -0,0 +1,5 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    @include('pages.dashboards.admin')
+    @include('pages.dashboards.customer')
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/pdfs/supplier_order.blade.php b/resources/views/pages/pdfs/supplier_order.blade.php
new file mode 100644
index 00000000..1d1029b2
--- /dev/null
+++ b/resources/views/pages/pdfs/supplier_order.blade.php
@@ -0,0 +1,39 @@
+@extends('layouts.base_pdf')
+@section('inner_content')
+    <style>
+        table, th, td {
+            border: 1px solid black;
+            border-collapse: collapse;
+        }
+        th, td {
+            padding: 15px;
+        }
+    </style>
+    <table style="margin-bottom: 25px;">
+        <tbody>
+            <tr>
+                <td>{{$supplier->name}}</td>
+                <td>{{\Carbon\Carbon::now('Asia/Singapore')->format('d-m-Y h:s')}}</td>
+            </tr>
+        </tbody>
+    </table>
+    <table style="width:100%">
+        <tbody>
+        <tr>
+            <td>Reference</td>
+            <td>Rate</td>
+            <td>Amount</td>
+            <td>Bank in Details</td>
+        </tr>
+        @foreach($transactions as $transaction)
+            <tr style="margin-bottom: 10px;">
+                <td>{{$transaction->booking->marking}}</td>
+                <td>{{$transaction->currency_rate}}</td>
+                <td>{{$transaction->original_currency->short_code}} {{$transaction->original_amount}}</td>
+                <td>Account Holder Name: {{$transaction->booking->bank->holder_name}}<br>{{$transaction->booking->bank->bank_name}}: {{$transaction->booking->bank->account_no}}
+                    <br>Branch: 首都<br>Bank in Amount: {{$transaction->original_amount}}</td>
+            </tr>
+        @endforeach
+        </tbody>
+    </table>
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php
new file mode 100644
index 00000000..9976e62c
--- /dev/null
+++ b/resources/views/pages/settings.blade.php
@@ -0,0 +1,536 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+<div class="row d-none" :class="[{'d-flex': $store.getters.isSuperAdmin}]" v-if="$store.getters.isSuperAdmin" >
+    <div class="col">
+        <div class="row">
+            <div class="col-8">
+                <div class="row tabsContainer">
+                    <div class="col-auto">
+                        <div class="row">
+                            <div class="col">
+                                <div class="row m-b-5">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="row">
+                                                    <div class="col bg-master-light active tabButton" tab-name="profile">
+                                                        <div class="row align-items-center">
+                                                            <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                     width="35" height="35"
+                                                                     viewBox="0 0 172 172"
+                                                                     style=" fill:#000000;"><defs><linearGradient x1="98.09375" y1="78.38631" x2="98.09375" y2="93.17294" gradientUnits="userSpaceOnUse" id="color-1_43985_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="73.90625" y1="78.38631" x2="73.90625" y2="93.17294" gradientUnits="userSpaceOnUse" id="color-2_43985_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="98.98869" x2="86" y2="111.08513" gradientUnits="userSpaceOnUse" id="color-3_43985_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="12.09375" x2="86" y2="158.68613" gradientUnits="userSpaceOnUse" id="color-4_43985_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M98.09375,79.28125c-3.71066,0 -6.71875,3.00809 -6.71875,6.71875c0,3.71066 3.00809,6.71875 6.71875,6.71875c3.71066,0 6.71875,-3.00809 6.71875,-6.71875c0,-3.71066 -3.00809,-6.71875 -6.71875,-6.71875z" fill="url(#color-1_43985_gr1)"></path><path d="M73.90625,79.28125c-3.71066,0 -6.71875,3.00809 -6.71875,6.71875c0,3.71066 3.00809,6.71875 6.71875,6.71875c3.71066,0 6.71875,-3.00809 6.71875,-6.71875c0,-3.71066 -3.00809,-6.71875 -6.71875,-6.71875z" fill="url(#color-2_43985_gr2)"></path><path d="M75.25,99.4375c0,5.93669 4.81331,10.75 10.75,10.75c5.93669,0 10.75,-4.81331 10.75,-10.75z" fill="url(#color-3_43985_gr3)"></path><path d="M86,16.125c-38.53069,0 -69.875,31.34431 -69.875,69.875c0,38.53069 31.34431,69.875 69.875,69.875c38.53069,0 69.875,-31.34431 69.875,-69.875c0,-38.53069 -31.34431,-69.875 -69.875,-69.875zM86,21.5c35.56369,0 64.5,28.93631 64.5,64.5c0,15.61975 -5.58463,29.96025 -14.85919,41.13219c-5.63569,-7.59756 -12.9,-13.76806 -21.29306,-18.10569c2.61762,-3.63619 4.54456,-7.78569 5.6115,-12.2765h0.97825c7.40944,0 13.4375,-6.02806 13.4375,-13.4375c0,-7.40944 -6.02806,-13.4375 -13.4375,-13.4375h-0.13706c-1.38137,-18.00894 -16.44481,-32.25 -34.80044,-32.25c-18.35562,0 -33.41906,14.24106 -34.80044,32.25h-0.13706c-7.40944,0 -13.4375,6.02806 -13.4375,13.4375c0,7.40944 6.02806,13.4375 13.4375,13.4375h0.97556c1.06694,4.4935 2.99656,8.64569 5.61688,12.28188c-8.39037,4.33762 -15.66275,10.50544 -21.29844,18.09763c-9.27187,-11.17194 -14.8565,-25.50975 -14.8565,-41.1295c0,-35.56369 28.93631,-64.5 64.5,-64.5zM61.28306,56.39181c0.17737,0.01075 0.34938,0.04569 0.52944,0.04569c5.72169,0 10.36838,-4.50156 10.68819,-10.14531c1.68775,-0.87075 3.46956,-1.58294 5.32663,-2.11775c0.04837,0.50256 0.11019,1.00512 0.11019,1.51306c0,8.89294 -7.23206,16.125 -16.125,16.125c-1.08844,0 -2.15537,-0.12094 -3.20081,-0.33056c0.72831,-1.78987 1.62325,-3.49375 2.67137,-5.09012zM108.26863,53.18025c-1.10188,0.37356 -2.26287,0.56975 -3.45612,0.56975c-5.5255,0 -10.03513,-4.20325 -10.63175,-9.57288c5.53625,1.59906 10.39794,4.77031 14.08788,9.00313zM88.69556,43.13706c0.07256,8.82844 7.27238,15.98794 16.11694,15.98794c2.33812,0 4.58488,-0.5375 6.66231,-1.48619c0.91106,1.548 1.677,3.182 2.29781,4.89394c-2.795,1.28194 -5.83456,1.96725 -8.96012,1.96725c-11.80887,0 -21.41937,-9.57288 -21.49194,-21.36294c0.88419,-0.08063 1.77375,-0.13706 2.67944,-0.13706c0.90838,0 1.806,0.05644 2.69556,0.13706zM56.4375,72.5625c0,-2.02369 0.20694,-3.999 0.59663,-5.90981c1.55337,0.35475 3.14975,0.53481 4.77837,0.53481c8.36888,0 15.61706,-4.816 19.16725,-11.81425c4.48812,8.60269 13.47781,14.50175 23.83275,14.50175c3.58513,0 7.06813,-0.76325 10.32269,-2.12313c0.258,1.5695 0.42731,3.16856 0.42731,4.81063v16.125c0,16.29969 -13.26281,29.5625 -29.5625,29.5625c-16.29969,0 -29.5625,-13.26281 -29.5625,-29.5625zM86,123.625c9.68844,0 18.46312,-3.96944 24.79756,-10.36031c1.91888,0.94063 3.78937,1.95919 5.57925,3.10138c-8.041,8.04369 -18.90925,12.63394 -30.37681,12.63394c-11.46487,0 -22.33313,-4.58756 -30.37681,-12.63394c1.78719,-1.14219 3.65769,-2.16612 5.57656,-3.10675c6.33444,6.39625 15.11181,10.36569 24.80025,10.36569zM120.9375,75.25c4.44512,0 8.0625,3.61737 8.0625,8.0625c0,4.44512 -3.61738,8.0625 -8.0625,8.0625v-2.6875zM51.0625,88.6875v2.6875c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625c0,-4.44512 3.61738,-8.0625 8.0625,-8.0625zM86,150.5c-17.96863,0 -34.23875,-7.39331 -45.9455,-19.28819c3.16319,-4.43438 6.91763,-8.3635 11.16388,-11.69063c9.10256,9.44119 21.58331,14.85381 34.78163,14.85381c13.201,0 25.68175,-5.41263 34.78163,-14.85381c4.24356,3.32712 8.00069,7.25356 11.16388,11.69063c-11.70944,11.89487 -27.97688,19.28819 -45.9455,19.28819z" fill="url(#color-4_43985_gr4)"></path></g></g></svg>
+                                                            </div>
+                                                            <div class="col">
+                                                                <div class="fs-12 m-t-5 all-caps m-b-5">User Profile</div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row m-b-5">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="row">
+                                                    <div class="col bg-master-light tabButton" tab-name="team">
+                                                        <div class="row align-items-center">
+                                                            <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                     width="35" height="35"
+                                                                     viewBox="0 0 172 172"
+                                                                     style=" fill:#000000;"><defs><linearGradient x1="108.17188" y1="101.74069" x2="108.17188" y2="111.89675" gradientUnits="userSpaceOnUse" id="color-1_KpyVqYNRzRZq_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="77.9375" y1="79.95313" x2="77.9375" y2="91.83188" gradientUnits="userSpaceOnUse" id="color-2_KpyVqYNRzRZq_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="53.75" y1="79.95313" x2="53.75" y2="91.83188" gradientUnits="userSpaceOnUse" id="color-3_KpyVqYNRzRZq_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="65.84375" y1="96.33075" x2="65.84375" y2="107.41131" gradientUnits="userSpaceOnUse" id="color-4_KpyVqYNRzRZq_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="119.59375" y1="88.18494" x2="119.59375" y2="97.09131" gradientUnits="userSpaceOnUse" id="color-5_KpyVqYNRzRZq_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="25.67369" x2="86" y2="144.96375" gradientUnits="userSpaceOnUse" id="color-6_KpyVqYNRzRZq_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M108.17188,111.32163v0c4.08231,0 7.39063,-3.30831 7.39063,-7.39062v-1.806h-14.78125v1.806c0,4.08231 3.30831,7.39063 7.39063,7.39063z" fill="url(#color-1_KpyVqYNRzRZq_gr1)"></path><circle cx="29" cy="32" transform="scale(2.6875,2.6875)" r="2" fill="url(#color-2_KpyVqYNRzRZq_gr2)"></circle><circle cx="20" cy="32" transform="scale(2.6875,2.6875)" r="2" fill="url(#color-3_KpyVqYNRzRZq_gr3)"></circle><path d="M65.30625,106.78244h1.075c4.15488,0 7.525,-3.37012 7.525,-7.525v-2.50744h-16.125v2.50744c0,4.15756 3.37013,7.525 7.525,7.525z" fill="url(#color-4_KpyVqYNRzRZq_gr4)"></path><circle cx="44.5" cy="34.5" transform="scale(2.6875,2.6875)" r="1.5" fill="url(#color-5_KpyVqYNRzRZq_gr5)"></circle><path d="M147.8125,114.26444v-18.54106c1.65281,-1.88931 2.6875,-4.33225 2.6875,-7.03588c0,-2.70363 -1.03469,-5.14388 -2.6875,-7.03587v-0.90031c0,-11.36812 -5.55506,-21.45969 -14.10937,-27.87206v-8.53012c0,-2.42144 -1.24969,-4.59294 -3.34594,-5.80769c-2.09625,-1.22013 -4.601,-1.22819 -6.708,-0.02419l-7.009,4.00438c-1.14756,-0.55094 -2.42144,-0.86538 -3.76519,-0.86538c-1.33031,0 -2.59881,0.32519 -3.74906,0.87613l-7.02781,-4.01512c-2.10431,-1.204 -4.60906,-1.19594 -6.708,0.02419c-1.33837,0.77669 -2.28438,1.96994 -2.82725,3.34325c-4.62519,-5.26213 -10.64519,-9.14556 -17.45531,-11.02681c-0.65844,-3.78669 -3.94256,-6.67038 -7.92006,-6.67038h-2.6875c-3.9775,0 -7.26162,2.88369 -7.92275,6.67038c-15.523,4.28656 -27.01475,19.006 -27.01475,36.507v3.22769c-4.67894,1.64475 -8.0625,6.08988 -8.0625,11.47294c0,6.40162 5.0525,11.60194 11.3735,11.9325c0.45419,2.32738 1.1395,4.57144 2.05862,6.69994c-11.80887,9.51644 -18.80712,24.07731 -18.80712,39.41219v7.70237h97.95131h1.48619h40.3125v-7.31269c0,-9.55944 -2.85412,-18.61631 -8.0625,-26.23537zM138.77712,104.43625c0.41388,-1.62056 0.70681,-3.28681 0.84656,-4.99875h0.12631c0.93256,0 1.82212,-0.15587 2.6875,-0.38163v8.7075c-1.15294,-1.16369 -2.37306,-2.27631 -3.66038,-3.32712zM96.75806,100.69794c0.91644,-2.1285 1.60444,-4.37256 2.05594,-6.69725c6.321,-0.33325 11.3735,-5.54163 11.3735,-12.12869c0,-2.11506 -0.59663,-4.07425 -1.56144,-5.80231c1.72806,-1.75763 3.14169,-3.75713 4.24894,-5.91519c4.01781,7.80181 12.13675,13.158 21.5,13.158v13.62025c0,12.84625 -9.72069,23.45112 -22.188,24.88356c-3.14169,-8.18881 -8.39844,-15.46119 -15.42894,-21.11837zM37.625,87.6985v-3.48569v-6.27531c4.44512,0 8.0625,-3.61737 8.0625,-8.0625v-5.375c0,-1.4835 1.20669,-2.6875 2.6875,-2.6875h34.9375c1.48081,0 2.6875,1.204 2.6875,2.6875v5.375c0,4.44513 3.61738,8.0625 8.0625,8.0625v9.761c0,15.36444 -12.65812,27.864 -28.21875,27.864c-15.56062,0 -28.21875,-12.49956 -28.21875,-27.864zM104.8125,82.0655c0,3.225 -2.31663,5.91787 -5.375,6.50375v-0.87075v-11.98356v-0.33863c3.05569,0.58856 5.375,3.29487 5.375,6.68919zM145.125,88.6875c0,2.96431 -2.41069,5.375 -5.375,5.375v-10.75c2.96431,0 5.375,2.41069 5.375,5.375zM142.3085,78.27881c-0.82237,-0.20156 -1.67162,-0.34131 -2.5585,-0.34131h-5.375c-10.37375,0 -18.8125,-8.44144 -18.8125,-18.8125h-5.375c0,4.85363 -1.85975,9.44387 -5.15194,12.91881c-0.88688,-0.62081 -1.8705,-1.08844 -2.91056,-1.45125v-3.225c0,-4.79719 -0.89763,-9.374 -2.46981,-13.60144c3.91031,-1.7415 8.17,-2.70363 12.49956,-2.70363c15.84819,0 28.86644,12.00238 30.15375,27.21631zM126.31788,43.18275c0.60738,-0.34669 1.14219,-0.11288 1.34375,0.00537c0.20156,0.11556 0.66919,0.46225 0.66919,1.161v5.19225c-2.49938,-1.25775 -5.16806,-2.22794 -7.96306,-2.87831c0.03763,-0.04569 0.0645,-0.09675 0.10481,-0.13975zM97.42188,48.762v-4.41287c0,-0.69875 0.46762,-1.04544 0.66919,-1.161c0.20156,-0.11556 0.73369,-0.34669 1.34375,-0.00537l5.68137,3.24381c-0.00269,0.00806 -0.00806,0.01344 -0.01075,0.0215c-2.63913,0.52406 -5.19763,1.333 -7.64594,2.42413c-0.0215,-0.03762 -0.04569,-0.07256 -0.0645,-0.11288h0.02687zM65.84375,34.9375c17.04144,0 30.90625,14.54744 30.90625,32.42738v5.19763h-2.6875c-1.48081,0 -2.6875,-1.204 -2.6875,-2.6875v-5.375c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-34.9375c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v5.375c0,1.4835 -1.20669,2.6875 -2.6875,2.6875h-2.6875v-5.19763c0,-17.87994 13.86481,-32.42737 30.90625,-32.42737zM32.25,88.56925c-3.05837,-0.58856 -5.375,-3.30294 -5.375,-6.69725c0,-3.22231 2.31931,-5.90981 5.375,-6.49569v2.56119v6.27531v3.48569zM37.52825,105.50856c5.96894,9.25844 16.41794,15.42894 28.3155,15.42894c11.87606,0 22.30894,-6.14631 28.28325,-15.37519c1.677,1.41094 3.23306,2.91862 4.6655,4.52844c-7.87169,10.0405 -20.04337,15.98794 -32.94875,15.98794c-12.986,0 -25.09587,-5.934 -32.96756,-16.00675c1.43512,-1.62325 2.98313,-3.15244 4.65206,-4.56337zM110.1875,142.4375h-10.75v-5.375h-5.375v5.375h-56.4375v-5.375h-5.375v5.375h-10.75v-2.32737c0,-9.27725 2.87025,-18.232 7.98725,-25.6925c8.89562,10.73387 22.15844,17.03875 36.3565,17.03875c14.11744,0 27.46088,-6.31563 36.35919,-17.03338c5.13044,7.43094 7.98456,16.297 7.98456,25.68713zM150.5,142.4375h-8.0625v-5.375h-5.375v5.375h-21.5v-2.32737c0,-4.50425 -0.59663,-8.901 -1.70925,-13.115c10.18025,-1.53456 18.70769,-8.10819 22.96469,-17.11131c8.71019,7.81525 13.68206,18.76681 13.68206,30.616z" fill="url(#color-6_KpyVqYNRzRZq_gr6)"></path></g></g></svg>
+                                                            </div>
+                                                            <div class="col">
+                                                                <div class="fs-12 m-t-5 all-caps m-b-5">Team</div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row m-b-5">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="row">
+                                                    <div class="col bg-master-light tabButton" tab-name="currency">
+                                                        <div class="row align-items-center">
+                                                            <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                     width="35" height="35"
+                                                                     viewBox="0 0 172 172"
+                                                                     style=" fill:#000000;"><defs><linearGradient x1="26.77825" y1="66.15819" x2="26.77825" y2="84.23969" gradientUnits="userSpaceOnUse" id="color-1_N77EvGyyBNEK_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="145.03094" y1="83.42806" x2="145.03094" y2="102.73775" gradientUnits="userSpaceOnUse" id="color-2_N77EvGyyBNEK_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="93.02512" y1="19.95738" x2="93.02512" y2="154.91825" gradientUnits="userSpaceOnUse" id="color-3_N77EvGyyBNEK_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="78.88081" y1="19.95738" x2="78.88081" y2="154.91825" gradientUnits="userSpaceOnUse" id="color-4_N77EvGyyBNEK_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="24.75994" x2="86" y2="69.45306" gradientUnits="userSpaceOnUse" id="color-5_N77EvGyyBNEK_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="109.98594" x2="86" y2="143.05294" gradientUnits="userSpaceOnUse" id="color-6_N77EvGyyBNEK_gr6"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M22.17725,66.74944l-9.159,15.17363c-1.08306,1.79256 0.20694,4.07694 2.3005,4.07694h22.92169c2.09087,0 3.38087,-2.28437 2.3005,-4.07694l-9.159,-15.17363c-2.09088,-3.46419 -7.11381,-3.46419 -9.20469,0z" fill="url(#color-1_N77EvGyyBNEK_gr1)"></path><path d="M140.42725,104.90388l-9.159,-15.17363c-1.08038,-1.78987 0.20963,-4.07694 2.3005,-4.07694h22.92169c2.09088,0 3.38088,2.28437 2.3005,4.07694l-9.159,15.17363c-2.09087,3.4615 -7.11381,3.4615 -9.20469,0z" fill="url(#color-2_N77EvGyyBNEK_gr2)"></path><path d="M161.16938,85.69631c-0.95138,-1.68506 -2.74394,-2.73319 -4.68162,-2.73319h-8.67525v-23.83813c0,-10.37375 -8.43875,-18.8125 -18.8125,-18.8125h-11.81156c-3.59319,-13.88631 -16.19488,-24.1875 -31.18844,-24.1875c-14.99356,0 -27.59525,10.30119 -31.18844,24.1875h-14.84575c-8.69944,0 -15.77831,7.07888 -15.77831,15.77831h5.375c0,-5.73781 4.6655,-10.40331 10.40331,-10.40331h13.92125c-0.07525,0.88956 -0.13706,1.77913 -0.13706,2.6875c0,17.78319 14.46681,32.25 32.25,32.25c17.78319,0 32.25,-14.46681 32.25,-32.25c0,-0.90837 -0.06181,-1.79794 -0.13706,-2.6875h10.88706c7.40944,0 13.4375,6.02806 13.4375,13.4375v23.83812h-8.86875c-1.935,0 -3.73025,1.04812 -4.68162,2.73319c-0.95138,1.68506 -0.92181,3.7625 0.08062,5.42069l9.159,15.17363c1.47275,2.44025 4.05275,3.89688 6.9015,3.89688c2.85144,0 5.43144,-1.45663 6.9015,-3.89688l9.159,-15.17363c1.00244,-1.65819 1.032,-3.73294 0.08062,-5.42069zM86,75.25c-14.81887,0 -26.875,-12.05613 -26.875,-26.875c0,-14.81887 12.05613,-26.875 26.875,-26.875c14.81887,0 26.875,12.05613 26.875,26.875c0,14.81887 -12.05612,26.875 -26.875,26.875zM147.32875,103.51444c-0.70681,1.17175 -1.84363,1.29806 -2.3005,1.29806c-0.45419,0 -1.59369,-0.12631 -2.3005,-1.29806l-9.159,-15.17631h22.92169z" fill="url(#color-3_N77EvGyyBNEK_gr3)"></path><path d="M142.4375,115.90919c0,5.73781 -4.6655,10.40331 -10.40331,10.40331h-13.90781c0.07525,-0.89494 0.12363,-1.78987 0.12363,-2.6875c0,-17.78319 -14.46681,-32.25 -32.25,-32.25c-17.78319,0 -32.25,14.46681 -32.25,32.25c0,0.90838 0.06181,1.79794 0.13706,2.6875h-10.88706c-7.40944,0 -13.4375,-6.02806 -13.4375,-13.4375v-24.1875h8.67794c1.935,0 3.73025,-1.04812 4.68163,-2.73319c0.95138,-1.68506 0.92181,-3.7625 -0.08062,-5.418l-9.159,-15.17363c-1.47275,-2.44025 -4.05275,-3.89687 -6.9015,-3.89687c-2.84875,0 -5.42875,1.45663 -6.9015,3.89687l-9.159,15.17363c-1.00244,1.6555 -1.032,3.73294 -0.08062,5.418c0.94869,1.68506 2.74125,2.73319 4.67894,2.73319h8.86875v24.1875c0,10.37375 8.43875,18.8125 18.8125,18.8125h11.81156c3.59319,13.88631 16.19488,24.1875 31.18844,24.1875c14.80812,0 27.57913,-10.04856 31.20994,-24.1875h14.82425c8.69944,0 15.77831,-7.07619 15.77831,-15.77831v-0.34669h-5.375zM15.31875,83.3125l9.159,-15.17363c0.70681,-1.17175 1.84631,-1.29806 2.3005,-1.29806c0.45688,0 1.59369,0.12631 2.3005,1.29806l9.16169,15.17363zM112.43156,128.51625c-2.34081,12.73875 -13.45631,21.98375 -26.43156,21.98375c-14.81887,0 -26.875,-12.05612 -26.875,-26.875c0,-14.81888 12.05613,-26.875 26.875,-26.875c14.81887,0 26.875,12.05612 26.875,26.875c0,1.63938 -0.1505,3.28681 -0.44344,4.89125z" fill="url(#color-4_N77EvGyyBNEK_gr4)"></path><path d="M96.75,40.3125v-5.375h-8.0625v-5.375h-5.375v5.375h-2.6875c-2.96431,0 -5.375,2.41069 -5.375,5.375v5.375c0,2.96431 2.41069,5.375 5.375,5.375h10.75v5.375h-16.125v5.375h8.0625v5.375h5.375v-5.375h2.6875c2.96431,0 5.375,-2.41069 5.375,-5.375v-5.375c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-10.75v-5.375z" fill="url(#color-5_N77EvGyyBNEK_gr5)"></path><path d="M88.6875,128.0755c0,-0.56975 0.18006,-1.12338 0.516,-1.58563l11.60462,-16.30237h-6.665l-8.14581,11.5025l-8.14044,-11.5025h-6.665l11.60462,16.30238c0.33594,0.46225 0.516,1.01587 0.516,1.58562v3.612h-5.375v5.375h5.375v5.375h5.375v-5.375h5.375v-5.375h-5.375z" fill="url(#color-6_N77EvGyyBNEK_gr6)"></path></g></g></svg>
+                                                            </div>
+                                                            <div class="col">
+                                                                <div class="fs-12 m-t-5 all-caps m-b-5">Currencies</div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row m-b-5">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="row">
+                                                    <div class="col bg-master-light tabButton" tab-name="bank">
+                                                        <div class="row align-items-center">
+                                                            <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                     width="35" height="35"
+                                                                     viewBox="0 0 172 172"
+                                                                     style=" fill:#000000; margin-top: -2px; margin-bottom: 2px;"><defs><linearGradient x1="86" y1="35.8405" x2="86" y2="60.92294" gradientUnits="userSpaceOnUse" id="color-1_77151_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="129" y1="126.46031" x2="129" y2="137.97356" gradientUnits="userSpaceOnUse" id="color-2_77151_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="149.15625" y1="18.58944" x2="149.15625" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-3_77151_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="111.53125" y1="18.58944" x2="111.53125" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-4_77151_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="107.5" y1="18.58944" x2="107.5" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-5_77151_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="129" y1="18.58944" x2="129" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-6_77151_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="18.58944" x2="86" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-7_77151_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M86,37.63037c-5.93706,0 -10.75,4.81294 -10.75,10.75c0,5.93706 4.81294,10.75 10.75,10.75c5.93706,0 10.75,-4.81294 10.75,-10.75c0,-5.93706 -4.81294,-10.75 -10.75,-10.75z" fill="url(#color-1_77151_gr1)"></path><path d="M88.6875,126.3125h80.625v10.75h-80.625z" fill="url(#color-2_77151_gr2)"></path><path d="M139.75,150.5h18.8125v5.375h-18.8125z" fill="url(#color-3_77151_gr3)"></path><path d="M99.4375,142.4375h24.1875v5.375h-24.1875z" fill="url(#color-4_77151_gr4)"></path><path d="M99.4375,153.1875h16.125v5.375h-16.125z" fill="url(#color-5_77151_gr5)"></path><path d="M161.25,112.875h-64.5c-5.92863,0 -10.75,4.82137 -10.75,10.75v37.625c0,5.92863 4.82137,10.75 10.75,10.75h64.5c5.92863,0 10.75,-4.82137 10.75,-10.75v-37.625c0,-5.92863 -4.82137,-10.75 -10.75,-10.75zM166.625,161.25c0,2.96431 -2.41069,5.375 -5.375,5.375h-64.5c-2.96431,0 -5.375,-2.41069 -5.375,-5.375v-37.625c0,-2.96431 2.41069,-5.375 5.375,-5.375h64.5c2.96431,0 5.375,2.41069 5.375,5.375z" fill="url(#color-6_77151_gr6)"></path><path d="M153.50463,61.47388c-59.30238,-39.96313 -60.65419,-40.83119 -60.84231,-40.94137c-3.74369,-2.2145 -9.59169,-2.20913 -13.31925,-0.00538c-0.16663,0.09675 -0.67187,0.39506 -60.85306,40.94675c-1.48081,0.99975 -2.365,2.666 -2.365,4.45587v1.25775c0,2.96431 2.41069,5.375 5.375,5.375h2.6875c0,0.7095 0,1.58831 0,2.6875c0,3.49912 2.25481,6.45538 5.375,7.568v43.49987c-4.44513,0 -8.0625,3.61738 -8.0625,8.0625v3.182c-3.12019,1.11531 -5.375,4.06888 -5.375,7.568v8.05713h72.5625v-5.375h-67.1875v-2.68212c0,-1.4835 1.204,-2.69288 2.6875,-2.69288h64.5v-5.375h-61.8125v-2.68212c0,-1.4835 1.204,-2.69288 2.6875,-2.69288h59.125v-5.375h-8.0625v-43h10.75v32.25h5.375v-32.7445c3.12019,-1.11263 5.375,-4.06888 5.375,-7.568c0,-1.09919 0,-1.978 0,-2.6875h13.4375c0,0.7095 0,1.58831 0,2.6875c0,3.49912 2.25481,6.45538 5.375,7.568v32.7445h5.375v-32.25h10.75v32.25h5.375v-32.7445c3.12019,-1.11263 5.375,-4.06888 5.375,-7.568c0,-1.09919 0,-1.978 0,-2.6875h2.6875c2.96431,0 5.375,-2.41069 5.375,-5.375v-1.25775c0,-1.78987 -0.88419,-3.45612 -2.37037,-4.45587zM45.6875,126.3125h-10.75v-43h10.75zM48.375,77.9375h-16.125c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875c0,-0.62619 0,-1.677 0,-2.6875h21.5c0,1.0105 0,2.06131 0,2.6875c0,1.4835 -1.204,2.6875 -2.6875,2.6875zM75.25,126.3125h-24.1875v-43.4945c3.12019,-1.11263 5.375,-4.06888 5.375,-7.568c0,-1.09919 0,-1.978 0,-2.6875h13.4375c0,0.7095 0,1.58831 0,2.6875c0,3.49912 2.25481,6.45538 5.375,7.568zM96.75,75.25c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-16.125c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875c0,-0.62619 0,-1.677 0,-2.6875h21.5c0,1.0105 0,2.06131 0,2.6875zM142.4375,75.25c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-16.125c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875c0,-0.62619 0,-1.677 0,-2.6875h21.5c0,1.0105 0,2.06131 0,2.6875zM150.5,67.1875h-129l-0.00269,-1.25775c37.10363,-25.00181 59.76731,-40.25337 60.57894,-40.77475c1.05619,-0.6235 2.44831,-0.9675 3.92375,-0.9675c1.462,0 2.84337,0.33862 3.89419,0.95137c1.16369,0.7525 23.76825,15.96912 60.60581,40.79356z" fill="url(#color-7_77151_gr7)"></path></g></g></svg>
+                                                            </div>
+                                                            <div class="col">
+                                                                <div class="fs-12 m-t-5 all-caps m-b-5">Company Banks</div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row m-b-5">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="row">
+                                                    <div class="col bg-master-light tabButton" tab-name="supplier">
+                                                        <div class="row align-items-center">
+                                                            <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                     width="35" height="35"
+                                                                     viewBox="0 0 172 172"
+                                                                     style=" fill:#000000;"><defs><linearGradient x1="86" y1="67.85938" x2="86" y2="98.7495" gradientUnits="userSpaceOnUse" id="color-1_44784_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="13.77344" x2="86" y2="157.88525" gradientUnits="userSpaceOnUse" id="color-2_44784_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M72.5625,83.3125c0,-7.42019 6.01731,-13.4375 13.4375,-13.4375c7.42019,0 13.4375,6.01731 13.4375,13.4375c0,7.42019 -6.01731,13.4375 -13.4375,13.4375c-0.91912,0 -1.81944,-0.09137 -2.6875,-0.26875v-10.48125l-10.75,-2.6875" fill="url(#color-1_44784_gr1)"></path><path d="M134.375,48.375h-5.375c0,-5.92862 -4.82137,-10.75 -10.75,-10.75c-1.96725,0 -3.78669,0.56975 -5.375,1.49425v-4.18175c0,-7.40944 -6.02806,-13.4375 -13.4375,-13.4375c-3.43731,0 -6.54675,1.33569 -8.92519,3.46687c-1.88663,-5.14119 -6.78594,-8.84187 -12.57481,-8.84187c-6.58169,0 -12.04806,4.76494 -13.19294,11.02144c-2.29513,-1.82481 -5.15731,-2.95894 -8.30706,-2.95894c-7.40944,0 -13.4375,6.02806 -13.4375,13.4375v10.75h-5.375c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v53.75c0,4.44512 3.61738,8.0625 8.0625,8.0625h5.59c0.62619,4.33762 2.72781,8.19419 5.78887,11.051c-3.44537,0.91644 -6.00387,4.03125 -6.00387,7.7615v10.75c0,4.44512 3.61738,8.0625 8.0625,8.0625h69.875c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-10.75c0,-3.73025 -2.5585,-6.84506 -6.00119,-7.7615c3.06106,-2.85681 5.16269,-6.71337 5.78887,-11.051h5.58731c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-53.75c0,-4.44512 -3.61737,-8.0625 -8.0625,-8.0625zM134.375,53.75c1.4835,0 2.6875,1.204 2.6875,2.6875v10.75h-2.6875c-5.92863,0 -10.75,-4.82138 -10.75,-10.75v-2.6875zM118.25,110.1875v2.6875h-34.77625c-1.634,-3.27875 -3.98825,-6.14094 -6.8585,-8.36619c5.36694,-1.23356 9.38475,-6.05225 9.38475,-11.79006c0,-6.66769 -5.42606,-12.09375 -12.09375,-12.09375h-17.46875c-7.40944,0 -13.4375,6.02806 -13.4375,13.4375v0.93525c-1.70925,-0.60469 -3.51525,-0.93525 -5.375,-0.93525h-2.6875v-21.5h2.6875c8.89294,0 16.125,-7.23206 16.125,-16.125v-2.6875h64.5v2.6875c0,8.89294 7.23206,16.125 16.125,16.125h2.6875v21.5h-2.6875c-8.89294,0 -16.125,7.23206 -16.125,16.125zM118.25,43c2.96431,0 5.375,2.41069 5.375,5.375h-10.75c0,-2.96431 2.41069,-5.375 5.375,-5.375zM99.4375,26.875c4.44512,0 8.0625,3.61737 8.0625,8.0625v13.4375h-16.125v-13.4375c0,-4.44513 3.61737,-8.0625 8.0625,-8.0625zM69.875,29.5625c0,-4.44513 3.61737,-8.0625 8.0625,-8.0625c4.44513,0 8.0625,3.61737 8.0625,8.0625v18.8125h-16.125v-10.75zM48.375,37.625c0,-4.44512 3.61738,-8.0625 8.0625,-8.0625c4.44512,0 8.0625,3.61738 8.0625,8.0625v10.75h-16.125zM37.625,53.75h10.75v2.6875c0,5.92862 -4.82138,10.75 -10.75,10.75h-2.6875v-10.75c0,-1.4835 1.204,-2.6875 2.6875,-2.6875zM34.9375,110.1875v-10.75h2.6875c1.91619,0 3.74369,0.52138 5.375,1.46738v11.97012h-5.375c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875zM120.9375,134.375c1.4835,0 2.6875,1.204 2.6875,2.6875v2.6875h-10.75v5.375h10.75v2.6875c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-69.875c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-10.75c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h10.75h5.375zM110.1875,129h-43h-5.375c-7.40944,0 -13.4375,-6.02806 -13.4375,-13.4375v-2.6875v-18.8125c0,-4.44512 3.61738,-8.0625 8.0625,-8.0625h17.46875c3.70606,0 6.71875,3.01269 6.71875,6.71875c0,3.70606 -3.01269,6.71875 -6.71875,6.71875h-14.78125v5.375h2.6875c10.37106,0 18.8125,8.44144 18.8125,18.8125h5.375c0,-1.849 -0.22306,-3.64425 -0.61544,-5.375h37.969c-1.24969,6.12481 -6.67575,10.75 -13.16606,10.75zM134.375,112.875h-10.75v-2.6875c0,-5.92863 4.82137,-10.75 10.75,-10.75h2.6875v10.75c0,1.4835 -1.204,2.6875 -2.6875,2.6875z" fill="url(#color-2_44784_gr2)"></path></g></g></svg>
+                                                            </div>
+                                                            <div class="col">
+                                                                <div class="fs-12 m-t-5 all-caps m-b-5">Suppliers</div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row m-b-5">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="row">
+                                                    <div class="col bg-master-light tabButton" tab-name="standardSegment">
+                                                        <div class="row align-items-center">
+                                                            <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                     width="35" height="35"
+                                                                     viewBox="0 0 172 172"
+                                                                     style=" fill:#000000;"><defs><linearGradient x1="29.5625" y1="81.51994" x2="29.5625" y2="137.9655" gradientUnits="userSpaceOnUse" id="color-1_SZIOLhqepltk_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="112.875" y1="22.70131" x2="112.875" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-2_SZIOLhqepltk_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="22.70131" x2="86" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-3_SZIOLhqepltk_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="112.875" y1="22.70131" x2="112.875" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-4_SZIOLhqepltk_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="51.00606" y1="15.45313" x2="51.00606" y2="61.15944" gradientUnits="userSpaceOnUse" id="color-5_SZIOLhqepltk_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><rect x="8" y="31" transform="scale(2.6875,2.6875)" width="6" height="19" fill="url(#color-1_SZIOLhqepltk_gr1)"></rect><path d="M112.875,75.25c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-8.89294 -7.23206,-16.125 -16.125,-16.125c-8.89294,0 -16.125,7.23206 -16.125,16.125c0,8.89294 7.23206,16.125 16.125,16.125zM112.875,48.375c5.92863,0 10.75,4.82138 10.75,10.75c0,5.92862 -4.82137,10.75 -10.75,10.75c-5.92863,0 -10.75,-4.82138 -10.75,-10.75c0,-5.92862 4.82137,-10.75 10.75,-10.75z" fill="url(#color-2_SZIOLhqepltk_gr2)"></path><path d="M151.64756,104.31531c-2.51819,-1.86244 -5.88025,-2.40531 -9.23156,-1.47812l-41.08919,11.36006c0.50525,-1.247 0.79819,-2.60419 0.79819,-4.03394c0,-5.91519 -4.82137,-10.72581 -10.75,-10.72581h-25.20069c-1.78988,-2.6875 -6.34788,-10.75 -12.42431,-10.75h-10.75v-2.6875c0,-4.44513 -3.61738,-8.0625 -8.0625,-8.0625h-10.75c-4.44513,0 -8.0625,3.61737 -8.0625,8.0625v45.6875c0,4.44512 3.61737,8.0625 8.0625,8.0625h10.75c4.44512,0 8.0625,-3.61469 8.0625,-8.0625v-2.021l32.62356,22.04288c4.09575,2.7735 8.86338,4.16563 13.63906,4.16563c4.41287,0 8.83381,-1.18787 12.74412,-3.57706l48.83994,-29.83394c3.10138,-1.88931 5.02831,-5.32394 5.02831,-8.95744v-0.84119c0,-3.30831 -1.53994,-6.35056 -4.22744,-8.35006zM37.625,131.6875c0,1.4835 -1.20669,2.6875 -2.6875,2.6875h-2.6875v-10.75h-5.375v10.75h-2.6875c-1.48081,0 -2.6875,-1.204 -2.6875,-2.6875v-45.6875c0,-1.4835 1.20669,-2.6875 2.6875,-2.6875h10.75c1.48081,0 2.6875,1.20669 2.6875,2.6875zM150.5,113.50656c0,1.77375 -0.94063,3.44806 -2.45369,4.37256l-48.83994,29.83125c-6.35594,3.87806 -14.42919,3.70338 -20.57013,-0.45419l-35.63625,-24.07463v-29.11906h10.75c2.84606,0 6.63544,5.46637 8.299,9.16169l0.71487,1.58831h28.61113c2.96431,0 5.375,2.39994 5.375,5.34813c0,2.97775 -2.41069,5.40187 -5.375,5.40187h-26.875v5.375h26.875h5.375l47.09575,-12.91881c1.72269,-0.47837 3.44,-0.24994 4.59562,0.61544c1.30881,0.97019 2.05863,2.44025 2.05863,4.03125z" fill="url(#color-3_SZIOLhqepltk_gr3)"></path><path d="M86,69.875h0.9245l-0.65306,0.65306c-2.03175,2.02906 -3.14975,4.72731 -3.14975,7.60025c0,2.87025 1.118,5.5685 3.14975,7.60025c2.03175,2.03175 4.73,3.14975 7.60025,3.14975c2.87294,0 5.57119,-1.118 7.60025,-3.14975l0.65306,-0.65306v0.9245c0,5.92863 4.82137,10.75 10.75,10.75c5.92863,0 10.75,-4.82137 10.75,-10.75v-0.9245l0.65306,0.65306c2.02906,2.03175 4.72731,3.14975 7.60025,3.14975c2.87025,0 5.5685,-1.118 7.60025,-3.14975c2.03175,-2.03175 3.14975,-4.73 3.14975,-7.60025c0,-2.87294 -1.118,-5.57119 -3.14975,-7.60025l-0.65306,-0.65306h0.9245c5.92863,0 10.75,-4.82138 10.75,-10.75c0,-5.92862 -4.82137,-10.75 -10.75,-10.75h-0.9245l0.65306,-0.65306c2.03175,-2.02906 3.14975,-4.72731 3.14975,-7.60025c0,-2.87025 -1.118,-5.5685 -3.14975,-7.60025c-4.06619,-4.06619 -11.14506,-4.06081 -15.2005,0l-0.65306,0.65306v-0.9245c0,-5.92862 -4.82137,-10.75 -10.75,-10.75c-5.92863,0 -10.75,4.82138 -10.75,10.75v0.9245l-0.65306,-0.65306c-4.05544,-4.06081 -11.13969,-4.06619 -15.2005,0c-2.03175,2.03175 -3.14975,4.73 -3.14975,7.60025c0,2.87294 1.118,5.57119 3.14975,7.60025l0.65306,0.65306h-0.9245c-5.92862,0 -10.75,4.82138 -10.75,10.75c0,5.92862 4.82138,10.75 10.75,10.75zM97.67181,81.92844c-2.03175,2.03175 -5.5685,2.03175 -7.60025,0c-1.01587,-1.01588 -1.57487,-2.365 -1.57487,-3.80013c0,-1.43512 0.559,-2.78425 1.57487,-3.80013l0.40581,-0.40581c1.99412,3.02613 4.57412,5.60613 7.60025,7.60025zM135.67844,81.92844c-2.03175,2.03175 -5.5685,2.03175 -7.60025,0l-0.40581,-0.40581c3.02612,-1.99413 5.60612,-4.57413 7.60025,-7.60025l0.40581,0.40581c1.01587,1.01588 1.57487,2.365 1.57487,3.80013c0,1.43512 -0.559,2.78425 -1.57487,3.80012zM128.07819,36.32156c2.03175,-2.03175 5.5685,-2.03175 7.60025,0c1.01587,1.01588 1.57487,2.365 1.57487,3.80013c0,1.43512 -0.559,2.78425 -1.57487,3.80013l-0.40581,0.40581c-1.99412,-3.02612 -4.57412,-5.60612 -7.60025,-7.60025zM90.07156,36.32156c2.03175,-2.03175 5.5685,-2.03175 7.60025,0l0.40581,0.40581c-3.02612,1.99413 -5.60612,4.57413 -7.60025,7.60025l-0.40581,-0.40581c-1.01587,-1.01588 -1.57487,-2.365 -1.57487,-3.80013c0,-1.43512 0.559,-2.78425 1.57487,-3.80013zM86,53.75h5.99312l0.63156,-1.79256c2.17419,-6.13825 6.94181,-10.90856 13.08006,-13.08006l1.79525,-0.63425v-5.99312c0,-2.96431 2.41069,-5.375 5.375,-5.375c2.96431,0 5.375,2.41069 5.375,5.375v5.99312l1.79256,0.63156c6.13825,2.17419 10.90856,6.94181 13.08006,13.08006l0.63425,1.79525h5.99312c2.96431,0 5.375,2.41069 5.375,5.375c0,2.96431 -2.41069,5.375 -5.375,5.375h-5.99312l-0.63156,1.79256c-2.17419,6.13825 -6.94181,10.90856 -13.08006,13.08006l-1.79525,0.63425v5.99313c0,2.96431 -2.41069,5.375 -5.375,5.375c-2.96431,0 -5.375,-2.41069 -5.375,-5.375v-5.99313l-1.79256,-0.63156c-6.13825,-2.17419 -10.90856,-6.94181 -13.08006,-13.08006l-0.63425,-1.79525h-5.99312c-2.96431,0 -5.375,-2.41069 -5.375,-5.375c0,-2.96431 2.41069,-5.375 5.375,-5.375z" fill="url(#color-4_SZIOLhqepltk_gr4)"></path><path d="M68.47481,32.25h-0.56437c-1.45125,0 -2.17687,-1.74687 -1.15563,-2.76812l0.40312,-0.40313c1.58563,-1.58562 1.58563,-4.13875 0,-5.6975l-1.90812,-1.90812c-1.55875,-1.58563 -4.11188,-1.58563 -5.6975,0l-0.40312,0.40312c-1.02125,1.02125 -2.76812,0.29563 -2.76812,-1.15562v-0.56437c0,-2.23062 -1.80063,-4.03125 -4.03125,-4.03125h-2.6875c-2.23062,0 -4.03125,1.80063 -4.03125,4.03125v0.56437c0,1.45125 -1.74688,2.17687 -2.76813,1.15563l-0.40312,-0.40313c-1.58563,-1.58563 -4.13875,-1.58563 -5.6975,0l-1.90813,1.90812c-1.58562,1.55875 -1.58562,4.11187 0,5.6975l0.40313,0.40313c1.02125,1.02125 0.29563,2.76812 -1.15563,2.76812h-0.56437c-2.23062,0 -4.03125,1.80062 -4.03125,4.03125v2.6875c0,2.23063 1.80063,4.03125 4.03125,4.03125h0.56437c1.45125,0 2.17688,1.74687 1.15563,2.76813l-0.40313,0.40312c-1.58562,1.58563 -1.58562,4.13875 0,5.6975l1.90813,1.90813c1.55875,1.58563 4.11187,1.58563 5.6975,0l0.40312,-0.40312c1.02125,-1.02125 2.76813,-0.29563 2.76813,1.15563v0.56437c0,2.23062 1.80063,4.03125 4.03125,4.03125h2.6875c2.23062,0 4.03125,-1.80063 4.03125,-4.03125v-0.56437c0,-1.45125 1.74687,-2.17687 2.76812,-1.15563l0.40312,0.40312c1.58563,1.58563 4.13875,1.58563 5.6975,0l1.90812,-1.90813c1.58563,-1.55875 1.58563,-4.11187 0,-5.6975l-0.40312,-0.40312c-1.02125,-1.02125 -0.29563,-2.76813 1.15563,-2.76813h0.56437c2.23062,0 4.03125,-1.80062 4.03125,-4.03125v-2.6875c0,-2.23063 -1.80062,-4.03125 -4.03125,-4.03125zM51.00606,45.6875c-4.46125,0 -8.0625,-3.60125 -8.0625,-8.0625c0,-4.46125 3.60125,-8.0625 8.0625,-8.0625c4.46125,0 8.0625,3.60125 8.0625,8.0625c0,4.46125 -3.60125,8.0625 -8.0625,8.0625z" fill="url(#color-5_SZIOLhqepltk_gr5)"></path></g></g></svg>
+                                                            </div>
+                                                            <div class="col">
+                                                                <div class="fs-12 m-t-5 all-caps m-b-5">Service Setup</div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="row">
+                                                    <div class="col bg-master-light tabButton" tab-name="customSegment">
+                                                        <div class="row align-items-center">
+                                                            <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                     width="35" height="35"
+                                                                     viewBox="0 0 172 172"
+                                                                     style=" fill:#000000;"><defs><linearGradient x1="86" y1="97.08594" x2="86" y2="105.31775" gradientUnits="userSpaceOnUse" id="color-1_43991_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="94.0625" y1="85.83338" x2="94.0625" y2="93.89588" gradientUnits="userSpaceOnUse" id="color-2_43991_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="77.9375" y1="85.83338" x2="77.9375" y2="93.89588" gradientUnits="userSpaceOnUse" id="color-3_43991_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="28.55469" x2="86" y2="143.10938" gradientUnits="userSpaceOnUse" id="color-4_43991_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M77.9375,96.75c0,4.45319 3.60931,8.0625 8.0625,8.0625c4.45319,0 8.0625,-3.60931 8.0625,-8.0625z" fill="url(#color-1_43991_gr1)"></path><path d="M94.0625,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-2_43991_gr2)"></path><path d="M77.9375,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-3_43991_gr3)"></path><path d="M147.8125,51.0625h-18.8125v-8.0625c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-11.2445c-1.11263,-3.12019 -4.06888,-5.375 -7.568,-5.375h-32.25c-3.49912,0 -6.45538,2.25481 -7.568,5.375h-11.2445c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v8.0625h-18.8125c-4.44513,0 -8.0625,3.61738 -8.0625,8.0625v59.125c0,4.44512 3.61737,8.0625 8.0625,8.0625h18.8125v8.0625c0,4.44512 3.61738,8.0625 8.0625,8.0625h69.875c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-8.0625h18.8125c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-59.125c0,-4.44512 -3.61737,-8.0625 -8.0625,-8.0625zM147.8125,56.4375c1.4835,0 2.6875,1.20669 2.6875,2.6875v51.0625h-2.88637c-0.80625,-6.09525 -4.28119,-11.78469 -9.47612,-15.25425c0.99437,-1.87319 1.6125,-3.98019 1.6125,-6.24575v-5.375c0,-6.48763 -4.62519,-11.91638 -10.75,-13.16606v-13.70894zM134.375,88.6875c0,3.49912 -2.25213,6.45538 -5.375,7.568v-20.50831c3.12287,1.11262 5.375,4.06887 5.375,7.568zM134.6545,99.1365c3.913,2.48056 6.62469,6.84506 7.47125,11.051h-13.12575v-8.33394c2.12044,-0.43269 4.02319,-1.41094 5.6545,-2.71706zM67.1875,37.625c0,-1.48081 1.204,-2.6875 2.6875,-2.6875h32.25c1.4835,0 2.6875,1.20669 2.6875,2.6875v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875h-32.25c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875zM51.0625,40.3125h10.75c0,4.44512 3.61737,8.0625 8.0625,8.0625h32.25c4.44512,0 8.0625,-3.61738 8.0625,-8.0625h10.75c1.4835,0 2.6875,1.20669 2.6875,2.6875v83.3125h-3.34056c-1.73881,-9.23963 -7.19444,-17.45531 -15.06344,-22.66906c1.44319,-2.88906 2.279,-6.13556 2.279,-9.58094v-10.75c0,-11.85456 -9.64544,-21.5 -21.5,-21.5c-11.85456,0 -21.5,9.64544 -21.5,21.5v10.75c0,3.44537 0.83581,6.69188 2.28169,9.58094c-7.869,5.21375 -13.32463,13.42675 -15.06344,22.66906h-3.34325v-83.3125c0,-1.48081 1.204,-2.6875 2.6875,-2.6875zM102.125,94.0625c0,8.89294 -7.23206,16.125 -16.125,16.125c-8.89294,0 -16.125,-7.23206 -16.125,-16.125v-10.75c0,-8.89294 7.23206,-16.125 16.125,-16.125c8.89294,0 16.125,7.23206 16.125,16.125zM86,115.5625c6.48494,0 12.29531,-2.89981 16.24056,-7.45513c6.39088,4.22744 10.93006,10.77956 12.59363,18.20513h-57.66837c1.66356,-7.42556 6.20275,-13.97769 12.59631,-18.20244c3.94256,4.55531 9.75294,7.45244 16.23787,7.45244zM43,96.2555c-3.12288,-1.11263 -5.375,-4.06888 -5.375,-7.568v-5.375c0,-3.49912 2.25212,-6.45538 5.375,-7.568zM37.32669,99.12306c1.634,1.31419 3.54481,2.29512 5.67331,2.7305v8.33394h-13.18487c0.78475,-4.57412 3.526,-8.63225 7.51156,-11.06444zM24.1875,56.4375h18.8125v13.70894c-6.12481,1.24969 -10.75,6.67575 -10.75,13.16606v5.375c0,2.26287 0.61544,4.36719 1.60981,6.24038c-5.21106,3.44806 -8.686,9.05688 -9.47613,15.25963h-2.88369v-51.0625c0,-1.48081 1.204,-2.6875 2.6875,-2.6875zM24.1875,120.9375c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875v-2.6875h21.5v5.375zM120.9375,137.0625h-69.875c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875v-2.6875h75.25v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875zM147.8125,120.9375h-18.8125v-5.375h21.5v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875z" fill="url(#color-4_43991_gr4)"></path></g></g></svg>
+                                                            </div>
+                                                            <div class="col">
+                                                                <div class="fs-12 m-t-5 all-caps m-b-5">Custom Segments</div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col bg-white p-l-25 p-r-25 p-t-15 p-b-15">
+                        <div class="row tabsContainer tabContent" tab-name="profile">
+                            <div class="col">
+                                <div class="row">
+                                    <div class="col">
+                                        <div class="row m-b-25">
+                                            <div class="col p-b-15 b-b b-grey">
+                                                <div class="font-heading all-caps fs-10 hint-text">
+                                                    Account Settings
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="row no-margin ">
+                                                    <div class="col">
+                                                        <div class="row align-items-center m-b-30">
+                                                            <div class="col-3 p-l-0">
+                                                                <div class="font-heading fs-11 bold text-info">Full Name</div>
+                                                            </div>
+                                                            <div class="col m-r-50">
+                                                                <div class="font-heading fs-11 muted" v-text="$store.getters.getUserName"></div>
+                                                            </div>
+                                                            <div class="col-auto p-r-0">
+                                                                <div class="btn btn-xs btn-default bg-master-lighter btn-rounded p-r-20 p-l-15">
+                                                                    <i class="fa fa-pencil m-r-10"></i>Edit
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="row align-items-center m-b-30">
+                                                            <div class="col-3 p-l-0">
+                                                                <div class="font-heading fs-11 bold text-info">Password</div>
+                                                            </div>
+                                                            <div class="col m-r-50">
+                                                                <div class="font-heading fs-11 muted">********</div>
+                                                            </div>
+                                                            <div class="col-auto p-r-0">
+                                                                <div class="btn btn-xs btn-default bg-master-lighter btn-rounded p-r-20 p-l-15">
+                                                                    <i class="fa fa-lock m-r-10"></i>Request Password Reset
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="row align-items-center">
+                                                            <div class="col-3 p-l-0">
+                                                                <div class="font-heading fs-11 bold text-info">Email Address</div>
+                                                            </div>
+                                                            <div class="col m-r-50">
+                                                                <div class="font-heading fs-11 muted" v-text="$store.getters.getUserEmail"></div>
+                                                            </div>
+                                                            <div class="col-auto p-r-0">
+                                                                <div class="btn btn-xs btn-default bg-master-lighter btn-rounded p-r-20 p-l-15">
+                                                                    <i class="fa fa-envelope-open-o m-r-10"></i>Request Email Change
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row tabsContainer hide tabContent" tab-name="currency">
+                            <div class="col">
+                                <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('currenciesSection')"></loading-component>
+                                <div class="row" v-show="!$store.getters.isLoading('currenciesSection')">
+                                    <div class="col">
+                                        <div class="row m-b-20">
+                                            <div class="col p-b-15 b-b b-grey">
+                                                <div class="font-heading all-caps fs-10 hint-text">
+                                                    System's Active Currencies
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row m-b-20">
+                                            <div class="col">
+                                                <div class="row m-l-0 m-r-0 m-b-10">
+                                                    <div class="col-auto p-l-0">
+                                                        <div class="font-heading all-caps fs-10 hint-text muted">
+                                                            Primary Currency
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="row m-l-0 m-r-0">
+                                                    <div class="col-3 bg-master-lightest p-t-20 p-b-20">
+                                                        <primary-currency-component></primary-currency-component>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="row m-l-0 m-r-0 m-b-10">
+                                                    <div class="col-auto p-l-0">
+                                                        <div class="font-heading all-caps fs-10 hint-text muted">
+                                                            Convertible Currency
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="row m-l-0 m-r-0">
+                                                    <div class="col">
+                                                        <convertible-currencies-component></convertible-currencies-component>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row tabsContainer hide tabContent" tab-name="bank">
+                            <div class="col">
+                                <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('banksSection')"></loading-component>
+                                <div class="row" v-show="!$store.getters.isLoading('banksSection')">
+                                    <div class="col">
+                                        <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                            <div class="col">
+                                                <div class="font-heading all-caps fs-10 hint-text">
+                                                    Company's Bank Accounts
+                                                </div>
+                                            </div>
+                                            <div class="col-auto">
+                                                <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                    <i class="fa fa-plus m-r-5"></i>
+                                                    Add New Bank Account
+                                                </button>
+                                                <modal-form-component section="banksSection">
+                                                    <template slot="form" slot-scope="{section}">
+                                                        <bank-account-form-component :section="section"></bank-account-form-component>
+                                                    </template>
+                                                </modal-form-component>
+                                            </div>
+                                        </div>
+                                        <div class="row m-b-20">
+                                            <div class="col">
+                                                <list-component section="banksSection" :endpoint="route('api.bank.list')" :options="{'company_id': 1}">
+                                                    <template slot="list" slot-scope="{data}">
+                                                        <bank-account-component :data="data"></bank-account-component>
+                                                    </template>
+                                                </list-component>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row tabsContainer hide tabContent" tab-name="supplier">
+                            <div class="col">
+                                <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('suppliersSection')"></loading-component>
+                                <div class="row" v-show="!$store.getters.isLoading('suppliersSection')">
+                                    <div class="col">
+                                        <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                            <div class="col">
+                                                <div class="font-heading all-caps fs-10 hint-text">
+                                                    Currency Suppliers
+                                                </div>
+                                            </div>
+                                            <div class="col-auto">
+                                                <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                    <i class="fa fa-plus m-r-5"></i>
+                                                    Create Supplier
+                                                </button>
+                                                <modal-form-component section="suppliersSection">
+                                                    <template slot="form" slot-scope="{section}">
+                                                        <supplier-form-component :section="section"></supplier-form-component>
+                                                    </template>
+                                                </modal-form-component>
+                                            </div>
+                                        </div>
+                                        <div class="row m-b-20">
+                                            <div class="col">
+                                                <list-component section="suppliersSection" :endpoint="route('api.company.list')" :options="{'business_type': 3}">
+                                                    <template slot="list" slot-scope="{data}">
+                                                        <supplier-component :data="data"></supplier-component>
+                                                    </template>
+                                                </list-component>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row tabsContainer hide tabContent" tab-name="standardSegment">
+                            <div class="col">
+                                <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('suppliersSection')"></loading-component>
+                                <div class="row" v-show="!$store.getters.isLoading('suppliersSection')">
+                                    <div class="col">
+                                        <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                            <div class="col">
+                                                <div class="font-heading all-caps fs-12 hint-text">
+                                                    Service Configuration
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row m-b-20">
+                                            <div class="col">
+                                                <div class="row align-items-center parentContainer">
+                                                    <div class="col-auto m-r-50">
+                                                        <div class="row m-b-5">
+                                                            <div class="col">
+                                                                <div class="font-heading fs-9 all-caps muted">Payment Attempt Duration Limit</div>
+                                                            </div>
+                                                        </div>
+                                                        <payment-attempt-component :segment_id="1"></payment-attempt-component>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row m-b-20 parentContainer">
+                                            <div class="col">
+                                                <div class="row align-items-center m-l-0 m-r-0 m-b-10 p-b-5 b-b b-grey">
+                                                    <div class="col p-l-0">
+                                                        <div class="font-heading all-caps fs-10 hint-text muted">
+                                                            Exchange Services
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-auto p-r-0">
+                                                        <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                            <i class="fa fa-plus m-r-5"></i>
+                                                            Create New Service
+                                                        </button>
+                                                        <modal-form-component size="large" section="serviceTypeSection">
+                                                            <template slot="form" slot-scope="{section}">
+                                                                <service-form-component :section="section"></service-form-component>
+                                                            </template>
+                                                        </modal-form-component>
+                                                    </div>
+                                                </div>
+                                                <list-component section="serviceTypeSection" :endpoint="route('api.service_type.list')">
+                                                    <template slot="list" slot-scope="{data}">
+                                                        <service-component :data="data"></service-component>
+                                                    </template>
+                                                </list-component>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row tabsContainer hide tabContent" tab-name="customSegment">
+                            <div class="col">
+                                <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('segmentsSection')"></loading-component>
+                                <div class="row" v-show="!$store.getters.isLoading('segmentsSection')">
+                                    <div class="col">
+                                        <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                            <div class="col">
+                                                <div class="font-heading all-caps fs-10 hint-text">
+                                                    Custom Segments
+                                                </div>
+                                            </div>
+                                            <div class="col-auto">
+                                                <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                    <i class="fa fa-plus m-r-5"></i>
+                                                    Create Segment
+                                                </button>
+                                                <modal-form-component section="segmentsSection">
+                                                    <template slot="form" slot-scope="{section}">
+                                                        <segment-form-component :section="section"></segment-form-component>
+                                                    </template>
+                                                </modal-form-component>
+                                            </div>
+                                        </div>
+                                        <div class="row m-b-20">
+                                            <div class="col">
+                                                <list-component section="segmentsSection" :endpoint="route('api.segment.list')" :options="{'type': 2}">
+                                                    <template slot="list" slot-scope="{data}">
+                                                        <segment-component :data="data"></segment-component>
+                                                    </template>
+                                                </list-component>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-4 p-r-0">
+                <div class="row">
+                    <div class="col">
+                        <div class="row tabsContainer">
+                            <div class="col">
+                                <div class="row m-l-0 m-r-0 d-none d-md-flex">
+                                    <div class="col">
+                                        <div class="row justify-content-end">
+                                            <div class="col">
+                                                <div class="row fs-12 text-center">
+                                                    <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="payments">
+                                                        <div class="row justify-content-center m-b-5">
+                                                            <div class="col-auto">
+                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                     width="35" height="35"
+                                                                     viewBox="0 0 172 172"
+                                                                     style=" fill:#000000;"><defs><linearGradient x1="99.4375" y1="60.46875" x2="99.4375" y2="79.9585" gradientUnits="userSpaceOnUse" id="color-1_44007_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="72.5625" y1="60.46875" x2="72.5625" y2="79.9585" gradientUnits="userSpaceOnUse" id="color-2_44007_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="16.125" x2="86" y2="157.44988" gradientUnits="userSpaceOnUse" id="color-3_44007_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="72.69688" y1="16.125" x2="72.69688" y2="157.44988" gradientUnits="userSpaceOnUse" id="color-4_44007_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M99.4375,61.8125c-4.4528,0 -8.0625,3.6097 -8.0625,8.0625c0,4.4528 3.6097,8.0625 8.0625,8.0625c4.4528,0 8.0625,-3.6097 8.0625,-8.0625c0,-4.4528 -3.6097,-8.0625 -8.0625,-8.0625z" fill="url(#color-1_44007_gr1)"></path><path d="M72.5625,61.8125c-4.4528,0 -8.0625,3.6097 -8.0625,8.0625c0,4.4528 3.6097,8.0625 8.0625,8.0625c4.4528,0 8.0625,-3.6097 8.0625,-8.0625c0,-4.4528 -3.6097,-8.0625 -8.0625,-8.0625z" fill="url(#color-2_44007_gr2)"></path><path d="M121.14981,92.23769c3.27606,-5.8265 5.16269,-12.52912 5.16269,-19.67519v-16.125c0,-22.22831 -18.08419,-40.3125 -40.3125,-40.3125c-22.22831,0 -40.3125,18.08419 -40.3125,40.3125v16.125c0,7.14606 1.88931,13.84869 5.16269,19.67519c-15.03387,11.13969 -23.97519,28.76163 -23.97519,47.51231v16.125h118.25v-16.125c0,-18.75069 -8.944,-36.37262 -23.97519,-47.51231zM51.0625,56.4375c0,-19.264 15.6735,-34.9375 34.9375,-34.9375c19.264,0 34.9375,15.6735 34.9375,34.9375v16.125c0,19.264 -15.6735,34.9375 -34.9375,34.9375c-19.264,0 -34.9375,-15.6735 -34.9375,-34.9375zM86,112.875c13.158,0 24.82444,-6.364 32.18819,-16.14381c1.45931,1.09381 2.8595,2.24944 4.18712,3.47225c-8.729,11.46756 -21.96763,18.04656 -36.37531,18.04656c-14.35125,0 -27.74844,-6.69725 -36.378,-18.04387c1.33031,-1.2255 2.7305,-2.38112 4.18981,-3.47494c7.36375,9.77981 19.03288,16.14381 32.18819,16.14381zM139.75,150.5h-13.4375v-5.375h-5.375v5.375h-69.875v-5.375h-5.375v5.375h-13.4375v-10.75c0,-13.28431 4.93425,-25.94781 13.57725,-35.69c9.6535,12.31144 24.39444,19.565 40.17275,19.565c15.8455,0 30.41713,-7.12725 40.17006,-19.56769c8.64569,9.7395 13.57994,22.40569 13.57994,35.69269z" fill="url(#color-3_44007_gr3)"></path><path d="M86,32.25v-5.375c-11.24719,0 -21.69081,6.54138 -26.60625,16.65981l4.83481,2.34887c4.085,-8.40919 12.427,-13.63369 21.77144,-13.63369z" fill="url(#color-4_44007_gr4)"></path></g></g></svg>
+                                                            </div>
+                                                        </div>
+                                                        <div class="row">
+                                                            <div class="col">
+                                                                <div class="fs-12 m-t-5 all-caps">Customers</div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col">
+                                        <div class="row justify-content-end">
+                                            <div class="col">
+                                                <div class="row fs-12 text-center">
+                                                    <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="transactions">
+                                                        <div class="row justify-content-center m-b-5">
+                                                            <div class="col-auto">
+                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                     width="35" height="35"
+                                                                     viewBox="0 0 172 172"
+                                                                     style=" fill:#000000;"><defs><linearGradient x1="99.4375" y1="43.33594" x2="99.4375" y2="60.14625" gradientUnits="userSpaceOnUse" id="color-1_43971_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="106.15625" y1="26.875" x2="106.15625" y2="146.16775" gradientUnits="userSpaceOnUse" id="color-2_43971_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="83.3125" y1="26.875" x2="83.3125" y2="146.16775" gradientUnits="userSpaceOnUse" id="color-3_43971_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="73.90625" y1="26.875" x2="73.90625" y2="146.16775" gradientUnits="userSpaceOnUse" id="color-4_43971_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="51.0625" y1="26.875" x2="51.0625" y2="146.16775" gradientUnits="userSpaceOnUse" id="color-5_43971_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="51.0625" y1="26.875" x2="51.0625" y2="146.16775" gradientUnits="userSpaceOnUse" id="color-6_43971_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="45.6875" y1="26.875" x2="45.6875" y2="146.16775" gradientUnits="userSpaceOnUse" id="color-7_43971_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="43" y1="26.875" x2="43" y2="146.16775" gradientUnits="userSpaceOnUse" id="color-8_43971_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M112.875,59.125h-26.875c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-10.75c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h26.875c1.4835,0 2.6875,1.204 2.6875,2.6875v10.75c0,1.4835 -1.204,2.6875 -2.6875,2.6875z" fill="url(#color-1_43971_gr1)"></path><path d="M155.875,96.75c0,-7.97381 -5.82381,-14.59581 -13.4375,-15.88313v-18.82325c0,-2.08819 -1.16906,-3.94525 -3.05031,-4.85094c-1.88125,-0.90031 -4.06081,-0.65575 -5.69481,0.64769l-21.48925,17.18925c-0.08062,0.0645 -0.13975,0.14781 -0.21769,0.21769h-31.36044c-7.40944,0 -13.4375,6.02806 -13.4375,13.4375h-5.375c-2.96431,0 -5.375,2.41069 -5.375,5.375v5.375c0,2.96431 2.41069,5.375 5.375,5.375h5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375v16.125c0,5.92863 4.82138,10.75 10.75,10.75c5.92863,0 10.75,-4.82137 10.75,-10.75v-16.125h9.86044c0.07794,0.06988 0.13706,0.15319 0.22038,0.22037l21.48656,17.18925c0.98094,0.78475 2.16075,1.18519 3.35131,1.18519c0.79281,0 1.59369,-0.17738 2.3435,-0.5375c1.88125,-0.903 3.05031,-2.76275 3.05031,-4.84825v-18.82325c7.61369,-1.28731 13.4375,-7.90931 13.4375,-15.88312zM61.8125,99.4375v-5.375h5.375v5.375zM96.75,134.375c0,2.96431 -2.41069,5.375 -5.375,5.375c-2.96431,0 -5.375,-2.41069 -5.375,-5.375v-16.125h10.75zM80.625,112.875c-4.44513,0 -8.0625,-3.61738 -8.0625,-8.0625v-16.125c0,-4.44513 3.61737,-8.0625 8.0625,-8.0625h29.5625v32.25h-8.0625zM137.05175,131.46175l-21.48925,-17.19462v-35.04231l10.75,-8.59194v26.11713h5.375v-30.41175l5.375,-4.29462l0.00538,69.42887c0,0 -0.00538,-0.00269 -0.01613,-0.01075zM142.4375,107.11837v-20.73675c4.6225,1.20131 8.0625,5.375 8.0625,10.36838c0,4.99337 -3.44,9.16706 -8.0625,10.36838z" fill="url(#color-2_43971_gr2)"></path><path d="M77.9375,91.375v5.375h5.375v-5.375h5.375v-5.375h-5.375c-2.96431,0 -5.375,2.41069 -5.375,5.375z" fill="url(#color-3_43971_gr3)"></path><path d="M21.5,107.5v-67.1875c0,-4.44512 3.61737,-8.0625 8.0625,-8.0625h88.6875c4.44512,0 8.0625,3.61738 8.0625,8.0625v10.75h5.375v-10.75c0,-7.40944 -6.02806,-13.4375 -13.4375,-13.4375h-88.6875c-7.40944,0 -13.4375,6.02806 -13.4375,13.4375v67.1875c0,7.40944 6.02806,13.4375 13.4375,13.4375h32.25v-5.375h-32.25c-4.44513,0 -8.0625,-3.61737 -8.0625,-8.0625z" fill="url(#color-4_43971_gr4)"></path><path d="M32.25,43h37.625v5.375h-37.625z" fill="url(#color-5_43971_gr5)"></path><path d="M32.25,53.75h37.625v5.375h-37.625z" fill="url(#color-6_43971_gr6)"></path><path d="M32.25,64.5h26.875v5.375h-26.875z" fill="url(#color-7_43971_gr7)"></path><path d="M32.25,75.25h21.5v5.375h-21.5z" fill="url(#color-8_43971_gr8)"></path></g></g></svg>
+                                                            </div>
+                                                        </div>
+                                                        <div class="row">
+                                                            <div class="col">
+                                                                <div class="fs-12 m-t-5 all-caps">Announcements</div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row no-margin">
+                                    <div class="col bg-white padding-25">
+                                        <div class="row tabsContainer tabContent" tab-name="transfers">
+                                            <div class="col no-padding">
+                                            </div>
+                                        </div>
+                                        <div class="row tabsContainer hide tabContent" tab-name="PO">
+                                            <div class="col">
+                                                <div class="row">
+                                                    <div class="col">
+                                                        <div class="row">
+                                                            <div class="col">
+
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php
index de92c64a..8d4fbcb3 100644
--- a/resources/views/partials/footer.blade.php
+++ b/resources/views/partials/footer.blade.php
@@ -1,9 +1,9 @@
 <!-- START COPYRIGHT -->
 <div class="footer bg-white">
-    <div class="container">
+    <div class="container-fluid">
         <div class="row no-margin">
             <div class="col p-l-0 p-t-20 p-b-20 sm-text-center">
-                <small class="small no-margin pull-left sm-pull-reset all-caps fs-10 muted" style=" letter-spacing: 1px; ">Copyright © 2020 IZYIM. All rights reserved.</small>
+                <small class="small no-margin pull-left sm-pull-reset all-caps fs-10 muted" style=" letter-spacing: 1px; ">Copyright © 2021 CIEF Exchange. All rights reserved.</small>
             </div>
         </div>
     </div>
diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php
index 026df1a5..63d3d35a 100644
--- a/resources/views/partials/header.blade.php
+++ b/resources/views/partials/header.blade.php
@@ -1,69 +1,80 @@
-<div class="header p-r-0 p-l-0 bg-primary" id="header">
-    <div class="row m-l-0 header-inner header-md-height">
-        <div class="col h-100">
-            <div class="row h-100 align-items-center justify-content-center">
-                <div class="col-auto d-none">
-                    <a href="#" class="btn-link toggle-sidebar fa fa-bars text-white" data-toggle="horizontal-menu"></a>
-                </div>
-                <div class="col-auto d-xs-none">
-                    <div class="brand inline no-border">
-                        <img src="{{asset('images/logo.png')}}" alt="logo" height="22">
+<div class="container-fluid p-r-15 p-l-15 position-fixed" style="z-index: 1050;">
+    <div class="row bg-primary-complete-gradient align-items-center justify-content-center">
+        <div class="col">
+            <div class="container-fluid container-fixed-lg no-padding">
+                <div class="row align-items-center justify-content-center">
+                    <div class="col-auto d-none">
+                        <a href="#" class="btn-link toggle-sidebar fa fa-bars text-white" data-toggle="horizontal-menu"></a>
                     </div>
-                </div>
-                <div class="col h-100">
-                    <div class="dropdown pull-right h-100 bg-primary">
-                        <button class="profile-dropdown-toggle h-100 p-r-10 p-l-10 pointer" type="button" data-toggle="dropdown" aria-expanded="false">
-                            <user-avatar class="bg-primary-dark" username="Omair Saleh" :size="32" color="#ffffff"></user-avatar>
-                        </button>
-                        {{--<div class="dropdown-menu dropdown-menu-right no-padding" role="menu" x-placement="bottom-end" style="width: 300px;">--}}
-                            {{--<div class="row">--}}
-                                {{--<div class="col">--}}
-                                    {{--<div class="row no-margin align-items-center justify-content-center p-t-10 p-b-10 b-b b-grey">--}}
-                                        {{--<div class="col-auto p-r-0">--}}
-                                            {{--<user-avatar username="{{auth()->user()->first_name.' '.auth()->user()->last_name}}" :size="75" ></user-avatar>--}}
-                                        {{--</div>--}}
-                                        {{--<div class="col">--}}
-                                            {{--<div class="row">--}}
-                                                {{--<div class="col">--}}
-                                                    {{--<div class="m-b-5">{{ucwords(auth()->user()->first_name.' '.auth()->user()->last_name)}}</div>--}}
-                                                    {{--<div class="muted m-b-10">{{auth()->user()->email}}</div>--}}
-                                                    {{--<div class="m-b-5"><a href="{{route('user.profile')}}"><span class="text-complete">View Profile</span></a></div>--}}
-                                                {{--</div>--}}
-                                            {{--</div>--}}
-                                        {{--</div>--}}
-                                    {{--</div>--}}
-                                    {{--<div class="row no-margin bg-white">--}}
-                                        {{--<div class="col">--}}
-                                            {{--<div class="row">--}}
-                                                {{--<div class="col p-t-10 p-b-10">--}}
-                                                    {{--<div class="row text-danger">--}}
-                                                        {{--<div class="col">--}}
-                                                            {{--<a href="{{route('auth.logout')}}" class="btn btn-sm btn-default text-danger pull-right">--}}
-                                                                {{--<span class="text-danger">--}}
-                                                                    {{--<i class="fa fa-power-off m-r-5"></i>Sign out--}}
-                                                                {{--</span>--}}
-                                                            {{--</a>--}}
-                                                        {{--</div>--}}
-                                                    {{--</div>--}}
-                                                {{--</div>--}}
-                                            {{--</div>--}}
-                                        {{--</div>--}}
-                                    {{--</div>--}}
-                                {{--</div>--}}
-                            {{--</div>--}}
-                        {{--</div>--}}
+                    <div class="col-auto d-xs-none bg-complete-light p-t-10 p-b-10 p-l-30 p-r-30">
+                        <div class="row">
+                            <div class="col">
+                                <img src="{{asset('images/logo-light.png')}}" alt="logo" height="22">
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col">
+                                <div class="m-t-5 all-caps fs-10 text-white hint-text">Overseas Transfers Management</div>
+                            </div>
+                        </div>
                     </div>
-                    <div class="dropdown pull-right h-100 bg-master-darker">
-                        <button class="profile-dropdown-toggle h-100 p-r-15 p-l-15 pointer" type="button" data-toggle="dropdown" aria-expanded="false">
-                            <span class="bg-master-darkest btn-rounded relative" style="padding: 5px 7px;">
-                                <i class="fa fa-bell fs-14 text-white"></i>
-                                <span class="bubble hide"></span>
-                            </span>
-                        </button>
+                    <div class="col text-right p-r-30">
+                        <div class="row justify-content-end">
+                            <div class="col text-right">
+                                <div class="row justify-content-end">
+                                    <div class="col-auto p-r-20">
+                                        <a href="{{route('dashboard')}}"><div class="text-white all-caps fs-12">Dashboard</div></a>
+                                    </div>
+                                    <div class="col-auto p-r-20">
+                                        <div class="text-white all-caps fs-12">Transfers</div>
+                                    </div>
+                                    <div class="col-auto p-r-20">
+                                        <div class="text-white all-caps fs-12">Payments & Billing</div>
+                                    </div>
+                                    <div class="col-auto p-r-20">
+                                        <div class="text-white all-caps fs-12">Bank Accounts</div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-auto p-r-30">
+                        <div class="row no-margin">
+                            <div class="col-auto m-r-5">
+                                <div class="row align-items-center justify-content-center b-a b-thick h-100" style="border-color: #ffffff3d">
+                                    <div class="col p-r-10 p-l-10">
+                                        <i class="fa fa-bell fs-12 text-primary-lighter"></i>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-auto m-r-20">
+                                <div class="row align-items-center p-t-5 p-b-5 b-a b-thick" style="border-color: #ffffff3d">
+                                    <div class="col-auto">
+                                        <div class="fs-12 text-primary-lighter">Hi, <span v-text="$store.getters.getUserName.split(' ').slice(0,2).join(' ')"></span>!</div>
+                                    </div>
+                                    <div class="col-auto p-l-0 p-r-10">
+                                        <div class="btn btn-xs btn-primary p-t-0 p-b-0 text-primary-lighter" style="background-color: rgba(255, 255, 255, 0.2);">
+                                            <i class="fa fa-angle-down fs-14 m-t-5"></i>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-auto m-r-5">
+                                <a href="{{route('settings')}}">
+                                    <div class="row align-items-center justify-content-center b-a b-thick h-100" style="border-color: #ffffff3d">
+                                        <div class="col p-r-10 p-l-10">
+                                            <i class="fa fa-cog fs-12 text-primary-lighter"></i>
+                                        </div>
+                                    </div>
+                                </a>
+                            </div>
+                            <div class="col-auto">
+                                <log-out-form-component></log-out-form-component>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
-    {{--@include('partials.menu')--}}
 </div>
\ No newline at end of file
diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php
deleted file mode 100644
index 076a5a14..00000000
--- a/resources/views/partials/menu.blade.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<div class="bg-white b-b b-grey">
-    <div class="container">
-        <div class="menu-bar header-sm-height invisible" data-pages-init='horizontal-menu' data-hide-extra-li="2">
-            <a href="#" class="btn-link toggle-sidebar hidden-lg-up pg pg-close" data-toggle="horizontal-menu">
-            </a>
-            <ul>
-                <li>
-                    <a href="#" class="b-r b-grey">
-                        <div class="inline v-align-middle">
-                            <span class="block m-b-5 lh-13 fs-12 semi-bold">Dashboard</span>
-                            <span class="block muted lh-11 fs-10 all-caps">New Updates</span>
-                        </div>
-                    </a>
-                </li>
-                <li>
-                    <a href="#" class="b-r b-grey">
-                        <div class="inline v-align-middle">
-                            <span class="block m-b-5 lh-13 fs-12 semi-bold">Orders</span>
-                            <span class="block muted lh-11 fs-10 all-caps">Manage & Track</span>
-                        </div>
-                    </a>
-                </li>
-                <li>
-                    <a href="#" class="b-r b-grey">
-                        <div class="inline v-align-middle">
-                            <span class="block m-b-5 lh-13 fs-12 semi-bold">Payments</span>
-                            <span class="block muted lh-11 fs-10 all-caps">Invoices & Receipts</span>
-                        </div>
-                    </a>
-                </li>
-                <li>
-                    <a href="#" class="b-r b-grey">
-                        <div class="inline v-align-middle">
-                            <span class="block m-b-5 lh-13 fs-12 semi-bold">Accounts</span>
-                            <span class="block muted lh-11 fs-10 all-caps">Users & Groups</span>
-                        </div>
-                    </a>
-                </li>
-                <li>
-                    <a href="#">
-                        <div class="inline v-align-middle">
-                            <span class="block m-b-5 lh-13 fs-12 semi-bold">Settings</span>
-                            <span class="block muted lh-11 fs-10 all-caps">Manage Application</span>
-                        </div>
-                    </a>
-                </li>
-                {{--<li>--}}
-                    {{--<a href="{{route('dashboard')}}" class="b-r b-grey">--}}
-                        {{--<div class="inline v-align-middle">--}}
-                            {{--<span class="block m-b-5 lh-13 semi-bold">Suppliers</span>--}}
-                            {{--<span class="block muted lh-11 fs-10 all-caps">Manage Suppliers</span>--}}
-                        {{--</div>--}}
-                    {{--</a>--}}
-                {{--</li>--}}
-                {{--<li>--}}
-                    {{--<a href="{{route('dashboard')}}">--}}
-                        {{--<div class="inline v-align-middle">--}}
-                            {{--<span class="block m-b-5 lh-13 semi-bold">Users</span>--}}
-                            {{--<span class="block muted lh-11 fs-10 all-caps">Manage Users</span>--}}
-                        {{--</div>--}}
-                    {{--</a>--}}
-                {{--</li>--}}
-                {{--<li>--}}
-                    {{--<a href="{{route('dashboard')}}">--}}
-                        {{--<div class="inline v-align-middle">--}}
-                            {{--<span class="block m-b-5 lh-13 semi-bold">Settings</span>--}}
-                            {{--<span class="block muted lh-11 fs-10 all-caps">Manage Application</span>--}}
-                        {{--</div>--}}
-                    {{--</a>--}}
-                {{--</li>--}}
-            </ul>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
deleted file mode 100644
index e69de29b..00000000
diff --git a/routes/account.php b/routes/account.php
index 5262c0f2..5ce39d98 100644
--- a/routes/account.php
+++ b/routes/account.php
@@ -6,25 +6,36 @@ Route::group(['prefix' => 'account', 'namespace' => 'Accounts', 'as' => 'account
 
     Route::group(['prefix' => 'authentication', 'as' => 'authentication.'], function () {
 
+
+        Route::group(['middleware' => 'valid.token'], function () {
+            Route::get('/logout', 'UserAuthenticationLogoutController@logout')->name('logout');
+            Route::get('/refresh', 'RefreshAuthenticationTokenController@refresh')->name('refresh');
+        });
+
          Route::group(['prefix' => 'login', 'as' => 'authenticate.'], function () {
             Route::post('/attempt', 'UserAuthenticationController@authenticate')->name('attempt');
             Route::post('/check_email', 'CheckEmailController@check')->name('email.check');
          });
 
-        // Route::group(['prefix' => 'password', 'as' => 'password.'], function () {
-        //     Route::post('/forget', 'GeneratePasswordResetController@generate')->name('forget');
-        //     Route::post('/reset', 'ResetPasswordController@reset')->name('reset');
-        // });
+         Route::group(['prefix' => 'password', 'as' => 'password.'], function () {
+//             Route::post('/forget', 'GeneratePasswordResetController@generate')->name('forget');
+//             Route::post('/reset', 'ResetPasswordController@reset')->name('reset');
+         });
 
     });
-    
-    Route::group(['middleware' => 'valid.token'], function () {
-        Route::post('/registration-setp-2', 'RegistrationStep2Controller@create')->name('registration-step-2');
+
+    Route::group(['prefix' => 'registration', 'as' => 'registration.'], function () {
+        Route::post('/registration', 'CreateCustomerController@create')->name('register');
+    });
+
+    Route::group(['prefix' => 'email', 'as' => 'email.'], function () {
+        Route::post('/verify', 'UserEmailVerificationController@verify')->name('verify');
+        Route::post('/verification/resend', 'ResendEmailVerificationController@resend')->name('verification.resend');
     });
 
-    Route::post('/registration', 'CreateUserController@create')->name('registration');
 
     Route::group(['prefix' => 'user', 'as' => 'user.'], function () {
-        Route::get('list', 'ListUsersController@list')->name('list');
+        Route::post('/show', 'FetchUserController@fetch')->name('show');
+        Route::get('/list', 'ListUsersController@list')->name('list');
     });
 });
\ No newline at end of file
diff --git a/routes/api.php b/routes/api.php
index 92d889c5..d82807ca 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,6 +1,5 @@
 <?php
 
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
 
 /*
@@ -17,25 +16,38 @@ use Illuminate\Support\Facades\Route;
 Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function () {
     
     require __DIR__ . '/account.php';
-    
-    require __DIR__ . '/transaction.php';
-    
-    require __DIR__ . '/receipt.php';
+
+//    Route::get('/rate/calculate', 'RateCalculateCurrencyController@convert')->name('calculate');
+
+    Route::group(['prefix' => 'service', 'as' => 'service.'], function () {
+        Route::get('countries/list', 'Services\CountriesListController@index')->name('list.countries');
+    });
+
+
 
     Route::group(['middleware' => 'valid.token'], function () {
-        require __DIR__ . '/crud.php';
 
-        require __DIR__ . '/wallet.php';
+        Route::get('/storage/{fileName}', 'Documents\RenderDocumentController@fileStorageServe')->where(['fileName' => '.*'])->name('storage.document.file');
 
-    require __DIR__ . '/company.php';
+        require __DIR__ . '/company.php';
 
-    require __DIR__ . '/company_bank.php';
+        require __DIR__ . '/document.php';
 
         require __DIR__ . '/segment.php';
 
         require __DIR__ . '/currency.php';
-        
-        require __DIR__ . '/currency_rate.php';
+
+        require __DIR__ . '/bank.php';
+
+        require __DIR__ . '/booking.php';
+
+        require __DIR__ . '/transaction.php';
+
+        require __DIR__ . '/crud.php';
+
+//        require __DIR__ . '/wallet.php';
+//        require __DIR__ . '/rate.php';
+//        require __DIR__ . '/receipt.php';
 
     });
 });
diff --git a/routes/bank.php b/routes/bank.php
new file mode 100644
index 00000000..a17ceb63
--- /dev/null
+++ b/routes/bank.php
@@ -0,0 +1,11 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+Route::group(['prefix' => 'bank', 'as' => 'bank.', 'namespace' => 'Banks'], function () {
+    Route::get('/list', 'ListBanksController@list')->name('list');
+    Route::post('/create', 'CreateBankController@create')->name('create');
+    Route::put('/update/{id}', 'UpdateBankController@update')->name('update');
+    Route::put('/{id}/default', 'SetBankToDefaultController@update')->name('default');
+    Route::delete('/delete/{id}', 'DeleteBankController@delete')->name('delete');
+});
\ No newline at end of file
diff --git a/routes/booking.php b/routes/booking.php
index 2697327d..8f60bfb2 100644
--- a/routes/booking.php
+++ b/routes/booking.php
@@ -2,12 +2,20 @@
 
 use Illuminate\Support\Facades\Route;
 
-Route::group(['namespace' => 'Bookings'], function () {
-    Route::group(['middleware' => 'valid.token'], function () {
-        Route::group(['prefix' => 'booking'], function () {
-            Route::post('/create', 'CreateBookingController@create')->name('create');
-            Route::put('/update/{id}', 'UpdateBookingController@update')->name('update');
-            Route::delete('/delete/{id}', 'DeleteBookingController@delete')->name('delete');
-    	});
-	});
+Route::group(['prefix' => 'booking', 'as' => 'booking.', 'namespace' => 'Bookings'], function () {
+    Route::get('/show/{marking}', 'FetchBookingController@fetch')->name('show');
+    Route::get('/list', 'ListBookingsController@list')->name('list');
+    Route::post('/create', 'CreateBookingController@create')->name('create');
+    Route::put('/update/{id}', 'UpdateBookingController@update')->name('update');
+    Route::delete('/delete/{id}', 'DeleteBookingController@delete')->name('delete');
+
+    Route::group(['prefix' => '{id}/payment', 'as' => 'payment.'], function () {
+        Route::post('quotation', 'FetchBookingPaymentQuotationController@fetch')->name('quotation');
+        Route::post('create', 'CreateBookingPaymentController@create')->name('create');
+        Route::post('{payment_id}/verification/create', 'CreatePaymentVerificationController@create')->name('verification.create');
+        Route::put('/{payment_id}/approval/{status}', 'ApprovePaymentVerificationController@approve')->where('status', 'approve|reject')->name('approval');
+    });
+
+    Route::post('{id}/purchase_order/verification', 'ApprovePurchaseOrderController@approve')->name('po.approval');
+
 });
\ No newline at end of file
diff --git a/routes/company.php b/routes/company.php
index b35d6a34..e964d741 100644
--- a/routes/company.php
+++ b/routes/company.php
@@ -8,4 +8,21 @@ Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Compani
     Route::post('/create', 'CreateCompanyController@create')->name('create');
     Route::put('/update/{id}', 'UpdateCompanyController@update')->name('update');
     Route::delete('/delete/{id}', 'DeleteCompanyController@destroy')->name('delete');
+
+    Route::group(['prefix' => '{id}/segment', 'as' => 'segment.'], function () {
+        Route::post('/assign', 'AssignCompanyToSegmentController@assign')->name('assign');
+        Route::delete('/detach/{segment_id}', 'RemoveCompanyFromSegmentController@detach')->name('detach');
+    });
+
+    Route::group(['prefix' => '{id}/currency', 'as' => 'currency.'], function () {
+        Route::post('/convert', 'FetchCompanyBookingQuotationController@fetch')->name('convert');
+    });
+
+    Route::put('supplier/{id}/currencies/update', 'UpdateSupplierCurrenciesController@update')->name('supplier.currencies.update');
+
+    Route::group(['prefix' => '{id}/identification', 'as' => 'identification.'], function () {
+        Route::post('/create', 'CreateIdentificationDocumentController@create')->name('create');
+        Route::put('/{document_id}/approval/{status}', 'ApproveIdentificationDocumentController@approve')->where('status', 'approve|reject')->name('approval');
+    });
+
 });
\ No newline at end of file
diff --git a/routes/company_bank.php b/routes/company_bank.php
deleted file mode 100644
index 8cfc9802..00000000
--- a/routes/company_bank.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Route;
-
-Route::group(['namespace' => 'CompanyBanks'], function () {
-    Route::group(['middleware' => 'valid.token'], function () {
-        Route::group(['prefix' => 'company-bank'], function () {
-            Route::post('/create', 'CreateCompanyBankController@create')->name('create');
-            Route::put('/update/{id}', 'UpdateCompanyBankController@update')->name('update');
-
-            Route::put('/update-to-default/{id}', 'UpdateToDefaultCompanyBankController@update')->name('update-to-default');
-
-            Route::delete('/delete/{id}', 'DeleteCompanyBankController@delete')->name('delete');
-        });
-    });
-});
\ No newline at end of file
diff --git a/routes/crud.php b/routes/crud.php
index 8dc59e9f..cdc418e2 100644
--- a/routes/crud.php
+++ b/routes/crud.php
@@ -6,6 +6,7 @@ Route::group(['prefix' => 'address', 'as' => 'address.', 'namespace' => 'Address
     Route::get('/{id}/show', 'FetchAddressController@fetch')->name('show');
 
     Route::get('/list', 'ListAddressesController@list')->name('list');
+    Route::get('district/list', 'ListDistrictsController@list')->name('district.list');
 
     Route::post('/create', 'CreateAddressController@create')->name('create');
 
@@ -15,3 +16,18 @@ Route::group(['prefix' => 'address', 'as' => 'address.', 'namespace' => 'Address
 
 });
 
+Route::group(['prefix' => 'service_type', 'as' => 'service_type.', 'namespace' => 'ServiceTypes'], function () {
+
+    Route::get('/{id}/show', 'FetchServiceTypeController@fetch')->name('show');
+
+    Route::get('/list', 'ListServiceTypesController@list')->name('list');
+
+    Route::post('/create', 'CreateServiceTypeController@create')->name('create');
+
+    Route::put('/update/{id}', 'UpdateServiceTypeController@update')->name('update');
+
+    Route::put('/status/{id}/{status}', 'UpdateServiceTypeStatusController@activate')->where('status', 'active|inactive')->name('status');
+
+    Route::delete('/delete/{id}', 'DeleteServiceTypeController@destroy')->name('delete');
+
+});
diff --git a/routes/currency.php b/routes/currency.php
index 6a6fbdab..ba308402 100644
--- a/routes/currency.php
+++ b/routes/currency.php
@@ -1,14 +1,10 @@
-<?php
+    <?php
 
 use Illuminate\Support\Facades\Route;
 
-Route::group(['namespace' => 'Currencies'], function () {
-    Route::group(['middleware' => 'valid.token'], function () {
-        Route::group(['prefix' => 'currency'], function () {
-            Route::get('/list', 'ListCurrencyController@list')->name('list');
-            Route::get('/rate/calculate', 'RateCalculateCurrencyController@convert')->name('convert');
-            Route::post('/create', 'CreateCurrencyController@create')->name('create');
-            Route::delete('/delete/{id}', 'DeleteCurrencyController@delete')->name('delete');
-        });
-    });
+Route::group(['namespace' => 'Currencies', 'as' => 'currency.', 'prefix' => 'currency'], function () {
+    Route::get('/primary/show', 'FetchSystemPrimaryCurrencyController@fetch')->name('primary.show');
+    Route::get('/list', 'ListCurrencyController@list')->name('list');
+    Route::post('/create', 'CreateCurrencyController@create')->name('create');
+    Route::delete('/delete/{id}', 'DeleteCurrencyController@delete')->name('delete');
 });
\ No newline at end of file
diff --git a/routes/currency_rate.php b/routes/currency_rate.php
deleted file mode 100644
index b4c2d055..00000000
--- a/routes/currency_rate.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Route;
-
-Route::group(['namespace' => 'CurrencyRates'], function () {
-    Route::group(['middleware' => 'valid.token'], function () {
-        Route::group(['prefix' => 'currency-rate'], function () {
-        	Route::get('/{id}/show', 'FetchCurrencyRateController@fetch')->name('show');
-    		Route::get('/list', 'ListCurrencyRatesController@list')->name('list');
-            Route::get('/calculate', 'CalculateCurrencyRateController@calculate')->name('calculate');
-            Route::post('/create', 'CreateCurrencyRateController@create')->name('create');
-            Route::put('/update/{id}', 'UpdateCurrencyRateController@update')->name('update');
-            Route::delete('/delete/{id}', 'DeleteCurrencyRateController@delete')->name('delete');
-        });
-    });
-});
\ No newline at end of file
diff --git a/routes/document.php b/routes/document.php
index d8705b2b..12419c9e 100644
--- a/routes/document.php
+++ b/routes/document.php
@@ -4,5 +4,6 @@ use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'document', 'as' => 'document.', 'namespace' => 'Documents'], function () {
     Route::get('/list', 'ListDocumentsController@list')->name('list');
-    Route::put('/approve/{id}', 'ApproveDocumentController@approve')->name('approve');
+    Route::put('/{id}/approve', 'ApproveDocumentController@approve')->name('status.approve');
+    Route::put('/{id}/reject', 'RejectDocumentController@reject')->name('status.reject');
 });
\ No newline at end of file
diff --git a/routes/rate.php b/routes/rate.php
new file mode 100644
index 00000000..78e4b479
--- /dev/null
+++ b/routes/rate.php
@@ -0,0 +1,12 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+Route::group(['namespace' => 'Rates', 'prefix' => 'currency-rate'], function () {
+    Route::get('/{id}/show', 'FetchRateController@fetch')->name('show');
+    Route::get('/list', 'ListRatesController@list')->name('list');
+    Route::get('/calculate', 'CalculateRateController@calculate')->name('calculate');
+    Route::post('/create', 'CreateRateController@create')->name('create');
+    Route::put('/update/{id}', 'UpdateRateController@update')->name('update');
+    Route::delete('/delete/{id}', 'DeleteRateController@delete')->name('delete');
+});
\ No newline at end of file
diff --git a/routes/segment.php b/routes/segment.php
index 0d8c7652..685b3ee0 100644
--- a/routes/segment.php
+++ b/routes/segment.php
@@ -2,39 +2,53 @@
 
 use Illuminate\Support\Facades\Route;
 
-Route::group(['namespace' => 'StandardSegments'], function () {
-    Route::group(['middleware' => 'valid.token'], function () {
-        Route::group(['prefix' => 'standard-segment'], function () {
-            Route::get('/list', 'ListStandardSegmentsController@list')->name('standard_segment.list');
-        });
+Route::group(['prefix' => 'segment', 'as' => 'segment.', 'namespace' => 'Segments'], function () {
+    Route::get('/{id}/show', 'FetchSegmentController@fetch')->name('show');
+    Route::post('/create', 'CreateSegmentController@create')->name('create');
+    Route::put('/update/{id}', 'UpdateSegmentController@update')->name('update');
+    Route::delete('/delete/{id}', 'DeleteSegmentController@delete')->name('delete');
+    Route::get('/list', 'ListSegmentsController@list')->name('list');
+
+    Route::group(['prefix' => '{id}/constant', 'as' => 'constant.'], function () {
+        Route::put('/service/update', 'UpdateCustomServiceConstantController@update')->name('service.update');
+        Route::put('/update', 'UpdateConstantController@update')->name('update');
+        Route::get('/show/{reference}', 'FetchConstantController@fetch')->name('show');
     });
+
 });
 
-Route::group(['namespace' => 'Segments'], function () {
-    Route::group(['middleware' => 'valid.token'], function () {
-        Route::group(['prefix' => 'segment'], function () {
-            Route::post('/create', 'CreateSegmentController@create')->name('segment.create');
-            Route::put('/update/{id}', 'UpdateSegmentController@update')->name('segment.update');
-            Route::delete('/delete/{id}', 'DeleteSegmentController@delete')->name('segment.delete');
-    	});
-	});
-});
-
-Route::group(['namespace' => 'StandardSegmentConstants'], function () {
-    Route::group(['middleware' => 'valid.token'], function () {
-        Route::group(['prefix' => 'standard-segment-constant'], function () {
-            Route::get('/list', 'ListStandardSegmentConstantsController@list')->name('standard_segment.update');
-            Route::put('/update/{id}', 'UpdateStandardSegmentConstantController@update')->name('standard_segment_constant.update');
-        });
-    });
-});
-
-Route::group(['namespace' => 'SegmentConstants'], function () {
-    Route::group(['middleware' => 'valid.token'], function () {
-        Route::group(['prefix' => 'segment-constant'], function () {
-            // Route::get('/list', 'ListStandardSegmentConstantsController@list')->name('standard_segment.update');
-            Route::post('/create', 'CreateSegmentConstantController@create')->name('segment_constant.create');
-            Route::put('/update/{id}', 'UpdateSegmentConstantController@update')->name('segment_constant.update');
-        });
-    });
-});
\ No newline at end of file
+//Route::group(['namespace' => 'StandardSegments'], function () {
+//    Route::group(['middleware' => 'valid.token'], function () {
+//        Route::group(['prefix' => 'standard-segment'], function () {
+//            Route::get('/list', 'ListStandardSegmentsController@list')->name('standard_segment.list');
+//        });
+//    });
+//});
+//
+//Route::group(['namespace' => 'Segments'], function () {
+//    Route::group(['middleware' => 'valid.token'], function () {
+//        Route::group(['prefix' => 'segment'], function () {
+//            Route::post('/create', 'CreateSegmentController@create')->name('segment.create');
+//            Route::delete('/delete/{id}', 'DeleteSegmentController@delete')->name('segment.delete');
+//    	});
+//	});
+//});
+//
+//Route::group(['namespace' => 'StandardSegmentConstants'], function () {
+//    Route::group(['middleware' => 'valid.token'], function () {
+//        Route::group(['prefix' => 'standard-segment-constant'], function () {
+//            Route::get('/list', 'ListStandardSegmentConstantsController@list')->name('standard_segment.list');
+//            Route::put('/update/{id}', 'UpdateStandardSegmentConstantController@update')->name('standard_segment_constant.update');
+//        });
+//    });
+//});
+//
+//Route::group(['namespace' => 'SegmentConstants'], function () {
+//    Route::group(['middleware' => 'valid.token'], function () {
+//        Route::group(['prefix' => 'segment-constant'], function () {
+//            // Route::get('/list', 'ListStandardSegmentConstantsController@list')->name('standard_segment.update');
+//            Route::post('/create', 'CreateSegmentConstantController@create')->name('segment_constant.create');
+//            Route::put('/update/{id}', 'UpdateSegmentConstantController@update')->name('segment_constant.update');
+//        });
+//    });
+//});
\ No newline at end of file
diff --git a/routes/transaction.php b/routes/transaction.php
index 7a39c7a1..cab4d241 100644
--- a/routes/transaction.php
+++ b/routes/transaction.php
@@ -4,8 +4,12 @@ use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' => 'transaction.'], function () {
 
-    Route::post('/create/{id}', 'CreateTransactionController@create')->name('create');
-    Route::post('/createPOPymt', 'CreateMakePaymentPOTransactionController@create')->name('create');
-    //Route::post('/create-transaction/{id}', 'CreateWalletTransactionController@create')->name('create_transaction');
+    Route::get('/list', 'ListTransactionsController@list')->name('list');
+    Route::delete('/suspend/{id}', 'SuspendTransactionController@suspend')->name('suspend');
+
+    route::post('/supplier/{id}/bill/create', 'CreateSupplierTransactionController@create')->name('supplier.create');
+    route::post('{id}/bill/verification', 'CreatePaymentProofDocumentController@verify')->name('bill.verification');
+
+    Route::post('booking/{id}/details/update', 'CreatePurchaseOrderTransactionController@create')->name('po.create');
 
 });
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 947823e5..c3c0c925 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -14,25 +14,27 @@ use Illuminate\Support\Facades\Route;
 */
 
 Route::get('', function () {
-    return view('pages.accounts.authentication.login');
+    return view('pages.accounts.login');
 })->name('login');
 
-Route::get('account/registration', function () {
-    return view('pages.accounts.registration');
-})->name('registration');
+Route::get('/account/email/verification/{token}', function ($token) {
+    return view('pages.accounts.email_verified', ['token' => $token]);
+})->name('account.email.verification');
 
-Route::get('account/registration-step-2', function () {
-    return view('pages.accounts.registration_step_2');
-})->name('registration-step-2');
+Route::get('/dashboard', function () {
+    return view('pages.dashboards.index');
+})->name('dashboard');
 
-Route::get('/accounts', function () {
-    return view('pages.accounts.dashboard');
-})->name('account.dashboard');
+Route::get('/settings', function () {
+    return view('pages.settings');
+})->name('settings');
+
+Route::get('/customers/{id}', function ($id) {
+    return view('pages.customers', ['id' => $id]);
+})->name('customers');
+
+Route::get('/transfer/{marking}', function ($marking) {
+    return view('pages.booking_details', ['marking' => $marking]);
+})->name('booking.details');
 
-// Route::get('/company/{id}/importer/dashboard', function ($id) {
-//     return view('pages.dashboards.importer_profile', ['id' => (int) $id]);
-// })->name('dashboard.importer');
 
-Route::get('/company/forwarder/dashboard', function () {
-    return view('pages.dashboards.forwarder_profile');
-})->name('dashboard.forwarder');
\ No newline at end of file
diff --git a/simhei.ttf b/simhei.ttf
new file mode 100644
index 00000000..c5030aea
Binary files /dev/null and b/simhei.ttf differ
diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php
index cdb51119..8fbf3706 100644
--- a/tests/Feature/ExampleTest.php
+++ b/tests/Feature/ExampleTest.php
@@ -2,7 +2,6 @@
 
 namespace Tests\Feature;
 
-use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
 class ExampleTest extends TestCase