From e434a23aca619c0733c59da1cf56878dd2f730b0 Mon Sep 17 00:00:00 2001 From: "sosuke.iwabuchi" Date: Thu, 14 Dec 2023 08:36:58 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=83=AB=E5=BE=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Email/Members/EntryApprove.php | 2 +- app/Email/Members/UserInfoUpdateOrderApprove.php | 1 - app/Http/Controllers/Web/Email/EmailSendController.php | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/Email/Members/EntryApprove.php b/app/Email/Members/EntryApprove.php index cf03f1d..63354c3 100644 --- a/app/Email/Members/EntryApprove.php +++ b/app/Email/Members/EntryApprove.php @@ -36,7 +36,7 @@ class EntryApprove extends Members 'customer_name' => $entry->customerName ?? "-", 'customer_name_kana' => $entry->customerNameKana ?? "-", 'parking_name' => $entry->parkingName ?? "-", - 'type_name' => "##TODO どの値を設定する??", //##TODO + 'type_name' => $this->plan->vehicleType, 'season_ticket_select' => null, //##TODO 'plan_name' => $entry->planName ?? "-", 'vehicle_no' => $entry->vehicleNo ?? "-", diff --git a/app/Email/Members/UserInfoUpdateOrderApprove.php b/app/Email/Members/UserInfoUpdateOrderApprove.php index a0720ad..a1600cf 100644 --- a/app/Email/Members/UserInfoUpdateOrderApprove.php +++ b/app/Email/Members/UserInfoUpdateOrderApprove.php @@ -10,7 +10,6 @@ class UserInfoUpdateOrderApprove extends Members { public function __construct( - private SeasonTicketContract $seasonTicketContract, private UserInfoUpdateApplication $app, ?Customer $customer = null, ) { diff --git a/app/Http/Controllers/Web/Email/EmailSendController.php b/app/Http/Controllers/Web/Email/EmailSendController.php index 0fe4fa9..5852c67 100644 --- a/app/Http/Controllers/Web/Email/EmailSendController.php +++ b/app/Http/Controllers/Web/Email/EmailSendController.php @@ -90,8 +90,7 @@ class EmailSendController extends FromKintoneController } if ($emailId === Email::USER_INFO_UPDATE_ORDER_APPROVE) { $application = UserInfoUpdateApplication::findByApplicationNo($this->param->applicationNo); - $seasonTicketContract = SeasonTicketContract::find($application->seasonTicketContractRecordNo); - $this->setEmail(new UserInfoUpdateOrderApprove($seasonTicketContract, $application)); + $this->setEmail(new UserInfoUpdateOrderApprove($application)); return; } if ($emailId === Email::ENTRY_APPROVE) {