route4me / route4me-php-sdk

examples/Order/UpdateOrder.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 	
 	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
-    require $vdir.'/../vendor/autoload.php';
+	require $vdir.'/../vendor/autoload.php';
 	
 	use Route4Me\Route4Me;
 	use Route4Me\Order;

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 	namespace Route4Me;
 	
-	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
+	$vdir = $_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
     require $vdir.'/../vendor/autoload.php';
 	

examples/Members/member_validate_session.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 	
 	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
-    require $vdir.'/../vendor/autoload.php';
+	require $vdir.'/../vendor/autoload.php';
 	
 	use Route4Me\Route4Me;
 	use Route4Me\Member;

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 	namespace Route4Me;
 	
-	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
+	$vdir = $_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
     require $vdir.'/../vendor/autoload.php';
 	

examples/Members/get_users.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 	
 	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
-    require $vdir.'/../vendor/autoload.php';
+	require $vdir.'/../vendor/autoload.php';
 	
 	use Route4Me\Route4Me;
 	use Route4Me\Member;

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 	namespace Route4Me;
 	
-	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
+	$vdir = $_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
     require $vdir.'/../vendor/autoload.php';
 	

src/Route4Me/Route4Me.php

Doc Comments +3 added lines

@@ -204,6 +204,9 @@
         }
     }
 
+	/**
+	 * @param string $url
+	 */
 	public static function makeUrlRequst($url, $options) {
 		$method = isset($options['method']) ? $options['method'] : 'GET';
         $query = isset($options['query']) ?

Indentation +135 added lines, -135 removed lines

@@ -7,37 +7,37 @@ 
 
 class Route4Me
 {
-    static public $apiKey;
-    static public $baseUrl = 'https://api.route4me.com';
+	static public $apiKey;
+	static public $baseUrl = 'https://api.route4me.com';
 
-    public static function setApiKey($apiKey)
-    {
-        self::$apiKey = $apiKey;
-    }
+	public static function setApiKey($apiKey)
+	{
+		self::$apiKey = $apiKey;
+	}
 
-    public static function getApiKey()
-    {
-        return self::$apiKey;
-    }
+	public static function getApiKey()
+	{
+		return self::$apiKey;
+	}
 
-    public static function setBaseUrl($baseUrl)
-    {
-        self::$baseUrl = $baseUrl;
-    }
+	public static function setBaseUrl($baseUrl)
+	{
+		self::$baseUrl = $baseUrl;
+	}
 
-    public static function getBaseUrl()
-    {
-        return self::$baseUrl;
-    }
+	public static function getBaseUrl()
+	{
+		return self::$baseUrl;
+	}
 	
 	public static function fileUploadRequest($options) {
 		$query = isset($options['query']) ?
-            array_filter($options['query']) : array();
+			array_filter($options['query']) : array();
 
 		if (sizeof($query)==0) return null;
 
 		$body = isset($options['body']) ?
-            array_filter($options['body']) : null;
+			array_filter($options['body']) : null;
 			
 		$fname = isset($body['strFilename']) ? $body['strFilename'] : '';
 		if ($fname=='') return null;
@@ -47,8 +47,8 @@ 
 		$fp=fopen(realpath($fname),"r");
 		
 		$url = self::$baseUrl.$options['url'] . '?' . http_build_query(array_merge(
-            array( 'api_key' => self::getApiKey()), $query)
-        );
+			array( 'api_key' => self::getApiKey()), $query)
+		);
 		
 		//self::simplePrint($body);die("");
 		//echo "url=".$url."<br>";die("");
@@ -56,12 +56,12 @@ 
 		$ch = curl_init($url);
 		
 		$curlOpts = array(
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_TIMEOUT        => 60,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSL_VERIFYHOST => FALSE,
-            CURLOPT_SSL_VERIFYPEER => FALSE
-        );
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_TIMEOUT        => 60,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_SSL_VERIFYHOST => FALSE,
+			CURLOPT_SSL_VERIFYPEER => FALSE
+		);
 		
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
 		
@@ -77,65 +77,65 @@ 
 		fclose($fp);
 		//var_dump($result); die('');
 		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+		curl_close($ch);
 		//echo "code = $code <br>";
 		$json = json_decode($result, true);
 		//var_dump($json); die("");
-        if (200 == $code) {
-            return $json;
-        } elseif (isset($json['errors'])) {
-            throw new ApiError(implode(', ', $json['errors']));
-        } else {
-            throw new ApiError('Something wrong');
-        }
+		if (200 == $code) {
+			return $json;
+		} elseif (isset($json['errors'])) {
+			throw new ApiError(implode(', ', $json['errors']));
+		} else {
+			throw new ApiError('Something wrong');
+		}
 	}
 
-    public static function makeRequst($options) {
-        $errorHandler = new myErrorHandler();
+	public static function makeRequst($options) {
+		$errorHandler = new myErrorHandler();
     
-        $old_error_handler = set_error_handler(array( $errorHandler, "proc_error"));
-        $method = isset($options['method']) ? $options['method'] : 'GET';
-        $query = isset($options['query']) ?
-            array_filter($options['query']) : array();
+		$old_error_handler = set_error_handler(array( $errorHandler, "proc_error"));
+		$method = isset($options['method']) ? $options['method'] : 'GET';
+		$query = isset($options['query']) ?
+			array_filter($options['query']) : array();
 		//echo "query=".$query['member_id'];die("");
-        $body = isset($options['body']) ?
-            array_filter($options['body']) : null;
+		$body = isset($options['body']) ?
+			array_filter($options['body']) : null;
 		$file = isset($options['FILE']) ? $options['FILE'] : null;
-        $headers = array(
-            "User-Agent: Route4Me php-sdk"
-        );
+		$headers = array(
+			"User-Agent: Route4Me php-sdk"
+		);
         
-        if (isset($options['HTTPHEADER'])) {
-            $headers[]=$options['HTTPHEADER'];
-        }
+		if (isset($options['HTTPHEADER'])) {
+			$headers[]=$options['HTTPHEADER'];
+		}
 
 		if (isset($options['HTTPHEADERS'])) {
-		    foreach ($options['HTTPHEADERS'] As $header) $headers[]=$header;
-        }
-        //self::simplePrint($headers); die("");
-        $ch = curl_init();
-        $url = $options['url'] . '?' . http_build_query(array_merge(
-            $query, array( 'api_key' => self::getApiKey())
-        ));
+			foreach ($options['HTTPHEADERS'] As $header) $headers[]=$header;
+		}
+		//self::simplePrint($headers); die("");
+		$ch = curl_init();
+		$url = $options['url'] . '?' . http_build_query(array_merge(
+			$query, array( 'api_key' => self::getApiKey())
+		));
 		//var_dump($body); echo "<br><br>";
 		//$jfile=json_encode($body); echo "<br><br>".$jfile; die("STOPPPP");
 
-        //self::simplePrint($headers); die("");
+		//self::simplePrint($headers); die("");
 		$baseUrl=self::getBaseUrl();
 		
 		if (strpos($url,'move_route_destination')>0) $baseUrl='https://api.route4me.com';
-        $curlOpts = arraY(
-            CURLOPT_URL            => $baseUrl. $url,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_TIMEOUT        => 60,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSL_VERIFYHOST => FALSE,
-            CURLOPT_SSL_VERIFYPEER => FALSE,
-            CURLOPT_HTTPHEADER     => $headers
-        );
+		$curlOpts = arraY(
+			CURLOPT_URL            => $baseUrl. $url,
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_TIMEOUT        => 60,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_SSL_VERIFYHOST => FALSE,
+			CURLOPT_SSL_VERIFYPEER => FALSE,
+			CURLOPT_HTTPHEADER     => $headers
+		);
 		
 		//echo "url=".$baseUrl.$url."<br>";die("");
-        curl_setopt_array($ch, $curlOpts);
+		curl_setopt_array($ch, $curlOpts);
 		
 		if ($file !=null) {
 			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
@@ -144,21 +144,21 @@ 
 			curl_setopt($ch, CURLOPT_INFILESIZE, filesize($file));
 		}
 		
-        switch($method) {
-        case 'DELETE':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+		switch($method) {
+		case 'DELETE':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
 			if (isset($body)) {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
 			}
-            break;
+			break;
 		case 'DELETEARRAY':
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
-            break;
-        case 'PUT':
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
+			break;
+		case 'PUT':
 			//$jfile=json_encode($body); echo $jfile; die("");
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
 			if (isset($query)) {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
 			}
@@ -167,9 +167,9 @@ 
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
 			}
 			break;
-        case 'POST':
+		case 'POST':
 			if (isset($query)) {
-            	curl_setopt($ch,  CURLOPT_POSTFIELDS, json_encode($query)); 
+				curl_setopt($ch,  CURLOPT_POSTFIELDS, json_encode($query)); 
 			}
             
 			//echo "<br><br>". json_encode($body); 
@@ -178,10 +178,10 @@ 
 			} 
 			break;
 		case 'ADD':
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
-        }
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
+		}
 
-        $result = curl_exec($ch);
+		$result = curl_exec($ch);
 		//var_dump($result); die("");
 		$isxml=FALSE;
 		$jxml="";
@@ -192,63 +192,63 @@ 
 			$isxml = TRUE;
 		}
 		
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		curl_close($ch);
 		//echo "code -> $code <br>";
 		
-        if (200 == $code) {
-            if ($isxml) {
-                $json = $jxml;
-            } else $json = json_decode($result, true);
-            //var_dump($json); die("");
-            if (isset($json['errors'])) {
-                throw new ApiError(implode(', ', $json['errors']));
-            } else {
-                return $json;
-            }
-        }  elseif (409 == $code) {
-            throw new ApiError('Wrong API key');
-        } else {
-            throw new ApiError('Something wrong');
-        }
-    }
+		if (200 == $code) {
+			if ($isxml) {
+				$json = $jxml;
+			} else $json = json_decode($result, true);
+			//var_dump($json); die("");
+			if (isset($json['errors'])) {
+				throw new ApiError(implode(', ', $json['errors']));
+			} else {
+				return $json;
+			}
+		}  elseif (409 == $code) {
+			throw new ApiError('Wrong API key');
+		} else {
+			throw new ApiError('Something wrong');
+		}
+	}
 
 	public static function makeUrlRequst($url, $options) {
 		$method = isset($options['method']) ? $options['method'] : 'GET';
-        $query = isset($options['query']) ?
-            array_filter($options['query']) : array();
-        $body = isset($options['body']) ?
-            array_filter($options['body']) : null;
-        $ch = curl_init();
+		$query = isset($options['query']) ?
+			array_filter($options['query']) : array();
+		$body = isset($options['body']) ?
+			array_filter($options['body']) : null;
+		$ch = curl_init();
 		
 		$curlOpts = arraY(
-            CURLOPT_URL            => $url,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_TIMEOUT        => 60,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSL_VERIFYHOST => FALSE,
-            CURLOPT_SSL_VERIFYPEER => FALSE,
-            CURLOPT_HTTPHEADER     => array(
-                'User-Agent' => 'Route4Me php-sdk'
-            )
-        );
+			CURLOPT_URL            => $url,
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_TIMEOUT        => 60,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_SSL_VERIFYHOST => FALSE,
+			CURLOPT_SSL_VERIFYPEER => FALSE,
+			CURLOPT_HTTPHEADER     => array(
+				'User-Agent' => 'Route4Me php-sdk'
+			)
+		);
 		
 		curl_setopt_array($ch, $curlOpts);
 		
-        switch($method) {
-        case 'DELETE':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+		switch($method) {
+		case 'DELETE':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
 			if (isset($body)) {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
 			}
-            break;
+			break;
 		case 'DELETEARRAY':
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
-            break;
-        case 'PUT':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
+			break;
+		case 'PUT':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
 			if (isset($query)) {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
 			}
@@ -257,10 +257,10 @@ 
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
 			}
 			break;
-        case 'POST':
+		case 'POST':
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); 
 			if (isset($query)) {
-            	curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); 
+				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); 
 			}
 
 			if (isset($body)) {
@@ -268,8 +268,8 @@ 
 			} 
 			break;
 		case 'ADD':
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
-        }
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
+		}
 
 		$result = curl_exec($ch);
         
@@ -282,21 +282,21 @@ 
 			$isxml = TRUE;
 		}
 		
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		curl_close($ch);
 		
 		if ($isxml) {
 			$json = $jxml;
 		} else $json = json_decode($result, true);
 		
 		
-        if (200 == $code) {
-            return $json;
-        } elseif (isset($json['errors'])) {
-            throw new ApiError(implode(', ', $json['errors']));
-        } else {
-            throw new ApiError('Something wrong');
-        }
+		if (200 == $code) {
+			return $json;
+		} elseif (isset($json['errors'])) {
+			throw new ApiError(implode(', ', $json['errors']));
+		} else {
+			throw new ApiError('Something wrong');
+		}
 	}
 	
 	/**

Spacing +25 added lines, -25 removed lines

@@ -44,10 +44,10 @@ 
 
 		$rpath = realpath($fname);
 		
-		$fp=fopen(realpath($fname),"r");
+		$fp = fopen(realpath($fname), "r");
 		
-		$url = self::$baseUrl.$options['url'] . '?' . http_build_query(array_merge(
-            array( 'api_key' => self::getApiKey()), $query)
+		$url = self::$baseUrl.$options['url'].'?'.http_build_query(array_merge(
+            array('api_key' => self::getApiKey()), $query)
         );
 		
 		//self::simplePrint($body);die("");
@@ -81,7 +81,7 @@ 
 		//echo "code = $code <br>";
 		$json = json_decode($result, true);
 		//var_dump($json); die("");
-        if (200 == $code) {
+        if (200==$code) {
             return $json;
         } elseif (isset($json['errors'])) {
             throw new ApiError(implode(', ', $json['errors']));
@@ -93,7 +93,7 @@ 
     public static function makeRequst($options) {
         $errorHandler = new myErrorHandler();
     
-        $old_error_handler = set_error_handler(array( $errorHandler, "proc_error"));
+        $old_error_handler = set_error_handler(array($errorHandler, "proc_error"));
         $method = isset($options['method']) ? $options['method'] : 'GET';
         $query = isset($options['query']) ?
             array_filter($options['query']) : array();
@@ -106,26 +106,26 @@ 
         );
         
         if (isset($options['HTTPHEADER'])) {
-            $headers[]=$options['HTTPHEADER'];
+            $headers[] = $options['HTTPHEADER'];
         }
 
 		if (isset($options['HTTPHEADERS'])) {
-		    foreach ($options['HTTPHEADERS'] As $header) $headers[]=$header;
+		    foreach ($options['HTTPHEADERS'] As $header) $headers[] = $header;
         }
         //self::simplePrint($headers); die("");
         $ch = curl_init();
-        $url = $options['url'] . '?' . http_build_query(array_merge(
-            $query, array( 'api_key' => self::getApiKey())
+        $url = $options['url'].'?'.http_build_query(array_merge(
+            $query, array('api_key' => self::getApiKey())
         ));
 		//var_dump($body); echo "<br><br>";
 		//$jfile=json_encode($body); echo "<br><br>".$jfile; die("STOPPPP");
 
         //self::simplePrint($headers); die("");
-		$baseUrl=self::getBaseUrl();
+		$baseUrl = self::getBaseUrl();
 		
-		if (strpos($url,'move_route_destination')>0) $baseUrl='https://api.route4me.com';
+		if (strpos($url, 'move_route_destination')>0) $baseUrl = 'https://api.route4me.com';
         $curlOpts = arraY(
-            CURLOPT_URL            => $baseUrl. $url,
+            CURLOPT_URL            => $baseUrl.$url,
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_TIMEOUT        => 60,
             CURLOPT_FOLLOWLOCATION => true,
@@ -137,14 +137,14 @@ 
 		//echo "url=".$baseUrl.$url."<br>";die("");
         curl_setopt_array($ch, $curlOpts);
 		
-		if ($file !=null) {
+		if ($file!=null) {
 			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-			$fp=fopen($file,'r');
-			curl_setopt($ch, CURLOPT_INFILE , $fp);
+			$fp = fopen($file, 'r');
+			curl_setopt($ch, CURLOPT_INFILE, $fp);
 			curl_setopt($ch, CURLOPT_INFILESIZE, filesize($file));
 		}
 		
-        switch($method) {
+        switch ($method) {
         case 'DELETE':
             curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
@@ -169,7 +169,7 @@ 
 			break;
         case 'POST':
 			if (isset($query)) {
-            	curl_setopt($ch,  CURLOPT_POSTFIELDS, json_encode($query)); 
+            	curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); 
 			}
             
 			//echo "<br><br>". json_encode($body); 
@@ -183,8 +183,8 @@ 
 
         $result = curl_exec($ch);
 		//var_dump($result); die("");
-		$isxml=FALSE;
-		$jxml="";
+		$isxml = FALSE;
+		$jxml = "";
 		if (strpos($result, '<?xml')>-1)
 		{
 			$xml = simplexml_load_string($result);
@@ -196,7 +196,7 @@ 
         curl_close($ch);
 		//echo "code -> $code <br>";
 		
-        if (200 == $code) {
+        if (200==$code) {
             if ($isxml) {
                 $json = $jxml;
             } else $json = json_decode($result, true);
@@ -206,7 +206,7 @@ 
             } else {
                 return $json;
             }
-        }  elseif (409 == $code) {
+        }  elseif (409==$code) {
             throw new ApiError('Wrong API key');
         } else {
             throw new ApiError('Something wrong');
@@ -235,7 +235,7 @@ 
 		
 		curl_setopt_array($ch, $curlOpts);
 		
-        switch($method) {
+        switch ($method) {
         case 'DELETE':
             curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
@@ -273,8 +273,8 @@ 
 
 		$result = curl_exec($ch);
         
-		$isxml=FALSE;
-		$jxml="";
+		$isxml = FALSE;
+		$jxml = "";
 		if (strpos($result, '<?xml')>-1)
 		{
 			$xml = simplexml_load_string($result);
@@ -290,7 +290,7 @@ 
 		} else $json = json_decode($result, true);
 		
 		
-        if (200 == $code) {
+        if (200==$code) {
             return $json;
         } elseif (isset($json['errors'])) {
             throw new ApiError(implode(', ', $json['errors']));

Braces +19 added lines, -7 removed lines

@@ -34,13 +34,17 @@ 
 		$query = isset($options['query']) ?
             array_filter($options['query']) : array();
 
-		if (sizeof($query)==0) return null;
+		if (sizeof($query)==0) {
+			return null;
+		}
 
 		$body = isset($options['body']) ?
             array_filter($options['body']) : null;
 			
 		$fname = isset($body['strFilename']) ? $body['strFilename'] : '';
-		if ($fname=='') return null;
+		if ($fname=='') {
+			return null;
+		}
 
 		$rpath = realpath($fname);
 		
@@ -110,7 +114,9 @@ 
         }
 
 		if (isset($options['HTTPHEADERS'])) {
-		    foreach ($options['HTTPHEADERS'] As $header) $headers[]=$header;
+		    foreach ($options['HTTPHEADERS'] As $header) {
+		    	$headers[]=$header;
+		    }
         }
         //self::simplePrint($headers); die("");
         $ch = curl_init();
@@ -123,7 +129,9 @@ 
         //self::simplePrint($headers); die("");
 		$baseUrl=self::getBaseUrl();
 		
-		if (strpos($url,'move_route_destination')>0) $baseUrl='https://api.route4me.com';
+		if (strpos($url,'move_route_destination')>0) {
+			$baseUrl='https://api.route4me.com';
+		}
         $curlOpts = arraY(
             CURLOPT_URL            => $baseUrl. $url,
             CURLOPT_RETURNTRANSFER => true,
@@ -199,14 +207,16 @@ 
         if (200 == $code) {
             if ($isxml) {
                 $json = $jxml;
-            } else $json = json_decode($result, true);
+            } else {
+            	$json = json_decode($result, true);
+            }
             //var_dump($json); die("");
             if (isset($json['errors'])) {
                 throw new ApiError(implode(', ', $json['errors']));
             } else {
                 return $json;
             }
-        }  elseif (409 == $code) {
+        } elseif (409 == $code) {
             throw new ApiError('Wrong API key');
         } else {
             throw new ApiError('Something wrong');
@@ -287,7 +297,9 @@ 
 		
 		if ($isxml) {
 			$json = $jxml;
-		} else $json = json_decode($result, true);
+		} else {
+			$json = json_decode($result, true);
+		}
 		
 		
         if (200 == $code) {

examples/GarageDoorOpener/myq_login.php

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
-    require $vdir.'/../vendor/autoload.php';
+	require $vdir.'/../vendor/autoload.php';
 	
 	use Route4Me\MyQ;
 	

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
+	$vdir = $_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
     require $vdir.'/../vendor/autoload.php';
 	
 	use Route4Me\MyQ;

src/Route4Me/Member.php

Indentation +146 added lines, -146 removed lines

@@ -68,60 +68,60 @@ 
 		
 		public static function fromArray(array $params) {
 			$member= new Member();
-	        foreach($params as $key => $value) {
-	            if (property_exists($member, $key)) {
-	                $member->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($member, $key)) {
+					$member->{$key} = $value;
+				}
 			}
 			
 			return $member;
 		}
 		
 		public static function getUsers()
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET'
-	        ));
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET'
+			));
 			//var_dump($response); die("");
 			return $response;
 		}
 		
 		public static function getUser($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	            	'member_id' => isset($params['member_id']) ? $params['member_id'] : null
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'member_id' => isset($params['member_id']) ? $params['member_id'] : null
 				)
-	        ));
+			));
 			//var_dump($response); die("");
 			return $response;
 		}
 		
 		public static function getUserLocations($param)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUserLocations,
-	            'method' => 'GET',
-	            'query'  => array(
-	            	'query' => $param
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUserLocations,
+				'method' => 'GET',
+				'query'  => array(
+					'query' => $param
 				)
-	        ));
+			));
 			//var_dump($response); die("");
 			return $response;
 		}
 		
 		public static function addDeviceRecord($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlDevice,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlDevice,
+				'method' => 'POST',
+				'body'  => array(
 					'device_id' => 	isset($body->device_id) ? $body->device_id: null,
-	                'device_type' => isset($body->device_type) ? $body->device_type : null,
-	                'format' => isset($body->format) ? $body->format : null
+					'device_type' => isset($body->device_type) ? $body->device_type : null,
+					'format' => isset($body->format) ? $body->format : null
 				)
 
 			));
@@ -129,25 +129,25 @@ 
 		}
 		
 		public static function createMember($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'POST',
+				'body'  => array(
 					'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null,
-	                'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
-	                'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
-	                'route_count' => isset($body->route_count) ? $body->route_count : null,
-	                'member_email' => isset($body->member_email) ? $body->member_email : null,
-	                'HIDE_VISITED_ADDRESSES' => isset($body->HIDE_VISITED_ADDRESSES) ? $body->HIDE_VISITED_ADDRESSES : null,
-	                'READONLY_USER' => isset($body->READONLY_USER) ? $body->READONLY_USER : null,
-	                'date_of_birth' => isset($body->date_of_birth) ? $body->date_of_birth : null,
-	                'member_first_name' => isset($body->member_first_name) ? $body->member_first_name : null,
-	                'member_password' => isset($body->member_password) ? $body->member_password : null,
-	                'HIDE_NONFUTURE_ROUTES' => isset($body->HIDE_NONFUTURE_ROUTES) ? $body->HIDE_NONFUTURE_ROUTES : null,
-	                'member_last_name' => isset($body->member_last_name) ? $body->member_last_name : null,
-	                'SHOW_ALL_VEHICLES' => isset($body->SHOW_ALL_VEHICLES) ? $body->SHOW_ALL_VEHICLES : null,
-	                'SHOW_ALL_DRIVERS' => isset($body->SHOW_ALL_DRIVERS) ? $body->SHOW_ALL_DRIVERS : null
+					'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
+					'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
+					'route_count' => isset($body->route_count) ? $body->route_count : null,
+					'member_email' => isset($body->member_email) ? $body->member_email : null,
+					'HIDE_VISITED_ADDRESSES' => isset($body->HIDE_VISITED_ADDRESSES) ? $body->HIDE_VISITED_ADDRESSES : null,
+					'READONLY_USER' => isset($body->READONLY_USER) ? $body->READONLY_USER : null,
+					'date_of_birth' => isset($body->date_of_birth) ? $body->date_of_birth : null,
+					'member_first_name' => isset($body->member_first_name) ? $body->member_first_name : null,
+					'member_password' => isset($body->member_password) ? $body->member_password : null,
+					'HIDE_NONFUTURE_ROUTES' => isset($body->HIDE_NONFUTURE_ROUTES) ? $body->HIDE_NONFUTURE_ROUTES : null,
+					'member_last_name' => isset($body->member_last_name) ? $body->member_last_name : null,
+					'SHOW_ALL_VEHICLES' => isset($body->SHOW_ALL_VEHICLES) ? $body->SHOW_ALL_VEHICLES : null,
+					'SHOW_ALL_DRIVERS' => isset($body->SHOW_ALL_DRIVERS) ? $body->SHOW_ALL_DRIVERS : null
 				)
 
 			));
@@ -155,26 +155,26 @@ 
 		}
 
 		public static function updateMember($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'PUT',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'PUT',
+				'body'  => array(
 					'member_id' => 	isset($body->member_id) ? $body->member_id: null,
-	                'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
-	                'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null,
-	                'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
-	                'route_count' => isset($body->route_count) ? $body->route_count : null,
-	                'member_email' => isset($body->member_email) ? $body->member_email : null,
-	                'HIDE_VISITED_ADDRESSES' => isset($body->HIDE_VISITED_ADDRESSES) ? $body->HIDE_VISITED_ADDRESSES : null,
-	                'READONLY_USER' => isset($body->READONLY_USER) ? $body->READONLY_USER : null,
-	                'date_of_birth' => isset($body->date_of_birth) ? $body->date_of_birth : null,
-	                'member_first_name' => isset($body->member_first_name) ? $body->member_first_name : null,
-	                'member_password' => isset($body->member_password) ? $body->member_password : null,
-	                'HIDE_NONFUTURE_ROUTES' => isset($body->HIDE_NONFUTURE_ROUTES) ? $body->HIDE_NONFUTURE_ROUTES : null,
-	                'member_last_name' => isset($body->member_last_name) ? $body->member_last_name : null,
-	                'SHOW_ALL_VEHICLES' => isset($body->SHOW_ALL_VEHICLES) ? $body->SHOW_ALL_VEHICLES : null,
-	                'SHOW_ALL_DRIVERS' => isset($body->SHOW_ALL_DRIVERS) ? $body->SHOW_ALL_DRIVERS : null
+					'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
+					'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null,
+					'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
+					'route_count' => isset($body->route_count) ? $body->route_count : null,
+					'member_email' => isset($body->member_email) ? $body->member_email : null,
+					'HIDE_VISITED_ADDRESSES' => isset($body->HIDE_VISITED_ADDRESSES) ? $body->HIDE_VISITED_ADDRESSES : null,
+					'READONLY_USER' => isset($body->READONLY_USER) ? $body->READONLY_USER : null,
+					'date_of_birth' => isset($body->date_of_birth) ? $body->date_of_birth : null,
+					'member_first_name' => isset($body->member_first_name) ? $body->member_first_name : null,
+					'member_password' => isset($body->member_password) ? $body->member_password : null,
+					'HIDE_NONFUTURE_ROUTES' => isset($body->HIDE_NONFUTURE_ROUTES) ? $body->HIDE_NONFUTURE_ROUTES : null,
+					'member_last_name' => isset($body->member_last_name) ? $body->member_last_name : null,
+					'SHOW_ALL_VEHICLES' => isset($body->SHOW_ALL_VEHICLES) ? $body->SHOW_ALL_VEHICLES : null,
+					'SHOW_ALL_DRIVERS' => isset($body->SHOW_ALL_DRIVERS) ? $body->SHOW_ALL_DRIVERS : null
 				)
 
 			));
@@ -182,11 +182,11 @@ 
 		}
 
 		public static function deleteMember($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'DELETE',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'DELETE',
+				'body'  => array(
 					'member_id' => 	isset($body->member_id) ? $body->member_id: null
 				)
 
@@ -195,50 +195,50 @@ 
 		}
 		
 		public static function newAccountRegistration($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlRegistr,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlRegistr,
+				'method' => 'POST',
+				'body'  => array(
 					'strEmail' => 	isset($body->strEmail) ? $body->strEmail: null,
-	                'strPassword_1' => isset($body->strPassword_1) ? $body->strPassword_1 : null,
-	                'strPassword_2' => isset($body->strPassword_2) ? $body->strPassword_2 : null,
-	                'strFirstName' => 	isset($body->strFirstName) ? $body->strFirstName: null,
-	                'strLastName' => 	isset($body->strLastName) ? $body->strLastName: null,
-	                'strIndustry' => 	isset($body->strIndustry) ? $body->strIndustry: null,
-	                'chkTerms' => 	isset($body->chkTerms) ? $body->chkTerms: null,
-	                'plan' => 	isset($body->plan) ? $body->plan: null,
-	                'strSubAccountType' =>  isset($body->strSubAccountType) ? $body->strSubAccountType: null,
-	                'blDisableMarketing' => isset($body->blDisableMarketing) ? $body->blDisableMarketing: false,
-	                'blDisableAccountActivationEmail' => isset($body->blDisableAccountActivationEmail) ? $body->blDisableAccountActivationEmail: false
+					'strPassword_1' => isset($body->strPassword_1) ? $body->strPassword_1 : null,
+					'strPassword_2' => isset($body->strPassword_2) ? $body->strPassword_2 : null,
+					'strFirstName' => 	isset($body->strFirstName) ? $body->strFirstName: null,
+					'strLastName' => 	isset($body->strLastName) ? $body->strLastName: null,
+					'strIndustry' => 	isset($body->strIndustry) ? $body->strIndustry: null,
+					'chkTerms' => 	isset($body->chkTerms) ? $body->chkTerms: null,
+					'plan' => 	isset($body->plan) ? $body->plan: null,
+					'strSubAccountType' =>  isset($body->strSubAccountType) ? $body->strSubAccountType: null,
+					'blDisableMarketing' => isset($body->blDisableMarketing) ? $body->blDisableMarketing: false,
+					'blDisableAccountActivationEmail' => isset($body->blDisableAccountActivationEmail) ? $body->blDisableAccountActivationEmail: false
 				)
 			));
 			return $response;
 		}
 		
 		public static function validateSession($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlSessValid,
-	            'method' => 'GET',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlSessValid,
+				'method' => 'GET',
+				'query'  => array(
 					'session_guid' => 	isset($params->session_guid) ? $params->session_guid: null,
-	                'member_id' => isset($params->member_id) ? $params->member_id : null,
-	                'format' => isset($params->format) ? $params->format : null
+					'member_id' => isset($params->member_id) ? $params->member_id : null,
+					'format' => isset($params->format) ? $params->format : null
 				)
 			));
 			return $response;
 		}
 		
 		public static function memberAuthentication($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlAuthen,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlAuthen,
+				'method' => 'POST',
+				'body'  => array(
 					'strEmail' => 	isset($body->strEmail) ? $body->strEmail: null,
-	                'strPassword' => isset($body->strPassword) ? $body->strPassword : null,
-	                'format' => isset($body->format) ? $body->format : null
+					'strPassword' => isset($body->strPassword) ? $body->strPassword : null,
+					'format' => isset($body->format) ? $body->format : null
 				)
 
 			));
@@ -246,18 +246,18 @@ 
 		}
 		
 		public static function webinarRegistration($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlWebinar,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlWebinar,
+				'method' => 'POST',
+				'body'  => array(
 					'email_address' => 	isset($body->email_address) ? $body->email_address: null,
-	                'first_name' => isset($body->first_name) ? $body->first_name : null,
-	                'last_name' => isset($body->last_name) ? $body->last_name : null,
-	                'phone_number' => isset($body->phone_number) ? $body->phone_number : null,
-	                'phone_number' => isset($body->phone_number) ? $body->phone_number : null,
-	                'member_id' => isset($body->member_id) ? $body->member_id : null,
-	                'webiinar_date' => isset($body->webiinar_date) ? $body->webiinar_date : null,
+					'first_name' => isset($body->first_name) ? $body->first_name : null,
+					'last_name' => isset($body->last_name) ? $body->last_name : null,
+					'phone_number' => isset($body->phone_number) ? $body->phone_number : null,
+					'phone_number' => isset($body->phone_number) ? $body->phone_number : null,
+					'member_id' => isset($body->member_id) ? $body->member_id : null,
+					'webiinar_date' => isset($body->webiinar_date) ? $body->webiinar_date : null,
 				)
 
 			));
@@ -265,19 +265,19 @@ 
 		}
 		
 		public static function purchaseUserLicense($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlLicense,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlLicense,
+				'method' => 'POST',
+				'body'  => array(
 					'member_id' => 	isset($body->member_id) ? $body->member_id: null,
-	                'session_guid' => isset($body->session_guid) ? $body->session_guid : null,
-	                'device_id' => isset($body->device_id) ? $body->device_id : null,
-	                'device_type' => isset($body->device_type) ? $body->device_type : null,
-	                'subscription_name' => isset($body->subscription_name) ? $body->subscription_name : null,
-	                'token' => isset($body->token) ? $body->token : null,
-	                'payload' => isset($body->payload) ? $body->payload : null,
-	                'format' => isset($body->format) ? $body->format : null,
+					'session_guid' => isset($body->session_guid) ? $body->session_guid : null,
+					'device_id' => isset($body->device_id) ? $body->device_id : null,
+					'device_type' => isset($body->device_type) ? $body->device_type : null,
+					'subscription_name' => isset($body->subscription_name) ? $body->subscription_name : null,
+					'token' => isset($body->token) ? $body->token : null,
+					'payload' => isset($body->payload) ? $body->payload : null,
+					'format' => isset($body->format) ? $body->format : null,
 				)
 
 			));
@@ -285,24 +285,24 @@ 
 		}
 		
 		public static function newMemberConfigKey($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiMemberConfig,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiMemberConfig,
+				'method' => 'POST',
+				'body'  => array(
 					'config_key' => 	isset($body->config_key) ? $body->config_key: null,
-	                'config_value' => isset($body->config_value) ? $body->config_value : null
+					'config_value' => isset($body->config_value) ? $body->config_value : null
 				)
 			));
 			return $response;
 		}
 		
 		public static function removeMemberConfigKey($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiMemberConfig,
-	            'method' => 'DELETE',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiMemberConfig,
+				'method' => 'DELETE',
+				'body'  => array(
 					'config_key' => 	isset($body->config_key) ? $body->config_key: null
 				)
 			));
@@ -310,11 +310,11 @@ 
 		}
 		
 		public static function getMemberConfigData($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiMemberConfig,
-	            'method' => 'GET',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiMemberConfig,
+				'method' => 'GET',
+				'query'  => array(
 					'config_key' => 	isset($body->config_key) ? $body->config_key: null
 				)
 			));
@@ -322,13 +322,13 @@ 
 		}
 
 		public static function updateMemberConfigKey($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiMemberConfig,
-	            'method' => 'PUT',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiMemberConfig,
+				'method' => 'PUT',
+				'body'  => array(
 					'config_key' => 	isset($body->config_key) ? $body->config_key: null,
-	                'config_value' => isset($body->config_value) ? $body->config_value : null
+					'config_value' => isset($body->config_value) ? $body->config_value : null
 				)
 			));
 			return $response;

Spacing +25 added lines, -25 removed lines

@@ -64,11 +64,11 @@ 
 		public $config_key;
 		public $config_value;
 		
-		public function __construct () {  }
+		public function __construct() {  }
 		
 		public static function fromArray(array $params) {
-			$member= new Member();
-	        foreach($params as $key => $value) {
+			$member = new Member();
+	        foreach ($params as $key => $value) {
 	            if (property_exists($member, $key)) {
 	                $member->{$key} = $value;
 	            }
@@ -119,7 +119,7 @@ 
 	            'url'    => self::$apiUrlDevice,
 	            'method' => 'POST',
 	            'body'  => array(
-					'device_id' => 	isset($body->device_id) ? $body->device_id: null,
+					'device_id' => 	isset($body->device_id) ? $body->device_id : null,
 	                'device_type' => isset($body->device_type) ? $body->device_type : null,
 	                'format' => isset($body->format) ? $body->format : null
 				)
@@ -134,7 +134,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'POST',
 	            'body'  => array(
-					'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null,
+					'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES : null,
 	                'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
 	                'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
 	                'route_count' => isset($body->route_count) ? $body->route_count : null,
@@ -160,9 +160,9 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'PUT',
 	            'body'  => array(
-					'member_id' => 	isset($body->member_id) ? $body->member_id: null,
+					'member_id' => 	isset($body->member_id) ? $body->member_id : null,
 	                'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
-	                'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null,
+	                'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES : null,
 	                'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
 	                'route_count' => isset($body->route_count) ? $body->route_count : null,
 	                'member_email' => isset($body->member_email) ? $body->member_email : null,
@@ -187,7 +187,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'DELETE',
 	            'body'  => array(
-					'member_id' => 	isset($body->member_id) ? $body->member_id: null
+					'member_id' => 	isset($body->member_id) ? $body->member_id : null
 				)
 
 			));
@@ -200,17 +200,17 @@ 
 	            'url'    => self::$apiUrlRegistr,
 	            'method' => 'POST',
 	            'body'  => array(
-					'strEmail' => 	isset($body->strEmail) ? $body->strEmail: null,
+					'strEmail' => 	isset($body->strEmail) ? $body->strEmail : null,
 	                'strPassword_1' => isset($body->strPassword_1) ? $body->strPassword_1 : null,
 	                'strPassword_2' => isset($body->strPassword_2) ? $body->strPassword_2 : null,
-	                'strFirstName' => 	isset($body->strFirstName) ? $body->strFirstName: null,
-	                'strLastName' => 	isset($body->strLastName) ? $body->strLastName: null,
-	                'strIndustry' => 	isset($body->strIndustry) ? $body->strIndustry: null,
-	                'chkTerms' => 	isset($body->chkTerms) ? $body->chkTerms: null,
-	                'plan' => 	isset($body->plan) ? $body->plan: null,
-	                'strSubAccountType' =>  isset($body->strSubAccountType) ? $body->strSubAccountType: null,
-	                'blDisableMarketing' => isset($body->blDisableMarketing) ? $body->blDisableMarketing: false,
-	                'blDisableAccountActivationEmail' => isset($body->blDisableAccountActivationEmail) ? $body->blDisableAccountActivationEmail: false
+	                'strFirstName' => 	isset($body->strFirstName) ? $body->strFirstName : null,
+	                'strLastName' => 	isset($body->strLastName) ? $body->strLastName : null,
+	                'strIndustry' => 	isset($body->strIndustry) ? $body->strIndustry : null,
+	                'chkTerms' => 	isset($body->chkTerms) ? $body->chkTerms : null,
+	                'plan' => 	isset($body->plan) ? $body->plan : null,
+	                'strSubAccountType' =>  isset($body->strSubAccountType) ? $body->strSubAccountType : null,
+	                'blDisableMarketing' => isset($body->blDisableMarketing) ? $body->blDisableMarketing : false,
+	                'blDisableAccountActivationEmail' => isset($body->blDisableAccountActivationEmail) ? $body->blDisableAccountActivationEmail : false
 				)
 			));
 			return $response;
@@ -222,7 +222,7 @@ 
 	            'url'    => self::$apiUrlSessValid,
 	            'method' => 'GET',
 	            'query'  => array(
-					'session_guid' => 	isset($params->session_guid) ? $params->session_guid: null,
+					'session_guid' => 	isset($params->session_guid) ? $params->session_guid : null,
 	                'member_id' => isset($params->member_id) ? $params->member_id : null,
 	                'format' => isset($params->format) ? $params->format : null
 				)
@@ -236,7 +236,7 @@ 
 	            'url'    => self::$apiUrlAuthen,
 	            'method' => 'POST',
 	            'body'  => array(
-					'strEmail' => 	isset($body->strEmail) ? $body->strEmail: null,
+					'strEmail' => 	isset($body->strEmail) ? $body->strEmail : null,
 	                'strPassword' => isset($body->strPassword) ? $body->strPassword : null,
 	                'format' => isset($body->format) ? $body->format : null
 				)
@@ -251,7 +251,7 @@ 
 	            'url'    => self::$apiUrlWebinar,
 	            'method' => 'POST',
 	            'body'  => array(
-					'email_address' => 	isset($body->email_address) ? $body->email_address: null,
+					'email_address' => 	isset($body->email_address) ? $body->email_address : null,
 	                'first_name' => isset($body->first_name) ? $body->first_name : null,
 	                'last_name' => isset($body->last_name) ? $body->last_name : null,
 	                'phone_number' => isset($body->phone_number) ? $body->phone_number : null,
@@ -270,7 +270,7 @@ 
 	            'url'    => self::$apiUrlLicense,
 	            'method' => 'POST',
 	            'body'  => array(
-					'member_id' => 	isset($body->member_id) ? $body->member_id: null,
+					'member_id' => 	isset($body->member_id) ? $body->member_id : null,
 	                'session_guid' => isset($body->session_guid) ? $body->session_guid : null,
 	                'device_id' => isset($body->device_id) ? $body->device_id : null,
 	                'device_type' => isset($body->device_type) ? $body->device_type : null,
@@ -290,7 +290,7 @@ 
 	            'url'    => self::$apiMemberConfig,
 	            'method' => 'POST',
 	            'body'  => array(
-					'config_key' => 	isset($body->config_key) ? $body->config_key: null,
+					'config_key' => 	isset($body->config_key) ? $body->config_key : null,
 	                'config_value' => isset($body->config_value) ? $body->config_value : null
 				)
 			));
@@ -303,7 +303,7 @@ 
 	            'url'    => self::$apiMemberConfig,
 	            'method' => 'DELETE',
 	            'body'  => array(
-					'config_key' => 	isset($body->config_key) ? $body->config_key: null
+					'config_key' => 	isset($body->config_key) ? $body->config_key : null
 				)
 			));
 			return $response;
@@ -315,7 +315,7 @@ 
 	            'url'    => self::$apiMemberConfig,
 	            'method' => 'GET',
 	            'query'  => array(
-					'config_key' => 	isset($body->config_key) ? $body->config_key: null
+					'config_key' => 	isset($body->config_key) ? $body->config_key : null
 				)
 			));
 			return $response;
@@ -327,7 +327,7 @@ 
 	            'url'    => self::$apiMemberConfig,
 	            'method' => 'PUT',
 	            'body'  => array(
-					'config_key' => 	isset($body->config_key) ? $body->config_key: null,
+					'config_key' => 	isset($body->config_key) ? $body->config_key : null,
 	                'config_value' => isset($body->config_value) ? $body->config_value : null
 				)
 			));

examples/Optimizations/hybridOptimization.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 require $vdir.'/../vendor/autoload.php';
 
 use Route4Me\OptimizationProblem;
-use Route4Me\Route;
 use Route4Me\Route4Me;
 
 /* The example demonstrates process of creating a Hybrid Optimization using scheduling addresses and orders.

Indentation +71 added lines, -71 removed lines

@@ -43,21 +43,21 @@ 
 $locationsFieldsMapping['monthly_nth_wwhat']=17;
 
 if (($handle = fopen("$source_file", "r")) !== FALSE) {
-        $oAbook = new AddressBookLocation();
+		$oAbook = new AddressBookLocation();
 
-        $results=$oAbook->addLocationsFromCsvFile($handle, $locationsFieldsMapping); //Temporarry
+		$results=$oAbook->addLocationsFromCsvFile($handle, $locationsFieldsMapping); //Temporarry
         
-        echo "Errors: <br><br>";
-        foreach ($results['fail'] as $evalue) {
-            echo $evalue."<br>";
-        }
+		echo "Errors: <br><br>";
+		foreach ($results['fail'] as $evalue) {
+			echo $evalue."<br>";
+		}
         
-        echo "Successes: <br><br>";
-        foreach ($results['success'] as $svalue) {
-            echo $svalue."<br>";
-        }
+		echo "Successes: <br><br>";
+		foreach ($results['success'] as $svalue) {
+			echo $svalue."<br>";
+		}
 
-    }
+	}
 
 /* Add orders with schedules from a CSV file  */
 
@@ -76,91 +76,91 @@ 
 $ordersFieldsMapping['day_scheduled_for_YYMMDD']=8;
 
 if (($handle = fopen("$orders_file", "r")) !== FALSE) {
-        $order = new Order();
-        $results=$order->addOrdersFromCsvFile($handle, $ordersFieldsMapping);
+		$order = new Order();
+		$results=$order->addOrdersFromCsvFile($handle, $ordersFieldsMapping);
         
-        echo "Errors: <br><br>";
-        foreach ($results['fail'] as $evalue) {
-            echo $evalue."<br>";
-        }
+		echo "Errors: <br><br>";
+		foreach ($results['fail'] as $evalue) {
+			echo $evalue."<br>";
+		}
         
-        echo "Successes: <br><br>";
-        foreach ($results['success'] as $svalue) {
-            echo $svalue."<br>";
-        }
+		echo "Successes: <br><br>";
+		foreach ($results['success'] as $svalue) {
+			echo $svalue."<br>";
+		}
   
-    }
+	}
 
 /* Get Hybrid Optimization */
 
-    $ep = time()+604800;
-    $sched_date = date("Y-m-d", $ep);
+	$ep = time()+604800;
+	$sched_date = date("Y-m-d", $ep);
 
-    $hybridParams = array(
-        "target_date_string" => $sched_date,
-        "timezone_offset_minutes" => 480
-    );
+	$hybridParams = array(
+		"target_date_string" => $sched_date,
+		"timezone_offset_minutes" => 480
+	);
     
-    $optimization = new OptimizationProblem(); 
-    $hybridOptimization = $optimization->getHybridOptimization($hybridParams);
+	$optimization = new OptimizationProblem(); 
+	$hybridOptimization = $optimization->getHybridOptimization($hybridParams);
     
-    if ($hybridOptimization!=null) {
+	if ($hybridOptimization!=null) {
         
-        if (isset($hybridOptimization['optimization_problem_id'])) {
-            $optid = $hybridOptimization['optimization_problem_id'];
+		if (isset($hybridOptimization['optimization_problem_id'])) {
+			$optid = $hybridOptimization['optimization_problem_id'];
             
-            echo "Hibrid optimization with optimization_problem_id=$optid <br><br>";
+			echo "Hibrid optimization with optimization_problem_id=$optid <br><br>";
             
-            /* Add depots to the Hybrid Optimization */
-            $depotfile = "depots.csv";
+			/* Add depots to the Hybrid Optimization */
+			$depotfile = "depots.csv";
             
-            if (($handle = fopen("$depotfile", "r")) !== FALSE) {
+			if (($handle = fopen("$depotfile", "r")) !== FALSE) {
                 
-                $columns = fgetcsv($handle, $max_line_length, $delemietr);
+				$columns = fgetcsv($handle, $max_line_length, $delemietr);
                 
-                if (!$columns) {
-                    $error['message'] = 'Empty';
-                     return ($error);
-                }
+				if (!$columns) {
+					$error['message'] = 'Empty';
+					 return ($error);
+				}
                 
-                $depotsParams = array(
-                    'optimization_problem_id' => $optid,
-                    'delete_old_depots'  => true,
-                );
+				$depotsParams = array(
+					'optimization_problem_id' => $optid,
+					'delete_old_depots'  => true,
+				);
                 
-                $iRow=1;
-                $depotAddresses = array();
+				$iRow=1;
+				$depotAddresses = array();
                 
-                while (($rows = fgetcsv($handle, $max_line_length, $delemietr)) !== false) {
-                    if ($rows[0] && $rows[1] && $rows[3] && array(null) !== $rows) {
-                        $depotAddress['lat']= $rows[0];
-                        $depotAddress['lng']= $rows[1];
-                        $depotAddress['address']= $rows[3];   
-                        array_push($depotAddresses,$depotAddress);
-                    }
-                }
+				while (($rows = fgetcsv($handle, $max_line_length, $delemietr)) !== false) {
+					if ($rows[0] && $rows[1] && $rows[3] && array(null) !== $rows) {
+						$depotAddress['lat']= $rows[0];
+						$depotAddress['lng']= $rows[1];
+						$depotAddress['address']= $rows[3];   
+						array_push($depotAddresses,$depotAddress);
+					}
+				}
                 
-                $depotsParams['new_depots'] = $depotAddresses;
+				$depotsParams['new_depots'] = $depotAddresses;
                 
-                $optProblem = new OptimizationProblem();
+				$optProblem = new OptimizationProblem();
                 
-                $resultDepots = $optProblem->addDepotsToHybrid($depotsParams);
+				$resultDepots = $optProblem->addDepotsToHybrid($depotsParams);
                 
-                var_dump($resultDepots);
+				var_dump($resultDepots);
                 
-                /* Reoptimize hybrid optimization */
+				/* Reoptimize hybrid optimization */
                 
-                if ($resultDepots!=null) {
-                    $problemParams = array(
-                        'optimization_problem_id'  =>  $optid
-                    );
-                    $problem = OptimizationProblem::reoptimize($problemParams);
+				if ($resultDepots!=null) {
+					$problemParams = array(
+						'optimization_problem_id'  =>  $optid
+					);
+					$problem = OptimizationProblem::reoptimize($problemParams);
                     
-                    Route4Me::simplePrint($problem);
-                }
-            }
+					Route4Me::simplePrint($problem);
+				}
+			}
                 
-        }
+		}
 
-    }
+	}
 ?>
\ No newline at end of file

Spacing +44 added lines, -44 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace Route4Me;
 
-$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
+$vdir = $_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
 require $vdir.'/../vendor/autoload.php';
 
@@ -17,35 +17,35 @@ 
 
 Route4Me::setApiKey('bd48828717021141485a701453273458');
 
-$source_file="addresses_1000.csv";
+$source_file = "addresses_1000.csv";
 $max_line_length = 512;
-$delemietr=',';
+$delemietr = ',';
 
 
 /* Add Address Book Locations with schedules from a CSV file */
 
 /* Mapping of a CSV file with the address book locations - which of the CSV table column is corresponding to which of the Address Book's field*/
-$locationsFieldsMapping['cached_lat']=0;
-$locationsFieldsMapping['cached_lng']=1;
-$locationsFieldsMapping['address_alias']=2;
-$locationsFieldsMapping['address_1']=3;
-$locationsFieldsMapping['address_city']=4;
-$locationsFieldsMapping['address_state_id']=5;
-$locationsFieldsMapping['address_zip']=6;
-$locationsFieldsMapping['address_phone_number']=7;
-$locationsFieldsMapping['schedule_mode']=8;
-$locationsFieldsMapping['schedule_enabled']=9;
-$locationsFieldsMapping['schedule_every']=10;
-$locationsFieldsMapping['schedule_weekdays']=11;
-$locationsFieldsMapping['monthly_mode']=12;
-$locationsFieldsMapping['monthly_dates']=13;
-$locationsFieldsMapping['monthly_nth_n']=16;
-$locationsFieldsMapping['monthly_nth_wwhat']=17;
-
-if (($handle = fopen("$source_file", "r")) !== FALSE) {
+$locationsFieldsMapping['cached_lat'] = 0;
+$locationsFieldsMapping['cached_lng'] = 1;
+$locationsFieldsMapping['address_alias'] = 2;
+$locationsFieldsMapping['address_1'] = 3;
+$locationsFieldsMapping['address_city'] = 4;
+$locationsFieldsMapping['address_state_id'] = 5;
+$locationsFieldsMapping['address_zip'] = 6;
+$locationsFieldsMapping['address_phone_number'] = 7;
+$locationsFieldsMapping['schedule_mode'] = 8;
+$locationsFieldsMapping['schedule_enabled'] = 9;
+$locationsFieldsMapping['schedule_every'] = 10;
+$locationsFieldsMapping['schedule_weekdays'] = 11;
+$locationsFieldsMapping['monthly_mode'] = 12;
+$locationsFieldsMapping['monthly_dates'] = 13;
+$locationsFieldsMapping['monthly_nth_n'] = 16;
+$locationsFieldsMapping['monthly_nth_wwhat'] = 17;
+
+if (($handle = fopen("$source_file", "r"))!==FALSE) {
         $oAbook = new AddressBookLocation();
 
-        $results=$oAbook->addLocationsFromCsvFile($handle, $locationsFieldsMapping); //Temporarry
+        $results = $oAbook->addLocationsFromCsvFile($handle, $locationsFieldsMapping); //Temporarry
         
         echo "Errors: <br><br>";
         foreach ($results['fail'] as $evalue) {
@@ -61,23 +61,23 @@ 
 
 /* Add orders with schedules from a CSV file  */
 
-$orders_file="orders_baton.csv";
+$orders_file = "orders_baton.csv";
 
 /* Mapping of a CSV file with the orders - which of the CSV table column is corresponding to which of the Order's field */
 
-$ordersFieldsMapping['cached_lat']=1;
-$ordersFieldsMapping['cached_lng']=0;
-$ordersFieldsMapping['address_alias']=2;
-$ordersFieldsMapping['address_1']=3;
-$ordersFieldsMapping['order_city']=4;
-$ordersFieldsMapping['order_state_id']=5;
-$ordersFieldsMapping['order_zip_code']=6;
-$ordersFieldsMapping['EXT_FIELD_phone']=7;
-$ordersFieldsMapping['day_scheduled_for_YYMMDD']=8;
-
-if (($handle = fopen("$orders_file", "r")) !== FALSE) {
+$ordersFieldsMapping['cached_lat'] = 1;
+$ordersFieldsMapping['cached_lng'] = 0;
+$ordersFieldsMapping['address_alias'] = 2;
+$ordersFieldsMapping['address_1'] = 3;
+$ordersFieldsMapping['order_city'] = 4;
+$ordersFieldsMapping['order_state_id'] = 5;
+$ordersFieldsMapping['order_zip_code'] = 6;
+$ordersFieldsMapping['EXT_FIELD_phone'] = 7;
+$ordersFieldsMapping['day_scheduled_for_YYMMDD'] = 8;
+
+if (($handle = fopen("$orders_file", "r"))!==FALSE) {
         $order = new Order();
-        $results=$order->addOrdersFromCsvFile($handle, $ordersFieldsMapping);
+        $results = $order->addOrdersFromCsvFile($handle, $ordersFieldsMapping);
         
         echo "Errors: <br><br>";
         foreach ($results['fail'] as $evalue) {
@@ -93,7 +93,7 @@ 
 
 /* Get Hybrid Optimization */
 
-    $ep = time()+604800;
+    $ep = time() + 604800;
     $sched_date = date("Y-m-d", $ep);
 
     $hybridParams = array(
@@ -114,7 +114,7 @@ 
             /* Add depots to the Hybrid Optimization */
             $depotfile = "depots.csv";
             
-            if (($handle = fopen("$depotfile", "r")) !== FALSE) {
+            if (($handle = fopen("$depotfile", "r"))!==FALSE) {
                 
                 $columns = fgetcsv($handle, $max_line_length, $delemietr);
                 
@@ -128,15 +128,15 @@ 
                     'delete_old_depots'  => true,
                 );
                 
-                $iRow=1;
+                $iRow = 1;
                 $depotAddresses = array();
                 
-                while (($rows = fgetcsv($handle, $max_line_length, $delemietr)) !== false) {
-                    if ($rows[0] && $rows[1] && $rows[3] && array(null) !== $rows) {
-                        $depotAddress['lat']= $rows[0];
-                        $depotAddress['lng']= $rows[1];
-                        $depotAddress['address']= $rows[3];   
-                        array_push($depotAddresses,$depotAddress);
+                while (($rows = fgetcsv($handle, $max_line_length, $delemietr))!==false) {
+                    if ($rows[0] && $rows[1] && $rows[3] && array(null)!==$rows) {
+                        $depotAddress['lat'] = $rows[0];
+                        $depotAddress['lng'] = $rows[1];
+                        $depotAddress['address'] = $rows[3];   
+                        array_push($depotAddresses, $depotAddress);
                     }
                 }
                 

src/Route4Me/AddressBookLocation.php

Doc Comments +3 added lines

@@ -103,6 +103,9 @@
 			return $ablocations;
 		}
 		
+		/**
+		 * @param AddressBookLocation $params
+		 */
 		public static function addAdressBookLocation($params)
 	    {
 	    	$ablocations = Route4Me::makeRequst(array(

Indentation +325 added lines, -325 removed lines

@@ -23,11 +23,11 @@ 
 		public $address_zip;
 		public $cached_lat;
 		public $cached_lng;
-        public $curbside_lat;
-        public $curbside_lng;
+		public $curbside_lat;
+		public $curbside_lng;
 		public $color;
-        public $address_custom_data;
-        public $schedule;
+		public $address_custom_data;
+		public $schedule;
 		
 		//public $offset;
 		//public $limit;
@@ -36,415 +36,415 @@ 
 		
 		public static function fromArray(array $params) {
 			$addressbooklocation = new AddressBookLocation();
-	        foreach($params as $key => $value) {
-	            if (property_exists($addressbooklocation, $key)) {
-	                $addressbooklocation->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($addressbooklocation, $key)) {
+					$addressbooklocation->{$key} = $value;
+				}
 			}
 			
 			return $addressbooklocation;
 		}
 		
 		public static function getAddressBookLocation($addressId)
-	    {
-	    	$ablocations = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'query' => $addressId,
-	                'limit' => 30
-	            )
-	        ));
+		{
+			$ablocations = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'query' => $addressId,
+					'limit' => 30
+				)
+			));
 
 			return $ablocations;
 		}
 		
 		public static function searchRoutedLocation($params)
-	    {
-	    	$result= Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'display' => isset($params['display']) ? $params['display']: null,
-	                'query' => isset($params['query']) ? $params['query']: null,
-	                'fields' => isset($params['fields']) ? $params['fields']: null,
-	                'limit' => isset($params['limit']) ? $params['limit']: null,
-	                'offset' => isset($params['offset']) ? $params['offset'] : null,
-	            )
-	        ));
+		{
+			$result= Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'display' => isset($params['display']) ? $params['display']: null,
+					'query' => isset($params['query']) ? $params['query']: null,
+					'fields' => isset($params['fields']) ? $params['fields']: null,
+					'limit' => isset($params['limit']) ? $params['limit']: null,
+					'offset' => isset($params['offset']) ? $params['offset'] : null,
+				)
+			));
 
 			return $result;
 		}
 		
 		public static function getAddressBookLocations($params)
-	    {
-	    	$ablocations = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'limit' => isset($params->limit) ? $params->limit: null,
-	                'offset' => isset($params->offset) ? $params->offset : null,
-	            )
-	        ));
+		{
+			$ablocations = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'limit' => isset($params->limit) ? $params->limit: null,
+					'offset' => isset($params->offset) ? $params->offset : null,
+				)
+			));
 
 			return $ablocations;
 		}
 		
 		public static function getAddressBookLocationsByIds($ids)
-	    {
-	    	$ablocations = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'address_id' => $ids
-	            )
-	        ));
+		{
+			$ablocations = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'address_id' => $ids
+				)
+			));
 
 			return $ablocations;
 		}
 		
 		public static function addAdressBookLocation($params)
-	    {
-	    	$ablocations = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'POST',
-	            'body'  => array(
-	            	'address_1' => 	isset($params->address_1) ? $params->address_1: null,
-	            	'address_2' =>    isset($params->address_2) ? $params->address_2: null,
-	            	'address_alias' =>    isset($params->address_alias) ? $params->address_alias: null,
-	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
-	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
-	                'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
-                    'curbside_lng' => isset($params->curbside_lng) ? $params->curbside_lng : null,
-	                'address_phone_number' =>    isset($params->address_phone_number) ? $params->address_phone_number: null,
-	                'address_group' =>    isset($params->address_group) ? $params->address_group: null,
-	                'first_name' =>    isset($params->first_name) ? $params->first_name: null,
-	                'last_name' =>    isset($params->last_name) ? $params->last_name: null,
-                    'local_time_window_start' =>    isset($params->local_time_window_start) ? $params->local_time_window_start: null,
-                    'local_time_window_end' =>    isset($params->local_time_window_end) ? $params->local_time_window_end: null,
-                    'local_time_window_start_2' =>    isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
-                    'local_time_window_end_2' =>    isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
-	                'address_email' =>    isset($params->address_email) ? $params->address_email: null,
-	                'address_city' =>    isset($params->address_city) ? $params->address_city: null,
-	                'address_state_id' =>    isset($params->address_state_id) ? $params->address_state_id: null,
-	                'address_country_id' =>    isset($params->address_country_id) ? $params->address_country_id: null,
-	                'address_zip' =>    isset($params->address_zip) ? $params->address_zip: null,
-	                'address_custom_data' =>    isset($params->address_custom_data) ? $params->address_custom_data: null,
-	                'schedule' =>    isset($params->schedule) ? $params->schedule: null,
-	                'schedule_blacklist' =>    isset($params->schedule_blacklist) ? $params->schedule_blacklist: null,
-	                'service_time' =>    isset($params->service_time) ? $params->service_time: null,
-	                'local_timezone_string' =>    isset($params->local_timezone_string) ? $params->local_timezone_string: null,
-	                'color' =>    isset($params->color) ? $params->color: null,
-	                'address_icon' =>    isset($params->address_icon) ? $params->address_icon: null,
-	                'address_stop_type' =>    isset($params->address_stop_type) ? $params->address_stop_type: null,
-	                'address_cube' =>    isset($params->address_cube) ? $params->address_cube: null,
-	                'address_pieces' =>    isset($params->address_pieces) ? $params->address_pieces: null,
-	                'address_reference_no' =>    isset($params->address_reference_no) ? $params->address_reference_no: null,
-	                'address_revenue' =>    isset($params->address_revenue) ? $params->address_revenue: null,
-	                'address_weight' =>    isset($params->address_weight) ? $params->address_weight: null,
-	                'address_priority' =>    isset($params->address_priority) ? $params->address_priority: null,
-	                'address_customer_po' =>    isset($params->address_customer_po) ? $params->address_customer_po: null,
-	            )
-	        ));
+		{
+			$ablocations = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'POST',
+				'body'  => array(
+					'address_1' => 	isset($params->address_1) ? $params->address_1: null,
+					'address_2' =>    isset($params->address_2) ? $params->address_2: null,
+					'address_alias' =>    isset($params->address_alias) ? $params->address_alias: null,
+					'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
+					'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
+					'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
+					'curbside_lng' => isset($params->curbside_lng) ? $params->curbside_lng : null,
+					'address_phone_number' =>    isset($params->address_phone_number) ? $params->address_phone_number: null,
+					'address_group' =>    isset($params->address_group) ? $params->address_group: null,
+					'first_name' =>    isset($params->first_name) ? $params->first_name: null,
+					'last_name' =>    isset($params->last_name) ? $params->last_name: null,
+					'local_time_window_start' =>    isset($params->local_time_window_start) ? $params->local_time_window_start: null,
+					'local_time_window_end' =>    isset($params->local_time_window_end) ? $params->local_time_window_end: null,
+					'local_time_window_start_2' =>    isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
+					'local_time_window_end_2' =>    isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
+					'address_email' =>    isset($params->address_email) ? $params->address_email: null,
+					'address_city' =>    isset($params->address_city) ? $params->address_city: null,
+					'address_state_id' =>    isset($params->address_state_id) ? $params->address_state_id: null,
+					'address_country_id' =>    isset($params->address_country_id) ? $params->address_country_id: null,
+					'address_zip' =>    isset($params->address_zip) ? $params->address_zip: null,
+					'address_custom_data' =>    isset($params->address_custom_data) ? $params->address_custom_data: null,
+					'schedule' =>    isset($params->schedule) ? $params->schedule: null,
+					'schedule_blacklist' =>    isset($params->schedule_blacklist) ? $params->schedule_blacklist: null,
+					'service_time' =>    isset($params->service_time) ? $params->service_time: null,
+					'local_timezone_string' =>    isset($params->local_timezone_string) ? $params->local_timezone_string: null,
+					'color' =>    isset($params->color) ? $params->color: null,
+					'address_icon' =>    isset($params->address_icon) ? $params->address_icon: null,
+					'address_stop_type' =>    isset($params->address_stop_type) ? $params->address_stop_type: null,
+					'address_cube' =>    isset($params->address_cube) ? $params->address_cube: null,
+					'address_pieces' =>    isset($params->address_pieces) ? $params->address_pieces: null,
+					'address_reference_no' =>    isset($params->address_reference_no) ? $params->address_reference_no: null,
+					'address_revenue' =>    isset($params->address_revenue) ? $params->address_revenue: null,
+					'address_weight' =>    isset($params->address_weight) ? $params->address_weight: null,
+					'address_priority' =>    isset($params->address_priority) ? $params->address_priority: null,
+					'address_customer_po' =>    isset($params->address_customer_po) ? $params->address_customer_po: null,
+				)
+			));
 
 			return $ablocations;
 		}
 		
 		public function deleteAdressBookLocation($address_ids)
-	    {
-	        $address = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'DELETEARRAY',
-	            'query'  => array(
-	                'address_ids'     => $address_ids
-	            )
-	        ));
+		{
+			$address = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'DELETEARRAY',
+				'query'  => array(
+					'address_ids'     => $address_ids
+				)
+			));
 	
-	        return $address;
-	    }
+			return $address;
+		}
 		
 		public function updateAdressBookLocation($params)
-	    {
-	    	//echo "address_id --> ".$params["address_id"]."<br";
-	        $address = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'PUT',
-	            'query'   => $params,
+		{
+			//echo "address_id --> ".$params["address_id"]."<br";
+			$address = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'PUT',
+				'query'   => $params,
 
-	        ));
+			));
 	
-	        return $address;
-	    }
+			return $address;
+		}
 			
 		public static function get($params)
-	    {
-	    	$ablocations = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'ADD',
-	            'query'  => array(
-	                'first_name' => isset($params->first_name) ? $params->first_name : null,
-	                'address_1' => isset($params->address_1) ? $params->address_1: null,
-	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
-	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
-	            )
-	        ));
+		{
+			$ablocations = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'ADD',
+				'query'  => array(
+					'first_name' => isset($params->first_name) ? $params->first_name : null,
+					'address_1' => isset($params->address_1) ? $params->address_1: null,
+					'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
+					'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
+				)
+			));
 
 			return $ablocations;
 		}
         
-        public static function validateScheduleMode($scheduleMode)
-        {
-            $schedMmodes=array("daily","weekly","monthly","annually");
+		public static function validateScheduleMode($scheduleMode)
+		{
+			$schedMmodes=array("daily","weekly","monthly","annually");
             
-            if (in_array($scheduleMode, $schedMmodes)) return TRUE; else return FALSE;
-        }
+			if (in_array($scheduleMode, $schedMmodes)) return TRUE; else return FALSE;
+		}
         
-        public static function validateScheduleEnable($scheduleEnabled)
-        {
-            $schedEnambles=array(TRUE,FALSE);
+		public static function validateScheduleEnable($scheduleEnabled)
+		{
+			$schedEnambles=array(TRUE,FALSE);
             
-            if (in_array($scheduleEnabled, $schedEnambles)) return TRUE; else return FALSE;
-        }
+			if (in_array($scheduleEnabled, $schedEnambles)) return TRUE; else return FALSE;
+		}
         
-        public static function validateScheduleEvery($scheduleEvery)
-        {
-            if (is_numeric($scheduleEvery)) return TRUE; else return FALSE;
-        }
+		public static function validateScheduleEvery($scheduleEvery)
+		{
+			if (is_numeric($scheduleEvery)) return TRUE; else return FALSE;
+		}
         
-        public static function validateScheduleWeekDays($scheduleWeekDays)
-        {
-            $weekdays = explode(',', $scheduleWeekDays);
+		public static function validateScheduleWeekDays($scheduleWeekDays)
+		{
+			$weekdays = explode(',', $scheduleWeekDays);
             
-            if (sizeof($weekdays)<1) return FALSE;
+			if (sizeof($weekdays)<1) return FALSE;
             
-            $isValid=TRUE;
+			$isValid=TRUE;
             
-            for ($i=0; $i < sizeof($weekdays); $i++) { 
-                if (is_numeric($weekdays[$i])) {
-                    $wday=intval($weekdays[$i]);
-                    if ($wday<1 || $wday>7) $isValid=FALSE;
-                }
-                else $isValid=FALSE;
-            }
-            //echo $scheduleWeekDays.' --- '. $isValid."<br>";
-            return $isValid;
-        }
+			for ($i=0; $i < sizeof($weekdays); $i++) { 
+				if (is_numeric($weekdays[$i])) {
+					$wday=intval($weekdays[$i]);
+					if ($wday<1 || $wday>7) $isValid=FALSE;
+				}
+				else $isValid=FALSE;
+			}
+			//echo $scheduleWeekDays.' --- '. $isValid."<br>";
+			return $isValid;
+		}
         
-        public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
-        {
-            $schedMonthlyMmodes=array("dates","nth");
+		public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
+		{
+			$schedMonthlyMmodes=array("dates","nth");
             
-            if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) return TRUE; else return FALSE;
-        }
+			if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) return TRUE; else return FALSE;
+		}
         
-        public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
-        {
-            $monthlyDates = explode(',', $scheduleMonthlyDates);
+		public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
+		{
+			$monthlyDates = explode(',', $scheduleMonthlyDates);
             
-            if (sizeof($monthlyDates)<1) return FALSE;
+			if (sizeof($monthlyDates)<1) return FALSE;
             
-            $isValid=TRUE;
+			$isValid=TRUE;
             
-            for ($i=0; $i < sizeof($monthlyDates); $i++) { 
-                if (is_numeric($monthlyDates[$i])) {
-                    $mday=intval($monthlyDates[$i]);
-                    if ($mday<1 || $mday>31) $isValid=FALSE;
-                }
-                else $isValid=FALSE;
-            }
+			for ($i=0; $i < sizeof($monthlyDates); $i++) { 
+				if (is_numeric($monthlyDates[$i])) {
+					$mday=intval($monthlyDates[$i]);
+					if ($mday<1 || $mday>31) $isValid=FALSE;
+				}
+				else $isValid=FALSE;
+			}
 
-            return $isValid;
-        }
+			return $isValid;
+		}
         
-        public static function validateScheduleNthN($scheduleNthN)
-        {
-            if (!is_numeric($scheduleNthN)) return FALSE;
+		public static function validateScheduleNthN($scheduleNthN)
+		{
+			if (!is_numeric($scheduleNthN)) return FALSE;
             
-            $schedNthNs=array(1,2,3,4,5,-1);
-            if (in_array($scheduleNthN, $schedNthNs)) return TRUE; else return FALSE;
-        }
+			$schedNthNs=array(1,2,3,4,5,-1);
+			if (in_array($scheduleNthN, $schedNthNs)) return TRUE; else return FALSE;
+		}
         
-        public static function validateScheduleNthWhat($scheduleNthWhat)
-        {
-            if (!is_numeric($scheduleNthWhat)) return FALSE;
+		public static function validateScheduleNthWhat($scheduleNthWhat)
+		{
+			if (!is_numeric($scheduleNthWhat)) return FALSE;
             
-            $schedNthWhats=array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-            if (in_array($scheduleNthWhat, $schedNthWhats)) return TRUE; else return FALSE;
-        }
+			$schedNthWhats=array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+			if (in_array($scheduleNthWhat, $schedNthWhats)) return TRUE; else return FALSE;
+		}
         
-        /* Function adds the locations (with/without schedule) from the CSV file. 
+		/* Function adds the locations (with/without schedule) from the CSV file. 
          * $csvFileHandle - a file handler.
          * Returns array $results which contains two arrays: fail and succes.
          */
-        public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
-        {
-            $max_line_length = 512;
-            $delemietr=',';
+		public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
+		{
+			$max_line_length = 512;
+			$delemietr=',';
             
-            $results=array();
-            $results['fail']=array();
-            $results['success']=array();
+			$results=array();
+			$results['fail']=array();
+			$results['success']=array();
             
-            $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
-            if (!empty($columns)) {
-                array_push($results['fail'],'Empty CSV table');
-                return ($results);
-            }
+			$columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
+			if (!empty($columns)) {
+				array_push($results['fail'],'Empty CSV table');
+				return ($results);
+			}
                      
-            $iRow=1;
+			$iRow=1;
             
-            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
-                if ($rows[$locationsFieldsMapping['cached_lat']] && $rows[$locationsFieldsMapping['cached_lng']] && $rows[$locationsFieldsMapping['address_1']] && array(null) !== $rows) {
-                    $curSchedule="";
-                    $mode="";
+			while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
+				if ($rows[$locationsFieldsMapping['cached_lat']] && $rows[$locationsFieldsMapping['cached_lng']] && $rows[$locationsFieldsMapping['address_1']] && array(null) !== $rows) {
+					$curSchedule="";
+					$mode="";
                     
-                    if (isset($rows[$locationsFieldsMapping['schedule_mode']])) {
-                        if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
-                            $curSchedule='"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
-                            $mode=$rows[$locationsFieldsMapping['schedule_mode']];
-                        }
-                        else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $curSchedule="";}
-                    }
-                    else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $curSchedule="";}
+					if (isset($rows[$locationsFieldsMapping['schedule_mode']])) {
+						if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
+							$curSchedule='"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
+							$mode=$rows[$locationsFieldsMapping['schedule_mode']];
+						}
+						else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $curSchedule="";}
+					}
+					else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $curSchedule="";}
                     
-                    if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
-                        if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
-                            $curSchedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
-                        }
-                        else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $curSchedule="";}
-                    }
+					if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
+						if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
+							$curSchedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
+						}
+						else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $curSchedule="";}
+					}
                     
-                    if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
-                        if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
-                            $curSchedule.='"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
-                            if ($mode=='daily') {
-                                $curSchedule=trim($curSchedule,',');
-                                $curSchedule.='}';
-                            }
-                        }
-                        else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $curSchedule=""; }
-                    }
+					if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
+						if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
+							$curSchedule.='"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
+							if ($mode=='daily') {
+								$curSchedule=trim($curSchedule,',');
+								$curSchedule.='}';
+							}
+						}
+						else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $curSchedule=""; }
+					}
                     
-                    if ($mode!='daily') {
-                        switch ($mode) {
-                            case 'weekly':
-                                if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                                    if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                                         $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
-                                    }
-                                    else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
-                                }
-                                else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
-                                break;
-                            case 'monthly':
-                                $monthlyMode="";
-                                if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
-                                    if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
-                                         $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
-                                         $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
-                                    }
-                                    else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
-                                }
-                                else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
+					if ($mode!='daily') {
+						switch ($mode) {
+							case 'weekly':
+								if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
+									if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
+										 $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
+									}
+									else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
+								}
+								else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
+								break;
+							case 'monthly':
+								$monthlyMode="";
+								if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
+									if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
+										 $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
+										 $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
+									}
+									else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
+								}
+								else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
                                 
-                                if ($monthlyMode!="") {
-                                    switch ($monthlyMode) {
-                                        case 'dates':
-                                            if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
-                                                if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
-                                                     $curSchedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
-                                            }
-                                            break;
-                                        case 'nth':
-                                            if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
-                                                if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
-                                                     $curSchedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
-                                            }
-                                            else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
+								if ($monthlyMode!="") {
+									switch ($monthlyMode) {
+										case 'dates':
+											if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
+												if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
+													 $curSchedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
+												}
+												else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
+											}
+											break;
+										case 'nth':
+											if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
+												if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
+													 $curSchedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
+												}
+												else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
+											}
+											else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
                                             
-                                            if ($curSchedule!="") {
-                                                if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                                    if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                                         $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
-                                                    }
-                                                    else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
-                                            }
+											if ($curSchedule!="") {
+												if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
+													if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
+														 $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
+													}
+													else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
+												}
+												else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
+											}
                                             
-                                            break;
-                                    }
-                                }
-                                break;
-                            default:
-                                $curSchedule=="";
-                                break;
-                        }
+											break;
+									}
+								}
+								break;
+							default:
+								$curSchedule=="";
+								break;
+						}
                         
-                    }
+					}
 
-                    if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {$iRow++; continue;}
+					if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {$iRow++; continue;}
                     
-                    $curSchedule=strtolower($curSchedule);
+					$curSchedule=strtolower($curSchedule);
                     
-                    $curSchedule='[{'.$curSchedule.'}]';
+					$curSchedule='[{'.$curSchedule.'}]';
 
-                    $oSchedule= json_decode($curSchedule,TRUE);
+					$oSchedule= json_decode($curSchedule,TRUE);
                     
-                    $AdressBookLocationParameters=AddressBookLocation::fromArray(array(
-                        "cached_lat"    => $rows[$locationsFieldsMapping['cached_lat']],
-                        "cached_lng"    => $rows[$locationsFieldsMapping['cached_lng']],
-                        "curbside_lat"     => isset($locationsFieldsMapping['curbside_lat']) ? $rows[$locationsFieldsMapping['curbside_lat']] : null,
-                        "curbside_lng"     => isset($locationsFieldsMapping['curbside_lng']) ? $rows[$locationsFieldsMapping['curbside_lng']] : null,
-                        "address_alias"     => isset($locationsFieldsMapping['address_alias']) ? $rows[$locationsFieldsMapping['address_alias']] : null,
-                        "address_1"     => $rows[$locationsFieldsMapping['address_1']],
-                        "address_2"     => isset($locationsFieldsMapping['address_2']) ? $rows[$locationsFieldsMapping['address_2']] : null,
-                        "address_city"     => isset($locationsFieldsMapping['address_city']) ? $rows[$locationsFieldsMapping['address_city']] : null,
-                        "address_state_id"     => isset($locationsFieldsMapping['address_state_id']) ? $rows[$locationsFieldsMapping['address_state_id']] : null,
-                        "address_zip"     => isset($locationsFieldsMapping['address_zip']) ? $rows[$locationsFieldsMapping['address_zip']] : null,
-                        "address_phone_number"  => isset($locationsFieldsMapping['address_phone_number']) ? $rows[$locationsFieldsMapping['address_phone_number']] : null,
-                        "schedule" => isset($oSchedule) ? $oSchedule : null,
-                        "address_group"  => isset($locationsFieldsMapping['address_group']) ? $rows[$locationsFieldsMapping['address_group']] : null,
-                        "first_name"  => isset($locationsFieldsMapping['first_name']) ? $rows[$locationsFieldsMapping['first_name']] : null,
-                        "last_name"  => isset($locationsFieldsMapping['last_name']) ? $rows[$locationsFieldsMapping['last_name']] : null,
-                        "local_time_window_start"  => isset($locationsFieldsMapping['local_time_window_start']) ? $rows[$locationsFieldsMapping['local_time_window_start']] : null,
-                        "local_time_window_end"  => isset($locationsFieldsMapping['local_time_window_end']) ? $rows[$locationsFieldsMapping['local_time_window_end']] : null,
-                        "local_time_window_start_2"  => isset($locationsFieldsMapping['local_time_window_start_2']) ? $rows[$locationsFieldsMapping['local_time_window_start_2']] : null,
-                        "local_time_window_end_2"  => isset($locationsFieldsMapping['local_time_window_end_2']) ? $rows[$locationsFieldsMapping['local_time_window_end_2']] : null,
-                        "address_email"  => isset($locationsFieldsMapping['address_email']) ? $rows[$locationsFieldsMapping['address_email']] : null,
-                        "address_country_id"  => isset($locationsFieldsMapping['address_country_id']) ? $rows[$locationsFieldsMapping['address_country_id']] : null,
-                        "address_custom_data"  => isset($locationsFieldsMapping['address_custom_data']) ? $rows[$locationsFieldsMapping['address_custom_data']] : null,
-                        "schedule_blacklist"  => isset($locationsFieldsMapping['schedule_blacklist']) ? $rows[$locationsFieldsMapping['schedule_blacklist']] : null,
-                        "service_time"  => isset($locationsFieldsMapping['service_time']) ? $rows[$locationsFieldsMapping['service_time']] : null,
-                        "local_timezone_string"  => isset($locationsFieldsMapping['local_timezone_string']) ? $rows[$locationsFieldsMapping['local_timezone_string']] : null,
-                        "color"  => isset($locationsFieldsMapping['color']) ? $rows[$locationsFieldsMapping['color']] : null,
-                        "address_icon"  => isset($locationsFieldsMapping['address_icon']) ? $rows[$locationsFieldsMapping['address_icon']] : null,
-                        "address_stop_type"  => isset($locationsFieldsMapping['address_stop_type']) ? $rows[$locationsFieldsMapping['address_stop_type']] : null,
-                        "address_cube"  => isset($locationsFieldsMapping['address_cube']) ? $rows[$locationsFieldsMapping['address_cube']] : null,
-                        "address_pieces"  => isset($locationsFieldsMapping['address_pieces']) ? $rows[$locationsFieldsMapping['address_pieces']] : null,
-                        "address_reference_no"  => isset($locationsFieldsMapping['address_reference_no']) ? $rows[$locationsFieldsMapping['address_reference_no']] : null,
-                        "address_revenue"  => isset($locationsFieldsMapping['address_revenue']) ? $rows[$locationsFieldsMapping['address_revenue']] : null,
-                        "address_weight"  => isset($locationsFieldsMapping['address_weight']) ? $rows[$locationsFieldsMapping['address_weight']] : null,
-                        "address_priority"  => isset($locationsFieldsMapping['address_priority']) ? $rows[$locationsFieldsMapping['address_priority']] : null,
-                        "address_customer_po"  => isset($locationsFieldsMapping['address_customer_po']) ? $rows[$locationsFieldsMapping['address_customer_po']] : null,
-                    ));
+					$AdressBookLocationParameters=AddressBookLocation::fromArray(array(
+						"cached_lat"    => $rows[$locationsFieldsMapping['cached_lat']],
+						"cached_lng"    => $rows[$locationsFieldsMapping['cached_lng']],
+						"curbside_lat"     => isset($locationsFieldsMapping['curbside_lat']) ? $rows[$locationsFieldsMapping['curbside_lat']] : null,
+						"curbside_lng"     => isset($locationsFieldsMapping['curbside_lng']) ? $rows[$locationsFieldsMapping['curbside_lng']] : null,
+						"address_alias"     => isset($locationsFieldsMapping['address_alias']) ? $rows[$locationsFieldsMapping['address_alias']] : null,
+						"address_1"     => $rows[$locationsFieldsMapping['address_1']],
+						"address_2"     => isset($locationsFieldsMapping['address_2']) ? $rows[$locationsFieldsMapping['address_2']] : null,
+						"address_city"     => isset($locationsFieldsMapping['address_city']) ? $rows[$locationsFieldsMapping['address_city']] : null,
+						"address_state_id"     => isset($locationsFieldsMapping['address_state_id']) ? $rows[$locationsFieldsMapping['address_state_id']] : null,
+						"address_zip"     => isset($locationsFieldsMapping['address_zip']) ? $rows[$locationsFieldsMapping['address_zip']] : null,
+						"address_phone_number"  => isset($locationsFieldsMapping['address_phone_number']) ? $rows[$locationsFieldsMapping['address_phone_number']] : null,
+						"schedule" => isset($oSchedule) ? $oSchedule : null,
+						"address_group"  => isset($locationsFieldsMapping['address_group']) ? $rows[$locationsFieldsMapping['address_group']] : null,
+						"first_name"  => isset($locationsFieldsMapping['first_name']) ? $rows[$locationsFieldsMapping['first_name']] : null,
+						"last_name"  => isset($locationsFieldsMapping['last_name']) ? $rows[$locationsFieldsMapping['last_name']] : null,
+						"local_time_window_start"  => isset($locationsFieldsMapping['local_time_window_start']) ? $rows[$locationsFieldsMapping['local_time_window_start']] : null,
+						"local_time_window_end"  => isset($locationsFieldsMapping['local_time_window_end']) ? $rows[$locationsFieldsMapping['local_time_window_end']] : null,
+						"local_time_window_start_2"  => isset($locationsFieldsMapping['local_time_window_start_2']) ? $rows[$locationsFieldsMapping['local_time_window_start_2']] : null,
+						"local_time_window_end_2"  => isset($locationsFieldsMapping['local_time_window_end_2']) ? $rows[$locationsFieldsMapping['local_time_window_end_2']] : null,
+						"address_email"  => isset($locationsFieldsMapping['address_email']) ? $rows[$locationsFieldsMapping['address_email']] : null,
+						"address_country_id"  => isset($locationsFieldsMapping['address_country_id']) ? $rows[$locationsFieldsMapping['address_country_id']] : null,
+						"address_custom_data"  => isset($locationsFieldsMapping['address_custom_data']) ? $rows[$locationsFieldsMapping['address_custom_data']] : null,
+						"schedule_blacklist"  => isset($locationsFieldsMapping['schedule_blacklist']) ? $rows[$locationsFieldsMapping['schedule_blacklist']] : null,
+						"service_time"  => isset($locationsFieldsMapping['service_time']) ? $rows[$locationsFieldsMapping['service_time']] : null,
+						"local_timezone_string"  => isset($locationsFieldsMapping['local_timezone_string']) ? $rows[$locationsFieldsMapping['local_timezone_string']] : null,
+						"color"  => isset($locationsFieldsMapping['color']) ? $rows[$locationsFieldsMapping['color']] : null,
+						"address_icon"  => isset($locationsFieldsMapping['address_icon']) ? $rows[$locationsFieldsMapping['address_icon']] : null,
+						"address_stop_type"  => isset($locationsFieldsMapping['address_stop_type']) ? $rows[$locationsFieldsMapping['address_stop_type']] : null,
+						"address_cube"  => isset($locationsFieldsMapping['address_cube']) ? $rows[$locationsFieldsMapping['address_cube']] : null,
+						"address_pieces"  => isset($locationsFieldsMapping['address_pieces']) ? $rows[$locationsFieldsMapping['address_pieces']] : null,
+						"address_reference_no"  => isset($locationsFieldsMapping['address_reference_no']) ? $rows[$locationsFieldsMapping['address_reference_no']] : null,
+						"address_revenue"  => isset($locationsFieldsMapping['address_revenue']) ? $rows[$locationsFieldsMapping['address_revenue']] : null,
+						"address_weight"  => isset($locationsFieldsMapping['address_weight']) ? $rows[$locationsFieldsMapping['address_weight']] : null,
+						"address_priority"  => isset($locationsFieldsMapping['address_priority']) ? $rows[$locationsFieldsMapping['address_priority']] : null,
+						"address_customer_po"  => isset($locationsFieldsMapping['address_customer_po']) ? $rows[$locationsFieldsMapping['address_customer_po']] : null,
+					));
                     
-                    $abContacts=new AddressBookLocation();
+					$abContacts=new AddressBookLocation();
     
-                    $abcResults=$abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
+					$abcResults=$abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
                     
-                    array_push($results['success'],"The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
+					array_push($results['success'],"The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
 
-                }
+				}
                 
-            }
+			}
 
-            return $results;
-        }
+			return $results;
+		}
 	
 	   
 	}

Switch Indentation +48 added lines, -48 removed lines

@@ -327,62 +327,62 @@
                     
                     if ($mode!='daily') {
                         switch ($mode) {
-                            case 'weekly':
-                                if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                                    if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                                         $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
-                                    }
-                                    else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
+                        case 'weekly':
+                            if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
+                                if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
+                                     $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
                                 }
-                                else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
-                                break;
-                            case 'monthly':
-                                $monthlyMode="";
-                                if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
-                                    if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
-                                         $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
-                                         $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
-                                    }
-                                    else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
+                                else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
+                            }
+                            else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
+                            break;
+                        case 'monthly':
+                            $monthlyMode="";
+                            if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
+                                if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
+                                     $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
+                                     $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
                                 }
-                                else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
+                                else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
+                            }
+                            else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
                                 
-                                if ($monthlyMode!="") {
-                                    switch ($monthlyMode) {
-                                        case 'dates':
-                                            if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
-                                                if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
-                                                     $curSchedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
-                                            }
-                                            break;
-                                        case 'nth':
-                                            if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
-                                                if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
-                                                     $curSchedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
-                                            }
-                                            else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
-                                            
-                                            if ($curSchedule!="") {
-                                                if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                                    if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                                         $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
-                                                    }
-                                                    else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
-                                            }
+                            if ($monthlyMode!="") {
+                                switch ($monthlyMode) {
+                                case 'dates':
+                                if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
+                                if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
+                                     $curSchedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
+                                }
+                                else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
+                                }
+                                break;
+                                case 'nth':
+                                if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
+                                if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
+                                     $curSchedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
+                                }
+                                else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
+                                }
+                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
                                             
-                                            break;
+                                if ($curSchedule!="") {
+                                if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
+                                    if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
+                                         $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
                                     }
+                                    else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
+                                }
+                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
                                 }
+                                            
                                 break;
-                            default:
-                                $curSchedule=="";
+                                }
+                                }
                                 break;
+                        default:
+                            $curSchedule=="";
+                            break;
                         }
                         
                     }

Spacing +99 added lines, -99 removed lines

@@ -32,11 +32,11 @@ 
 		//public $offset;
 		//public $limit;
 		
-		public function __construct () {  }
+		public function __construct() {  }
 		
 		public static function fromArray(array $params) {
 			$addressbooklocation = new AddressBookLocation();
-	        foreach($params as $key => $value) {
+	        foreach ($params as $key => $value) {
 	            if (property_exists($addressbooklocation, $key)) {
 	                $addressbooklocation->{$key} = $value;
 	            }
@@ -61,14 +61,14 @@ 
 		
 		public static function searchRoutedLocation($params)
 	    {
-	    	$result= Route4Me::makeRequst(array(
+	    	$result = Route4Me::makeRequst(array(
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-	                'display' => isset($params['display']) ? $params['display']: null,
-	                'query' => isset($params['query']) ? $params['query']: null,
-	                'fields' => isset($params['fields']) ? $params['fields']: null,
-	                'limit' => isset($params['limit']) ? $params['limit']: null,
+	                'display' => isset($params['display']) ? $params['display'] : null,
+	                'query' => isset($params['query']) ? $params['query'] : null,
+	                'fields' => isset($params['fields']) ? $params['fields'] : null,
+	                'limit' => isset($params['limit']) ? $params['limit'] : null,
 	                'offset' => isset($params['offset']) ? $params['offset'] : null,
 	            )
 	        ));
@@ -82,7 +82,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-	                'limit' => isset($params->limit) ? $params->limit: null,
+	                'limit' => isset($params->limit) ? $params->limit : null,
 	                'offset' => isset($params->offset) ? $params->offset : null,
 	            )
 	        ));
@@ -109,41 +109,41 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'POST',
 	            'body'  => array(
-	            	'address_1' => 	isset($params->address_1) ? $params->address_1: null,
-	            	'address_2' =>    isset($params->address_2) ? $params->address_2: null,
-	            	'address_alias' =>    isset($params->address_alias) ? $params->address_alias: null,
+	            	'address_1' => 	isset($params->address_1) ? $params->address_1 : null,
+	            	'address_2' =>    isset($params->address_2) ? $params->address_2 : null,
+	            	'address_alias' =>    isset($params->address_alias) ? $params->address_alias : null,
 	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
 	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
 	                'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
                     'curbside_lng' => isset($params->curbside_lng) ? $params->curbside_lng : null,
-	                'address_phone_number' =>    isset($params->address_phone_number) ? $params->address_phone_number: null,
-	                'address_group' =>    isset($params->address_group) ? $params->address_group: null,
-	                'first_name' =>    isset($params->first_name) ? $params->first_name: null,
-	                'last_name' =>    isset($params->last_name) ? $params->last_name: null,
-                    'local_time_window_start' =>    isset($params->local_time_window_start) ? $params->local_time_window_start: null,
-                    'local_time_window_end' =>    isset($params->local_time_window_end) ? $params->local_time_window_end: null,
-                    'local_time_window_start_2' =>    isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
-                    'local_time_window_end_2' =>    isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
-	                'address_email' =>    isset($params->address_email) ? $params->address_email: null,
-	                'address_city' =>    isset($params->address_city) ? $params->address_city: null,
-	                'address_state_id' =>    isset($params->address_state_id) ? $params->address_state_id: null,
-	                'address_country_id' =>    isset($params->address_country_id) ? $params->address_country_id: null,
-	                'address_zip' =>    isset($params->address_zip) ? $params->address_zip: null,
-	                'address_custom_data' =>    isset($params->address_custom_data) ? $params->address_custom_data: null,
-	                'schedule' =>    isset($params->schedule) ? $params->schedule: null,
-	                'schedule_blacklist' =>    isset($params->schedule_blacklist) ? $params->schedule_blacklist: null,
-	                'service_time' =>    isset($params->service_time) ? $params->service_time: null,
-	                'local_timezone_string' =>    isset($params->local_timezone_string) ? $params->local_timezone_string: null,
-	                'color' =>    isset($params->color) ? $params->color: null,
-	                'address_icon' =>    isset($params->address_icon) ? $params->address_icon: null,
-	                'address_stop_type' =>    isset($params->address_stop_type) ? $params->address_stop_type: null,
-	                'address_cube' =>    isset($params->address_cube) ? $params->address_cube: null,
-	                'address_pieces' =>    isset($params->address_pieces) ? $params->address_pieces: null,
-	                'address_reference_no' =>    isset($params->address_reference_no) ? $params->address_reference_no: null,
-	                'address_revenue' =>    isset($params->address_revenue) ? $params->address_revenue: null,
-	                'address_weight' =>    isset($params->address_weight) ? $params->address_weight: null,
-	                'address_priority' =>    isset($params->address_priority) ? $params->address_priority: null,
-	                'address_customer_po' =>    isset($params->address_customer_po) ? $params->address_customer_po: null,
+	                'address_phone_number' =>    isset($params->address_phone_number) ? $params->address_phone_number : null,
+	                'address_group' =>    isset($params->address_group) ? $params->address_group : null,
+	                'first_name' =>    isset($params->first_name) ? $params->first_name : null,
+	                'last_name' =>    isset($params->last_name) ? $params->last_name : null,
+                    'local_time_window_start' =>    isset($params->local_time_window_start) ? $params->local_time_window_start : null,
+                    'local_time_window_end' =>    isset($params->local_time_window_end) ? $params->local_time_window_end : null,
+                    'local_time_window_start_2' =>    isset($params->local_time_window_start_2) ? $params->local_time_window_start_2 : null,
+                    'local_time_window_end_2' =>    isset($params->local_time_window_end_2) ? $params->local_time_window_end_2 : null,
+	                'address_email' =>    isset($params->address_email) ? $params->address_email : null,
+	                'address_city' =>    isset($params->address_city) ? $params->address_city : null,
+	                'address_state_id' =>    isset($params->address_state_id) ? $params->address_state_id : null,
+	                'address_country_id' =>    isset($params->address_country_id) ? $params->address_country_id : null,
+	                'address_zip' =>    isset($params->address_zip) ? $params->address_zip : null,
+	                'address_custom_data' =>    isset($params->address_custom_data) ? $params->address_custom_data : null,
+	                'schedule' =>    isset($params->schedule) ? $params->schedule : null,
+	                'schedule_blacklist' =>    isset($params->schedule_blacklist) ? $params->schedule_blacklist : null,
+	                'service_time' =>    isset($params->service_time) ? $params->service_time : null,
+	                'local_timezone_string' =>    isset($params->local_timezone_string) ? $params->local_timezone_string : null,
+	                'color' =>    isset($params->color) ? $params->color : null,
+	                'address_icon' =>    isset($params->address_icon) ? $params->address_icon : null,
+	                'address_stop_type' =>    isset($params->address_stop_type) ? $params->address_stop_type : null,
+	                'address_cube' =>    isset($params->address_cube) ? $params->address_cube : null,
+	                'address_pieces' =>    isset($params->address_pieces) ? $params->address_pieces : null,
+	                'address_reference_no' =>    isset($params->address_reference_no) ? $params->address_reference_no : null,
+	                'address_revenue' =>    isset($params->address_revenue) ? $params->address_revenue : null,
+	                'address_weight' =>    isset($params->address_weight) ? $params->address_weight : null,
+	                'address_priority' =>    isset($params->address_priority) ? $params->address_priority : null,
+	                'address_customer_po' =>    isset($params->address_customer_po) ? $params->address_customer_po : null,
 	            )
 	        ));
 
@@ -183,7 +183,7 @@ 
 	            'method' => 'ADD',
 	            'query'  => array(
 	                'first_name' => isset($params->first_name) ? $params->first_name : null,
-	                'address_1' => isset($params->address_1) ? $params->address_1: null,
+	                'address_1' => isset($params->address_1) ? $params->address_1 : null,
 	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
 	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
 	            )
@@ -194,14 +194,14 @@ 
         
         public static function validateScheduleMode($scheduleMode)
         {
-            $schedMmodes=array("daily","weekly","monthly","annually");
+            $schedMmodes = array("daily", "weekly", "monthly", "annually");
             
             if (in_array($scheduleMode, $schedMmodes)) return TRUE; else return FALSE;
         }
         
         public static function validateScheduleEnable($scheduleEnabled)
         {
-            $schedEnambles=array(TRUE,FALSE);
+            $schedEnambles = array(TRUE, FALSE);
             
             if (in_array($scheduleEnabled, $schedEnambles)) return TRUE; else return FALSE;
         }
@@ -217,14 +217,14 @@ 
             
             if (sizeof($weekdays)<1) return FALSE;
             
-            $isValid=TRUE;
+            $isValid = TRUE;
             
-            for ($i=0; $i < sizeof($weekdays); $i++) { 
+            for ($i = 0; $i<sizeof($weekdays); $i++) { 
                 if (is_numeric($weekdays[$i])) {
-                    $wday=intval($weekdays[$i]);
-                    if ($wday<1 || $wday>7) $isValid=FALSE;
+                    $wday = intval($weekdays[$i]);
+                    if ($wday<1 || $wday>7) $isValid = FALSE;
                 }
-                else $isValid=FALSE;
+                else $isValid = FALSE;
             }
             //echo $scheduleWeekDays.' --- '. $isValid."<br>";
             return $isValid;
@@ -232,7 +232,7 @@ 
         
         public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
         {
-            $schedMonthlyMmodes=array("dates","nth");
+            $schedMonthlyMmodes = array("dates", "nth");
             
             if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) return TRUE; else return FALSE;
         }
@@ -243,14 +243,14 @@ 
             
             if (sizeof($monthlyDates)<1) return FALSE;
             
-            $isValid=TRUE;
+            $isValid = TRUE;
             
-            for ($i=0; $i < sizeof($monthlyDates); $i++) { 
+            for ($i = 0; $i<sizeof($monthlyDates); $i++) { 
                 if (is_numeric($monthlyDates[$i])) {
-                    $mday=intval($monthlyDates[$i]);
-                    if ($mday<1 || $mday>31) $isValid=FALSE;
+                    $mday = intval($monthlyDates[$i]);
+                    if ($mday<1 || $mday>31) $isValid = FALSE;
                 }
-                else $isValid=FALSE;
+                else $isValid = FALSE;
             }
 
             return $isValid;
@@ -260,7 +260,7 @@ 
         {
             if (!is_numeric($scheduleNthN)) return FALSE;
             
-            $schedNthNs=array(1,2,3,4,5,-1);
+            $schedNthNs = array(1, 2, 3, 4, 5, -1);
             if (in_array($scheduleNthN, $schedNthNs)) return TRUE; else return FALSE;
         }
         
@@ -268,7 +268,7 @@ 
         {
             if (!is_numeric($scheduleNthWhat)) return FALSE;
             
-            $schedNthWhats=array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+            $schedNthWhats = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
             if (in_array($scheduleNthWhat, $schedNthWhats)) return TRUE; else return FALSE;
         }
         
@@ -279,50 +279,50 @@ 
         public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
         {
             $max_line_length = 512;
-            $delemietr=',';
+            $delemietr = ',';
             
-            $results=array();
-            $results['fail']=array();
-            $results['success']=array();
+            $results = array();
+            $results['fail'] = array();
+            $results['success'] = array();
             
             $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
             if (!empty($columns)) {
-                array_push($results['fail'],'Empty CSV table');
+                array_push($results['fail'], 'Empty CSV table');
                 return ($results);
             }
                      
-            $iRow=1;
+            $iRow = 1;
             
-            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
-                if ($rows[$locationsFieldsMapping['cached_lat']] && $rows[$locationsFieldsMapping['cached_lng']] && $rows[$locationsFieldsMapping['address_1']] && array(null) !== $rows) {
-                    $curSchedule="";
-                    $mode="";
+            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr))!==false) {
+                if ($rows[$locationsFieldsMapping['cached_lat']] && $rows[$locationsFieldsMapping['cached_lng']] && $rows[$locationsFieldsMapping['address_1']] && array(null)!==$rows) {
+                    $curSchedule = "";
+                    $mode = "";
                     
                     if (isset($rows[$locationsFieldsMapping['schedule_mode']])) {
                         if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
-                            $curSchedule='"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
-                            $mode=$rows[$locationsFieldsMapping['schedule_mode']];
+                            $curSchedule = '"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
+                            $mode = $rows[$locationsFieldsMapping['schedule_mode']];
                         }
-                        else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $curSchedule="";}
+                        else {array_push($results['fail'], "$iRow --> Wrong schedule mode parameter"); $curSchedule = ""; }
                     }
-                    else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $curSchedule="";}
+                    else {array_push($results['fail'], "$iRow --> The schedule mode parameter is not set"); $curSchedule = ""; }
                     
                     if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
                         if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
-                            $curSchedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
+                            $curSchedule .= '"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
                         }
-                        else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $curSchedule="";}
+                        else {array_push($results['fail'], "$iRow --> The schedule enabled parameter is not set "); $curSchedule = ""; }
                     }
                     
                     if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
                         if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
-                            $curSchedule.='"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
+                            $curSchedule .= '"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
                             if ($mode=='daily') {
-                                $curSchedule=trim($curSchedule,',');
-                                $curSchedule.='}';
+                                $curSchedule = trim($curSchedule, ',');
+                                $curSchedule .= '}';
                             }
                         }
-                        else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $curSchedule=""; }
+                        else {array_push($results['fail'], "$iRow --> The parameter sched_every is not set"); $curSchedule = ""; }
                     }
                     
                     if ($mode!='daily') {
@@ -330,50 +330,50 @@ 
                             case 'weekly':
                                 if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
                                     if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                                         $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
+                                         $curSchedule .= '"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
                                     }
-                                    else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
+                                    else {array_push($results['fail'], "$iRow --> Wrong weekdays"); $curSchedule = ""; }
                                 }
-                                else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
+                                else {array_push($results['fail'], "$iRow --> The parameters sched_weekdays is not set"); $curSchedule = ""; }
                                 break;
                             case 'monthly':
-                                $monthlyMode="";
+                                $monthlyMode = "";
                                 if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
                                     if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
-                                         $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
-                                         $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
+                                         $monthlyMode = $rows[$locationsFieldsMapping['monthly_mode']];
+                                         $curSchedule .= '"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
                                     }
-                                    else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
+                                    else {array_push($results['fail'], "$iRow --> Wrong monthly mode"); $curSchedule = ""; }
                                 }
-                                else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
+                                else {array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule = ""; }
                                 
                                 if ($monthlyMode!="") {
                                     switch ($monthlyMode) {
                                         case 'dates':
                                             if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
                                                 if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
-                                                     $curSchedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
+                                                     $curSchedule .= '"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
                                                 }
-                                                else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
+                                                else {array_push($results['fail'], "$iRow --> Wrong monthly dates"); $curSchedule = ""; }
                                             }
                                             break;
                                         case 'nth':
                                             if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
                                                 if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
-                                                     $curSchedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
+                                                     $curSchedule .= '"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
                                                 }
-                                                else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
+                                                else {array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_n"); $curSchedule = ""; }
                                             }
-                                            else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
+                                            else {array_push($results['fail'], "$iRow --> The parameter sched_nth_n is not set"); $curSchedule = ""; }
                                             
                                             if ($curSchedule!="") {
                                                 if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
                                                     if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                                         $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
+                                                         $curSchedule .= '"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
                                                     }
-                                                    else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
+                                                    else {array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_what"); $curSchedule = ""; }
                                                 }
-                                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
+                                                else {array_push($results['fail'], "$iRow --> The parameter sched_nth_what is not set"); $curSchedule = ""; }
                                             }
                                             
                                             break;
@@ -387,15 +387,15 @@ 
                         
                     }
 
-                    if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {$iRow++; continue;}
+                    if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {$iRow++; continue; }
                     
-                    $curSchedule=strtolower($curSchedule);
+                    $curSchedule = strtolower($curSchedule);
                     
-                    $curSchedule='[{'.$curSchedule.'}]';
+                    $curSchedule = '[{'.$curSchedule.'}]';
 
-                    $oSchedule= json_decode($curSchedule,TRUE);
+                    $oSchedule = json_decode($curSchedule, TRUE);
                     
-                    $AdressBookLocationParameters=AddressBookLocation::fromArray(array(
+                    $AdressBookLocationParameters = AddressBookLocation::fromArray(array(
                         "cached_lat"    => $rows[$locationsFieldsMapping['cached_lat']],
                         "cached_lng"    => $rows[$locationsFieldsMapping['cached_lng']],
                         "curbside_lat"     => isset($locationsFieldsMapping['curbside_lat']) ? $rows[$locationsFieldsMapping['curbside_lat']] : null,
@@ -433,11 +433,11 @@ 
                         "address_customer_po"  => isset($locationsFieldsMapping['address_customer_po']) ? $rows[$locationsFieldsMapping['address_customer_po']] : null,
                     ));
                     
-                    $abContacts=new AddressBookLocation();
+                    $abContacts = new AddressBookLocation();
     
-                    $abcResults=$abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
+                    $abcResults = $abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
                     
-                    array_push($results['success'],"The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
+                    array_push($results['success'], "The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
 
                 }
                 

Braces +65 added lines, -40 removed lines

@@ -196,35 +196,52 @@ 
         {
             $schedMmodes=array("daily","weekly","monthly","annually");
             
-            if (in_array($scheduleMode, $schedMmodes)) return TRUE; else return FALSE;
+            if (in_array($scheduleMode, $schedMmodes)) {
+            	return TRUE;
+            } else {
+            	return FALSE;
+            }
         }
         
         public static function validateScheduleEnable($scheduleEnabled)
         {
             $schedEnambles=array(TRUE,FALSE);
             
-            if (in_array($scheduleEnabled, $schedEnambles)) return TRUE; else return FALSE;
+            if (in_array($scheduleEnabled, $schedEnambles)) {
+            	return TRUE;
+            } else {
+            	return FALSE;
+            }
         }
         
         public static function validateScheduleEvery($scheduleEvery)
         {
-            if (is_numeric($scheduleEvery)) return TRUE; else return FALSE;
+            if (is_numeric($scheduleEvery)) {
+            	return TRUE;
+            } else {
+            	return FALSE;
+            }
         }
         
         public static function validateScheduleWeekDays($scheduleWeekDays)
         {
             $weekdays = explode(',', $scheduleWeekDays);
             
-            if (sizeof($weekdays)<1) return FALSE;
+            if (sizeof($weekdays)<1) {
+            	return FALSE;
+            }
             
             $isValid=TRUE;
             
             for ($i=0; $i < sizeof($weekdays); $i++) { 
                 if (is_numeric($weekdays[$i])) {
                     $wday=intval($weekdays[$i]);
-                    if ($wday<1 || $wday>7) $isValid=FALSE;
+                    if ($wday<1 || $wday>7) {
+                    	$isValid=FALSE;
+                    }
+                } else {
+                	$isValid=FALSE;
                 }
-                else $isValid=FALSE;
             }
             //echo $scheduleWeekDays.' --- '. $isValid."<br>";
             return $isValid;
@@ -234,23 +251,32 @@ 
         {
             $schedMonthlyMmodes=array("dates","nth");
             
-            if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) return TRUE; else return FALSE;
+            if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) {
+            	return TRUE;
+            } else {
+            	return FALSE;
+            }
         }
         
         public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
         {
             $monthlyDates = explode(',', $scheduleMonthlyDates);
             
-            if (sizeof($monthlyDates)<1) return FALSE;
+            if (sizeof($monthlyDates)<1) {
+            	return FALSE;
+            }
             
             $isValid=TRUE;
             
             for ($i=0; $i < sizeof($monthlyDates); $i++) { 
                 if (is_numeric($monthlyDates[$i])) {
                     $mday=intval($monthlyDates[$i]);
-                    if ($mday<1 || $mday>31) $isValid=FALSE;
+                    if ($mday<1 || $mday>31) {
+                    	$isValid=FALSE;
+                    }
+                } else {
+                	$isValid=FALSE;
                 }
-                else $isValid=FALSE;
             }
 
             return $isValid;
@@ -258,18 +284,30 @@ 
         
         public static function validateScheduleNthN($scheduleNthN)
         {
-            if (!is_numeric($scheduleNthN)) return FALSE;
+            if (!is_numeric($scheduleNthN)) {
+            	return FALSE;
+            }
             
             $schedNthNs=array(1,2,3,4,5,-1);
-            if (in_array($scheduleNthN, $schedNthNs)) return TRUE; else return FALSE;
+            if (in_array($scheduleNthN, $schedNthNs)) {
+            	return TRUE;
+            } else {
+            	return FALSE;
+            }
         }
         
         public static function validateScheduleNthWhat($scheduleNthWhat)
         {
-            if (!is_numeric($scheduleNthWhat)) return FALSE;
+            if (!is_numeric($scheduleNthWhat)) {
+            	return FALSE;
+            }
             
             $schedNthWhats=array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-            if (in_array($scheduleNthWhat, $schedNthWhats)) return TRUE; else return FALSE;
+            if (in_array($scheduleNthWhat, $schedNthWhats)) {
+            	return TRUE;
+            } else {
+            	return FALSE;
+            }
         }
         
         /* Function adds the locations (with/without schedule) from the CSV file. 
@@ -302,16 +340,13 @@ 
                         if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
                             $curSchedule='"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
                             $mode=$rows[$locationsFieldsMapping['schedule_mode']];
-                        }
-                        else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $curSchedule="";}
-                    }
-                    else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $curSchedule="";}
+                        } else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $curSchedule="";}
+                    } else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $curSchedule="";}
                     
                     if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
                         if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
                             $curSchedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
-                        }
-                        else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $curSchedule="";}
+                        } else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $curSchedule="";}
                     }
                     
                     if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
@@ -321,8 +356,7 @@ 
                                 $curSchedule=trim($curSchedule,',');
                                 $curSchedule.='}';
                             }
-                        }
-                        else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $curSchedule=""; }
+                        } else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $curSchedule=""; }
                     }
                     
                     if ($mode!='daily') {
@@ -331,10 +365,8 @@ 
                                 if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
                                     if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
                                          $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
-                                    }
-                                    else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
-                                }
-                                else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
+                                    } else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
+                                } else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
                                 break;
                             case 'monthly':
                                 $monthlyMode="";
@@ -342,10 +374,8 @@ 
                                     if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
                                          $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
                                          $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
-                                    }
-                                    else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
-                                }
-                                else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
+                                    } else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
+                                } else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
                                 
                                 if ($monthlyMode!="") {
                                     switch ($monthlyMode) {
@@ -353,27 +383,22 @@ 
                                             if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
                                                 if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
                                                      $curSchedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
+                                                } else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
                                             }
                                             break;
                                         case 'nth':
                                             if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
                                                 if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
                                                      $curSchedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
-                                            }
-                                            else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
+                                                } else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
+                                            } else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
                                             
                                             if ($curSchedule!="") {
                                                 if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
                                                     if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
                                                          $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
-                                                    }
-                                                    else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
+                                                    } else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
+                                                } else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
                                             }
                                             
                                             break;

src/Route4Me/Order.php

Doc Comments +3 added lines

@@ -59,6 +59,9 @@
 			return $order;
 		}
 		
+		/**
+		 * @param Order $params
+		 */
 		public static function addOrder($params)
 	    {
 	    	$response = Route4Me::makeRequst(array(

Indentation +174 added lines, -174 removed lines

@@ -10,11 +10,11 @@ 
 		static public $apiUrlOpt = '/api.v4/optimization_problem.php';
 		
 		public $address_1;
-        public $address_2;
+		public $address_2;
 		public $cached_lat;
 		public $cached_lng;
-        public $curbside_lat;
-        public $curbside_lng;
+		public $curbside_lat;
+		public $curbside_lng;
 		public $address_alias;
 		public $address_city;
 		public $EXT_FIELD_first_name;
@@ -23,15 +23,15 @@ 
 		public $EXT_FIELD_phone;
 		public $EXT_FIELD_custom_data;
         
-        public $color;
-        public $order_icon;
-        public $local_time_window_start;
-        public $local_time_window_end;
-        public $local_time_window_start_2;
-        public $local_time_window_end_2;
-        public $service_time;
+		public $color;
+		public $order_icon;
+		public $local_time_window_start;
+		public $local_time_window_end;
+		public $local_time_window_start_2;
+		public $local_time_window_end_2;
+		public $service_time;
         
-        public $day_scheduled_for_YYMMDD;
+		public $day_scheduled_for_YYMMDD;
 		
 		public $route_id;
 		public $redirect;
@@ -50,56 +50,56 @@ 
 		
 		public static function fromArray(array $params) {
 			$order= new Order();
-	        foreach($params as $key => $value) {
-	            if (property_exists($order, $key)) {
-	                $order->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($order, $key)) {
+					$order->{$key} = $value;
+				}
 			}
 			
 			return $order;
 		}
 		
 		public static function addOrder($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'POST',
+				'body'  => array(
 					'address_1' => 	isset($params->address_1) ? $params->address_1: null,
 					'address_2' =>     isset($params->address_2) ? $params->address_2: null,
-	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
-	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
-	                'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
-                    'curbside_lng' => isset($params->curbside_lng) ? $params->curbside_lng : null,
-	                'color' => isset($params->color) ? $params->color : null,
-	                'order_icon' => isset($params->order_icon) ? $params->order_icon : null,
-	                'day_scheduled_for_YYMMDD' => isset($params->day_scheduled_for_YYMMDD) ? $params->day_scheduled_for_YYMMDD : null,
-	                'address_alias' => isset($params->address_alias) ? $params->address_alias : null,
-	                'address_city' => 	isset($params->address_city) ? $params->address_city: null,
-	                'local_time_window_start' =>  isset($params->local_time_window_start) ? $params->local_time_window_start: null,
-	                'local_time_window_end' =>  isset($params->local_time_window_end) ? $params->local_time_window_end: null,
-	                'local_time_window_start_2' =>  isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
-	                'local_time_window_end_2' =>  isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
-	                'service_time' =>  isset($params->service_time) ? $params->service_time: null,
-	                'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name: null,
-	                'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name: null,
-	                'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email: null,
-	                'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone: null,
-	                'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data: null,
+					'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
+					'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
+					'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
+					'curbside_lng' => isset($params->curbside_lng) ? $params->curbside_lng : null,
+					'color' => isset($params->color) ? $params->color : null,
+					'order_icon' => isset($params->order_icon) ? $params->order_icon : null,
+					'day_scheduled_for_YYMMDD' => isset($params->day_scheduled_for_YYMMDD) ? $params->day_scheduled_for_YYMMDD : null,
+					'address_alias' => isset($params->address_alias) ? $params->address_alias : null,
+					'address_city' => 	isset($params->address_city) ? $params->address_city: null,
+					'local_time_window_start' =>  isset($params->local_time_window_start) ? $params->local_time_window_start: null,
+					'local_time_window_end' =>  isset($params->local_time_window_end) ? $params->local_time_window_end: null,
+					'local_time_window_start_2' =>  isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
+					'local_time_window_end_2' =>  isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
+					'service_time' =>  isset($params->service_time) ? $params->service_time: null,
+					'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name: null,
+					'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name: null,
+					'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email: null,
+					'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone: null,
+					'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data: null,
 				)
-	        ));
+			));
 
 			return $response;
 		}
 
 		public static function addOrder2Route($params,$body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlRoute,
-	            'method' => 'PUT',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlRoute,
+				'method' => 'PUT',
+				'query'  => array(
 					'route_id' => 	isset($params->route_id) ? $params->route_id: null,
-	                'redirect' => isset($params->redirect) ? $params->redirect : null
+					'redirect' => isset($params->redirect) ? $params->redirect : null
 				),
 				'body'  => (array)$body
 			));
@@ -108,13 +108,13 @@ 
 		}
 		
 		public static function addOrder2Destination($params,$body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlOpt,
-	            'method' => 'PUT',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlOpt,
+				'method' => 'PUT',
+				'query'  => array(
 					'optimization_problem_id' => 	isset($params->optimization_problem_id) ? $params->optimization_problem_id: null,
-	                'redirect' => isset($params->redirect) ? $params->redirect : null
+					'redirect' => isset($params->redirect) ? $params->redirect : null
 				),
 				'body'  => (array)$body
 			));
@@ -123,58 +123,58 @@ 
 		}
 		
 		public static function getOrder($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
 					'order_id' => 	isset($params->order_id) ? $params->order_id: null,
 				)
-	        ));
+			));
 
 			return $response;
 		}
 		
 		public static function getOrders()
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET'
-	        ));
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET'
+			));
 
 			return $response;
 		}
 		
 		public static function removeOrder($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'DELETE',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'DELETE',
+				'body'  => array(
 					'order_ids' => 	isset($params->order_ids) ? $params->order_ids: null
 				)
-	        ));
+			));
 
 			return $response;
 		}
 		
 		public static function updateOrder($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'PUT',
-	            'body'  => (array)$body
-	        ));
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'PUT',
+				'body'  => (array)$body
+			));
 
 			return $response;
 		}
 		
 		public static function searchOrder($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
 					'day_added_YYMMDD' => 	isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD: null,
 					'scheduled_for_YYMMDD' => 	isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD: null,
 					'fields' => 	isset($params->fields) ? $params->fields: null,
@@ -182,129 +182,129 @@ 
 					'limit' => 	isset($params->limit) ? $params->limit: null,
 					'query' => 	isset($params->query) ? $params->query: null,
 				)
-	        ));
+			));
 
 			return $response;
 		}
         
-        public static function validateLatitude($lat)
-        {
-            if (!is_numeric($lat)) return false;
+		public static function validateLatitude($lat)
+		{
+			if (!is_numeric($lat)) return false;
             
-            if ($lat>90 || $lat<-90) return false;
+			if ($lat>90 || $lat<-90) return false;
             
-            return true;
-        }
+			return true;
+		}
         
-        public static function validateLongitude($lng)
-        {
-            if (!is_numeric($lng)) return false;
+		public static function validateLongitude($lng)
+		{
+			if (!is_numeric($lng)) return false;
             
-            if ($lng>180 || $lng<-180) return false;
+			if ($lng>180 || $lng<-180) return false;
             
-            return true;
-        }
+			return true;
+		}
         
-        public function addOrdersFromCsvFile($csvFileHandle, $ordersFieldsMapping)
-        {
-            $max_line_length = 512;
-            $delemietr=',';
+		public function addOrdersFromCsvFile($csvFileHandle, $ordersFieldsMapping)
+		{
+			$max_line_length = 512;
+			$delemietr=',';
             
-            $results=array();
-            $results['fail']=array();
-            $results['success']=array();
+			$results=array();
+			$results['fail']=array();
+			$results['success']=array();
             
-            $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
+			$columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
             
-            if (!empty($columns)) {
-                 array_push($results['fail'],'Empty CSV table');
-                 return ($results);
-            }
+			if (!empty($columns)) {
+				 array_push($results['fail'],'Empty CSV table');
+				 return ($results);
+			}
                      
-            $iRow=1;
+			$iRow=1;
             
-            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
-                if ($rows[$ordersFieldsMapping['cached_lat']] && $rows[$ordersFieldsMapping['cached_lng']] && $rows[$ordersFieldsMapping['address_1']] && array(null) !== $rows) {
+			while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
+				if ($rows[$ordersFieldsMapping['cached_lat']] && $rows[$ordersFieldsMapping['cached_lng']] && $rows[$ordersFieldsMapping['address_1']] && array(null) !== $rows) {
                     
-                    $cached_lat=0.000;
+					$cached_lat=0.000;
                     
-                    if (!$this->validateLatitude($rows[$ordersFieldsMapping['cached_lat']])) {
-                        array_push($results['fail'],"$iRow --> Wrong cached_lat"); 
-                        $iRow++;
-                        continue;
-                    }
-                    else $cached_lat=doubleval($rows[$ordersFieldsMapping['cached_lat']]);
+					if (!$this->validateLatitude($rows[$ordersFieldsMapping['cached_lat']])) {
+						array_push($results['fail'],"$iRow --> Wrong cached_lat"); 
+						$iRow++;
+						continue;
+					}
+					else $cached_lat=doubleval($rows[$ordersFieldsMapping['cached_lat']]);
                     
-                    $cached_lng=0.000;
+					$cached_lng=0.000;
                     
-                    if (!$this->validateLongitude($rows[$ordersFieldsMapping['cached_lng']])) {
-                        array_push($results['fail'],"$iRow --> Wrong cached_lng"); 
-                        $iRow++;
-                        continue;
-                    }
-                    else $cached_lng=doubleval($rows[$ordersFieldsMapping['cached_lng']]);
+					if (!$this->validateLongitude($rows[$ordersFieldsMapping['cached_lng']])) {
+						array_push($results['fail'],"$iRow --> Wrong cached_lng"); 
+						$iRow++;
+						continue;
+					}
+					else $cached_lng=doubleval($rows[$ordersFieldsMapping['cached_lng']]);
                     
-                    if (isset($ordersFieldsMapping['curbside_lat'])) {
-                        if (!$this->validateLatitude($rows[$ordersFieldsMapping['curbside_lat']])) {
-                            array_push($results['fail'],"$iRow --> Wrong curbside_lat"); 
-                            $iRow++;
-                            continue;
-                        }
-                    }
+					if (isset($ordersFieldsMapping['curbside_lat'])) {
+						if (!$this->validateLatitude($rows[$ordersFieldsMapping['curbside_lat']])) {
+							array_push($results['fail'],"$iRow --> Wrong curbside_lat"); 
+							$iRow++;
+							continue;
+						}
+					}
                     
-                    if (isset($ordersFieldsMapping['curbside_lng'])) {
-                        if (!$this->validateLongitude($rows[$ordersFieldsMapping['curbside_lng']])) {
-                            array_push($results['fail'],"$iRow --> Wrong curbside_lng"); 
-                            $iRow++;
-                            continue;
-                        }
-                    }
+					if (isset($ordersFieldsMapping['curbside_lng'])) {
+						if (!$this->validateLongitude($rows[$ordersFieldsMapping['curbside_lng']])) {
+							array_push($results['fail'],"$iRow --> Wrong curbside_lng"); 
+							$iRow++;
+							continue;
+						}
+					}
                     
-                    $address=$rows[$ordersFieldsMapping['address_1']];
+					$address=$rows[$ordersFieldsMapping['address_1']];
                     
-                    if (isset($ordersFieldsMapping['order_city'])) $address.=', '.$rows[$ordersFieldsMapping['order_city']];
-                    if (isset($ordersFieldsMapping['order_state_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
-                    if (isset($ordersFieldsMapping['order_zip_code'])) $address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
-                    if (isset($ordersFieldsMapping['order_country_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
+					if (isset($ordersFieldsMapping['order_city'])) $address.=', '.$rows[$ordersFieldsMapping['order_city']];
+					if (isset($ordersFieldsMapping['order_state_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
+					if (isset($ordersFieldsMapping['order_zip_code'])) $address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
+					if (isset($ordersFieldsMapping['order_country_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
                     
-                    echo "$iRow --> ".$ordersFieldsMapping['day_scheduled_for_YYMMDD'].", ".$rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']]."<br>";
+					echo "$iRow --> ".$ordersFieldsMapping['day_scheduled_for_YYMMDD'].", ".$rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']]."<br>";
                     
-                    $orderParameters = Order::fromArray(array(
-                        "cached_lat"    => $cached_lat,
-                        "cached_lng"    => $cached_lng,
-                        "curbside_lat"     => isset($ordersFieldsMapping['curbside_lat']) ? $rows[$ordersFieldsMapping['curbside_lat']] : null,
-                        "curbside_lng"     => isset($ordersFieldsMapping['curbside_lng']) ? $rows[$ordersFieldsMapping['curbside_lng']] : null,
-                        "color"     => isset($ordersFieldsMapping['color']) ? $rows[$ordersFieldsMapping['color']] : null,
-                        "day_scheduled_for_YYMMDD"     => isset($ordersFieldsMapping['day_scheduled_for_YYMMDD']) ? $rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']] : null,
-                        "address_alias"     => isset($ordersFieldsMapping['address_alias']) ? $rows[$ordersFieldsMapping['address_alias']] : null,
-                        "address_1"     => $address,
-                        "address_2"     => isset($ordersFieldsMapping['address_2']) ? $rows[$ordersFieldsMapping['address_2']] : null,
-                        "local_time_window_start"     => isset($ordersFieldsMapping['local_time_window_start']) ? $rows[$ordersFieldsMapping['local_time_window_start']] : null,
-                        "local_time_window_end"     => isset($ordersFieldsMapping['local_time_window_end']) ? $rows[$ordersFieldsMapping['local_time_window_end']] : null,
-                        "local_time_window_start_2"     => isset($ordersFieldsMapping['local_time_window_start_2']) ? $rows[$ordersFieldsMapping['local_time_window_start_2']] : null,
-                        "local_time_window_end_2"     => isset($ordersFieldsMapping['local_time_window_end_2']) ? $rows[$ordersFieldsMapping['local_time_window_end_2']] : null,
-                        "service_time"     => isset($ordersFieldsMapping['service_time']) ? $rows[$ordersFieldsMapping['service_time']] : null,
-                        "EXT_FIELD_first_name"     => isset($ordersFieldsMapping['EXT_FIELD_first_name']) ? $rows[$ordersFieldsMapping['EXT_FIELD_first_name']] : null,
-                        "EXT_FIELD_last_name"     => isset($ordersFieldsMapping['EXT_FIELD_last_name']) ? $rows[$ordersFieldsMapping['EXT_FIELD_last_name']] : null,
-                        "EXT_FIELD_email"     => isset($ordersFieldsMapping['EXT_FIELD_email']) ? $rows[$ordersFieldsMapping['EXT_FIELD_email']] : null,
-                        "EXT_FIELD_phone"     => isset($ordersFieldsMapping['EXT_FIELD_phone']) ? $rows[$ordersFieldsMapping['EXT_FIELD_phone']] : null,
-                        "EXT_FIELD_custom_data"     => isset($ordersFieldsMapping['EXT_FIELD_custom_data']) ? $rows[$ordersFieldsMapping['EXT_FIELD_custom_data']] : null,
-                        "order_icon"     => isset($ordersFieldsMapping['order_icon']) ? $rows[$ordersFieldsMapping['order_icon']] : null,
-                    ));
+					$orderParameters = Order::fromArray(array(
+						"cached_lat"    => $cached_lat,
+						"cached_lng"    => $cached_lng,
+						"curbside_lat"     => isset($ordersFieldsMapping['curbside_lat']) ? $rows[$ordersFieldsMapping['curbside_lat']] : null,
+						"curbside_lng"     => isset($ordersFieldsMapping['curbside_lng']) ? $rows[$ordersFieldsMapping['curbside_lng']] : null,
+						"color"     => isset($ordersFieldsMapping['color']) ? $rows[$ordersFieldsMapping['color']] : null,
+						"day_scheduled_for_YYMMDD"     => isset($ordersFieldsMapping['day_scheduled_for_YYMMDD']) ? $rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']] : null,
+						"address_alias"     => isset($ordersFieldsMapping['address_alias']) ? $rows[$ordersFieldsMapping['address_alias']] : null,
+						"address_1"     => $address,
+						"address_2"     => isset($ordersFieldsMapping['address_2']) ? $rows[$ordersFieldsMapping['address_2']] : null,
+						"local_time_window_start"     => isset($ordersFieldsMapping['local_time_window_start']) ? $rows[$ordersFieldsMapping['local_time_window_start']] : null,
+						"local_time_window_end"     => isset($ordersFieldsMapping['local_time_window_end']) ? $rows[$ordersFieldsMapping['local_time_window_end']] : null,
+						"local_time_window_start_2"     => isset($ordersFieldsMapping['local_time_window_start_2']) ? $rows[$ordersFieldsMapping['local_time_window_start_2']] : null,
+						"local_time_window_end_2"     => isset($ordersFieldsMapping['local_time_window_end_2']) ? $rows[$ordersFieldsMapping['local_time_window_end_2']] : null,
+						"service_time"     => isset($ordersFieldsMapping['service_time']) ? $rows[$ordersFieldsMapping['service_time']] : null,
+						"EXT_FIELD_first_name"     => isset($ordersFieldsMapping['EXT_FIELD_first_name']) ? $rows[$ordersFieldsMapping['EXT_FIELD_first_name']] : null,
+						"EXT_FIELD_last_name"     => isset($ordersFieldsMapping['EXT_FIELD_last_name']) ? $rows[$ordersFieldsMapping['EXT_FIELD_last_name']] : null,
+						"EXT_FIELD_email"     => isset($ordersFieldsMapping['EXT_FIELD_email']) ? $rows[$ordersFieldsMapping['EXT_FIELD_email']] : null,
+						"EXT_FIELD_phone"     => isset($ordersFieldsMapping['EXT_FIELD_phone']) ? $rows[$ordersFieldsMapping['EXT_FIELD_phone']] : null,
+						"EXT_FIELD_custom_data"     => isset($ordersFieldsMapping['EXT_FIELD_custom_data']) ? $rows[$ordersFieldsMapping['EXT_FIELD_custom_data']] : null,
+						"order_icon"     => isset($ordersFieldsMapping['order_icon']) ? $rows[$ordersFieldsMapping['order_icon']] : null,
+					));
                     
-                    $order = new Order();
+					$order = new Order();
                     
-                    $orderResults = $order->addOrder($orderParameters);
+					$orderResults = $order->addOrder($orderParameters);
                     
-                    array_push($results['success'],"The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
-                }
-                else {
-                    array_push($results['fail'],"$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
-                }
+					array_push($results['success'],"The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
+				}
+				else {
+					array_push($results['fail'],"$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
+				}
                 
-                $iRow++;
-            }
-        }
+				$iRow++;
+			}
+		}
 
 	}
 	

Spacing +51 added lines, -51 removed lines

@@ -46,11 +46,11 @@ 
 		public $limit;
 		public $query;
 		
-		public function __construct () {  }
+		public function __construct() {  }
 		
 		public static function fromArray(array $params) {
-			$order= new Order();
-	        foreach($params as $key => $value) {
+			$order = new Order();
+	        foreach ($params as $key => $value) {
 	            if (property_exists($order, $key)) {
 	                $order->{$key} = $value;
 	            }
@@ -65,8 +65,8 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'POST',
 	            'body'  => array(
-					'address_1' => 	isset($params->address_1) ? $params->address_1: null,
-					'address_2' =>     isset($params->address_2) ? $params->address_2: null,
+					'address_1' => 	isset($params->address_1) ? $params->address_1 : null,
+					'address_2' =>     isset($params->address_2) ? $params->address_2 : null,
 	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
 	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
 	                'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
@@ -75,30 +75,30 @@ 
 	                'order_icon' => isset($params->order_icon) ? $params->order_icon : null,
 	                'day_scheduled_for_YYMMDD' => isset($params->day_scheduled_for_YYMMDD) ? $params->day_scheduled_for_YYMMDD : null,
 	                'address_alias' => isset($params->address_alias) ? $params->address_alias : null,
-	                'address_city' => 	isset($params->address_city) ? $params->address_city: null,
-	                'local_time_window_start' =>  isset($params->local_time_window_start) ? $params->local_time_window_start: null,
-	                'local_time_window_end' =>  isset($params->local_time_window_end) ? $params->local_time_window_end: null,
-	                'local_time_window_start_2' =>  isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
-	                'local_time_window_end_2' =>  isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
-	                'service_time' =>  isset($params->service_time) ? $params->service_time: null,
-	                'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name: null,
-	                'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name: null,
-	                'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email: null,
-	                'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone: null,
-	                'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data: null,
+	                'address_city' => 	isset($params->address_city) ? $params->address_city : null,
+	                'local_time_window_start' =>  isset($params->local_time_window_start) ? $params->local_time_window_start : null,
+	                'local_time_window_end' =>  isset($params->local_time_window_end) ? $params->local_time_window_end : null,
+	                'local_time_window_start_2' =>  isset($params->local_time_window_start_2) ? $params->local_time_window_start_2 : null,
+	                'local_time_window_end_2' =>  isset($params->local_time_window_end_2) ? $params->local_time_window_end_2 : null,
+	                'service_time' =>  isset($params->service_time) ? $params->service_time : null,
+	                'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name : null,
+	                'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name : null,
+	                'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email : null,
+	                'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone : null,
+	                'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data : null,
 				)
 	        ));
 
 			return $response;
 		}
 
-		public static function addOrder2Route($params,$body)
+		public static function addOrder2Route($params, $body)
 	    {
 	    	$response = Route4Me::makeRequst(array(
 	            'url'    => self::$apiUrlRoute,
 	            'method' => 'PUT',
 	            'query'  => array(
-					'route_id' => 	isset($params->route_id) ? $params->route_id: null,
+					'route_id' => 	isset($params->route_id) ? $params->route_id : null,
 	                'redirect' => isset($params->redirect) ? $params->redirect : null
 				),
 				'body'  => (array)$body
@@ -107,13 +107,13 @@ 
 			return $response;
 		}
 		
-		public static function addOrder2Destination($params,$body)
+		public static function addOrder2Destination($params, $body)
 	    {
 	    	$response = Route4Me::makeRequst(array(
 	            'url'    => self::$apiUrlOpt,
 	            'method' => 'PUT',
 	            'query'  => array(
-					'optimization_problem_id' => 	isset($params->optimization_problem_id) ? $params->optimization_problem_id: null,
+					'optimization_problem_id' => 	isset($params->optimization_problem_id) ? $params->optimization_problem_id : null,
 	                'redirect' => isset($params->redirect) ? $params->redirect : null
 				),
 				'body'  => (array)$body
@@ -128,7 +128,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-					'order_id' => 	isset($params->order_id) ? $params->order_id: null,
+					'order_id' => 	isset($params->order_id) ? $params->order_id : null,
 				)
 	        ));
 
@@ -151,7 +151,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'DELETE',
 	            'body'  => array(
-					'order_ids' => 	isset($params->order_ids) ? $params->order_ids: null
+					'order_ids' => 	isset($params->order_ids) ? $params->order_ids : null
 				)
 	        ));
 
@@ -175,12 +175,12 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-					'day_added_YYMMDD' => 	isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD: null,
-					'scheduled_for_YYMMDD' => 	isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD: null,
-					'fields' => 	isset($params->fields) ? $params->fields: null,
-					'offset' => 	isset($params->offset) ? $params->offset: null,
-					'limit' => 	isset($params->limit) ? $params->limit: null,
-					'query' => 	isset($params->query) ? $params->query: null,
+					'day_added_YYMMDD' => 	isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD : null,
+					'scheduled_for_YYMMDD' => 	isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD : null,
+					'fields' => 	isset($params->fields) ? $params->fields : null,
+					'offset' => 	isset($params->offset) ? $params->offset : null,
+					'limit' => 	isset($params->limit) ? $params->limit : null,
+					'query' => 	isset($params->query) ? $params->query : null,
 				)
 	        ));
 
@@ -208,45 +208,45 @@ 
         public function addOrdersFromCsvFile($csvFileHandle, $ordersFieldsMapping)
         {
             $max_line_length = 512;
-            $delemietr=',';
+            $delemietr = ',';
             
-            $results=array();
-            $results['fail']=array();
-            $results['success']=array();
+            $results = array();
+            $results['fail'] = array();
+            $results['success'] = array();
             
             $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
             
             if (!empty($columns)) {
-                 array_push($results['fail'],'Empty CSV table');
+                 array_push($results['fail'], 'Empty CSV table');
                  return ($results);
             }
                      
-            $iRow=1;
+            $iRow = 1;
             
-            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
-                if ($rows[$ordersFieldsMapping['cached_lat']] && $rows[$ordersFieldsMapping['cached_lng']] && $rows[$ordersFieldsMapping['address_1']] && array(null) !== $rows) {
+            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr))!==false) {
+                if ($rows[$ordersFieldsMapping['cached_lat']] && $rows[$ordersFieldsMapping['cached_lng']] && $rows[$ordersFieldsMapping['address_1']] && array(null)!==$rows) {
                     
-                    $cached_lat=0.000;
+                    $cached_lat = 0.000;
                     
                     if (!$this->validateLatitude($rows[$ordersFieldsMapping['cached_lat']])) {
-                        array_push($results['fail'],"$iRow --> Wrong cached_lat"); 
+                        array_push($results['fail'], "$iRow --> Wrong cached_lat"); 
                         $iRow++;
                         continue;
                     }
-                    else $cached_lat=doubleval($rows[$ordersFieldsMapping['cached_lat']]);
+                    else $cached_lat = doubleval($rows[$ordersFieldsMapping['cached_lat']]);
                     
-                    $cached_lng=0.000;
+                    $cached_lng = 0.000;
                     
                     if (!$this->validateLongitude($rows[$ordersFieldsMapping['cached_lng']])) {
-                        array_push($results['fail'],"$iRow --> Wrong cached_lng"); 
+                        array_push($results['fail'], "$iRow --> Wrong cached_lng"); 
                         $iRow++;
                         continue;
                     }
-                    else $cached_lng=doubleval($rows[$ordersFieldsMapping['cached_lng']]);
+                    else $cached_lng = doubleval($rows[$ordersFieldsMapping['cached_lng']]);
                     
                     if (isset($ordersFieldsMapping['curbside_lat'])) {
                         if (!$this->validateLatitude($rows[$ordersFieldsMapping['curbside_lat']])) {
-                            array_push($results['fail'],"$iRow --> Wrong curbside_lat"); 
+                            array_push($results['fail'], "$iRow --> Wrong curbside_lat"); 
                             $iRow++;
                             continue;
                         }
@@ -254,18 +254,18 @@ 
                     
                     if (isset($ordersFieldsMapping['curbside_lng'])) {
                         if (!$this->validateLongitude($rows[$ordersFieldsMapping['curbside_lng']])) {
-                            array_push($results['fail'],"$iRow --> Wrong curbside_lng"); 
+                            array_push($results['fail'], "$iRow --> Wrong curbside_lng"); 
                             $iRow++;
                             continue;
                         }
                     }
                     
-                    $address=$rows[$ordersFieldsMapping['address_1']];
+                    $address = $rows[$ordersFieldsMapping['address_1']];
                     
-                    if (isset($ordersFieldsMapping['order_city'])) $address.=', '.$rows[$ordersFieldsMapping['order_city']];
-                    if (isset($ordersFieldsMapping['order_state_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
-                    if (isset($ordersFieldsMapping['order_zip_code'])) $address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
-                    if (isset($ordersFieldsMapping['order_country_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
+                    if (isset($ordersFieldsMapping['order_city'])) $address .= ', '.$rows[$ordersFieldsMapping['order_city']];
+                    if (isset($ordersFieldsMapping['order_state_id'])) $address .= ', '.$rows[$ordersFieldsMapping['order_state_id']];
+                    if (isset($ordersFieldsMapping['order_zip_code'])) $address .= ', '.$rows[$ordersFieldsMapping['order_zip_code']];
+                    if (isset($ordersFieldsMapping['order_country_id'])) $address .= ', '.$rows[$ordersFieldsMapping['order_country_id']];
                     
                     echo "$iRow --> ".$ordersFieldsMapping['day_scheduled_for_YYMMDD'].", ".$rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']]."<br>";
                     
@@ -296,10 +296,10 @@ 
                     
                     $orderResults = $order->addOrder($orderParameters);
                     
-                    array_push($results['success'],"The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
+                    array_push($results['success'], "The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
                 }
                 else {
-                    array_push($results['fail'],"$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
+                    array_push($results['fail'], "$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
                 }
                 
                 $iRow++;

Braces +29 added lines, -12 removed lines

@@ -189,18 +189,26 @@ 
         
         public static function validateLatitude($lat)
         {
-            if (!is_numeric($lat)) return false;
+            if (!is_numeric($lat)) {
+            	return false;
+            }
             
-            if ($lat>90 || $lat<-90) return false;
+            if ($lat>90 || $lat<-90) {
+            	return false;
+            }
             
             return true;
         }
         
         public static function validateLongitude($lng)
         {
-            if (!is_numeric($lng)) return false;
+            if (!is_numeric($lng)) {
+            	return false;
+            }
             
-            if ($lng>180 || $lng<-180) return false;
+            if ($lng>180 || $lng<-180) {
+            	return false;
+            }
             
             return true;
         }
@@ -232,8 +240,9 @@ 
                         array_push($results['fail'],"$iRow --> Wrong cached_lat"); 
                         $iRow++;
                         continue;
+                    } else {
+                    	$cached_lat=doubleval($rows[$ordersFieldsMapping['cached_lat']]);
                     }
-                    else $cached_lat=doubleval($rows[$ordersFieldsMapping['cached_lat']]);
                     
                     $cached_lng=0.000;
                     
@@ -241,8 +250,9 @@ 
                         array_push($results['fail'],"$iRow --> Wrong cached_lng"); 
                         $iRow++;
                         continue;
+                    } else {
+                    	$cached_lng=doubleval($rows[$ordersFieldsMapping['cached_lng']]);
                     }
-                    else $cached_lng=doubleval($rows[$ordersFieldsMapping['cached_lng']]);
                     
                     if (isset($ordersFieldsMapping['curbside_lat'])) {
                         if (!$this->validateLatitude($rows[$ordersFieldsMapping['curbside_lat']])) {
@@ -262,10 +272,18 @@ 
                     
                     $address=$rows[$ordersFieldsMapping['address_1']];
                     
-                    if (isset($ordersFieldsMapping['order_city'])) $address.=', '.$rows[$ordersFieldsMapping['order_city']];
-                    if (isset($ordersFieldsMapping['order_state_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
-                    if (isset($ordersFieldsMapping['order_zip_code'])) $address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
-                    if (isset($ordersFieldsMapping['order_country_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
+                    if (isset($ordersFieldsMapping['order_city'])) {
+                    	$address.=', '.$rows[$ordersFieldsMapping['order_city']];
+                    }
+                    if (isset($ordersFieldsMapping['order_state_id'])) {
+                    	$address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
+                    }
+                    if (isset($ordersFieldsMapping['order_zip_code'])) {
+                    	$address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
+                    }
+                    if (isset($ordersFieldsMapping['order_country_id'])) {
+                    	$address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
+                    }
                     
                     echo "$iRow --> ".$ordersFieldsMapping['day_scheduled_for_YYMMDD'].", ".$rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']]."<br>";
                     
@@ -297,8 +315,7 @@ 
                     $orderResults = $order->addOrder($orderParameters);
                     
                     array_push($results['success'],"The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
-                }
-                else {
+                } else {
                     array_push($results['fail'],"$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
                 }