Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-30 23:04:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes for updating products

Browse Source
This commit is contained in:
David Bomba 2020-11-04 00:57:48 +11:00
parent d762c5e842
commit f98e7d15da
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Jobs/Product/UpdateOrCreateProduct.php
View File

@ -18,7 +18,6 @@ use App\Models\Product;
use App\Repositories\InvoiceRepository; use App\Repositories\InvoiceRepository;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Database\Capsule\Eloquent;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
@ -27,11 +26,11 @@ class UpdateOrCreateProduct implements ShouldQueue
{ {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
private $products; public $products;
private $invoice; public $invoice;
private $company; public $company;
/** /**
* Create a new job instance. * Create a new job instance.
@ -59,7 +58,14 @@ class UpdateOrCreateProduct implements ShouldQueue
{ {
MultiDB::setDB($this->company->db); MultiDB::setDB($this->company->db);
foreach ($this->products as $item) { //only update / create products - not tasks or gateway fees
$updateable_products = collect($this->products)->filter(function ($item) {
return $item->type_id == 1;
});
foreach ($updateable_products as $item) {
if (empty($item->product_key)) { if (empty($item->product_key)) {
continue; continue;
} }

2
app/Repositories/BaseRepository.php
View File

@ -270,7 +270,7 @@ class BaseRepository
$model = $model->service()->applyNumber()->save(); $model = $model->service()->applyNumber()->save();
if ($model->company->update_products !== false) { if ($model->company->update_products !== false) {
UpdateOrCreateProduct::dispatch($model->line_items, $model, $model->company); UpdateOrCreateProduct::dispatchNow($model->line_items, $model, $model->company);
} }
if ($class->name == Invoice::class) { if ($class->name == Invoice::class) {