From 9fd57f8020a0deb4346b1f71a31985cbb4dd2b4f Mon Sep 17 00:00:00 2001
From: "sosuke.iwabuchi" <sosuke.iwabuchi@satellite-tech.co.jp>
Date: Tue, 21 May 2024 10:16:00 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=90=E3=83=B3=E3=82=AF=E3=83=81=E3=82=A7?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E7=99=BB=E9=8C=B2=E3=82=92=E3=83=9E=E3=82=A4?=
 =?UTF-8?q?=E3=83=9A=E3=83=BC=E3=82=B8=E7=B5=8C=E7=94=B1=E3=81=A7=E8=A1=8C?=
 =?UTF-8?q?=E3=81=86=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Web/BanckCheck/EntryController.php        | 60 -------------------
 .../Controllers/Web/BanckCheck/EntryParam.php | 46 --------------
 .../BanckCheck/PaymentInfoController.php      |  4 +-
 .../BanckCheck/PaymentInfoParam.php           |  2 +-
 .../BanckCheck/RegisterController.php         | 35 +++++++++++
 .../RobotPayment/BanckCheck/RegisterParam.php | 31 ++++++++++
 .../bank-check/ok.blade.php                   |  0
 .../bank-check/register.blade.php             | 28 +++++++++
 routes/web.php                                |  5 +-
 9 files changed, 100 insertions(+), 111 deletions(-)
 delete mode 100644 app/Http/Controllers/Web/BanckCheck/EntryController.php
 delete mode 100644 app/Http/Controllers/Web/BanckCheck/EntryParam.php
 rename app/Http/Controllers/Web/{ => RobotPayment}/BanckCheck/PaymentInfoController.php (95%)
 rename app/Http/Controllers/Web/{ => RobotPayment}/BanckCheck/PaymentInfoParam.php (97%)
 create mode 100644 app/Http/Controllers/Web/RobotPayment/BanckCheck/RegisterController.php
 create mode 100644 app/Http/Controllers/Web/RobotPayment/BanckCheck/RegisterParam.php
 rename resources/views/{ => robot-payment}/bank-check/ok.blade.php (100%)
 create mode 100644 resources/views/robot-payment/bank-check/register.blade.php

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 @@
-<?php
-
-namespace App\Http\Controllers\Web\BanckCheck;
-
-use App\Http\Controllers\Web\WebController;
-use App\Kintone\Models\BankCheckResult;
-use App\Util\DateUtil;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Str;
-
-class EntryController extends WebController
-{
-
-    public function name(): string
-    {
-        return "バンクチェック 受付";
-    }
-
-    public function description(): string
-    {
-        return "バンクチェック 受付";
-    }
-
-
-    public function __construct(protected EntryParam $param)
-    {
-        parent::__construct();
-    }
-
-    protected function run(Request $request): Response
-    {
-        $param = $this->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 @@
-<?php
-
-namespace App\Http\Controllers\Web\BanckCheck;
-
-use App\Http\Controllers\Web\BaseParam;
-
-/**
- * @property string $gid 決済受付時に発行された決済番号
- * @property string $rst 決済結果（1：OK 2:NG）
- * @property string $ap 入金:完了(BAN_SAL)
- * @property string $ec エラーコード
- * @property string $god オーダーコード
- * @property string $cod 店舗側オーダー番号
- * @property string $am 決済金額
- * @property string $tx 税金額
- * @property string $sf 送料
- * @property string $ta 合計金額
- * @property string $bank 振込先口座情報（ドット「.」区切りの文字列）[銀行コード].[銀行名].[支店コード].[支店名].[口座種別].[口座番号].[口座名義]
- * @property string $exp 支払期限（yyyymmdd形式）
- * @property string $customerCode カスタム-顧客コード
- * @property int $entryRecordNo カスタム-定期申込レコード番号
- * @property string $token カスタム-トークン
- */
-class EntryParam extends BaseParam
-{
-    public function rules(): array
-    {
-        return [
-            'gid' => $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 @@
 <?php
 
-namespace App\Http\Controllers\Web\BanckCheck;
+namespace App\Http\Controllers\Web\RobotPayment\BanckCheck;
 
 use App\Exceptions\AppCommonException;
 use App\Http\Controllers\Web\WebController;
@@ -44,7 +44,7 @@ class PaymentInfoController extends WebController
         }
 
 
-        return response()->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 @@
 <?php
 
-namespace App\Http\Controllers\Web\BanckCheck;
+namespace App\Http\Controllers\Web\RobotPayment\BanckCheck;
 
 use App\Http\Controllers\Web\BaseParam;
 
diff --git a/app/Http/Controllers/Web/RobotPayment/BanckCheck/RegisterController.php b/app/Http/Controllers/Web/RobotPayment/BanckCheck/RegisterController.php
new file mode 100644
index 0000000..fde961a
--- /dev/null
+++ b/app/Http/Controllers/Web/RobotPayment/BanckCheck/RegisterController.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Controllers\Web\RobotPayment\BanckCheck;
+
+use App\Http\Controllers\Web\WebController;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+class RegisterController extends WebController
+{
+
+    public function name(): string
+    {
+        return "バンクチェック 登録画面遷移";
+    }
+
+    public function description(): string
+    {
+        return "バンクチェック 登録画面遷移";
+    }
+
+
+    public function __construct(protected RegisterParam $param)
+    {
+        $this->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 @@
+<?php
+
+namespace App\Http\Controllers\Web\RobotPayment\BanckCheck;
+
+use App\Http\Controllers\Web\BaseParam;
+
+/**
+ * @property string $aid 
+ * @property string $cod 
+ * @property string $am 
+ * @property string $tx 
+ * @property string $sf 
+ * @property string $customerCode カスタム-顧客コード
+ * @property int $entryRecordNo カスタム-定期申込レコード番号
+ */
+class RegisterParam extends BaseParam
+{
+    public function rules(): array
+    {
+        return [
+            'aid' => $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 @@
+<html>
+
+<body>
+    <span>
+        ...遷移中
+    </span>
+    <form id="target-form" action="https://credit.j-payment.co.jp/link/bankcheck" method="post">
+        <input type="hidden" name="aid" value="{{ $aid }}">
+        <input type="hidden" name="cod" value="{{ $cod }}">
+        <input type="hidden" name="jb" value="{{ $jb }}">
+        <input type="hidden" name="am" value="{{ $am }}">
+        <input type="hidden" name="tx" value="{{ $tx }}">
+        <input type="hidden" name="sf" value="{{ $sf }}">
+        <input type="hidden" name="customer_code" value="{{ $customer_code }}">
+        <input type="hidden" name="entry_record_no" value="{{ $entry_record_no }}">
+        <input type="hidden" name="token" value="{{ config('custom.bank-check.token') }}">
+    </form>
+
+    <script>
+        window.onload = () => {
+            document.getElementById('target-form').submit()
+        }
+    </script>
+</body>
+
+
+
+</html>
\ 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にゆだねる