Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 04:07:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6504 from turbo124/v5-develop

Browse Source 
Fixes for namespace include
This commit is contained in:
David Bomba 2021-08-23 08:49:49 +10:00 committed by GitHub
commit 3886925bb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Factory/CloneQuoteToInvoiceFactory.php
View File

@ -43,6 +43,8 @@ class CloneQuoteToInvoiceFactory
$invoice->number = null; $invoice->number = null;
$invoice->date = now()->format('Y-m-d'); $invoice->date = now()->format('Y-m-d');
$invoice->balance = 0; $invoice->balance = 0;
$invoice->deleted_at = null;
return $invoice; return $invoice;
} }
} }

2
app/Models/Presenters/ClientPresenter.php
View File

@ -28,7 +28,7 @@ class ClientPresenter extends EntityPresenter
} }
//$contact = $this->entity->primary_contact->first(); //$contact = $this->entity->primary_contact->first();
$contact = $this->entity->contacts->first(); $contact = $this->entity->contacts->whereNotNull('email')->first();
$contact_name = 'No Contact Set'; $contact_name = 'No Contact Set';

2
app/Services/Invoice/TriggeredActions.php
View File

@ -12,7 +12,7 @@
namespace App\Services\Invoice; namespace App\Services\Invoice;
use App\Events\Invoice\InvoiceWasEmailed; use App\Events\Invoice\InvoiceWasEmailed;
use App\Jobs\Invoice\EmailEntity; use App\Jobs\Entity\EmailEntity;
use App\Models\Invoice; use App\Models\Invoice;
use App\Services\AbstractService; use App\Services\AbstractService;
use App\Utils\Ninja; use App\Utils\Ninja;

2
config/database.php
View File

@ -207,6 +207,7 @@ return [
['options' => [ ['options' => [
'replication' => 'sentinel', 'replication' => 'sentinel',
'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'), 'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'),
'sentinel_timeout' => 1.0,
'parameters' => [ 'parameters' => [
'password' => env('REDIS_PASSWORD', null), 'password' => env('REDIS_PASSWORD', null),
'database' => env('REDIS_DB', 0), 'database' => env('REDIS_DB', 0),
@ -225,6 +226,7 @@ return [
['options' => [ ['options' => [
'replication' => 'sentinel', 'replication' => 'sentinel',
'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'), 'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'),
'sentinel_timeout' => 1.0,
'parameters' => [ 'parameters' => [
'password' => env('REDIS_PASSWORD', null), 'password' => env('REDIS_PASSWORD', null),
'database' => env('REDIS_CACHE_DB', 1), 'database' => env('REDIS_CACHE_DB', 1),

4
routes/api.php
View File

@ -159,8 +159,8 @@ Route::group(['middleware' => ['api_db', 'token_auth', 'locale'], 'prefix' => 'a
Route::post('templates', 'TemplateController@show')->name('templates.show'); Route::post('templates', 'TemplateController@show')->name('templates.show');
Route::resource('tokens', 'TokenController')->middleware('password_protected'); // name = (tokens. index / create / show / update / destroy / edit Route::resource('tokens', 'TokenController'); // name = (tokens. index / create / show / update / destroy / edit
Route::post('tokens/bulk', 'TokenController@bulk')->name('tokens.bulk')->middleware('password_protected'); Route::post('tokens/bulk', 'TokenController@bulk')->name('tokens.bulk');
Route::get('settings/enable_two_factor', 'TwoFactorController@setupTwoFactor'); Route::get('settings/enable_two_factor', 'TwoFactorController@setupTwoFactor');
Route::post('settings/enable_two_factor', 'TwoFactorController@enableTwoFactor'); Route::post('settings/enable_two_factor', 'TwoFactorController@enableTwoFactor');