diff --git a/app/Http/Controllers/Web/BanckCheck/EntryController.php b/app/Http/Controllers/Web/BanckCheck/EntryController.php deleted file mode 100644 index 5ca27f8..0000000 --- a/app/Http/Controllers/Web/BanckCheck/EntryController.php +++ /dev/null @@ -1,60 +0,0 @@ -param; - - if ($param->token !== config('custom.bank-check.token')) { - abort(403); - } - - $model = new BankCheckResult(); - - $model->customerCode = $param->customerCode; - $model->entryRecordNo = $param->entryRecordNo; - $model->shopOrderNo = $param->cod; - $model->paymentNo = $param->gid; - $model->orderCode = $param->god; - $model->entryResult = $param->rst; - $model->entryErrorCode = $param->ec; - $model->paymentPlanAmount = intval($param->am); - $model->paymentExpiresDate = Carbon::createFromFormat("Ymd", $param->exp); - - $requestArr = $request->toArray(); - unset($requestArr["token"]); - $model->dataEntry = json_encode($requestArr); - - $model->save(); - - return response()->view('bank-check.ok'); - } -} diff --git a/app/Http/Controllers/Web/BanckCheck/EntryParam.php b/app/Http/Controllers/Web/BanckCheck/EntryParam.php deleted file mode 100644 index 224ba01..0000000 --- a/app/Http/Controllers/Web/BanckCheck/EntryParam.php +++ /dev/null @@ -1,46 +0,0 @@ - $this->str(), - 'rst' => $this->str(), - 'ap' => $this->str(), - 'ec' => $this->str(), - 'god' => $this->str(), - 'cod' => $this->str(), - 'am' => $this->numeric(), - 'tx' => $this->numeric(), - 'sf' => $this->numeric(), - 'ta' => $this->numeric(), - 'bank' => $this->str(), - 'exp' => $this->str(), - 'customer_code' => $this->str(), - 'entry_record_no' => $this->numeric(), - 'token' => $this->str(), - ]; - } -} diff --git a/app/Http/Controllers/Web/BanckCheck/PaymentInfoController.php b/app/Http/Controllers/Web/RobotPayment/BanckCheck/PaymentInfoController.php similarity index 95% rename from app/Http/Controllers/Web/BanckCheck/PaymentInfoController.php rename to app/Http/Controllers/Web/RobotPayment/BanckCheck/PaymentInfoController.php index c18069a..6735951 100644 --- a/app/Http/Controllers/Web/BanckCheck/PaymentInfoController.php +++ b/app/Http/Controllers/Web/RobotPayment/BanckCheck/PaymentInfoController.php @@ -1,6 +1,6 @@ view('bank-check.ok'); + return response()->view('robot-payment.bank-check.ok'); } private function handleEntry() diff --git a/app/Http/Controllers/Web/BanckCheck/PaymentInfoParam.php b/app/Http/Controllers/Web/RobotPayment/BanckCheck/PaymentInfoParam.php similarity index 97% rename from app/Http/Controllers/Web/BanckCheck/PaymentInfoParam.php rename to app/Http/Controllers/Web/RobotPayment/BanckCheck/PaymentInfoParam.php index 9a082de..23ed724 100644 --- a/app/Http/Controllers/Web/BanckCheck/PaymentInfoParam.php +++ b/app/Http/Controllers/Web/RobotPayment/BanckCheck/PaymentInfoParam.php @@ -1,6 +1,6 @@ middleware('fromKintone'); + parent::__construct(); + } + + protected function run(Request $request): Response + { + $param = $this->param; + + return response()->view('robot-payment.bank-check.register', $param->toArray()); + } +} diff --git a/app/Http/Controllers/Web/RobotPayment/BanckCheck/RegisterParam.php b/app/Http/Controllers/Web/RobotPayment/BanckCheck/RegisterParam.php new file mode 100644 index 0000000..e3b8565 --- /dev/null +++ b/app/Http/Controllers/Web/RobotPayment/BanckCheck/RegisterParam.php @@ -0,0 +1,31 @@ + $this->str(), + 'cod' => $this->str(), + 'jb' => $this->str(true), + 'am' => $this->str(), + 'tx' => $this->str(), + 'sf' => $this->numeric(), + 'customer_code' => $this->str(), + 'entry_record_no' => $this->numeric(), + ]; + } +} diff --git a/resources/views/bank-check/ok.blade.php b/resources/views/robot-payment/bank-check/ok.blade.php similarity index 100% rename from resources/views/bank-check/ok.blade.php rename to resources/views/robot-payment/bank-check/ok.blade.php diff --git a/resources/views/robot-payment/bank-check/register.blade.php b/resources/views/robot-payment/bank-check/register.blade.php new file mode 100644 index 0000000..b93b048 --- /dev/null +++ b/resources/views/robot-payment/bank-check/register.blade.php @@ -0,0 +1,28 @@ + + +
+ + ...遷移中 + + + + + + + + + \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index acc34cd..b1240b5 100644 --- a/routes/web.php +++ b/routes/web.php @@ -19,10 +19,11 @@ RouteHelper::get('/pdf', App\Http\Controllers\PDFController::class); // 画像取得 RouteHelper::get('/image/season-ticket-contract/{id}', App\Http\Controllers\Web\Image\SeasonTicketContractImageController::class); -RouteHelper::get('/test/bank', App\Http\Controllers\Web\Image\SeasonTicketContractImageController::class); +// ロボットペイメント画面遷移 +RouteHelper::get('/robot-payment/bank-check/register', App\Http\Controllers\Web\RobotPayment\BanckCheck\RegisterController::class); // BANK CHECK WEBHOOK -RouteHelper::get('/bank-check/info', App\Http\Controllers\Web\BanckCheck\PaymentInfoController::class); +RouteHelper::get('/robot-payment/bank-check/info', App\Http\Controllers\Web\RobotPayment\BanckCheck\PaymentInfoController::class); // ルーティングで適合しない場合はフロント側のRoutingにゆだねる