Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into container-profile-forms-ui

# Conflicts:
#	routes/web.php

app/Http/Controllers/Accounts/CreateInvitedCustomerController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Accounts;
+
+use App\Classes\Modules\Accounts\ControllersLogic\CreateInvitedCustomerLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateInvitedCustomerController
+{
+    /**
+     * @param Request $request
+     * @param CreateInvitedCustomerLogic $createCustomerLogic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateInvitedCustomerLogic $createCustomerLogic): JsonResponse
+    {
+        return $createCustomerLogic->execute($request);
+    }
+}

app/Http/Resources/CompanyResource.php

@@ -11,6 +11,7 @@ use App\Models\CompanyModule;
 use App\Models\Currency;
 use App\Models\SegmentConstant;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Crypt;
 
 class CompanyResource extends JsonResource
 {
@@ -25,6 +26,7 @@ class CompanyResource extends JsonResource
         $companyModule = $this->companyModules()->where('type', '=', BusinessType::IMPORTER)->first();
         return [
             'id' => $this->id,
+            'hash_id' => Crypt::encryptString($this->id),
             'name' => $this->name,
             'reference' => $this->reference,
             'type' => (int) $this->type,

app/Http/Resources/ContainerResource.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\Classes\ValueObjects\Constants\ContainerTypes;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class ContainerResource extends JsonResource
@@ -17,7 +18,7 @@ class ContainerResource extends JsonResource
         return [
             'id' => $this->id,
             'container_reference' => $this->reference,
-            'container_type' => $this->container_type,
+            'container_specification' => ContainerTypes::CONTAINER_SPECIFICATION[$this->container_type],
             'container_number' => $this->container_number,
             'seal_reference' => $this->seal_reference,
             'transport' => new TransportResource($this->transports()->first()),