Merge branch 'development' of github.com:bakaphp/kanvas-ecosystem-api…

… into warehouse-type-update
bakaphp · Feb 19, 2024 · 46be135 · 46be135
2 parents 2bb5a34 + 6917205
commit 46be135
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 31 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/graphql/schemas/Ecosystem/user.graphql b/graphql/schemas/Ecosystem/user.graphql
@@ -104,6 +104,7 @@ input RegisterInput {
     password: String! @rules(apply: ["required", "min:8"])
     password_confirmation: String! @rules(apply: ["required"])
     company_name: String
+    phone_number: String
     custom_fields: [CustomFieldEntityInput!]
 }
 

diff --git a/graphql/schemas/Inventory/region.graphql b/graphql/schemas/Inventory/region.graphql
@@ -2,7 +2,7 @@ type Region {
     id: Int!
     companies_id: Int!
     currency_id: Int!
-    companies: Company!
+    companies: Company! @belongsTo(relation: "company")
     currencies: Currency!
     uuid: String!
     name: String!

diff --git a/src/Domains/Inventory/Warehouses/Models/Warehouses.php b/src/Domains/Inventory/Warehouses/Models/Warehouses.php
@@ -41,27 +41,16 @@ class Warehouses extends BaseModel
 
     protected $guarded = [];
 
-    /**
-     *
-     */
     public function apps(): BelongsTo
     {
         return $this->belongsTo(Apps::class, 'apps_id');
     }
 
-    /**
-     *
-     */
     public function regions(): BelongsTo
     {
         return $this->belongsTo(Regions::class, 'regions_id');
     }
 
-    public function systemModules(): HasMany
-    {
-        return $this->hasMany(SystemModules::class, 'apps_id');
-    }
-
     public function variantsWarehouses(): HasMany
     {
         return $this->hasMany(VariantsWarehouses::class, 'warehouses_id');
@@ -182,7 +171,7 @@ public function isVariantPublished(): ?Attribute
      *
      * @return Int
      */
-    public function getTotalProducts(): Int
+    public function getTotalProducts(): int
     {
         if (! $totalProducts = $this->get('total_products')) {
             $this->set(

diff --git a/src/Kanvas/Auth/DataTransferObject/RegisterInput.php b/src/Kanvas/Auth/DataTransferObject/RegisterInput.php
@@ -51,7 +51,8 @@ public static function viaRequest(Request $request): self
             password: Hash::make($request->get('password')),
             default_company: $request->get('default_company') ?? null,
             role_ids: $roles,
-            custom_fields: $request->get('custom_fields') ?? []
+            custom_fields: $request->get('custom_fields') ?? [],
+            phone_number: $request->get('phone_number') ?? null,
         );
     }