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

Fixes for surcharge visibility

Browse Source
This commit is contained in:
David Bomba 2022-07-01 18:11:04 +10:00
parent af8ec95e2c
commit fcdc69c829
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.4.4 5.4.5

6
app/Utils/TemplateEngine.php
View File

@ -105,7 +105,7 @@ class TemplateEngine
private function setSettingsObject() private function setSettingsObject()
{ {
if($this->entity == 'purchase_order'){ if($this->entity == 'purchaseOrder'){
$this->settings_entity = auth()->user()->company(); $this->settings_entity = auth()->user()->company();
$this->settings = $this->settings_entity->settings; $this->settings = $this->settings_entity->settings;
} }
@ -153,7 +153,7 @@ class TemplateEngine
$this->raw_body = $this->body; $this->raw_body = $this->body;
$this->raw_subject = $this->subject; $this->raw_subject = $this->subject;
if($this->entity == 'purchase_order'){ if($this->entity == 'purchaseOrder'){
$this->fakerValues(); $this->fakerValues();
} }
elseif ($this->entity_obj) { elseif ($this->entity_obj) {
@ -269,7 +269,7 @@ class TemplateEngine
private function mockEntity() private function mockEntity()
{ {
if(!$this->entity && $this->template && str_contains($this->template, 'purchase_order')) if(!$this->entity && $this->template && str_contains($this->template, 'purchase_order'))
$this->entity = 'purchase_order'; $this->entity = 'purchaseOrder';
DB::connection(config('database.default'))->beginTransaction(); DB::connection(config('database.default'))->beginTransaction();

4
config/ninja.php
View File

@ -14,8 +14,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.4.4', 'app_version' => '5.4.5',
'app_tag' => '5.4.4', 'app_tag' => '5.4.5',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''), 'api_secret' => env('API_SECRET', ''),