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

Code cleanup

Browse Source
This commit is contained in:
David Bomba 2023-08-05 12:26:07 +10:00
parent 911738c443
commit 45e2465a24
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/BankTransactionController.php
View File

@ -114,7 +114,10 @@ class BankTransactionController extends BaseController
public function match(MatchBankTransactionRequest $request) public function match(MatchBankTransactionRequest $request)
{ {
$bts = (new MatchBankTransactions(auth()->user()->company()->id, auth()->user()->company()->db, $request->all()))->handle(); /** @var \App\Models\User $user */
$user = auth()->user();
$bts = (new MatchBankTransactions($user->company()->id, $user->company()->db, $request->all()))->handle();
return $this->listResponse($bts); return $this->listResponse($bts);
} }

23
app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php
View File

@ -24,26 +24,35 @@ class MatchBankTransactionRequest extends Request
*/ */
public function authorize() : bool public function authorize() : bool
{ {
return auth()->user()->isAdmin() || auth()->user()->can('create', BankTransaction::class) || auth()->user()->hasPermission('edit_bank_transaction'); /** @var \App\Models\User $user */
$user = auth()->user();
return $user->isAdmin() || $user->can('create', BankTransaction::class) || $user->hasPermission('edit_bank_transaction');
} }
public function rules() public function rules(): array
{ {
/** @var \App\Models\User $user */
$user = auth()->user();
$rules = [ $rules = [
'transactions' => 'bail|array', 'transactions' => 'bail|array',
'transactions.*.invoice_ids' => 'nullable|string|sometimes', 'transactions.*.invoice_ids' => 'nullable|string|sometimes',
]; ];
$rules['transactions.*.ninja_category_id'] = 'bail|nullable|sometimes|exists:expense_categories,id,company_id,'.auth()->user()->company()->id.',is_deleted,0'; $rules['transactions.*.ninja_category_id'] = 'bail|nullable|sometimes|exists:expense_categories,id,company_id,'.$user->company()->id.',is_deleted,0';
$rules['transactions.*.vendor_id'] = 'bail|nullable|sometimes|exists:vendors,id,company_id,'.auth()->user()->company()->id.',is_deleted,0'; $rules['transactions.*.vendor_id'] = 'bail|nullable|sometimes|exists:vendors,id,company_id,'.$user->company()->id.',is_deleted,0';
$rules['transactions.*.id'] = 'bail|required|exists:bank_transactions,id,company_id,'.auth()->user()->company()->id.',is_deleted,0'; $rules['transactions.*.id'] = 'bail|required|exists:bank_transactions,id,company_id,'.$user->company()->id.',is_deleted,0';
$rules['transactions.*.payment_id'] = 'bail|sometimes|nullable|exists:payments,id,company_id,'.auth()->user()->company()->id.',is_deleted,0'; $rules['transactions.*.payment_id'] = 'bail|sometimes|nullable|exists:payments,id,company_id,'.$user->company()->id.',is_deleted,0';
return $rules; return $rules;
} }
public function prepareForValidation() public function prepareForValidation()
{ {
/** @var \App\Models\User $user */
$user = auth()->user();
$inputs = $this->all(); $inputs = $this->all();
foreach ($inputs['transactions'] as $key => $input) { foreach ($inputs['transactions'] as $key => $input) {
@ -61,7 +70,7 @@ class MatchBankTransactionRequest extends Request
if (array_key_exists('payment_id', $inputs['transactions'][$key]) && strlen($inputs['transactions'][$key]['payment_id']) >= 1) { if (array_key_exists('payment_id', $inputs['transactions'][$key]) && strlen($inputs['transactions'][$key]['payment_id']) >= 1) {
$inputs['transactions'][$key]['payment_id'] = $this->decodePrimaryKey($inputs['transactions'][$key]['payment_id']); $inputs['transactions'][$key]['payment_id'] = $this->decodePrimaryKey($inputs['transactions'][$key]['payment_id']);
$p = Payment::withTrashed()->where('company_id', auth()->user()->company()->id)->where('id', $inputs['transactions'][$key]['payment_id'])->first(); $p = Payment::withTrashed()->where('company_id', $user->company()->id)->where('id', $inputs['transactions'][$key]['payment_id'])->first();
/*Ensure we don't relink an existing payment*/ /*Ensure we don't relink an existing payment*/
if (!$p || is_numeric($p->transaction_id)) { if (!$p || is_numeric($p->transaction_id)) {

2
app/Jobs/Bank/MatchBankTransactions.php
View File

@ -218,7 +218,7 @@ class MatchBankTransactions implements ShouldQueue
private function matchInvoicePayment($input) :self private function matchInvoicePayment($input) :self
{ {
$this->bt = BankTransaction::find($input['id']); $this->bt = BankTransaction::withTrashed()->find($input['id']);
if (!$this->bt || $this->bt->status_id == BankTransaction::STATUS_CONVERTED) { if (!$this->bt || $this->bt->status_id == BankTransaction::STATUS_CONVERTED) {
return $this; return $this;