Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 12:20:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on payment terms

Browse Source
This commit is contained in:
David Bomba 2020-07-20 16:10:14 +10:00
parent 7636595f7e
commit 5e6fdef935
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/DataMapper/FreeCompanySettings.php
View File

@ -45,7 +45,7 @@ class FreeCompanySettings extends BaseSettings
public $military_time = false; public $military_time = false;
public $payment_number_pattern = ''; public $payment_number_pattern = '';
public $payment_number_counter = 1; public $payment_number_counter = 1;
public $payment_terms = -1; public $payment_terms = "";
public $payment_type_id = '0'; public $payment_type_id = '0';
public $portal_design_id = '1'; public $portal_design_id = '1';
public $quote_design_id = 'VolejRejNm'; public $quote_design_id = 'VolejRejNm';
@ -112,7 +112,7 @@ class FreeCompanySettings extends BaseSettings
'custom_value4' => 'string', 'custom_value4' => 'string',
'inclusive_taxes' => 'bool', 'inclusive_taxes' => 'bool',
'name' => 'string', 'name' => 'string',
'payment_terms' => 'integer', 'payment_terms' => 'string',
'payment_type_id' => 'string', 'payment_type_id' => 'string',
'phone' => 'string', 'phone' => 'string',
'postal_code' => 'string', 'postal_code' => 'string',

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

@ -161,11 +161,9 @@ class InvoiceService
/* One liners */ /* One liners */
public function setDueDate() public function setDueDate()
{ {
if($this->invoice->due_date != '') if($this->invoice->due_date != '' || $this->invoice->client->getSetting('payment_terms') == '')
return $this; return $this;
//$this->invoice->due_date = Carbon::now()->addDays($this->invoice->client->getSetting('payment_terms'));
$this->invoice->due_date = Carbon::parse($this->invoice->date)->addDays($this->invoice->client->getSetting('payment_terms')); $this->invoice->due_date = Carbon::parse($this->invoice->date)->addDays($this->invoice->client->getSetting('payment_terms'));
return $this; return $this;

2
config/ninja.php
View File

@ -56,7 +56,7 @@ return [
'datetime_format_id' => env('DEFAULT_DATETIME_FORMAT_ID', '1'), 'datetime_format_id' => env('DEFAULT_DATETIME_FORMAT_ID', '1'),
'locale' => env('DEFAULT_LOCALE', 'en'), 'locale' => env('DEFAULT_LOCALE', 'en'),
'map_zoom' => env('DEFAULT_MAP_ZOOM', 10), 'map_zoom' => env('DEFAULT_MAP_ZOOM', 10),
'payment_terms' => env('DEFAULT_PAYMENT_TERMS', "-1"), 'payment_terms' => env('DEFAULT_PAYMENT_TERMS', ""),
'military_time' => env('MILITARY_TIME', 0), 'military_time' => env('MILITARY_TIME', 0),
'first_day_of_week' => env('FIRST_DATE_OF_WEEK', 0), 'first_day_of_week' => env('FIRST_DATE_OF_WEEK', 0),
'first_month_of_year' => env('FIRST_MONTH_OF_YEAR', '2000-01-01') 'first_month_of_year' => env('FIRST_MONTH_OF_YEAR', '2000-01-01')