Explorar el Código

微修正

master
sosuke.iwabuchi hace 2 años
padre
commit
c10e38627c
Se han modificado 2 ficheros con 7 adiciones y 2 borrados
  1. +7
    -1
      app/Kintone/Models/SeasonTicketContract.php
  2. +0
    -1
      app/Kintone/Repositories/SeasonTicketContractRepositoryData.php

+ 7
- 1
app/Kintone/Models/SeasonTicketContract.php Ver fichero

@@ -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


+ 0
- 1
app/Kintone/Repositories/SeasonTicketContractRepositoryData.php Ver fichero

@@ -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),
];
}
}

Cargando…
Cancelar
Guardar