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

Merge pull request #5624 from turbo124/v5-develop

Browse Source 
email_receipt flag for payment receipt emails
This commit is contained in:
David Bomba 2021-05-06 13:23:25 +10:00 committed by GitHub
commit 875bd24220
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/BaseController.php
View File

@ -111,6 +111,7 @@ class BaseController extends Controller
'company.tax_rates', 'company.tax_rates',
'company.groups', 'company.groups',
'company.payment_terms', 'company.payment_terms',
'company.designs.company'
]; ];
public function __construct() public function __construct()
@ -416,12 +417,12 @@ class BaseController extends Controller
$query->where('credits.user_id', $user->id)->orWhere('credits.assigned_user_id', $user->id); $query->where('credits.user_id', $user->id)->orWhere('credits.assigned_user_id', $user->id);
}, },
'company.designs'=> function ($query) use ($created_at, $user) { // 'company.designs'=> function ($query) use ($created_at, $user) {
$query->where('created_at', '>=', $created_at)->with('company'); // $query->where('created_at', '>=', $created_at)->with('company');
if(!$user->isAdmin()) // if(!$user->isAdmin())
$query->where('designs.user_id', $user->id); // $query->where('designs.user_id', $user->id);
}, // },
'company.documents'=> function ($query) use ($created_at, $user) { 'company.documents'=> function ($query) use ($created_at, $user) {
$query->where('created_at', '>=', $created_at); $query->where('created_at', '>=', $created_at);
}, },

3
app/Http/Controllers/PaymentController.php
View File

@ -208,6 +208,9 @@ class PaymentController extends BaseController
{ {
$payment = $this->payment_repo->save($request->all(), PaymentFactory::create(auth()->user()->company()->id, auth()->user()->id)); $payment = $this->payment_repo->save($request->all(), PaymentFactory::create(auth()->user()->company()->id, auth()->user()->id));
if($request->has('email_receipt') && $request->input('email_receipt') == 'true' && !$payment->client->getSetting('client_manual_payment_notification'))
$payment->service()->sendEmail();
return $this->itemResponse($payment); return $this->itemResponse($payment);
} }

14
app/Jobs/Util/Import.php
View File

@ -459,6 +459,19 @@ class Import implements ShouldQueue
$user_repository = null; $user_repository = null;
} }
private function checkUniqueConstraint($model, $column, $value)
{
$model_query = (new $model())
->query()
->where($column, $value)
->exists();
if($model_query)
return $value.'_'. Str::random(5);
return $value;
}
/** /**
* @param array $data * @param array $data
* @throws Exception * @throws Exception
@ -476,6 +489,7 @@ class Import implements ShouldQueue
$modified['user_id'] = $this->processUserId($resource); $modified['user_id'] = $this->processUserId($resource);
$modified['balance'] = $modified['balance'] ?: 0; $modified['balance'] = $modified['balance'] ?: 0;
$modified['paid_to_date'] = $modified['paid_to_date'] ?: 0; $modified['paid_to_date'] = $modified['paid_to_date'] ?: 0;
$modified['number'] = $this->checkUniqueConstraint(Client::class, 'number', $modified['number']);
unset($modified['id']); unset($modified['id']);
unset($modified['contacts']); unset($modified['contacts']);