Procházet zdrojové kódy

Merge branch 'hotfix-update-client' into 'master'

Update when we select a client with state cancelled or deleted

See merge request interlink-sa/flowdat3/modules/api!7
Jean Sumara Leopoldo před 5 roky
rodič
revize
3c5e3cc1fd
1 změnil soubory, kde provedl 8 přidání a 2 odebrání
  1. 8 2
      src/Swagger/Client/FTTH/Services.php

+ 8 - 2
src/Swagger/Client/FTTH/Services.php

@@ -760,8 +760,11 @@ class Services extends ApiServices
                     if ($apiValidationBase->validTenancy($instance->getTenancyId())) {
                         if (!is_null($instance->getClientId()) && $instance->getClientId() > 0) {
                             // chequeo el cliente exista
-                            if (!$apiValidationBase->validClient($instance->getClientId())) {
+                            $clientFound = $apiValidationBase->validClient($instance->getClientId());
+                            if (!$clientFound) {
                                 $content = "El id del cliente no existe.";
+                            }else if($clientFound->getCurrentState() == "cancelled" || $clientFound->getCurrentState() == "deleted"){
+                                throw new \Exception ("No puede usar el cliente cancelado o eliminado");
                             }
                         }
                         if (is_null($content)) {
@@ -918,8 +921,11 @@ class Services extends ApiServices
                     if ($apiValidationBase->validTenancy($instance->getTenancyId())) {
                         if (!is_null($instance->getClientId()) && $instance->getClientId() > 0) {
                             // chequeo el cliente exista
-                            if (!$apiValidationBase->validClient($instance->getClientId())) {
+                            $clientFound = $apiValidationBase->validClient($instance->getClientId());
+                            if (!$clientFound) {
                                 $content = "El id del cliente no existe.";
+                            }else if($clientFound->getCurrentState() == "cancelled" || $clientFound->getCurrentState() == "deleted"){
+                                throw new \Exception ("No puede usar el cliente cancelado o eliminado");
                             }
                         }
                         if (is_null($content)) {