From aded55b8c7831d2dbd949b0826fc066af4ee72b8 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Fri, 28 Apr 2023 19:34:22 +0800 Subject: [PATCH] appprove group mapping transaction api --- ...DuplicateBankStatementDetailsStatusLogic.php} | 16 ++++++++++++---- ...cateBankStatementDetailsStatusController.php} | 6 +++--- .../elements/StatementTransactionComponent.vue | 2 +- routes/accounting.php | 3 ++- 4 files changed, 18 insertions(+), 9 deletions(-) rename app/Classes/Modules/Accounting/ControllersLogic/{UpdateDuplicateStatementTransactionStatusLogic.php => UpdateDuplicateBankStatementDetailsStatusLogic.php} (80%) rename app/Http/Controllers/Accounting/{UpdateDuplicateStatementTransactionStatusController.php => UpdateDuplicateBankStatementDetailsStatusController.php} (62%) diff --git a/app/Classes/Modules/Accounting/ControllersLogic/UpdateDuplicateStatementTransactionStatusLogic.php b/app/Classes/Modules/Accounting/ControllersLogic/UpdateDuplicateBankStatementDetailsStatusLogic.php similarity index 80% rename from app/Classes/Modules/Accounting/ControllersLogic/UpdateDuplicateStatementTransactionStatusLogic.php rename to app/Classes/Modules/Accounting/ControllersLogic/UpdateDuplicateBankStatementDetailsStatusLogic.php index 9a9fedb1..6578064d 100644 --- a/app/Classes/Modules/Accounting/ControllersLogic/UpdateDuplicateStatementTransactionStatusLogic.php +++ b/app/Classes/Modules/Accounting/ControllersLogic/UpdateDuplicateBankStatementDetailsStatusLogic.php @@ -11,9 +11,10 @@ use App\Classes\ValueObjects\Constants\StatementTransactionOwnerType; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus; +use App\Classes\Modules\Accounting\Services\FetchesBankStatementDetails; -class UpdateDuplicateStatementTransactionStatusLogic extends AbstractControllerLogic +class UpdateDuplicateBankStatementDetailsStatusLogic extends AbstractControllerLogic { /** @@ -22,7 +23,7 @@ class UpdateDuplicateStatementTransactionStatusLogic extends AbstractControllerL protected function notification(): array { return [ - 'title' => 'Update Duplicate Statement Transaction Status', + 'title' => 'Update Duplicate Bank Statement Details Status', 'message' => 'You have successfully updated the Statement Transation Status' ]; } @@ -30,6 +31,9 @@ class UpdateDuplicateStatementTransactionStatusLogic extends AbstractControllerL /** @var FetchesBankStatementTransaction */ private $fetchesBankStatementTransaction; + /** @var FetchesBankStatementDetails */ + private $fetchesBankStatementDetails; + /** @var UpdatesBankStatementTransactionOwnerStatus */ private $updatesBankStatementTransactionOwnerStatus; @@ -39,15 +43,18 @@ class UpdateDuplicateStatementTransactionStatusLogic extends AbstractControllerL /** * UpdateAnnouncementLogic constructor. * @param FetchesBankStatementTransaction $fetchesBankStatementTransaction + * @param FetchesBankStatementDetails $fetchesBankStatementDetails * @param UpdatesBankStatementTransactionOwnerStatus $updatesBankStatementTransactionOwnerStatus * @param UpdatesTransactionStatus $updatesTransactionStatus */ public function __construct( FetchesBankStatementTransaction $fetchesBankStatementTransaction, + FetchesBankStatementDetails $fetchesBankStatementDetails, UpdatesBankStatementTransactionOwnerStatus $updatesBankStatementTransactionOwnerStatus, UpdatesTransactionStatus $updatesTransactionStatus ) { $this->fetchesBankStatementTransaction = $fetchesBankStatementTransaction; + $this->fetchesBankStatementDetails = $fetchesBankStatementDetails; $this->updatesBankStatementTransactionOwnerStatus = $updatesBankStatementTransactionOwnerStatus; $this->updatesTransactionStatus = $updatesTransactionStatus; } @@ -61,9 +68,10 @@ class UpdateDuplicateStatementTransactionStatusLogic extends AbstractControllerL */ public function logic(Request $request): JsonResponse { - $statementTrasaction = $this->fetchesBankStatementTransaction->execute(['id' => $request->route('id')]); + // $statementTrasaction = $this->fetchesBankStatementTransaction->execute(['id' => $request->route('id')]); + $bankSatement = $this->fetchesBankStatementDetails->execute(['id' => $request->route('id')]); - dd($statementTrasaction->owners); + dd($bankSatement); $statementTrasactionOwner = $statementTrasaction->owners->first(); diff --git a/app/Http/Controllers/Accounting/UpdateDuplicateStatementTransactionStatusController.php b/app/Http/Controllers/Accounting/UpdateDuplicateBankStatementDetailsStatusController.php similarity index 62% rename from app/Http/Controllers/Accounting/UpdateDuplicateStatementTransactionStatusController.php rename to app/Http/Controllers/Accounting/UpdateDuplicateBankStatementDetailsStatusController.php index 03ba11c8..6ec599c6 100644 --- a/app/Http/Controllers/Accounting/UpdateDuplicateStatementTransactionStatusController.php +++ b/app/Http/Controllers/Accounting/UpdateDuplicateBankStatementDetailsStatusController.php @@ -2,18 +2,18 @@ namespace App\Http\Controllers\Accounting; -use App\Classes\Modules\Accounting\ControllersLogic\UpdateDuplicateStatementTransactionStatusLogic; +use App\Classes\Modules\Accounting\ControllersLogic\UpdateDuplicateBankStatementDetailsStatusLogic; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; -class UpdateDuplicateStatementTransactionStatusController +class UpdateDuplicateBankStatementDetailsStatusController { /** * @param Request $request * @param ApprovePaymentLogic $logic * @return JsonResponse */ - public function update(Request $request, UpdateDuplicateStatementTransactionStatusLogic $logic): JsonResponse { + public function update(Request $request, UpdateDuplicateBankStatementDetailsStatusLogic $logic): JsonResponse { return $logic->execute($request); } diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue index c323cd53..eb89985f 100644 --- a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue +++ b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue @@ -40,7 +40,7 @@ :contentText="returnTextWithVariable(owner.reference)" modalType="confirm" class="text-center" - :apiRoute="route('api.accounting.statement_transaction.duplicate.owner.status.update', item.id, 'approve')" + :apiRoute="route('api.accounting.bankStatement.details.status.update', owner.id, 'approve')" apiMethod="post" section="statementTransactionComponent" > diff --git a/routes/accounting.php b/routes/accounting.php index 0c82014a..822bdafb 100644 --- a/routes/accounting.php +++ b/routes/accounting.php @@ -10,9 +10,10 @@ Route::group(['prefix' => 'accounting', 'as' => 'accounting.', 'namespace' => 'A Route::put('/details/update', 'BankStatementController@update')->name('details.update'); }); + Route::post('bankStatement/{id}/details/{status}', 'UpdateDuplicateBankStatementDetailsStatusController@update')->where('status', 'approve|reject')->name('bankStatement.details.status.update'); + Route::group(['prefix' => 'statement_transaction', 'as' => 'statement_transaction.'], function () { Route::post('/owner/group-approve', 'GroupApproveStatementTransactionController@approve')->name('owner.groupApprove'); Route::post('/{id}/owner/{status}', 'UpdateStatementTransactionStatusController@update')->where('status', 'approve|reject')->name('owner.status.update'); - Route::post('/{id}/duplicate/owner/{status}', 'UpdateDuplicateStatementTransactionStatusController@update')->where('status', 'approve|reject')->name('duplicate.owner.status.update'); }); });