From c10e38627c84e1567d85a32f445961adbf310cbb Mon Sep 17 00:00:00 2001 From: "sosuke.iwabuchi" Date: Mon, 27 Nov 2023 13:10:53 +0900 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Kintone/Models/SeasonTicketContract.php | 8 +++++++- .../Repositories/SeasonTicketContractRepositoryData.php | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Kintone/Models/SeasonTicketContract.php b/app/Kintone/Models/SeasonTicketContract.php index 7a2cb73..6a35641 100644 --- a/app/Kintone/Models/SeasonTicketContract.php +++ b/app/Kintone/Models/SeasonTicketContract.php @@ -83,6 +83,7 @@ class SeasonTicketContract extends KintoneModel 'can_some_apply' => $this->canSomeApply(), 'can_parking_certificate_apply' => $this->canParkingCertificateApply(), 'can_change_plan_apply' => $this->canChangePlanApply(), + 'is_terminated' => $this->isTerminated(), ]; } @@ -117,7 +118,12 @@ class SeasonTicketContract extends KintoneModel */ public function canSomeApply(): bool { - return $this->contractEndDate instanceof Carbon ? DateUtil::now() <= $this->contractEndDate : false; + return !$this->isTerminated(); + } + + public function isTerminated(): bool + { + return $this->contractEndDate instanceof Carbon ? $this->contractEndDate <= DateUtil::now() : false; } public function canParkingCertificateApply(): bool diff --git a/app/Kintone/Repositories/SeasonTicketContractRepositoryData.php b/app/Kintone/Repositories/SeasonTicketContractRepositoryData.php index e77c57a..72796e3 100644 --- a/app/Kintone/Repositories/SeasonTicketContractRepositoryData.php +++ b/app/Kintone/Repositories/SeasonTicketContractRepositoryData.php @@ -20,7 +20,6 @@ class SeasonTicketContractRepositoryData ...$this->seasonTicketContract->toArray(), ...$this->plan->toArray(), 'season_ticekt_contract_record_no' => $this->seasonTicketContract->getRecordId(), - 'is_terminated' => DateUtil::now()->setTime(0, 0)->greaterThanOrEqualTo($this->seasonTicketContract->contractEndDate), ]; } }