From 62fc7edbae96b2d635e8078194275f42c797ce75 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 25 Feb 2020 20:17:04 +1100 Subject: [PATCH] Fixes for updating a product on invoice save (#3372) --- app/Jobs/Product/UpdateOrCreateProduct.php | 2 +- database/migrations/2014_10_13_000000_create_users_table.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Jobs/Product/UpdateOrCreateProduct.php b/app/Jobs/Product/UpdateOrCreateProduct.php index 8a08d4b5d3dd..30d9bb8577c1 100644 --- a/app/Jobs/Product/UpdateOrCreateProduct.php +++ b/app/Jobs/Product/UpdateOrCreateProduct.php @@ -63,7 +63,7 @@ class UpdateOrCreateProduct implements ShouldQueue $product->product_key = $item->product_key; $product->notes = isset($item->notes) ? $item->notes : ''; //$product->cost = isset($item->cost) ? $item->cost : 0; //this value shouldn't be updated. - $product->price = isset($item->price) ? $item->cost : 0; + $product->price = isset($item->cost) ? $item->cost : 0; $product->quantity = isset($item->quantity) ? $item->quantity : 0; $product->tax_name1 = isset($item->tax_name1) ? $item->tax_name1 : ''; $product->tax_rate1 = isset($item->tax_rate1) ? $item->tax_rate1 : 0 ; diff --git a/database/migrations/2014_10_13_000000_create_users_table.php b/database/migrations/2014_10_13_000000_create_users_table.php index 5e4fbf0710a3..c01424ed22c8 100644 --- a/database/migrations/2014_10_13_000000_create_users_table.php +++ b/database/migrations/2014_10_13_000000_create_users_table.php @@ -204,7 +204,8 @@ class CreateUsersTable extends Migration $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); // $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); - + + $table->unique(['company_id', 'user_id']); $table->index(['account_id', 'company_id']); });