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

fixes for tests

Browse Source
This commit is contained in:
Benjamin Beganović 2020-12-23 11:41:57 +01:00
parent a907933d57
commit ada4f3065c
6 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/SetupController.php
View File

@ -32,7 +32,6 @@ use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Request; use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use Spatie\Browsershot\Browsershot;
/** /**
* Class SetupController. * Class SetupController.

3
app/Jobs/Import/CSVImport.php
View File

@ -113,7 +113,6 @@ class CSVImport implements ShouldQueue
info(print_r($data, 1)); info(print_r($data, 1));
MailRouter::dispatch(new ImportCompleted($data), $this->company, auth()->user()); MailRouter::dispatch(new ImportCompleted($data), $this->company, auth()->user());
} }
public function failed($exception) public function failed($exception)
@ -184,7 +183,6 @@ info(print_r($data,1));
if ($validator->fails()) { if ($validator->fails()) {
$this->error_array['invoices'] = ['invoice' => $invoice, 'error' => json_encode($validator->errors())]; $this->error_array['invoices'] = ['invoice' => $invoice, 'error' => json_encode($validator->errors())];
} else { } else {
if ($validator->fails()) { if ($validator->fails()) {
$this->error_array[] = ['invoice' => $invoice, 'error' => json_encode($validator->errors())]; $this->error_array[] = ['invoice' => $invoice, 'error' => json_encode($validator->errors())];
} else { } else {
@ -195,6 +193,7 @@ info(print_r($data,1));
$this->performInvoiceActions($invoice, $record, $invoice_repository); $this->performInvoiceActions($invoice, $record, $invoice_repository);
} }
} }
}
private function performInvoiceActions($invoice, $record, $invoice_repository) private function performInvoiceActions($invoice, $record, $invoice_repository)
{ {

1
app/Jobs/Mail/BaseMailerJob.php
View File

@ -96,7 +96,6 @@ class BaseMailerJob implements ShouldQueue
public function failed($exception = null) public function failed($exception = null)
{ {
info('the job failed'); info('the job failed');
info($exception->getMessage()); info($exception->getMessage());

4
app/Jobs/Mail/MailRouter.php
View File

@ -12,7 +12,6 @@
namespace App\Jobs\Mail; namespace App\Jobs\Mail;
use App\Libraries\MultiDB; use App\Libraries\MultiDB;
use App\Models\Client;
use App\Models\ClientContact; use App\Models\ClientContact;
use App\Models\Company; use App\Models\Company;
use App\Models\User; use App\Models\User;
@ -76,8 +75,9 @@ class MailRouter extends BaseMailerJob implements ShouldQueue
} catch (\Exception $e) { } catch (\Exception $e) {
$this->failed($e); $this->failed($e);
if($this->to_user instanceof ClientContact) if ($this->to_user instanceof ClientContact) {
$this->logMailError($e->getMessage(), $this->to_user->client); $this->logMailError($e->getMessage(), $this->to_user->client);
} }
} }
} }
}

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

@ -631,9 +631,12 @@ trait MakesInvoiceValues
$data[$key][$table_type . ".{$_table_type}1"] = $helpers->formatCustomFieldValue($this->client->company->custom_fields, "{$_table_type}1", $item->custom_value1, $this->client); $data[$key][$table_type . ".{$_table_type}1"] = $helpers->formatCustomFieldValue($this->client->company->custom_fields, "{$_table_type}1", $item->custom_value1, $this->client);
$data[$key][$table_type . ".{$_table_type}2"] = $helpers->formatCustomFieldValue($this->client->company->custom_fields, "{$_table_type}2", $item->custom_value2, $this->client);; $data[$key][$table_type . ".{$_table_type}2"] = $helpers->formatCustomFieldValue($this->client->company->custom_fields, "{$_table_type}2", $item->custom_value2, $this->client);
$data[$key][$table_type . ".{$_table_type}3"] = $helpers->formatCustomFieldValue($this->client->company->custom_fields, "{$_table_type}3", $item->custom_value3, $this->client);; ;
$data[$key][$table_type . ".{$_table_type}4"] = $helpers->formatCustomFieldValue($this->client->company->custom_fields, "{$_table_type}4", $item->custom_value4, $this->client);; $data[$key][$table_type . ".{$_table_type}3"] = $helpers->formatCustomFieldValue($this->client->company->custom_fields, "{$_table_type}3", $item->custom_value3, $this->client);
;
$data[$key][$table_type . ".{$_table_type}4"] = $helpers->formatCustomFieldValue($this->client->company->custom_fields, "{$_table_type}4", $item->custom_value4, $this->client);
;
$data[$key][$table_type.'.quantity'] = $item->quantity; $data[$key][$table_type.'.quantity'] = $item->quantity;