diff --git a/app/Models/Company.php b/app/Models/Company.php index 63392d8e06e1..4c02942c854e 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -106,6 +106,7 @@ class Company extends BaseModel 'enable_applying_payments', 'track_inventory', 'inventory_notification_threshold', + 'stock_notification' ]; protected $hidden = [ diff --git a/app/Models/Product.php b/app/Models/Product.php index 0988e54bcd79..129a0fae19ca 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -38,6 +38,7 @@ class Product extends BaseModel 'tax_rate3', 'in_stock_quantity', 'stock_notification_threshold', + 'stock_notification', ]; protected $touches = []; diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index 5de5a837e850..e1a9ee0d13eb 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -170,6 +170,10 @@ class CompanyTransformer extends EntityTransformer 'markdown_email_enabled' => (bool) $company->markdown_email_enabled, 'stop_on_unpaid_recurring' => (bool) $company->stop_on_unpaid_recurring, 'use_quote_terms_on_conversion' => (bool) $company->use_quote_terms_on_conversion, + 'stock_notification' => (bool) $company->stock_notification, + 'inventory_notification_threshold' => (int) $company->inventory_notification_threshold, + 'track_inventory' => (bool) $company->track_inventory, + 'enable_applying_payments' => (bool) $company->enable_applying_payments, ]; } diff --git a/app/Transformers/ProductTransformer.php b/app/Transformers/ProductTransformer.php index a7ce6c3dc730..28408ae2b23d 100644 --- a/app/Transformers/ProductTransformer.php +++ b/app/Transformers/ProductTransformer.php @@ -90,6 +90,9 @@ class ProductTransformer extends EntityTransformer 'custom_value3' => $product->custom_value3 ?: '', 'custom_value4' => $product->custom_value4 ?: '', 'is_deleted' => (bool) $product->is_deleted, + 'in_stock_quantity' => (int) $product->in_stock_quantity ?: 0, + 'stock_notification' => (bool) $product->stock_notification, + 'stock_notification_threshold' => (bool) $product->stock_notification_threshold, ]; } } diff --git a/database/migrations/2022_05_31_101504_inventory_management_schema.php b/database/migrations/2022_05_31_101504_inventory_management_schema.php index ae88786331b0..783c7a8a409a 100644 --- a/database/migrations/2022_05_31_101504_inventory_management_schema.php +++ b/database/migrations/2022_05_31_101504_inventory_management_schema.php @@ -18,13 +18,14 @@ class InventoryManagementSchema extends Migration Schema::table('companies', function (Blueprint $table) { $table->boolean('enable_applying_payments')->default(0); $table->boolean('track_inventory')->default(0); - $table->integer('inventory_notification_threshold')->nullable(); - + $table->integer('inventory_notification_threshold')->default(0); + $table->boolean('stock_notification')->default(1); }); Schema::table('products', function (Blueprint $table){ - $table->integer('in_stock_quantity')->nullable(); - $table->integer('stock_notification_threshold')->nullable(); + $table->integer('in_stock_quantity')->default(0); + $table->boolean('stock_notification')->default(1); + $table->integer('stock_notification_threshold')->default(0); });