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

Fixes for applying numbers

Browse Source
This commit is contained in:
David Bomba 2022-09-12 21:08:50 +10:00
parent 9dd06fae34
commit a1629bbab4
4 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/Invoice/StoreInvoiceRequest.php
View File

@ -62,7 +62,7 @@ class StoreInvoiceRequest extends Request
$rules['invitations.*.client_contact_id'] = 'distinct'; $rules['invitations.*.client_contact_id'] = 'distinct';
$rules['number'] = ['nullable', Rule::unique('invoices')->where('company_id', auth()->user()->company()->id)]; $rules['number'] = ['bail', 'nullable', Rule::unique('invoices')->where('company_id', auth()->user()->company()->id)];
$rules['project_id'] = ['bail', 'sometimes', new ValidProjectForClient($this->all())]; $rules['project_id'] = ['bail', 'sometimes', new ValidProjectForClient($this->all())];
$rules['is_amount_discount'] = ['boolean']; $rules['is_amount_discount'] = ['boolean'];

6
app/Models/Client.php
View File

@ -613,19 +613,19 @@ class Client extends BaseModel implements HasLocalePreference
{ {
$defaults = []; $defaults = [];
if (! (array_key_exists('terms', $data) && strlen($data['terms']) > 1)) { if (! (array_key_exists('terms', $data) && is_string($data['terms']) && strlen($data['terms']) > 1)) {
$defaults['terms'] = $this->getSetting($entity_name.'_terms'); $defaults['terms'] = $this->getSetting($entity_name.'_terms');
} elseif (array_key_exists('terms', $data)) { } elseif (array_key_exists('terms', $data)) {
$defaults['terms'] = $data['terms']; $defaults['terms'] = $data['terms'];
} }
if (! (array_key_exists('footer', $data) && strlen($data['footer']) > 1)) { if (! (array_key_exists('footer', $data) && is_string($data['footer']) && strlen($data['footer']) > 1)) {
$defaults['footer'] = $this->getSetting($entity_name.'_footer'); $defaults['footer'] = $this->getSetting($entity_name.'_footer');
} elseif (array_key_exists('footer', $data)) { } elseif (array_key_exists('footer', $data)) {
$defaults['footer'] = $data['footer']; $defaults['footer'] = $data['footer'];
} }
if (strlen($this->public_notes) >= 1) { if (is_string($this->public_notes) && strlen($this->public_notes) >= 1) {
$defaults['public_notes'] = $this->public_notes; $defaults['public_notes'] = $this->public_notes;
} }

4
app/Services/Invoice/ApplyNumber.php
View File

@ -70,7 +70,6 @@ class ApplyNumber extends AbstractService
$this->invoice->saveQuietly(); $this->invoice->saveQuietly();
$this->completed = false; $this->completed = false;
} }
catch(QueryException $e){ catch(QueryException $e){
@ -84,5 +83,8 @@ class ApplyNumber extends AbstractService
} }
while($this->completed); while($this->completed);
return $this;
} }
} }

14
app/Utils/Traits/GeneratesCounter.php
View File

@ -416,10 +416,8 @@ trait GeneratesCounter
{ {
$check = false; $check = false;
$check_counter = 1; $check_counter = 1;
$original_counter = $counter;
do { do {
nlog($check_counter);
$number = $this->padCounter($counter, $padding); $number = $this->padCounter($counter, $padding);
@ -433,21 +431,13 @@ trait GeneratesCounter
$check_counter++; $check_counter++;
if ($check_counter > 100) { if ($check_counter > 100) {
nlog("counter error");
nlog("check counter = {$check_counter}");
nlog("original_counter = {$original_counter}");
nlog("entity company = {$entity->company_id}");
nlog("counter = {$counter}");
nlog("returning = {$number}");
return $number.'_'.Str::random(5); return $number.'_'.Str::random(5);
} }
} while ($check); } while ($check);
nlog($number);
return $number; return $number;
} }
@ -472,12 +462,10 @@ trait GeneratesCounter
$settings = $entity->settings; $settings = $entity->settings;
if ($counter_name == 'invoice_number_counter' && ! property_exists($entity->settings, 'invoice_number_counter')) { if ($counter_name == 'invoice_number_counter' && ! property_exists($entity->settings, 'invoice_number_counter')) {
nlog("BAD STATE - why no invoice_number_counter set?");
$settings->invoice_number_counter = 0; $settings->invoice_number_counter = 0;
} }
if (! property_exists($settings, $counter_name)) { if (! property_exists($settings, $counter_name)) {
nlog("BAD STATE - why no {$counter_name} set?");
$settings->{$counter_name} = 1; $settings->{$counter_name} = 1;
} }