Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
David Bomba 2020-09-27 20:39:13 +10:00
parent 9bdfacd49b
commit fd67a48c91
6 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/DataMapper/CompanySettings.php
View File

@ -610,17 +610,17 @@ class CompanySettings extends BaseSettings
'$task.line_total', '$task.line_total',
], ],
'total_columns' => [ 'total_columns' => [
'$total_taxes',
'$line_taxes',
'$subtotal', '$subtotal',
'$discount', '$discount',
'$total_taxes',
'$line_taxes',
'$custom_surcharge1', '$custom_surcharge1',
'$custom_surcharge2', '$custom_surcharge2',
'$custom_surcharge3', '$custom_surcharge3',
'$custom_surcharge4', '$custom_surcharge4',
'$paid_to_date',
'$client.balance',
'$total', '$total',
'$paid_to_date',
'$outstanding',
], ],
]; ];

2
app/Http/Controllers/SelfUpdateController.php
View File

@ -74,8 +74,8 @@ class SelfUpdateController extends BaseController
try { try {
$res = $repo->pull(); $res = $repo->pull();
} catch (GitException $e) { } catch (GitException $e) {
info($e->getMessage());
info($e->getMessage());
return response()->json(['message'=>$e->getMessage()], 500); return response()->json(['message'=>$e->getMessage()], 500);
} }
info('Are there any changes to pull? '.$repo->hasChanges()); info('Are there any changes to pull? '.$repo->hasChanges());

4
app/Http/Requests/Design/StoreDesignRequest.php
View File

@ -51,6 +51,10 @@ class StoreDesignRequest extends Request
$input['design']['includes'] = ''; $input['design']['includes'] = '';
} }
if (! array_key_exists('footer', $input['design']) || is_null($input['design']['footer'])) {
$input['design']['footer'] = '';
}
$this->replace($input); $this->replace($input);
} }
} }

9
app/Http/Requests/Design/UpdateDesignRequest.php
View File

@ -14,7 +14,6 @@ namespace App\Http\Requests\Design;
use App\Http\Requests\Request; use App\Http\Requests\Request;
use App\Models\Design; use App\Models\Design;
use App\Utils\Traits\ChecksEntityStatus; use App\Utils\Traits\ChecksEntityStatus;
use Illuminate\Support\Facades\Log;
class UpdateDesignRequest extends Request class UpdateDesignRequest extends Request
{ {
@ -47,6 +46,14 @@ class UpdateDesignRequest extends Request
$input['design']['task'] = ''; $input['design']['task'] = '';
} }
if (! array_key_exists('includes', $input['design']) || is_null($input['design']['includes'])) {
$input['design']['includes'] = '';
}
if (! array_key_exists('footer', $input['design']) || is_null($input['design']['footer'])) {
$input['design']['footer'] = '';
}
$this->replace($input); $this->replace($input);
} }
} }

1
app/Utils/HtmlEngine.php
View File

@ -237,6 +237,7 @@ class HtmlEngine
$data['$client.email'] = &$data['$email']; $data['$client.email'] = &$data['$email'];
$data['$client.balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')]; $data['$client.balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
$data['$outstanding'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
$data['$client_balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')]; $data['$client_balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
$data['$paid_to_date'] = ['value' => Number::formatMoney($this->client->paid_to_date, $this->client), 'label' => ctrans('texts.paid_to_date')]; $data['$paid_to_date'] = ['value' => Number::formatMoney($this->client->paid_to_date, $this->client), 'label' => ctrans('texts.paid_to_date')];

2
app/Utils/Traits/MakesInvoiceValues.php
View File

@ -314,6 +314,8 @@ trait MakesInvoiceValues
$data['$client_name'] = ['value' => $this->present()->clientName() ?: ' ', 'label' => ctrans('texts.client_name')]; $data['$client_name'] = ['value' => $this->present()->clientName() ?: ' ', 'label' => ctrans('texts.client_name')];
$data['$client.name'] = &$data['$client_name']; $data['$client.name'] = &$data['$client_name'];
$data['$client.balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')]; $data['$client.balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
$data['$outstanding'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
$data['$client_balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')]; $data['$client_balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
$data['$paid_to_date'] = ['value' => Number::formatMoney($this->client->paid_to_date, $this->client), 'label' => ctrans('texts.paid_to_date')]; $data['$paid_to_date'] = ['value' => Number::formatMoney($this->client->paid_to_date, $this->client), 'label' => ctrans('texts.paid_to_date')];