diff --git a/app/Http/Requests/BankTransaction/DestroyBankTransactionRequest.php b/app/Http/Requests/BankTransaction/DestroyBankTransactionRequest.php index 87f31514d2dd..35f33c7ec78d 100644 --- a/app/Http/Requests/BankTransaction/DestroyBankTransactionRequest.php +++ b/app/Http/Requests/BankTransaction/DestroyBankTransactionRequest.php @@ -22,6 +22,6 @@ class DestroyBankTransactionRequest extends Request */ public function authorize() : bool { - return auth()->user()->can('edit', $this->bank_integration); + return auth()->user()->can('edit', $this->bank_transaction); } } diff --git a/app/Http/Requests/BankTransaction/EditBankTransactionRequest.php b/app/Http/Requests/BankTransaction/EditBankTransactionRequest.php index d40195a7e44a..b2413ffabbcd 100644 --- a/app/Http/Requests/BankTransaction/EditBankTransactionRequest.php +++ b/app/Http/Requests/BankTransaction/EditBankTransactionRequest.php @@ -22,6 +22,6 @@ class EditBankTransactionRequest extends Request */ public function authorize() : bool { - return auth()->user()->can('edit', $this->bank_integration); + return auth()->user()->can('edit', $this->bank_transaction); } } diff --git a/app/Http/Requests/BankTransaction/ShowBankTransactionRequest.php b/app/Http/Requests/BankTransaction/ShowBankTransactionRequest.php index 68cc4fdbb9e6..f41b9a28ab8e 100644 --- a/app/Http/Requests/BankTransaction/ShowBankTransactionRequest.php +++ b/app/Http/Requests/BankTransaction/ShowBankTransactionRequest.php @@ -22,6 +22,6 @@ class ShowBankTransactionRequest extends Request */ public function authorize() : bool { - return auth()->user()->can('view', $this->bank_integration); + return auth()->user()->can('view', $this->bank_transaction); } } diff --git a/app/Http/Requests/BankTransaction/UpdateBankTransactionRequest.php b/app/Http/Requests/BankTransaction/UpdateBankTransactionRequest.php index b18ecf224284..be5b87e5c4cf 100644 --- a/app/Http/Requests/BankTransaction/UpdateBankTransactionRequest.php +++ b/app/Http/Requests/BankTransaction/UpdateBankTransactionRequest.php @@ -25,7 +25,7 @@ class UpdateBankTransactionRequest extends Request */ public function authorize() : bool { - return auth()->user()->can('edit', $this->bank_integration); + return auth()->user()->can('edit', $this->bank_transaction); } public function rules() diff --git a/app/Http/Requests/BankTransaction/UploadBankTransactionRequest.php b/app/Http/Requests/BankTransaction/UploadBankTransactionRequest.php index 2a3760e2e0cf..d0c45260ebbf 100644 --- a/app/Http/Requests/BankTransaction/UploadBankTransactionRequest.php +++ b/app/Http/Requests/BankTransaction/UploadBankTransactionRequest.php @@ -22,7 +22,7 @@ class UploadBankTransactionRequest extends Request */ public function authorize() : bool { - return auth()->user()->can('edit', $this->bank_integration); + return auth()->user()->can('edit', $this->bank_transaction); } public function rules() diff --git a/app/Transformers/BankTransactionTransformer.php b/app/Transformers/BankTransactionTransformer.php index 7729e1b8ff52..e1f6663bd353 100644 --- a/app/Transformers/BankTransactionTransformer.php +++ b/app/Transformers/BankTransactionTransformer.php @@ -63,6 +63,10 @@ class BankTransactionTransformer extends EntityTransformer 'invoice_id' => (string)$this->encodePrimaryKey($bank_transaction->invoice_id) ?: '', 'expense_id'=> (string)$this->encodePrimaryKey($bank_transaction->expense_id) ?: '', 'is_matched'=> (bool)$bank_transaction->is_matched ?: '', + 'is_deleted' => (bool) $bank_transaction->is_deleted, + 'created_at' => (int) $bank_transaction->created_at, + 'updated_at' => (int) $bank_transaction->updated_at, + 'archived_at' => (int) $bank_transaction->deleted_at, ]; } diff --git a/database/migrations/2022_08_05_023357_bank_integration.php b/database/migrations/2022_08_05_023357_bank_integration.php index a61aa17be3c3..d1766b995f1b 100644 --- a/database/migrations/2022_08_05_023357_bank_integration.php +++ b/database/migrations/2022_08_05_023357_bank_integration.php @@ -66,6 +66,7 @@ return new class extends Migration $table->unsignedInteger('invoice_id')->nullable(); $table->unsignedInteger('expense_id')->nullable(); $table->boolean('is_matched')->default(0); + $table->boolean('is_deleted')->default(0); $table->timestamps(6);