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

Refactor Generated number trait

Browse Source
This commit is contained in:
David Bomba 2019-05-02 14:04:51 +10:00
parent c77c2811ef
commit 7a65ef24d2
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,16 +122,13 @@ trait GeneratesNumberCounter
} }
public function incrementCounter($entity) public function incrementCounter($entity)
{ {
$entity_name = $this->entityName($entity); $counter = $this->getCounterName($entity) . '_number_counter';
if($entity_name == $this->entityName(RecurringInvoice::class) || ( $entity_name == $this->entityName(Quote::class) && $this->hasSharedCounter()) ) //Log::error('entity = '.$entity_name);
$entity_name = $this->entityName(Invoice::class);
$counter = $entity_name . '_number_counter';
Log::error('entity = '.$entity_name);
$entity_settings = $this->getSettingsByKey( $counter ); $entity_settings = $this->getSettingsByKey( $counter );
@ -147,7 +144,7 @@ trait GeneratesNumberCounter
$this->setSettingsByEntity($entity_settings->entity, $entity_settings); $this->setSettingsByEntity($entity_settings->entity, $entity_settings);
Log::error(print_r($entity_settings,1)); //Log::error(print_r($entity_settings,1));
} }
@ -161,13 +158,8 @@ 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 */ $counter = $this->getCounterName($entity) . '_number_counter';
if($entity_name == $this->entityName(RecurringInvoice::class) || ( $entity_name == $this->entityName(Quote::class) && $this->hasSharedCounter()) )
$entity_name = $this->entityName(Invoice::class);
$counter = $entity_name . '_number_counter';
return $this->getSettingsByKey( $counter )->{$counter}; return $this->getSettingsByKey( $counter )->{$counter};
@ -208,6 +200,7 @@ trait GeneratesNumberCounter
$format = $matches[1]; $format = $matches[1];
$search[] = $matches[0]; $search[] = $matches[0];
/* The following adjusts for the company timezone */
$date = Carbon::now($this->company->timezone()->name)->format($format); $date = Carbon::now($this->company->timezone()->name)->format($format);
$replace[] = str_replace($format, $date, $matches[1]); $replace[] = str_replace($format, $date, $matches[1]);
} }
@ -239,10 +232,7 @@ trait GeneratesNumberCounter
'{$clientCounter}', '{$clientCounter}',
]; ];
if($entity_name == $this->entityName(RecurringInvoice::class) || ( $entity_name == $this->entityName(Quote::class) && $this->hasSharedCounter()) ) $counter = $this->getCounterName($entity) . '_number_counter';
$entity_name = Invoice::class;
$counter = $entity_name . '_number_counter';
$counter_value = $this->getSettingsByKey( $counter )->{$counter}; $counter_value = $this->getSettingsByKey( $counter )->{$counter};
$entity_padding = $this->getSettingsByKey( 'counter_padding' )->counter_padding; $entity_padding = $this->getSettingsByKey( 'counter_padding' )->counter_padding;
@ -260,4 +250,14 @@ trait GeneratesNumberCounter
return str_replace($search, $replace, $pattern); return str_replace($search, $replace, $pattern);
} }
private function getCounterName($entity)
{
if($this->entityName($entity) == $this->entityName(RecurringInvoice::class) || ( $this->entityName($entity) == $this->entityName(Quote::class) && $this->hasSharedCounter()) )
$entity = Invoice::class;
return $this->entityName($entity);
}
} }

6
tests/Unit/GenerateNumberTest.php
View File

@ -186,15 +186,15 @@ class GenerateNumberTest extends TestCase
$settings->client_number_pattern = '{$date:j}-{$counter}'; $settings->client_number_pattern = '{$date:j}-{$counter}';
$this->client->setSettingsByEntity($settings->entity, $settings); $this->client->setSettingsByEntity($settings->entity, $settings);
$this->assertEquals($this->client->getNextNumber($this->client), date('j').'-1'); $this->assertEquals($this->client->getNextNumber($this->client), date('j') . '-1');
} }
public function testClientNumberPatternWithDate2() public function testClientNumberPatternWithDate()
{ {
$settings = $this->client->getSettingsByKey('client_number_pattern'); $settings = $this->client->getSettingsByKey('client_number_pattern');
$settings->client_number_pattern = '{$date:d M Y}-{$counter}'; $settings->client_number_pattern = '{$date:d M Y}-{$counter}';
$this->client->setSettingsByEntity($settings->entity, $settings); $this->client->setSettingsByEntity($settings->entity, $settings);
$this->assertEquals($this->client->getNextNumber($this->client), date('d M Y').'-1'); $this->assertEquals($this->client->getNextNumber($this->client), date('d M Y') . '-1');
} }
} }