Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-04 02:14:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate saves for company settings

Browse Source
This commit is contained in:
David Bomba 2023-05-24 20:31:46 +10:00
parent b8070a130e
commit cf75b9d273
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/CompanyController.php
View File

@ -412,7 +412,8 @@ class CompanyController extends BaseController
$company = $this->company_repo->save($request->all(), $company); $company = $this->company_repo->save($request->all(), $company);
$company->saveSettings($request->input('settings'), $company); /** We save the settings in the repository - this is duplicated */
// $company->saveSettings($request->input('settings'), $company);
if ($request->has('documents')) { if ($request->has('documents')) {
$this->saveDocuments($request->input('documents'), $company, false); $this->saveDocuments($request->input('documents'), $company, false);

1
app/Jobs/Cron/RecurringInvoicesCron.php
View File

@ -73,7 +73,6 @@ class RecurringInvoicesCron
/* Special check if we should generate another invoice is the previous one is yet to be paid */ /* Special check if we should generate another invoice is the previous one is yet to be paid */
if ($recurring_invoice->company->stop_on_unpaid_recurring && $recurring_invoice->invoices()->whereIn('status_id', [2, 3])->where('is_deleted', 0)->where('balance', '>', 0)->exists()) { if ($recurring_invoice->company->stop_on_unpaid_recurring && $recurring_invoice->invoices()->whereIn('status_id', [2, 3])->where('is_deleted', 0)->where('balance', '>', 0)->exists()) {
nlog('Existing invoice exists, skipping'); nlog('Existing invoice exists, skipping');
return; return;
} }

12
app/Utils/Traits/CompanySettingsSaver.php
View File

@ -77,6 +77,18 @@ trait CompanySettingsSaver
$entity->settings = $company_settings; $entity->settings = $company_settings;
if(array_key_exists('settings', $entity->getDirty()))
{
$old_settings = $entity->getOriginal()['settings'];
if($settings->name != $old_settings->name) {
nlog("name change {$old_settings->name} -> {$settings->name} ");
}
}
$entity->save(); $entity->save();
} }