From 5a1d874f98dc471e7f7bc354b06608a294b2966c Mon Sep 17 00:00:00 2001 From: kaioken Date: Sun, 16 Jun 2024 23:53:36 -0400 Subject: [PATCH 1/3] refact: task list --- .../ActionEngine/2024_06_03_011634_create_task_list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index d8117b9b1e..67733739a1 100644 --- 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(); From fbad074ba4cda30db4a193ea4a7300b9af63e88d Mon Sep 17 00:00:00 2001 From: kaioken Date: Mon, 17 Jun 2024 07:19:17 -0400 Subject: [PATCH 2/3] refact: description accepts null --- src/Domains/Guild/Customers/Jobs/CustomerImporterJob.php | 6 +----- .../Importer/DataTransferObjects/ProductImporter.php | 2 +- src/Domains/Inventory/Importer/Jobs/ProductImporterJob.php | 6 +----- src/Kanvas/Users/Jobs/OnBoardingJob.php | 5 ----- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/Domains/Guild/Customers/Jobs/CustomerImporterJob.php b/src/Domains/Guild/Customers/Jobs/CustomerImporterJob.php index 4d85076626..ae2b4205aa 100644 --- a/src/Domains/Guild/Customers/Jobs/CustomerImporterJob.php +++ b/src/Domains/Guild/Customers/Jobs/CustomerImporterJob.php @@ -45,11 +45,7 @@ class CustomerImporterJob implements ShouldQueue, ShouldBeUnique */ public $uniqueFor = 1800; - /** - * constructor. - * - * @param array $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 index 78d2138044..1bb2b6050a 100644 --- 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 index 57c06b7817..bb36ced978 100644 --- a/src/Domains/Inventory/Importer/Jobs/ProductImporterJob.php +++ b/src/Domains/Inventory/Importer/Jobs/ProductImporterJob.php @@ -42,11 +42,7 @@ class ProductImporterJob implements ShouldQueue, ShouldBeUnique */ public $uniqueFor = 1800; - /** - * constructor. - * - * @param array $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 index 1b882f727e..34471eaf3f 100644 --- a/src/Kanvas/Users/Jobs/OnBoardingJob.php +++ b/src/Kanvas/Users/Jobs/OnBoardingJob.php @@ -31,11 +31,6 @@ class OnBoardingJob implements ShouldQueue public $failOnTimeout = false; public $timeout = 120000; - /** - * constructor. - * - * @param array $importer - */ public function __construct( public UserInterface $user, public CompaniesBranches $branch, From 5ec180d26ac3aacf2f46eefc6b0bbea287ac4d8c Mon Sep 17 00:00:00 2001 From: kaioken Date: Mon, 17 Jun 2024 07:20:27 -0400 Subject: [PATCH 3/3] refact: description accepts null --- src/Domains/Guild/Customers/Jobs/CustomerImporterJob.php | 2 -- src/Domains/Inventory/Importer/Jobs/ProductImporterJob.php | 2 -- src/Kanvas/Users/Jobs/OnBoardingJob.php | 1 - 3 files changed, 5 deletions(-) diff --git a/src/Domains/Guild/Customers/Jobs/CustomerImporterJob.php b/src/Domains/Guild/Customers/Jobs/CustomerImporterJob.php index ae2b4205aa..b98b89dc38 100644 --- 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,7 +44,6 @@ class CustomerImporterJob implements ShouldQueue, ShouldBeUnique */ public $uniqueFor = 1800; - public function __construct( public string $jobUuid, public array $importer, diff --git a/src/Domains/Inventory/Importer/Jobs/ProductImporterJob.php b/src/Domains/Inventory/Importer/Jobs/ProductImporterJob.php index bb36ced978..095e9df20e 100644 --- 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,7 +41,6 @@ class ProductImporterJob implements ShouldQueue, ShouldBeUnique */ public $uniqueFor = 1800; - 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 index 34471eaf3f..89b90e7b99 100644 --- 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