From 524c912d70cf0e33b1d4441081e36ead774d97dc Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Sun, 12 Jun 2016 17:59:50 +0200 Subject: =?UTF-8?q?Adherent/view=20:=20allow=20service=20termination=20if?= =?UTF-8?q?=20ServiceStatut=20is=20"Pr=C3=A9vu"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- generator/after-bake/src/Controller/ServicesController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'generator/after-bake/src/Controller/ServicesController.php') diff --git a/generator/after-bake/src/Controller/ServicesController.php b/generator/after-bake/src/Controller/ServicesController.php index 57f9e5d..616385a 100644 --- a/generator/after-bake/src/Controller/ServicesController.php +++ b/generator/after-bake/src/Controller/ServicesController.php @@ -285,7 +285,7 @@ class ServicesController extends AppController $this->Flash->error(__('The service could not be saved. Please, try again.')); } } else { - $this->Flash->error(__('Can\'t terminate the service. Bad service state.')); + $this->Flash->error(__('Can\'t suspend the service. Bad service state.')); } return $this->redirect(['controller' => 'Adherents', 'action' => 'view', $service->adherent_id]); } @@ -296,7 +296,7 @@ class ServicesController extends AppController $this->request->allowMethod(['post']); $service = $this->Services->get($id); if ( $service ) { - if ( $service->service_statut_id === 4 /* Actif CHD */ ) { + if ( $service->service_statut_id === 4 /* Actif CHD */ || $service->service_statut_id === 1 /* Prévu */ ) { $patch = array( 'service_statut_id' => 6, /* Actif CHD */ 'date_fin' => new DateTime('now'), -- cgit v1.1