Merge pull request #1509 from bakaphp/hotfix-variant-sku-validation

fix: variant update
bakaphp · Jun 13, 2024 · ff2442b · ff2442b
2 parents 53bf8d0 + 8d96789
commit ff2442b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/graphql/schemas/Inventory/variant.graphql b/graphql/schemas/Inventory/variant.graphql
@@ -9,6 +9,8 @@ type Variant {
     html_description: String
     sku: String
     ean: String
+    barcode: String
+    serial_number: String
     status: Status
     files: [Filesystem]
         @paginate(

diff --git a/src/Domains/Inventory/Variants/Actions/CreateVariantsAction.php b/src/Domains/Inventory/Variants/Actions/CreateVariantsAction.php
@@ -45,7 +45,6 @@ public function execute(): Variants
 
         $search = [
             'products_id' => $this->variantDto->product->getId(),
-            'slug' => $this->variantDto->slug ?? Str::slug($this->variantDto->name),
             'sku' => $this->variantDto->sku,
             'companies_id' => $this->variantDto->product->companies_id,
             'apps_id' => $this->variantDto->product->apps_id,
@@ -56,6 +55,7 @@ public function execute(): Variants
             [
                 'name' => $this->variantDto->name,
                 'users_id' => $this->user->getId(),
+                'slug' => $this->variantDto->slug ?? Str::slug($this->variantDto->name),
                 'description' => $this->variantDto->description,
                 'short_description' => $this->variantDto->short_description,
                 'html_description' => $this->variantDto->html_description,

diff --git a/src/Domains/Inventory/Variants/Services/VariantService.php b/src/Domains/Inventory/Variants/Services/VariantService.php
@@ -15,6 +15,7 @@
 use Kanvas\Inventory\Variants\Actions\CreateVariantsAction;
 use Kanvas\Inventory\Variants\Actions\UpdateToChannelAction;
 use Kanvas\Inventory\Variants\Actions\UpdateToWarehouseAction;
+use Kanvas\Inventory\Variants\Actions\UpdateVariantsAction;
 use Kanvas\Inventory\Variants\DataTransferObject\VariantChannel as VariantChannelDto;
 use Kanvas\Inventory\Variants\DataTransferObject\Variants as VariantsDto;
 use Kanvas\Inventory\Variants\DataTransferObject\VariantsWarehouses;
@@ -41,7 +42,14 @@ public static function createVariantsFromArray(Products $product, array $variant
                 ...$variant,
             ]);
 
-            $variantModel = (new CreateVariantsAction($variantDto, $user))->execute();
+            $existVariantUpdate = Variants::fromCompany($product->company)->fromApp($product->app)->where('sku', $variantDto->sku)->first();
+
+            if (! $existVariantUpdate) {
+                $variantModel = (new CreateVariantsAction($variantDto, $user))->execute();
+            } else {
+                $variantModel = (new UpdateVariantsAction($existVariantUpdate, $variantDto, $user))->execute();
+            }
+
             $company = $variantDto->product->company;
 
             if (isset($variant['custom_fields']) && ! empty($variant['custom_fields'])) {