Merge pull request #1529 from bakaphp/development

hotfix import
bakaphp · Jun 17, 2024 · b7bc5f5 · b7bc5f5
2 parents 45a274c + 5905729
commit b7bc5f5
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 20 deletions.
diff --git a/database/migrations/ActionEngine/2024_06_03_011634_create_task_list.php b/database/migrations/ActionEngine/2024_06_03_011634_create_task_list.php
@@ -27,7 +27,7 @@ public function up(): void
             $table->foreignId('task_list_id')->constrained('company_task_list')->onDelete('cascade');
             $table->string('name');
             $table->bigInteger('companies_action_id')->index();
-            $table->enum('status', ['pending', 'in_progress', 'completed'])->default('pending')->comment('pending, in_progress, completed')->index();
+            $table->enum('status', ['pending', 'in_progress', 'completed','no_applicable'])->default('pending')->comment('pending, in_progress, completed')->index();
             $table->json('config')->nullable();
             $table->decimal('weight', 8, 2)->default(0)->index();
             $table->timestamps();

diff --git a/src/Domains/Guild/Customers/Jobs/CustomerImporterJob.php b/src/Domains/Guild/Customers/Jobs/CustomerImporterJob.php
@@ -22,7 +22,6 @@
 use Kanvas\Guild\Customers\DataTransferObject\Contact;
 use Kanvas\Guild\Customers\DataTransferObject\People;
 use Kanvas\Guild\Customers\Repositories\PeoplesRepository;
-use Kanvas\Inventory\Importer\DataTransferObjects\ProductImporter as ImporterDto;
 
 use function Sentry\captureException;
 
@@ -45,11 +44,6 @@ class CustomerImporterJob implements ShouldQueue, ShouldBeUnique
     */
     public $uniqueFor = 1800;
 
-    /**
-     * constructor.
-     *
-     * @param array<int, ImporterDto> $importer
-     */
     public function __construct(
         public string $jobUuid,
         public array $importer,

diff --git a/src/Domains/Inventory/Importer/DataTransferObjects/ProductImporter.php b/src/Domains/Inventory/Importer/DataTransferObjects/ProductImporter.php
@@ -11,11 +11,11 @@ class ProductImporter extends Data
 {
     public function __construct(
         public string $name,
-        public string $description,
         public string $slug,
         public string $sku,
         public float $price,
         public array $variants,
+        public ?string $description = null,
         public array $categories = [],
         public int $quantity = 0,
         public bool $isPublished = true,

diff --git a/src/Domains/Inventory/Importer/Jobs/ProductImporterJob.php b/src/Domains/Inventory/Importer/Jobs/ProductImporterJob.php
@@ -19,7 +19,6 @@
 use Kanvas\Companies\Models\CompaniesBranches;
 use Kanvas\Inventory\Importer\Actions\ProductImporterAction;
 use Kanvas\Inventory\Importer\DataTransferObjects\ProductImporter;
-use Kanvas\Inventory\Importer\DataTransferObjects\ProductImporter as ImporterDto;
 use Kanvas\Inventory\Regions\Models\Regions;
 use Kanvas\Inventory\Variants\Models\Variants;
 
@@ -42,11 +41,6 @@ class ProductImporterJob implements ShouldQueue, ShouldBeUnique
     */
     public $uniqueFor = 1800;
 
-    /**
-     * constructor.
-     *
-     * @param array<int, ImporterDto> $importer
-     */
     public function __construct(
         public string $jobUuid,
         public array $importer,

diff --git a/src/Kanvas/Users/Jobs/OnBoardingJob.php b/src/Kanvas/Users/Jobs/OnBoardingJob.php
@@ -17,7 +17,6 @@
 use Kanvas\Companies\Models\CompaniesBranches;
 use Kanvas\Enums\AppSettingsEnums;
 use Kanvas\Guild\Support\Setup as GuildSetup;
-use Kanvas\Inventory\Importer\DataTransferObjects\ProductImporter as ImporterDto;
 use Kanvas\Inventory\Support\Setup as InventorySetup;
 
 class OnBoardingJob implements ShouldQueue
@@ -31,11 +30,6 @@ class OnBoardingJob implements ShouldQueue
     public $failOnTimeout = false;
     public $timeout = 120000;
 
-    /**
-     * constructor.
-     *
-     * @param array<int, ImporterDto> $importer
-     */
     public function __construct(
         public UserInterface $user,
         public CompaniesBranches $branch,