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

Fix for date localization

Browse Source
This commit is contained in:
David Bomba 2020-10-24 14:38:53 +11:00
parent 2d0e1a53f2
commit 50eaf0cc78
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Models/Client.php
View File

@ -240,7 +240,6 @@ class Client extends BaseModel implements HasLocalePreference
return $item->id == $this->getSetting('date_format_id'); return $item->id == $this->getSetting('date_format_id');
})->first()->format; })->first()->format;
//return DateFormat::find($this->getSetting('date_format_id'))->format;
} }
public function currency() public function currency()

34
app/Utils/HtmlEngine.php
View File

@ -15,10 +15,13 @@ namespace App\Utils;
use App\Designs\Designer; use App\Designs\Designer;
use App\Models\Country; use App\Models\Country;
use App\Utils\Number; use App\Utils\Number;
use App\Utils\Traits\MakesDates;
use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\App;
class HtmlEngine class HtmlEngine
{ {
use MakesDates;
public $entity; public $entity;
public $invitation; public $invitation;
@ -172,10 +175,10 @@ class HtmlEngine
$data['$taxes'] = ['value' => Number::formatMoney($this->entity_calc->getItemTotalTaxes(), $this->client) ?: ' ', 'label' => ctrans('texts.taxes')]; $data['$taxes'] = ['value' => Number::formatMoney($this->entity_calc->getItemTotalTaxes(), $this->client) ?: ' ', 'label' => ctrans('texts.taxes')];
$data['$invoice.taxes'] = &$data['$taxes']; $data['$invoice.taxes'] = &$data['$taxes'];
$data['$invoice.custom1'] = ['value' => $this->entity->custom_value1 ?: ' ', 'label' => $this->makeCustomField('invoice1')]; $data['$invoice.custom1'] = ['value' => $this->formatCustomFieldValue('invoice1', $this->entity->custom_value1) ?: ' ', 'label' => $this->makeCustomField('invoice1')];
$data['$invoice.custom2'] = ['value' => $this->entity->custom_value2 ?: ' ', 'label' => $this->makeCustomField('invoice2')]; $data['$invoice.custom2'] = ['value' => $this->formatCustomFieldValue('invoice2', $this->entity->custom_value2) ?: ' ', 'label' => $this->makeCustomField('invoice2')];
$data['$invoice.custom3'] = ['value' => $this->entity->custom_value3 ?: ' ', 'label' => $this->makeCustomField('invoice3')]; $data['$invoice.custom3'] = ['value' => $this->formatCustomFieldValue('invoice3', $this->entity->custom_value3) ?: ' ', 'label' => $this->makeCustomField('invoice3')];
$data['$invoice.custom4'] = ['value' => $this->entity->custom_value4 ?: ' ', 'label' => $this->makeCustomField('invoice4')]; $data['$invoice.custom4'] = ['value' => $this->formatCustomFieldValue('invoice4', $this->entity->custom_value4) ?: ' ', 'label' => $this->makeCustomField('invoice4')];
$data['$invoice.public_notes'] = ['value' => $this->entity->public_notes ?: ' ', 'label' => ctrans('texts.public_notes')]; $data['$invoice.public_notes'] = ['value' => $this->entity->public_notes ?: ' ', 'label' => ctrans('texts.public_notes')];
$data['$entity.public_notes'] = &$data['$invoice.public_notes']; $data['$entity.public_notes'] = &$data['$invoice.public_notes'];
@ -481,6 +484,7 @@ class HtmlEngine
if ($custom_fields && property_exists($custom_fields, $field)) { if ($custom_fields && property_exists($custom_fields, $field)) {
$custom_field = $custom_fields->{$field}; $custom_field = $custom_fields->{$field};
$custom_field_parts = explode('|', $custom_field); $custom_field_parts = explode('|', $custom_field);
return $custom_field_parts[0]; return $custom_field_parts[0];
@ -489,6 +493,28 @@ class HtmlEngine
return ''; return '';
} }
private function formatCustomFieldValue($field, $value) :string
{
$custom_fields = $this->company->custom_fields;
$custom_field = '';
if ($custom_fields && property_exists($custom_fields, $field)) {
$custom_field = $custom_fields->{$field};
$custom_field_parts = explode('|', $custom_field);
$custom_field = $custom_field_parts[1];
}
switch ($custom_field) {
case 'date':
return $this->formatDate($value, $this->client->date_format());
break;
default:
return $value;
break;
}
}
private function makeTotalTaxes() :string private function makeTotalTaxes() :string
{ {
$data = ''; $data = '';