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

Merge pull request #6802 from turbo124/v5-develop

Browse Source 
Fixes for settings Default Design
This commit is contained in:
David Bomba 2021-10-09 08:50:45 +11:00 committed by GitHub
commit 7278f7fb61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Factory/CloneQuoteToInvoiceFactory.php
View File

@ -28,9 +28,9 @@ class CloneQuoteToInvoiceFactory
unset($quote_array['invoice_id']); unset($quote_array['invoice_id']);
unset($quote_array['id']); unset($quote_array['id']);
unset($quote_array['invitations']); unset($quote_array['invitations']);
//unset($quote_array['terms']); unset($quote_array['terms']);
//unset($quote_array['public_notes']); unset($quote_array['public_notes']);
//unset($quote_array['footer']); unset($quote_array['footer']);
unset($quote_array['design_id']); unset($quote_array['design_id']);
foreach ($quote_array as $key => $value) { foreach ($quote_array as $key => $value) {

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

@ -491,7 +491,7 @@ class DesignController extends BaseController
public function default(DefaultDesignRequest $request) public function default(DefaultDesignRequest $request)
{ {
$design_id = $request->int('design_id'); $design_id = $request->input('design_id');
$entity = $request->input('entity'); $entity = $request->input('entity');
$company = auth()->user()->getCompany(); $company = auth()->user()->getCompany();

2
app/Jobs/Mail/NinjaMailerJob.php
View File

@ -257,6 +257,8 @@ class NinjaMailerJob implements ShouldQueue
if(Ninja::isHosted() && $this->company->account->emailQuotaExceeded()) if(Ninja::isHosted() && $this->company->account->emailQuotaExceeded())
return true; return true;
if(!str_contains($this->nmo->to_user->email, "@"))
return true;
return false; return false;
} }