Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename $payment_date to $payment.date

Browse Source
This commit is contained in:
Benjamin Beganović 2021-08-24 15:37:16 +02:00
parent 1f341fb29a
commit a5f8d8c042
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/DataMapper/CompanySettings.php
View File

@ -71,7 +71,7 @@ class CompanySettings extends BaseSettings
public $inclusive_taxes = false; //@implemented public $inclusive_taxes = false; //@implemented
public $quote_footer = ''; //@implmented public $quote_footer = ''; //@implmented
public $translations; public $translations;
public $counter_number_applied = 'when_saved'; // when_saved , when_sent //@implemented public $counter_number_applied = 'when_saved'; // when_saved , when_sent //@implemented
public $quote_number_applied = 'when_saved'; // when_saved , when_sent //@implemented public $quote_number_applied = 'when_saved'; // when_saved , when_sent //@implemented
@ -685,7 +685,7 @@ class CompanySettings extends BaseSettings
], ],
'statement_payment_columns' => [ 'statement_payment_columns' => [
'$invoice.number', '$invoice.number',
'$payment_date', '$payment.date',
'$method', '$method',
'$outstanding', '$outstanding',
], ],

7
app/Utils/HtmlEngine.php
View File

@ -190,7 +190,7 @@ class HtmlEngine
} }
else{ else{
$data['$balance_due'] = ['value' => Number::formatMoney($this->entity->balance, $this->client) ?: ' ', 'label' => ctrans('texts.balance_due')]; $data['$balance_due'] = ['value' => Number::formatMoney($this->entity->balance, $this->client) ?: ' ', 'label' => ctrans('texts.balance_due')];
$data['$balance_due_raw'] = ['value' => $this->entity->balance, 'label' => ctrans('texts.balance_due')]; $data['$balance_due_raw'] = ['value' => $this->entity->balance, 'label' => ctrans('texts.balance_due')];
} }
} }
@ -302,7 +302,7 @@ class HtmlEngine
$data['$contact.full_name'] = ['value' => $this->contact->present()->name(), 'label' => ctrans('texts.name')]; $data['$contact.full_name'] = ['value' => $this->contact->present()->name(), 'label' => ctrans('texts.name')];
$data['$contact'] = &$data['$contact.full_name']; $data['$contact'] = &$data['$contact.full_name'];
$data['$contact.email'] = ['value' => $this->contact->email, 'label' => ctrans('texts.email')]; $data['$contact.email'] = ['value' => $this->contact->email, 'label' => ctrans('texts.email')];
$data['$contact.phone'] = ['value' => $this->contact->phone, 'label' => ctrans('texts.phone')]; $data['$contact.phone'] = ['value' => $this->contact->phone, 'label' => ctrans('texts.phone')];
@ -439,8 +439,7 @@ class HtmlEngine
$data['$dir'] = ['value' => optional($this->client->language())->locale === 'ar' ? 'rtl' : 'ltr', 'label' => '']; $data['$dir'] = ['value' => optional($this->client->language())->locale === 'ar' ? 'rtl' : 'ltr', 'label' => ''];
$data['$dir_text_align'] = ['value' => optional($this->client->language())->locale === 'ar' ? 'right' : 'left', 'label' => '']; $data['$dir_text_align'] = ['value' => optional($this->client->language())->locale === 'ar' ? 'right' : 'left', 'label' => ''];
$data['$statement_date'] = ['value' => '{CHANGE_THIS}', 'label' => ctrans('texts.statement_date')]; $data['$payment.date'] = ['value' => ' ', 'label' => ctrans('texts.payment_date')];
$data['$payment_date'] = ['value' => ' ', 'label' => ctrans('texts.payment_date')];
$data['$method'] = ['value' => ' ', 'label' => ctrans('texts.method')]; $data['$method'] = ['value' => ' ', 'label' => ctrans('texts.method')];
$arrKeysLength = array_map('strlen', array_keys($data)); $arrKeysLength = array_map('strlen', array_keys($data));