Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into multi-payment-final

# Conflicts:
# app/Classes/Modules/Segments/ControllersLogic/UpdateConstantPostcodeLogic.php
# app/Classes/ValueObjects/Constants/TransactionType.php
# routes/api.php
# routes/web.php

app/Http/Resources/CompanyModuleResource.php

@@ -49,6 +49,7 @@ class CompanyModuleResource extends JsonResource
             'marking' => $marking,
             'warehouseCharges' => array_key_exists($this->id, $segmentConstant) ? $segmentConstant[$this->id] : null,
             'connections' => $this->connections,
+            'contact' => new ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
         ];
 
     }