Update agent registration process

composer.json

@@ -3,6 +3,8 @@
     "require": {
         "phpmailer/phpmailer": "^6.1",
         "twilio/sdk": "^6.4",
-        "guzzlehttp/guzzle": "^7.1"
+        "guzzlehttp/guzzle": "^7.1",
-    }
+        "ext-json": "*"
+    },
+    "description": "iLink World Mobile Backend"
 }

database/Requester.php

@@ -395,13 +395,28 @@ class Requester
      */
     public function registerGeolocated($request)
     {
-        if ($this->db->isPhoneExistedInCategory($request->phone, $request->category,$request->phone_transaction)) {
+        if($this->db->isPhoneExistedAgent($request->phone)) {
             // user is already existed - error response
+            $response['agent']= $request->lastname;
             $response["error"] = 1;
-            $response["error_msg"] = $this->messageText['ALREADY_PHONE_NUMBER'];
+            $response["error_msg"] = sprintf($this->messageText['ALREADY_PHONE_NUMBER'],$request->phone);
-            echo json_encode($response);
+            return json_encode($response);
-        } else {
+        }
-            if ($checkValidity = $this->db->checknumberValidity($request->phone)) {
+
+        if($this->db->isPhoneExistedAgent($request->phone_transaction)) {
+            // user is already existed - error response
+            $response['agent']= $request->lastname;
+            $response["error"] = 1;
+            $response["error_msg"] = sprintf($this->messageText['ALREADY_TRANSACTION_PHONE_NUMBER'],$request->phone_transaction);
+            return json_encode($response);
+        }
+
+        if ($this->db->checknumberValidity($request->phone))
+            return json_encode([ 'agent' => $request->lastname , 'error' => 'invalid phone number', 'error_msg' => $this->messageText['INVALID_PHONE']]);
+
+        if ($this->db->checknumberValidity($request->phone_transaction))
+            return json_encode([ 'agent' => $request->lastname , 'error' => 'invalid transaction phone number', 'error_msg' => $this->messageText['INVALID_TRANSACTION_PHONE']]);
+
         $membercodetest = $this->db->isMemberCodeExisted($request->member);
         if ($membercodetest) {
             $user = $this->db->storeUser($request->address, $request->lastname, $request->email, $request->phone,
@@ -449,14 +464,9 @@ class Requester
               echo "Code membre pour le réseau : ".$user["code_membre"]."<br />";
               echo "<br />";*/
         } else {
-                    return json_encode(['error' => 'unable to get membrre', 'error_msg' => $this->messageText['NO_CODE_MEMBER']]);
+            return json_encode([ 'agent' => $request->lastname , 'error' => 'unable to get member', 'error_msg' => $this->messageText['NO_CODE_MEMBER']]);
 
         }
-            }else{
-                return json_encode(['error' => 'unable to get membrre',"msg"=>$this->messageText, 'error_msg' => $this->messageText['INVALID_PHONE']]);
-
-            }
-        }
     }
 
     /**

static/en/message.json

@@ -15,9 +15,11 @@
   "MESSAGE_1":"Hi %s, \n \nYour %s account has just been created. \nYour ID:%s \nYour Passwords:%s \n\nYour member code : %s\n\nYour verification code:%s \n \nService, \niLinkWorld Team.",
   "MESSAGE_1_USER":"Hi %s, \n \nYour %s account has just been created. \nYour ID:%s \nYour Passwords:%s \n\nYour verification code:%s \n \nService, \niLinkWorld Team.",
   "MESSAGE_2":"Hi %s, \n \nYour %s account has just been created. \nYour ID:%s \n \nYour password:%s\n \nYour member code : %s\n Your verification code will be sent to you once your Hypervisor validates it \n\nKindly, \niLinkWorld team.",
-  "ALREADY_PHONE_NUMBER":"The phone number is already created",
+  "ALREADY_PHONE_NUMBER":"The phone number %s is already created",
+  "ALREADY_TRANSACTION_PHONE_NUMBER":"The transaction phone number %s is already created",
   "NO_CODE_MEMBER":"no member has this code",
   "INVALID_PHONE":"Invalide phone number",
+  "INVALID_TRANSACTION_PHONE":"Invalid transaction phone number",
   "WRONG_PASSWORD":"Wrong password",
   "USER_":"User",
   "AGENT_GEO":"GeolocatedAgent",

static/fr/message.json

@@ -18,9 +18,11 @@
   "MESSAGE_1":"Salut %s,\n\nVotre compte %s vient d'être crée.\nVotre identifiant : %s \nVotre mot de passe : %s\n\nVotre code membre : %s\nVotre code de validation : %s\n\nCordialement,\nEquipe iLinkWorld.",
  "MESSAGE_1_USER":"Salut %s,\n\nVotre compte %s vient d'être crée.\nVotre identifiant : %s \nVotre mot de passe : %s\n\nVotre code de validation : %s\n\nCordialement,\nEquipe iLinkWorld.",
   "MESSAGE_2":"Salut %s,\n\nVotre compte %s vient d'être crée.\nVotre identifiant : %s \n\nVotre mot de passe : %s\nVotre code membre : %s\n Votre code de validation vous sera envoye une fois que votre Hyperviseur l'aura validé\n\nCordialement,\nEquipe iLinkWorld.",
-  "ALREADY_PHONE_NUMBER":"le numero de telephone existe deja",
+  "ALREADY_PHONE_NUMBER":"Le numero de téléphone %s existe déjà",
+  "ALREADY_TRANSACTION_PHONE_NUMBER":"Le numero de téléphone de transaction %s existe déjà",
   "NO_CODE_MEMBER":"aucun membre ne possede ce code",
   "INVALID_PHONE":"le numero est invalide",
+  "INVALID_TRANSACTION_PHONE":"Le numéro de transaction est invalide",
   "WELCOME_ILINK":"Bienvenue dans iLinkWorld",
   "AGENT_GEO":"Agent Géolocalisé",
   "ADMIN":"Administrateur",