diff --git a/app/Models/Order/Card/CardTransaction/CardTransaction.php b/app/Models/Order/Card/CardTransaction/CardTransaction.php new file mode 100644 index 0000000..000de4a --- /dev/null +++ b/app/Models/Order/Card/CardTransaction/CardTransaction.php @@ -0,0 +1,11 @@ +isOperator()) { - return $user->getPermissionNames()->contains('ViewLoanOrders'); - } + // if ($user->isOperator()) { + // return $user->getPermissionNames()->contains('ViewLoanOrders'); + // } return true; } @@ -29,13 +29,17 @@ class LoanOrderPolicy return true; } - if ($user->isOperator() && $user->getPermissionNames()->contains('ViewLoanOrders')) { - return in_array( - $loanOrder->branch_id, - $user->branches->pluck('id')->toArray() - ); + if ($user->isOperator()) { + return true; } + // if ($user->isOperator() && $user->getPermissionNames()->contains('ViewLoanOrders')) { + // return in_array( + // $loanOrder->branch_id, + // $user->branches->pluck('id')->toArray() + // ); + // } + if ($user->ownsLoanOrder($loanOrder)) { return true; } @@ -48,8 +52,12 @@ class LoanOrderPolicy */ public function create(User $user): bool { + // if ($user->isOperator()) { + // return $user->getPermissionNames()->contains('ViewLoanOrders'); + // } + if ($user->isOperator()) { - return $user->getPermissionNames()->contains('ViewLoanOrders'); + return true; } return true; @@ -64,13 +72,17 @@ class LoanOrderPolicy return true; } - if ($user->isOperator() && $user->getPermissionNames()->contains('ViewLoanOrders')) { - return in_array( - $loanOrder->branch_id, - $user->branches->pluck('id')->toArray() - ); + if ($user->isOperator()) { + return true; } + // if ($user->isOperator() && $user->getPermissionNames()->contains('ViewLoanOrders')) { + // return in_array( + // $loanOrder->branch_id, + // $user->branches->pluck('id')->toArray() + // ); + // } + if ($user->ownsLoanOrder($loanOrder) && in_array($loanOrder->status, [ OrderRepo::PENDING, ])) { @@ -89,13 +101,17 @@ class LoanOrderPolicy return true; } - if ($user->isOperator() && $user->getPermissionNames()->contains('ViewLoanOrders')) { - return in_array( - $loanOrder->branch_id, - $user->branches->pluck('id')->toArray() - ); + if ($user->isOperator()) { + return true; } + // if ($user->isOperator() && $user->getPermissionNames()->contains('ViewLoanOrders')) { + // return in_array( + // $loanOrder->branch_id, + // $user->branches->pluck('id')->toArray() + // ); + // } + if ($user->ownsLoanOrder($loanOrder)) { return true; } diff --git a/database/migrations/2025_05_21_142230_create_card_transactions_table.php b/database/migrations/2025_05_21_142230_create_card_transactions_table.php new file mode 100644 index 0000000..0fb9612 --- /dev/null +++ b/database/migrations/2025_05_21_142230_create_card_transactions_table.php @@ -0,0 +1,27 @@ +id(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('card_transactions'); + } +}; diff --git a/routes/web.php b/routes/web.php index d3c78c4..6199237 100644 --- a/routes/web.php +++ b/routes/web.php @@ -32,7 +32,7 @@ Route::middleware(['auth'])->group(function () { Route::post('password-change', [PasswordChangeController::class, 'update'])->name('password-change.update'); }); -Route::get('tester', [ApiTesterController::class, 'index']); +// Route::get('tester', [ApiTesterController::class, 'index']); Route::get('online-payment-store', [OnlinePaymentController::class, 'store']) ->name('online-payment-store');