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

Fixes for creating a client invoice number

Browse Source
This commit is contained in:
David Bomba 2019-05-01 19:31:16 +10:00
parent 599ff31f9d
commit c77c2811ef
2 changed files with 70 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
app/Utils/Traits/GeneratesNumberCounter.php
View File

@ -19,6 +19,7 @@ trait GeneratesNumberCounter
public function getNextNumber($entity) public function getNextNumber($entity)
{ {
$entity_name = $this->entityName($entity);
$counter = $this->getCounter($entity); $counter = $this->getCounter($entity);
$counter_offset = 0; $counter_offset = 0;
@ -39,13 +40,13 @@ trait GeneratesNumberCounter
// $number = $this->getSettingsByKey('recurring_invoice_number_prefix')->recurring_invoice_number_prefix . $number; // $number = $this->getSettingsByKey('recurring_invoice_number_prefix')->recurring_invoice_number_prefix . $number;
// } // }
if ($entity == Client::class) { if ($entity_name == Client::class) {
$check = Client::company($this->company_id)->whereIdNumber($number)->withTrashed()->first(); $check = Client::company($this->company_id)->whereIdNumber($number)->withTrashed()->first();
} elseif ($entity == Invoice::class) { } elseif ($entity_name == Invoice::class) {
$check = Invoice::company($this->company_id)->whereInvoiceNumber($number)->withTrashed()->first(); $check = Invoice::company($this->company_id)->whereInvoiceNumber($number)->withTrashed()->first();
} elseif ($entity == Quote::class) { } elseif ($entity_name == Quote::class) {
$check = Quote::company($this->company_id)->whereQuoteNumber($number)->withTrashed()->first(); $check = Quote::company($this->company_id)->whereQuoteNumber($number)->withTrashed()->first();
} elseif ($entity == Credit::class) { } elseif ($entity_name == Credit::class) {
$check = Credit::company($this->company_id)->whereCreditNumber($number)->withTrashed()->first(); $check = Credit::company($this->company_id)->whereCreditNumber($number)->withTrashed()->first();
} }
@ -93,12 +94,13 @@ trait GeneratesNumberCounter
*/ */
public function getNumberPattern($entity) public function getNumberPattern($entity)
{ {
$entity_name = $this->entityName($entity);
/** Recurring invoice share the same number pattern as invoices */ /** Recurring invoice share the same number pattern as invoices */
if($entity == RecurringInvoice::class ) if($entity_name == $this->entityName(RecurringInvoice::class) )
$entity = Invoice::class; $entity_name = $this->entityName(Invoice::class);
$field = $this->entityName($entity) . "_number_pattern"; $field = $entity_name . "_number_pattern";
return $this->getSettingsByKey( $field )->{$field}; return $this->getSettingsByKey( $field )->{$field};
@ -111,8 +113,9 @@ trait GeneratesNumberCounter
*/ */
public function getNumberPrefix($entity) public function getNumberPrefix($entity)
{ {
$entity_name = $this->entityName($entity);
$field = $this->entityName($entity) . "_number_prefix"; $field = $this->entityName($entity_name) . "_number_prefix";
return $this->getSettingsByKey( $field )->{$field}; return $this->getSettingsByKey( $field )->{$field};
@ -121,12 +124,14 @@ trait GeneratesNumberCounter
public function incrementCounter($entity) public function incrementCounter($entity)
{ {
if($entity == RecurringInvoice::class || ( $entity == Quote::class && $this->hasSharedCounter()) ) $entity_name = $this->entityName($entity);
$entity = Invoice::class;
$counter = $this->entityName($entity) . '_number_counter'; if($entity_name == $this->entityName(RecurringInvoice::class) || ( $entity_name == $this->entityName(Quote::class) && $this->hasSharedCounter()) )
$entity_name = $this->entityName(Invoice::class);
Log::error('entity = '.$entity); $counter = $entity_name . '_number_counter';
Log::error('entity = '.$entity_name);
$entity_settings = $this->getSettingsByKey( $counter ); $entity_settings = $this->getSettingsByKey( $counter );
@ -156,12 +161,13 @@ trait GeneratesNumberCounter
public function getCounter($entity) : int public function getCounter($entity) : int
{ {
$entity_name = $this->entityName($entity);
/** Recurring invoice share the same counter as invoices also harvest the invoice_counter if quote and invoices are sharing a counter */ /** Recurring invoice share the same counter as invoices also harvest the invoice_counter if quote and invoices are sharing a counter */
if($entity == RecurringInvoice::class || ( $entity == Quote::class && $this->hasSharedCounter()) ) if($entity_name == $this->entityName(RecurringInvoice::class) || ( $entity_name == $this->entityName(Quote::class) && $this->hasSharedCounter()) )
$entity = Invoice::class; $entity_name = $this->entityName(Invoice::class);
$counter = $this->entityName($entity) . '_number_counter'; $counter = $entity_name . '_number_counter';
return $this->getSettingsByKey( $counter )->{$counter}; return $this->getSettingsByKey( $counter )->{$counter};
@ -175,9 +181,10 @@ trait GeneratesNumberCounter
*/ */
public function applyNumberPattern($entity, $counter = 1) public function applyNumberPattern($entity, $counter = 1)
{ {
$entity_name = $this->entityName($entity);
$counter = $counter ?: $this->getCounter($entity); $counter = $counter ?: $this->getCounter($entity_name);
$pattern = $this->getNumberPattern($entity); $pattern = $this->getNumberPattern($entity_name);
if (! $pattern) { if (! $pattern) {
return false; return false;
@ -206,15 +213,19 @@ trait GeneratesNumberCounter
} }
$pattern = str_replace($search, $replace, $pattern); $pattern = str_replace($search, $replace, $pattern);
// $pattern = $this->getClientInvoiceNumber($pattern, $entity); $pattern = $this->getClientInvoiceNumber($pattern, $entity);
return $pattern; return $pattern;
} }
private function getClientInvoiceNumber($pattern, $invoice) private function getClientInvoiceNumber($pattern, $entity)
{
$entity_name = $this->entityName($entity);
if ($entity_name == $this->entityName(Client::class) || $entity_name == $this->entityName(Credit::class) || ! $entity->client_id)
{ {
if (! $invoice->client_id) {
return $pattern; return $pattern;
} }
@ -228,17 +239,22 @@ trait GeneratesNumberCounter
'{$clientCounter}', '{$clientCounter}',
]; ];
$client = $invoice->client; if($entity_name == $this->entityName(RecurringInvoice::class) || ( $entity_name == $this->entityName(Quote::class) && $this->hasSharedCounter()) )
$clientCounter = ($invoice->isQuote() && ! $this->share_counter) ? $client->quote_number_counter : $client->invoice_number_counter; $entity_name = Invoice::class;
$counter = $entity_name . '_number_counter';
$counter_value = $this->getSettingsByKey( $counter )->{$counter};
$entity_padding = $this->getSettingsByKey( 'counter_padding' )->counter_padding;
$replace = [ $replace = [
$client->custom_value1, $this->custom_value1,
$client->custom_value2, $this->custom_value2,
$client->id_number, $this->id_number,
$client->custom_value1, // backwards compatibility $this->custom_value1, // backwards compatibility
$client->custom_value2, $this->custom_value2,
$client->id_number, $this->id_number,
str_pad($clientCounter, $this->invoice_number_padding, '0', STR_PAD_LEFT), str_pad($counter_value, $entity_padding, '0', STR_PAD_LEFT),
]; ];
return str_replace($search, $replace, $pattern); return str_replace($search, $replace, $pattern);

33
tests/Unit/GenerateNumberTest.php
View File

@ -94,7 +94,7 @@ class GenerateNumberTest extends TestCase
public function testEntityName() public function testEntityName()
{ {
$this->assertEquals($this->entityName(Client::class), 'client'); $this->assertEquals($this->entityName($this->client), 'client');
} }
@ -108,14 +108,14 @@ class GenerateNumberTest extends TestCase
public function testClientCounterValue() public function testClientCounterValue()
{ {
$this->assertEquals($this->client->getCounter(Client::class), 1); $this->assertEquals($this->client->getCounter($this->client), 1);
} }
public function testClientNextNumber() public function testClientNextNumber()
{ {
$this->assertEquals($this->client->getNextNumber(Client::class),1); $this->assertEquals($this->client->getNextNumber($this->client),1);
} }
@ -123,15 +123,15 @@ class GenerateNumberTest extends TestCase
{ {
$this->assertEquals($this->client->getNextNumber(RecurringInvoice::class), 'R1'); $this->assertEquals($this->client->getNextNumber(RecurringInvoice::class), 'R1');
$this->assertEquals($this->client->getCounter(Client::class), 1); $this->assertEquals($this->client->getCounter($this->client), 1);
} }
public function testClientIncrementer() public function testClientIncrementer()
{ {
$this->client->incrementCounter(Client::class); $this->client->incrementCounter($this->client);
$this->assertEquals($this->client->getCounter(Client::class), 2); $this->assertEquals($this->client->getCounter($this->client), 2);
} }
public function testCounterValues() public function testCounterValues()
@ -172,12 +172,29 @@ class GenerateNumberTest extends TestCase
$settings = $this->client->getSettingsByKey('client_number_pattern'); $settings = $this->client->getSettingsByKey('client_number_pattern');
$settings->client_number_pattern = '{$year}-{$counter}'; $settings->client_number_pattern = '{$year}-{$counter}';
$this->client->setSettingsByEntity($settings->entity, $settings); $this->client->setSettingsByEntity($settings->entity, $settings);
$this->assertEquals($this->client->getNextNumber(Client::class), '2019-1'); $this->assertEquals($this->client->getNextNumber($this->client), '2019-1');
$this->assertEquals($this->client->getNextNumber(Client::class), '2019-2'); $this->assertEquals($this->client->getNextNumber($this->client), '2019-2');
$company = Company::find($this->client->company_id); $company = Company::find($this->client->company_id);
$this->assertEquals($company->settings->client_number_counter,3); $this->assertEquals($company->settings->client_number_counter,3);
} }
public function testClientNumberPatternWithDate()
{
$settings = $this->client->getSettingsByKey('client_number_pattern');
$settings->client_number_pattern = '{$date:j}-{$counter}';
$this->client->setSettingsByEntity($settings->entity, $settings);
$this->assertEquals($this->client->getNextNumber($this->client), date('j').'-1');
}
public function testClientNumberPatternWithDate2()
{
$settings = $this->client->getSettingsByKey('client_number_pattern');
$settings->client_number_pattern = '{$date:d M Y}-{$counter}';
$this->client->setSettingsByEntity($settings->entity, $settings);
$this->assertEquals($this->client->getNextNumber($this->client), date('d M Y').'-1');
}
} }