Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for bank transactions

Browse Source
This commit is contained in:
David Bomba 2024-01-21 13:47:25 +11:00
parent 0c7c82bc87
commit 1f77856829
6 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,22 +99,24 @@ class BankTransactionController extends BaseController
public function bulk(BulkBankTransactionRequest $request)
{
/** @var \App\Models\User $user */
$user = auth()->user();
$action = $request->input('action');
$ids = request()->input('ids');
$bank_transactions = BankTransaction::withTrashed()->whereIn('id', $this->transformKeys($ids))->company()->get();
if ($action == 'convert_matched') { //catch this action
if ($action == 'convert_matched' && $user->can('edit', $bank_transactions->first())) { //catch this action
$this->bank_transaction_repo->convert_matched($bank_transactions);
} else {
$bank_transactions->each(function ($bank_transaction, $key) use ($action) {
$this->bank_transaction_repo->{$action}($bank_transaction);
$bank_transactions->each(function ($bank_transaction, $key) use ($action, $user) {
if($user->can('edit', $bank_transaction))
$this->bank_transaction_repo->{$action}($bank_transaction);
});
}
/* Need to understand which permission are required for the given bulk action ie. view / edit */
return $this->listResponse(BankTransaction::withTrashed()->whereIn('id', $this->transformKeys($ids))->company());
}

5
app/Http/Requests/BankTransaction/BulkBankTransactionRequest.php
View File

@ -22,10 +22,7 @@ class BulkBankTransactionRequest extends Request
*/
public function authorize(): bool
{
/** @var \App\Models\User $user **/
$user = auth()->user();
return $user->isAdmin();
return true;
}
public function rules(): array

5
app/Http/Requests/BankTransaction/CreateBankTransactionRequest.php
View File

@ -23,6 +23,9 @@ class CreateBankTransactionRequest extends Request
*/
public function authorize(): bool
{
return auth()->user()->can('create', BankTransaction::class);
/** @var \App\Models\User $user */
$user = auth()->user();
return $user->can('create', BankTransaction::class);
}
}

2
app/Policies/EntityPolicy.php
View File

@ -31,8 +31,6 @@ class EntityPolicy
*/
public function before($user, $ability)
{
//if($user->isAdmin())
// return true;
}
/**

2
routes/api.php
View File

@ -139,7 +139,7 @@ Route::group(['middleware' => ['throttle:api', 'api_db', 'token_auth', 'locale']
Route::post('bank_integrations/bulk', [BankIntegrationController::class, 'bulk'])->name('bank_integrations.bulk');
Route::resource('bank_transactions', BankTransactionController::class); // name = (clients. index / create / show / update / destroy / edit
Route::resource('bank_transactions', BankTransactionController::class); // name = (bank_transactions. index / create / show / update / destroy / edit
Route::post('bank_transactions/bulk', [BankTransactionController::class, 'bulk'])->name('bank_transactions.bulk');
Route::post('bank_transactions/match', [BankTransactionController::class, 'match'])->name('bank_transactions.match');

14
tests/Feature/BankTransactionApiTest.php
View File

@ -31,6 +31,8 @@ class BankTransactionApiTest extends TestCase
use DatabaseTransactions;
use MockAccountData;
public $faker;
protected function setUp() :void
{
parent::setUp();
@ -44,6 +46,18 @@ class BankTransactionApiTest extends TestCase
Model::reguard();
}
public function testBankTransactionCreate()
{
nlog("creeeeate");
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->get('/api/v1/bank_transactions/create');
$response->assertStatus(200);
}
public function testBankTransactionGetClientStatus()
{