Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-08-11 15:34:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

working on authorize

Browse Source
This commit is contained in:
David Bomba 2020-11-26 20:39:35 +11:00
parent 72bbf24c69
commit 5e0bcfbc88
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Helpers/Invoice/InvoiceSum.php
View File

@ -160,19 +160,19 @@ class InvoiceSum
{ {
$this->total += $this->total_taxes; $this->total += $this->total_taxes;
if (is_numeric($this->invoice->custom_value1) && $this->invoice->custom_value1 > 0) { if (is_numeric($this->invoice->custom_value1)) {
$this->total += $this->invoice->custom_value1; $this->total += $this->invoice->custom_value1;
} }
if (is_numeric($this->invoice->custom_value2) && $this->invoice->custom_value2 > 0) { if (is_numeric($this->invoice->custom_value2)) {
$this->total += $this->invoice->custom_value2; $this->total += $this->invoice->custom_value2;
} }
if (is_numeric($this->invoice->custom_value3) && $this->invoice->custom_value3 > 0) { if (is_numeric($this->invoice->custom_value3)) {
$this->total += $this->invoice->custom_value3; $this->total += $this->invoice->custom_value3;
} }
if (is_numeric($this->invoice->custom_value4) && $this->invoice->custom_value4 > 0) { if (is_numeric($this->invoice->custom_value4)) {
$this->total += $this->invoice->custom_value4; $this->total += $this->invoice->custom_value4;
} }

8
app/Helpers/Invoice/InvoiceSumInclusive.php
View File

@ -172,19 +172,19 @@ class InvoiceSumInclusive
{ {
//$this->total += $this->total_taxes; //$this->total += $this->total_taxes;
if (is_numeric($this->invoice->custom_value1) && $this->invoice->custom_value1 > 0) { if (is_numeric($this->invoice->custom_value1)) {
$this->total += $this->invoice->custom_value1; $this->total += $this->invoice->custom_value1;
} }
if (is_numeric($this->invoice->custom_value2) && $this->invoice->custom_value2 > 0) { if (is_numeric($this->invoice->custom_value2)) {
$this->total += $this->invoice->custom_value2; $this->total += $this->invoice->custom_value2;
} }
if (is_numeric($this->invoice->custom_value3) && $this->invoice->custom_value3 > 0) { if (is_numeric($this->invoice->custom_value3)) {
$this->total += $this->invoice->custom_value3; $this->total += $this->invoice->custom_value3;
} }
if (is_numeric($this->invoice->custom_value4) && $this->invoice->custom_value4 > 0) { if (is_numeric($this->invoice->custom_value4)) {
$this->total += $this->invoice->custom_value4; $this->total += $this->invoice->custom_value4;
} }

2
app/Utils/PhantomJS/Phantom.php
View File

@ -76,6 +76,8 @@ class Phantom
$phantom_url = "https://phantomjscloud.com/api/browser/v2/{$key}/?request=%7Burl:%22{$url}%22,renderType:%22pdf%22%7D"; $phantom_url = "https://phantomjscloud.com/api/browser/v2/{$key}/?request=%7Burl:%22{$url}%22,renderType:%22pdf%22%7D";
$pdf = CurlUtils::get($phantom_url); $pdf = CurlUtils::get($phantom_url);
//info($pdf);
Storage::makeDirectory($path, 0775); Storage::makeDirectory($path, 0775);
$instance = Storage::disk(config('filesystems.default'))->put($file_path, $pdf); $instance = Storage::disk(config('filesystems.default'))->put($file_path, $pdf);

3
config/filesystems.php
View File

@ -60,7 +60,8 @@ return [
'public' => [ 'public' => [
'driver' => 'local', 'driver' => 'local',
'root' => storage_path('app/public'), 'root' => 'storage/',
// 'root' => storage_path('app/public'),
'url' => env('APP_URL').'/storage', 'url' => env('APP_URL').'/storage',
'visibility' => 'public', 'visibility' => 'public',
'permissions' => [ 'permissions' => [