route4me / route4me-php-sdk

examples/Territories/UpdateTerritory.php

Indentation +14 added lines, -14 removed lines

@@ -18,14 +18,14 @@ 
 
 $territoryParams['type'] = TerritoryTypes::CIRCLE;
 $territoryParams['data'] = array(
-    "37.569752822786455,-77.47833251953125",
-    "5000"
+	"37.569752822786455,-77.47833251953125",
+	"5000"
 );
 
 $TerritoryParameters = Territory::fromArray(array(
-    "territory_name"  => "Test Territory ".strval(rand(10000,99999)),
-    "territory_color" => "ff7700",
-    "territory"       => $territoryParams
+	"territory_name"  => "Test Territory ".strval(rand(10000,99999)),
+	"territory_color" => "ff7700",
+	"territory"       => $territoryParams
 ));
 
 $result = (array)$territory->addTerritory($TerritoryParameters);
@@ -38,18 +38,18 @@ 
 
 // Update territory
 $territoryParameters = array (
-    "type" => TerritoryTypes::RECT,
-    "data" => array(
-        "29.6600127358956,-95.6593322753906",
-        "29.8966150753098,-95.3146362304688"
-       )
+	"type" => TerritoryTypes::RECT,
+	"data" => array(
+		"29.6600127358956,-95.6593322753906",
+		"29.8966150753098,-95.3146362304688"
+	   )
    );
 
 $TerritoryParameters = Territory::fromArray(array(
-    "territory_id"     => $territory_id,
-    "territory_name"   => "Test Territory Updated as rectangle",
-    "territory_color"  => "ff5500",
-    "territory"        => $territoryParameters
+	"territory_id"     => $territory_id,
+	"territory_name"   => "Test Territory Updated as rectangle",
+	"territory_color"  => "ff5500",
+	"territory"        => $territoryParameters
 ));
 
 $result1 = $territory->updateTerritory($TerritoryParameters);

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace Route4Me;
 
-$root=realpath(dirname(__FILE__).'/../../');
+$root = realpath(dirname(__FILE__).'/../../');
 require $root.'/vendor/autoload.php';
 
 use Route4Me\Route4Me;
@@ -23,7 +23,7 @@ 
 );
 
 $TerritoryParameters = Territory::fromArray(array(
-    "territory_name"  => "Test Territory ".strval(rand(10000,99999)),
+    "territory_name"  => "Test Territory ".strval(rand(10000, 99999)),
     "territory_color" => "ff7700",
     "territory"       => $territoryParams
 ));
@@ -37,7 +37,7 @@ 
 echo "------------------------------------------------------------------------<br><br>";
 
 // Update territory
-$territoryParameters = array (
+$territoryParameters = array(
     "type" => TerritoryTypes::RECT,
     "data" => array(
         "29.6600127358956,-95.6593322753906",

examples/Territories/CreatePolygonianTerritory.php

Indentation +12 added lines, -12 removed lines

@@ -16,21 +16,21 @@
 
 $territoryParams['type'] = TerritoryTypes::POLY;
 $territoryParams['data'] = array(
-    "37.769752822786455,-77.67833251953125",
-    "37.75886716305343,-77.68974800109863",
-    "37.74763966054455,-77.6917221069336",
-    "37.74655084306813,-77.68863220214844",
-    "37.7502255383101,-77.68125076293945",
-    "37.74797991274437,-77.67498512268066",
-    "37.73327960206065,-77.6411678314209",
-    "37.74430510679532,-77.63172645568848",
-    "37.76641925847049,-77.66846199035645"
+	"37.769752822786455,-77.67833251953125",
+	"37.75886716305343,-77.68974800109863",
+	"37.74763966054455,-77.6917221069336",
+	"37.74655084306813,-77.68863220214844",
+	"37.7502255383101,-77.68125076293945",
+	"37.74797991274437,-77.67498512268066",
+	"37.73327960206065,-77.6411678314209",
+	"37.74430510679532,-77.63172645568848",
+	"37.76641925847049,-77.66846199035645"
 );
 
 $TerritoryParameters=Territory::fromArray(array(
-    "territory_name"   => "Test Polygonian Territory ".strval(rand(10000,99999)),
-    "territory_color"  => "ff7700",
-    "territory"        => $territoryParams
+	"territory_name"   => "Test Polygonian Territory ".strval(rand(10000,99999)),
+	"territory_color"  => "ff7700",
+	"territory"        => $territoryParams
 ));
 
 $territory = new Territory();

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace Route4Me;
 
-$root=realpath(dirname(__FILE__).'/../../');
+$root = realpath(dirname(__FILE__).'/../../');
 require $root.'/vendor/autoload.php';
 
 use Route4Me\Route4Me;
@@ -27,8 +27,8 @@ 
     "37.76641925847049,-77.66846199035645"
 );
 
-$TerritoryParameters=Territory::fromArray(array(
-    "territory_name"   => "Test Polygonian Territory ".strval(rand(10000,99999)),
+$TerritoryParameters = Territory::fromArray(array(
+    "territory_name"   => "Test Polygonian Territory ".strval(rand(10000, 99999)),
     "territory_color"  => "ff7700",
     "territory"        => $territoryParams
 ));

examples/Territories/GetTerritory.php

Indentation +6 added lines, -6 removed lines

@@ -18,14 +18,14 @@ 
 
 $territoryParams['type'] = TerritoryTypes::CIRCLE;
 $territoryParams['data'] = array(
-    "37.569752822786455,-77.47833251953125",
-    "5000"
+	"37.569752822786455,-77.47833251953125",
+	"5000"
 );
 
 $TerritoryParameters = Territory::fromArray(array(
-    "territory_name"   => "Test Territory ".strval(rand(10000,99999)),
-    "territory_color"  => "ff7700",
-    "territory"        => $territoryParams
+	"territory_name"   => "Test Territory ".strval(rand(10000,99999)),
+	"territory_color"  => "ff7700",
+	"territory"        => $territoryParams
 ));
 
 $territory = new Territory();
@@ -41,7 +41,7 @@ 
 echo "------------------------------------------------------------------------<br><br>";
 
 $params = array(
-    "territory_id" => $territory_id
+	"territory_id" => $territory_id
 );
 
 $result1 = $territory->getTerritory($params);

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace Route4Me;
 
-$root=realpath(dirname(__FILE__).'/../../');
+$root = realpath(dirname(__FILE__).'/../../');
 require $root.'/vendor/autoload.php';
 
 use Route4Me\Route4Me;
@@ -23,7 +23,7 @@ 
 );
 
 $TerritoryParameters = Territory::fromArray(array(
-    "territory_name"   => "Test Territory ".strval(rand(10000,99999)),
+    "territory_name"   => "Test Territory ".strval(rand(10000, 99999)),
     "territory_color"  => "ff7700",
     "territory"        => $territoryParams
 ));

examples/Territories/AddTerritory.php

Indentation +5 added lines, -5 removed lines

@@ -14,14 +14,14 @@
 
 $territoryParams['type'] = TerritoryTypes::CIRCLE;
 $territoryParams['data'] = array(
-    "37.569752822786455,-77.47833251953125",
-    "5000"
+	"37.569752822786455,-77.47833251953125",
+	"5000"
 );
 
 $TerritoryParameters = Territory::fromArray(array(
-    "territory_name"   => "Test Territory ".strval(rand(10000,99999)),
-    "territory_color"  => "ff7700",
-    "territory"        => $territoryParams
+	"territory_name"   => "Test Territory ".strval(rand(10000,99999)),
+	"territory_color"  => "ff7700",
+	"territory"        => $territoryParams
 ));
 
 $territory = new Territory();

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace Route4Me;
 
-$root=realpath(dirname(__FILE__).'/../../');
+$root = realpath(dirname(__FILE__).'/../../');
 require $root.'/vendor/autoload.php';
 
 use Route4Me\Route4Me;
@@ -19,7 +19,7 @@ 
 );
 
 $TerritoryParameters = Territory::fromArray(array(
-    "territory_name"   => "Test Territory ".strval(rand(10000,99999)),
+    "territory_name"   => "Test Territory ".strval(rand(10000, 99999)),
     "territory_color"  => "ff7700",
     "territory"        => $territoryParams
 ));

src/Route4Me/OptimizationProblem.php

Indentation +220 added lines, -220 removed lines

@@ -11,271 +11,271 @@
 
 class OptimizationProblem extends Common
 {
-    public $optimization_problem_id;
-    public $user_errors = array();
-    public $state;
-    public $optimization_errors = array();
-    public $parameters;
-    public $sent_to_background;
-    public $created_timestamp;
-    public $scheduled_for;
-    public $optimization_completed_timestamp;
-    public $addresses = array();
-    public $routes = array();
-    public $links = array();
+	public $optimization_problem_id;
+	public $user_errors = array();
+	public $state;
+	public $optimization_errors = array();
+	public $parameters;
+	public $sent_to_background;
+	public $created_timestamp;
+	public $scheduled_for;
+	public $optimization_completed_timestamp;
+	public $addresses = array();
+	public $routes = array();
+	public $links = array();
 
-    function __construct()
-    {
-        $this->parameters = new RouteParameters;
-    }
+	function __construct()
+	{
+		$this->parameters = new RouteParameters;
+	}
 
-    public static function fromArray(array $params)
-    {
-        $problem = new OptimizationProblem;
-        $problem->optimization_problem_id = Common::getValue($params, 'optimization_problem_id');
-        $problem->user_errors = Common::getValue($params, 'user_errors', array());
-        $problem->state = Common::getValue($params, 'state', array());
-        $problem->sent_to_background = Common::getValue($params, 'sent_to_background', array());
-        $problem->links = Common::getValue($params, 'links', array());
+	public static function fromArray(array $params)
+	{
+		$problem = new OptimizationProblem;
+		$problem->optimization_problem_id = Common::getValue($params, 'optimization_problem_id');
+		$problem->user_errors = Common::getValue($params, 'user_errors', array());
+		$problem->state = Common::getValue($params, 'state', array());
+		$problem->sent_to_background = Common::getValue($params, 'sent_to_background', array());
+		$problem->links = Common::getValue($params, 'links', array());
 
-        if (isset($params['parameters'])) {
-            $problem->parameters = RouteParameters::fromArray($params['parameters']);
-        }
+		if (isset($params['parameters'])) {
+			$problem->parameters = RouteParameters::fromArray($params['parameters']);
+		}
 
-        if (isset($params['addresses'])) {
-            $addresses = array();
+		if (isset($params['addresses'])) {
+			$addresses = array();
             
-            foreach ($params['addresses'] as $address) {
-                $addresses[] = Address::fromArray($address);
-            }
+			foreach ($params['addresses'] as $address) {
+				$addresses[] = Address::fromArray($address);
+			}
             
-            $problem->addresses = $addresses;
-        }
+			$problem->addresses = $addresses;
+		}
 
-        if (isset($params['routes'])) {
-            $routes = array();
+		if (isset($params['routes'])) {
+			$routes = array();
             
-            foreach ($params['routes'] as $route) {
-                $routes[] = Route::fromArray($route);
-            }
+			foreach ($params['routes'] as $route) {
+				$routes[] = Route::fromArray($route);
+			}
             
-            $problem->routes = $routes;
-        }
+			$problem->routes = $routes;
+		}
 
-        return $problem;
-    }
+		return $problem;
+	}
 
-    public static function optimize(OptimizationProblemParams $params)
-    {
-        $optimize = Route4Me::makeRequst(array(
-            'url'    => Endpoint::OPTIMIZATION_PROBLEM,
-            'method' => 'POST',
-            'query'  => array(
-                'redirect'               => isset($params->redirect) ? $params->redirect : null,
-                'directions'             => isset($params->directions) ? $params->directions : null, 
-                'format'                 => isset($params->format) ? $params->format : null,
-                'route_path_output'      => isset($params->route_path_output) ? $params->route_path_output : null,
-                'optimized_callback_url' => isset($params->optimized_callback_url) ? $params->optimized_callback_url : null
-            ),
-            'body'   => array(
-                'addresses'  => $params->getAddressesArray(),
-                'parameters' => $params->getParametersArray()
-            )
-        ));
+	public static function optimize(OptimizationProblemParams $params)
+	{
+		$optimize = Route4Me::makeRequst(array(
+			'url'    => Endpoint::OPTIMIZATION_PROBLEM,
+			'method' => 'POST',
+			'query'  => array(
+				'redirect'               => isset($params->redirect) ? $params->redirect : null,
+				'directions'             => isset($params->directions) ? $params->directions : null, 
+				'format'                 => isset($params->format) ? $params->format : null,
+				'route_path_output'      => isset($params->route_path_output) ? $params->route_path_output : null,
+				'optimized_callback_url' => isset($params->optimized_callback_url) ? $params->optimized_callback_url : null
+			),
+			'body'   => array(
+				'addresses'  => $params->getAddressesArray(),
+				'parameters' => $params->getParametersArray()
+			)
+		));
 
-        return OptimizationProblem::fromArray($optimize);
-    }
+		return OptimizationProblem::fromArray($optimize);
+	}
 
-    public static function get($params)
-    {
-        $optimize = Route4Me::makeRequst(array(
-            'url'    => Endpoint::OPTIMIZATION_PROBLEM,
-            'method' => 'GET',
-            'query'  => array(
-                'state'  => isset($params['state']) ? $params['state'] : null,
-                'limit'  => isset($params['limit']) ? $params['limit'] : null,
-                'offset' => isset($params['offset']) ? $params['offset'] : null,
-                'optimization_problem_id' => isset($params['optimization_problem_id']) 
-                    ? $params['optimization_problem_id'] : null,
-                'wait_for_final_state' => isset($params['wait_for_final_state']) 
-                    ? $params['wait_for_final_state'] : null,
-            )
-        ));
+	public static function get($params)
+	{
+		$optimize = Route4Me::makeRequst(array(
+			'url'    => Endpoint::OPTIMIZATION_PROBLEM,
+			'method' => 'GET',
+			'query'  => array(
+				'state'  => isset($params['state']) ? $params['state'] : null,
+				'limit'  => isset($params['limit']) ? $params['limit'] : null,
+				'offset' => isset($params['offset']) ? $params['offset'] : null,
+				'optimization_problem_id' => isset($params['optimization_problem_id']) 
+					? $params['optimization_problem_id'] : null,
+				'wait_for_final_state' => isset($params['wait_for_final_state']) 
+					? $params['wait_for_final_state'] : null,
+			)
+		));
 
-        if (isset($optimize['optimizations'])) {
-            $problems = array();
+		if (isset($optimize['optimizations'])) {
+			$problems = array();
             
-            foreach ($optimize['optimizations'] as $problem) {
-                $problems[] = OptimizationProblem::fromArray($problem);
-            }
+			foreach ($optimize['optimizations'] as $problem) {
+				$problems[] = OptimizationProblem::fromArray($problem);
+			}
             
-            return $problems;
-        } else {
-            return OptimizationProblem::fromArray($optimize);
-        }
-    }
+			return $problems;
+		} else {
+			return OptimizationProblem::fromArray($optimize);
+		}
+	}
 
-    public static function reoptimize($params)
-    {
-        $param = new OptimizationProblemParams;
-        $param->optimization_problem_id = isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null;
-        $param->reoptimize = 1;
+	public static function reoptimize($params)
+	{
+		$param = new OptimizationProblemParams;
+		$param->optimization_problem_id = isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null;
+		$param->reoptimize = 1;
 
-        return self::update((array)$param);
-    }
+		return self::update((array)$param);
+	}
 
-    public static function update($params)
-    {
-        $optimize = Route4Me::makeRequst(array(
-            'url'    => Endpoint::OPTIMIZATION_PROBLEM,
-            'method' => 'PUT',
-            'query'  => array(
-                'optimization_problem_id' => isset($params['optimization_problem_id'])
-                                               ? $params['optimization_problem_id'] : null,
-                'addresses'  => isset($params['addresses']) ? $params['addresses'] : null,
-                'reoptimize' => isset($params['reoptimize']) ? $params['reoptimize'] : null,
-            )
-        ));
+	public static function update($params)
+	{
+		$optimize = Route4Me::makeRequst(array(
+			'url'    => Endpoint::OPTIMIZATION_PROBLEM,
+			'method' => 'PUT',
+			'query'  => array(
+				'optimization_problem_id' => isset($params['optimization_problem_id'])
+											   ? $params['optimization_problem_id'] : null,
+				'addresses'  => isset($params['addresses']) ? $params['addresses'] : null,
+				'reoptimize' => isset($params['reoptimize']) ? $params['reoptimize'] : null,
+			)
+		));
         
-        return $optimize;
-    }
+		return $optimize;
+	}
 
-    public function getOptimizationId()
-    {
-        return $this->optimization_problem_id;
-    }
+	public function getOptimizationId()
+	{
+		return $this->optimization_problem_id;
+	}
 
-    public function getRoutes()
-    {
-        return $this->routes;
-    }
+	public function getRoutes()
+	{
+		return $this->routes;
+	}
     
-    public function getRandomOptimizationId($offset, $limit)
-    {
-        $query['limit'] = !is_null($limit) ? $limit : 30;
-        $query['offset'] = !is_null($offset) ? $offset : 0;
+	public function getRandomOptimizationId($offset, $limit)
+	{
+		$query['limit'] = !is_null($limit) ? $limit : 30;
+		$query['offset'] = !is_null($offset) ? $offset : 0;
             
-        $json = Route4Me::makeRequst(array(
-            'url'    => Endpoint::OPTIMIZATION_PROBLEM,
-            'method' => 'GET',
-            'query'  => $query
-        ));
+		$json = Route4Me::makeRequst(array(
+			'url'    => Endpoint::OPTIMIZATION_PROBLEM,
+			'method' => 'GET',
+			'query'  => $query
+		));
         
-        $optimizations = array();
-            foreach ($json as $optimization) {
-                if (gettype($optimization)!="array") {
-                   continue; 
-                }
+		$optimizations = array();
+			foreach ($json as $optimization) {
+				if (gettype($optimization)!="array") {
+				   continue; 
+				}
                 
-                foreach ($optimization as $otp1) {
-                    $optimizations[] = $otp1;
-                }
-            }
+				foreach ($optimization as $otp1) {
+					$optimizations[] = $otp1;
+				}
+			}
             
-            $num = rand(0,sizeof($optimizations)-1);
+			$num = rand(0,sizeof($optimizations)-1);
             
-            $rOptimization = $optimizations[$num];
+			$rOptimization = $optimizations[$num];
             
-            return $rOptimization['optimization_problem_id'];
-    }
+			return $rOptimization['optimization_problem_id'];
+	}
     
-    public function getAddresses($opt_id)
-    {
-        if ($opt_id==null) {
-            return null;
-        }
+	public function getAddresses($opt_id)
+	{
+		if ($opt_id==null) {
+			return null;
+		}
         
-        $params = array("optimization_problem_id" => $opt_id );
+		$params = array("optimization_problem_id" => $opt_id );
         
-        $optimization = (array)$this->get($params);
+		$optimization = (array)$this->get($params);
         
-        $addresses = $optimization["addresses"];
+		$addresses = $optimization["addresses"];
         
-        return $addresses;
-    }
+		return $addresses;
+	}
     
-    public function getRandomAddressFromOptimization($opt_id)
-    {
-        $addresses = (array)$this->getAddresses($opt_id);
+	public function getRandomAddressFromOptimization($opt_id)
+	{
+		$addresses = (array)$this->getAddresses($opt_id);
         
-        if ($addresses==null) {
-            echo "There are no addresses in this optimization!.. Try again.";
-            return null;
-        }
+		if ($addresses==null) {
+			echo "There are no addresses in this optimization!.. Try again.";
+			return null;
+		}
         
-        $num = rand(0, sizeof($addresses)-1);
+		$num = rand(0, sizeof($addresses)-1);
         
-        $rAddress = $addresses[$num];
+		$rAddress = $addresses[$num];
         
-        return $rAddress;
-    }
+		return $rAddress;
+	}
     
-    public function removeAddress($params)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            'method' => 'DELETE',
-            'query'  => array(
-                'optimization_problem_id' => isset($params['optimization_problem_id'])
-                                               ? $params['optimization_problem_id'] : null,
-                'route_destination_id'    => isset($params['route_destination_id'])
-                                               ? $params['route_destination_id'] : null,
-            )
-        ));
+	public function removeAddress($params)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'method' => 'DELETE',
+			'query'  => array(
+				'optimization_problem_id' => isset($params['optimization_problem_id'])
+											   ? $params['optimization_problem_id'] : null,
+				'route_destination_id'    => isset($params['route_destination_id'])
+											   ? $params['route_destination_id'] : null,
+			)
+		));
         
-        return $response;
-    }
+		return $response;
+	}
     
-    public function removeOptimization($params)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::OPTIMIZATION_PROBLEM,
-            'method' => 'DELETE',
-            'query'  => array(
-                'redirect' => isset($params['redirect']) ? $params['redirect'] : null,
-            ),
-            'body'   => array(
-                'optimization_problem_ids' => isset($params['optimization_problem_ids'])
-                                                ? $params['optimization_problem_ids'] : null,
-            )
-        ));
+	public function removeOptimization($params)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::OPTIMIZATION_PROBLEM,
+			'method' => 'DELETE',
+			'query'  => array(
+				'redirect' => isset($params['redirect']) ? $params['redirect'] : null,
+			),
+			'body'   => array(
+				'optimization_problem_ids' => isset($params['optimization_problem_ids'])
+												? $params['optimization_problem_ids'] : null,
+			)
+		));
         
-        return $response;
-    }
+		return $response;
+	}
     
-    public function getHybridOptimization($params)
-    {
-        $optimize = Route4Me::makeRequst(array(
-            'url'    => Endpoint::HYBRID_DATE_OPTIMIZATION,
-            'method' => 'GET',
-            'query'  => array(
-                'target_date_string'      => isset($params['target_date_string'])
-                                               ? $params['target_date_string'] : null,
-                'timezone_offset_minutes' => isset($params['timezone_offset_minutes'])
-                                               ? $params['timezone_offset_minutes'] : null
-            )
-        ));
+	public function getHybridOptimization($params)
+	{
+		$optimize = Route4Me::makeRequst(array(
+			'url'    => Endpoint::HYBRID_DATE_OPTIMIZATION,
+			'method' => 'GET',
+			'query'  => array(
+				'target_date_string'      => isset($params['target_date_string'])
+											   ? $params['target_date_string'] : null,
+				'timezone_offset_minutes' => isset($params['timezone_offset_minutes'])
+											   ? $params['timezone_offset_minutes'] : null
+			)
+		));
 
-        return $optimize;
-    }
+		return $optimize;
+	}
     
-    Public function addDepotsToHybrid($params)
-    {
-        $depots = Route4Me::makeRequst(array( 
-            'url'    => Endpoint::CHANGE_HYBRID_OPTIMIZATION_DEPOT,
-            'method' => 'POST',
-            'query'  => array(
-                'optimization_problem_id' => isset($params['optimization_problem_id'])
-                                               ? $params['optimization_problem_id'] : null,
-                ),
-            'body'   => array(
-                'optimization_problem_id' => isset($params['optimization_problem_id'])
-                                               ? $params['optimization_problem_id'] : null,
-                'delete_old_depots'       => isset($params['delete_old_depots']) ? $params['delete_old_depots'] : null,
-                'new_depots'              => isset($params['new_depots']) ? $params['new_depots'] : null,
-            )
-        ));
+	Public function addDepotsToHybrid($params)
+	{
+		$depots = Route4Me::makeRequst(array( 
+			'url'    => Endpoint::CHANGE_HYBRID_OPTIMIZATION_DEPOT,
+			'method' => 'POST',
+			'query'  => array(
+				'optimization_problem_id' => isset($params['optimization_problem_id'])
+											   ? $params['optimization_problem_id'] : null,
+				),
+			'body'   => array(
+				'optimization_problem_id' => isset($params['optimization_problem_id'])
+											   ? $params['optimization_problem_id'] : null,
+				'delete_old_depots'       => isset($params['delete_old_depots']) ? $params['delete_old_depots'] : null,
+				'new_depots'              => isset($params['new_depots']) ? $params['new_depots'] : null,
+			)
+		));
         
-        return $depots;
-    }
+		return $depots;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -172,7 +172,7 @@ 
                 }
             }
             
-            $num = rand(0,sizeof($optimizations)-1);
+            $num = rand(0, sizeof($optimizations) - 1);
             
             $rOptimization = $optimizations[$num];
             
@@ -185,7 +185,7 @@ 
             return null;
         }
         
-        $params = array("optimization_problem_id" => $opt_id );
+        $params = array("optimization_problem_id" => $opt_id);
         
         $optimization = (array)$this->get($params);
         
@@ -203,7 +203,7 @@ 
             return null;
         }
         
-        $num = rand(0, sizeof($addresses)-1);
+        $num = rand(0, sizeof($addresses) - 1);
         
         $rAddress = $addresses[$num];
         

src/Route4Me/Order.php

Indentation +296 added lines, -296 removed lines

@@ -6,378 +6,378 @@
 
 class Order extends Common
 {
-    public $address_1;
-    public $address_2;
-    public $cached_lat;
-    public $cached_lng;
-    public $curbside_lat;
-    public $curbside_lng;
-    public $address_alias;
-    public $address_city;
-    public $EXT_FIELD_first_name;
-    public $EXT_FIELD_last_name;
-    public $EXT_FIELD_email;
-    public $EXT_FIELD_phone;
-    public $EXT_FIELD_custom_data;
+	public $address_1;
+	public $address_2;
+	public $cached_lat;
+	public $cached_lng;
+	public $curbside_lat;
+	public $curbside_lng;
+	public $address_alias;
+	public $address_city;
+	public $EXT_FIELD_first_name;
+	public $EXT_FIELD_last_name;
+	public $EXT_FIELD_email;
+	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;
-    public $optimization_problem_id;
-    public $order_id;
-    public $order_ids;
+	public $route_id;
+	public $redirect;
+	public $optimization_problem_id;
+	public $order_id;
+	public $order_ids;
     
-    public $day_added_YYMMDD;
-    public $scheduled_for_YYMMDD;
-    public $fields;
-    public $offset;
-    public $limit;
-    public $query;
+	public $day_added_YYMMDD;
+	public $scheduled_for_YYMMDD;
+	public $fields;
+	public $offset;
+	public $limit;
+	public $query;
     
-    public $created_timestamp;
-    public $order_status_id;
-    public $member_id;
-    public $address_state_id;
-    public $address_country_id;
-    public $address_zip;
-    public $in_route_count;
-    public $last_visited_timestamp;
-    public $last_routed_timestamp;
-    public $local_timezone_string;
-    public $is_validated;
-    public $is_pending;
-    public $is_accepted;
-    public $is_started;
-    public $is_completed;
-    public $custom_user_fields;
+	public $created_timestamp;
+	public $order_status_id;
+	public $member_id;
+	public $address_state_id;
+	public $address_country_id;
+	public $address_zip;
+	public $in_route_count;
+	public $last_visited_timestamp;
+	public $last_routed_timestamp;
+	public $local_timezone_string;
+	public $is_validated;
+	public $is_pending;
+	public $is_accepted;
+	public $is_started;
+	public $is_completed;
+	public $custom_user_fields;
     
-    public static function fromArray(array $params) {
-        $order = new Order();
-        foreach ($params as $key => $value) {
-            if (property_exists($order, $key)) {
-                $order->{$key} = $value;
-            }
-        }
+	public static function fromArray(array $params) {
+		$order = new Order();
+		foreach ($params as $key => $value) {
+			if (property_exists($order, $key)) {
+				$order->{$key} = $value;
+			}
+		}
         
-        return $order;
-    }
+		return $order;
+	}
     
-    /**
-     * @param Order $params
-     */
-    public static function addOrder($params)
-    {
-        $body = array();
+	/**
+	 * @param Order $params
+	 */
+	public static function addOrder($params)
+	{
+		$body = array();
         
-        $allAddOrderParameters = array('address_1', 'address_2', 'member_id', 'cached_lat', 'cached_lng', 'curbside_lat', 
-        'curbside_lng', 'color', 'order_icon', 'day_scheduled_for_YYMMDD', 'address_alias', 'address_city', 'address_state_id', 
-        'address_country_id', 'address_zip', 'local_time_window_start', 'local_time_window_end', 'local_time_window_start_2', 
-        'local_time_window_end_2', 'service_time', 'local_timezone_string', 'EXT_FIELD_first_name', 'EXT_FIELD_last_name', 
-        'EXT_FIELD_email', 'EXT_FIELD_phone', 'EXT_FIELD_custom_data', 'is_validated', 'is_pending', 'is_accepted', 'is_started', 
-        'is_completed', 'custom_user_fields');
+		$allAddOrderParameters = array('address_1', 'address_2', 'member_id', 'cached_lat', 'cached_lng', 'curbside_lat', 
+		'curbside_lng', 'color', 'order_icon', 'day_scheduled_for_YYMMDD', 'address_alias', 'address_city', 'address_state_id', 
+		'address_country_id', 'address_zip', 'local_time_window_start', 'local_time_window_end', 'local_time_window_start_2', 
+		'local_time_window_end_2', 'service_time', 'local_timezone_string', 'EXT_FIELD_first_name', 'EXT_FIELD_last_name', 
+		'EXT_FIELD_email', 'EXT_FIELD_phone', 'EXT_FIELD_custom_data', 'is_validated', 'is_pending', 'is_accepted', 'is_started', 
+		'is_completed', 'custom_user_fields');
         
-        foreach ($allAddOrderParameters as $addOrderParameter) {
-            if (isset($params->{$addOrderParameter})) $body[$addOrderParameter] = $params->{$addOrderParameter};
-        }
+		foreach ($allAddOrderParameters as $addOrderParameter) {
+			if (isset($params->{$addOrderParameter})) $body[$addOrderParameter] = $params->{$addOrderParameter};
+		}
        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'POST',
-            'body'   => $body
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'POST',
+			'body'   => $body
+		));
 
-        return $response;
-    }
+		return $response;
+	}
 
-    public static function addOrder2Route($params, $body)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'PUT',
-            'query'  => array(
-                'route_id' => isset($params->route_id) ? $params->route_id : null,
-                'redirect' => isset($params->redirect) ? $params->redirect : null
-            ),
-            'body' => (array)$body
-        ));
+	public static function addOrder2Route($params, $body)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'PUT',
+			'query'  => array(
+				'route_id' => isset($params->route_id) ? $params->route_id : null,
+				'redirect' => isset($params->redirect) ? $params->redirect : null
+			),
+			'body' => (array)$body
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function addOrder2Optimization($params, $body)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::OPTIMIZATION_PROBLEM,
-            'method' => 'PUT',
-            'query'  => array(
-                'optimization_problem_id' =>  isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null,
-                'redirect'                => isset($params['redirect']) ? $params['redirect'] : null,
-                'device_type'             => isset($params['device_type']) ? $params['device_type'] : null
-            ),
-            'body'  => (array)$body
-        ));
+	public static function addOrder2Optimization($params, $body)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::OPTIMIZATION_PROBLEM,
+			'method' => 'PUT',
+			'query'  => array(
+				'optimization_problem_id' =>  isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null,
+				'redirect'                => isset($params['redirect']) ? $params['redirect'] : null,
+				'device_type'             => isset($params['device_type']) ? $params['device_type'] : null
+			),
+			'body'  => (array)$body
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getOrder($params)
-    {
-        $query = array();
-        $allGetParameters = array('order_id', 'fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit' );
+	public static function getOrder($params)
+	{
+		$query = array();
+		$allGetParameters = array('order_id', 'fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit' );
         
-        foreach ($allGetParameters as $getParameter) {
-            if (isset($params->{$getParameter})) $query[$getParameter] = $params->{$getParameter};
-        }
+		foreach ($allGetParameters as $getParameter) {
+			if (isset($params->{$getParameter})) $query[$getParameter] = $params->{$getParameter};
+		}
 
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'GET',
-            'query'  => $query
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'GET',
+			'query'  => $query
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getOrders($params)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'offset' => isset($params->offset) ? $params->offset : null,
-                'limit'  => isset($params->limit) ? $params->limit : null
-            )
-        ));
+	public static function getOrders($params)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'offset' => isset($params->offset) ? $params->offset : null,
+				'limit'  => isset($params->limit) ? $params->limit : null
+			)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public function getRandomOrderId($offset, $limit)
-    {
-        $params = array('offset' => $offset, 'limit' => $limit);
+	public function getRandomOrderId($offset, $limit)
+	{
+		$params = array('offset' => $offset, 'limit' => $limit);
         
-        $orders = self::getOrders($params);
+		$orders = self::getOrders($params);
         
-        if (is_null($orders)) {
-            return null;
-        }
+		if (is_null($orders)) {
+			return null;
+		}
         
-        if (!isset($orders['results'])) {
-            return null;
-        }
+		if (!isset($orders['results'])) {
+			return null;
+		}
         
-        $randomIndex = rand(0, sizeof($orders['results']) - 1);
+		$randomIndex = rand(0, sizeof($orders['results']) - 1);
         
-        $order = $orders['results'][$randomIndex];
+		$order = $orders['results'][$randomIndex];
         
-        return $order['order_id'];
-    }
+		return $order['order_id'];
+	}
     
-    public function getRandomOrder($offset, $limit)
-    {
-        $params = array('offset' => $offset, 'limit' => $limit);
+	public function getRandomOrder($offset, $limit)
+	{
+		$params = array('offset' => $offset, 'limit' => $limit);
         
-        $orders = self::getOrders($params);
+		$orders = self::getOrders($params);
         
-        if (is_null($orders)) {
-            return null;
-        }
+		if (is_null($orders)) {
+			return null;
+		}
         
-        if (!isset($orders['results'])) {
-            return null;
-        }
+		if (!isset($orders['results'])) {
+			return null;
+		}
         
-        $randomIndex = rand(0, sizeof($orders['results']) - 1);
+		$randomIndex = rand(0, sizeof($orders['results']) - 1);
         
-        $order = $orders['results'][$randomIndex];
+		$order = $orders['results'][$randomIndex];
         
-        return $order;
-    }
+		return $order;
+	}
     
-    public static function removeOrder($params)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'DELETE',
-            'body'   => array(
-                'order_ids' =>  isset($params->order_ids) ? $params->order_ids : null
-            )
-        ));
+	public static function removeOrder($params)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'DELETE',
+			'body'   => array(
+				'order_ids' =>  isset($params->order_ids) ? $params->order_ids : null
+			)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function updateOrder($body)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'PUT',
-            'body'   => (array)$body
-        ));
+	public static function updateOrder($body)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'PUT',
+			'body'   => (array)$body
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function searchOrder($params)
-    {
-        $query = array();
-        $allSearchParameters = array('fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit' );
+	public static function searchOrder($params)
+	{
+		$query = array();
+		$allSearchParameters = array('fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit' );
         
-        foreach ($allSearchParameters as $searchParameter) {
-            if (isset($params->{$searchParameter})) $query[$searchParameter] = $params->{$searchParameter};
-        }
+		foreach ($allSearchParameters as $searchParameter) {
+			if (isset($params->{$searchParameter})) $query[$searchParameter] = $params->{$searchParameter};
+		}
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'GET',
-            'query'  => $query
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'GET',
+			'query'  => $query
+		));
 
-        return $response;
-    }
+		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);
         
-        $allOrderFields = array("curbside_lat","curbside_lng","color","day_scheduled_for_YYMMDD",
-                "address_alias","address_1","address_2","local_time_window_start","local_time_window_end","local_time_window_start_2",
-                "local_time_window_end_2","service_time","EXT_FIELD_first_name","EXT_FIELD_last_name","EXT_FIELD_email","EXT_FIELD_phone",
-                "EXT_FIELD_custom_data","order_icon");
+		$allOrderFields = array("curbside_lat","curbside_lng","color","day_scheduled_for_YYMMDD",
+				"address_alias","address_1","address_2","local_time_window_start","local_time_window_end","local_time_window_start_2",
+				"local_time_window_end_2","service_time","EXT_FIELD_first_name","EXT_FIELD_last_name","EXT_FIELD_email","EXT_FIELD_phone",
+				"EXT_FIELD_custom_data","order_icon");
         
-        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_city'])) {
+					$address.=', '.$rows[$ordersFieldsMapping['order_city']];
+				}
                 
-                if (isset($ordersFieldsMapping['order_state_id'])) {
-                    $address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
-                }
+				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_zip_code'])) {
+					$address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
+				}
                 
-                if (isset($ordersFieldsMapping['order_country_id'])) {
-                    $address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
-                }
+				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>";
                 
-                $parametersArray = array();
+				$parametersArray = array();
                 
-                $parametersArray["cached_lat"] = $cached_lat;
-                $parametersArray["cached_lng"] = $cached_lng;
+				$parametersArray["cached_lat"] = $cached_lat;
+				$parametersArray["cached_lng"] = $cached_lng;
                 
                 
-                foreach ($allOrderFields as $orderField) {
-                    if (isset($ordersFieldsMapping[$orderField])) {
-                        $parametersArray[$orderField] = $rows[$ordersFieldsMapping[$orderField]];
-                    }
-                }
+				foreach ($allOrderFields as $orderField) {
+					if (isset($ordersFieldsMapping[$orderField])) {
+						$parametersArray[$orderField] = $rows[$ordersFieldsMapping[$orderField]];
+					}
+				}
                 
-                $orderParameters = Order::fromArray($parametersArray);
+				$orderParameters = Order::fromArray($parametersArray);
 
-                $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 +12 added lines, -12 removed lines

@@ -132,7 +132,7 @@ 
     public static function getOrder($params)
     {
         $query = array();
-        $allGetParameters = array('order_id', 'fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit' );
+        $allGetParameters = array('order_id', 'fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit');
         
         foreach ($allGetParameters as $getParameter) {
             if (isset($params->{$getParameter})) $query[$getParameter] = $params->{$getParameter};
@@ -230,7 +230,7 @@ 
     public static function searchOrder($params)
     {
         $query = array();
-        $allSearchParameters = array('fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit' );
+        $allSearchParameters = array('fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit');
         
         foreach ($allSearchParameters as $searchParameter) {
             if (isset($params->{$searchParameter})) $query[$searchParameter] = $params->{$searchParameter};
@@ -282,17 +282,17 @@ 
         
         $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
         
-        $allOrderFields = array("curbside_lat","curbside_lng","color","day_scheduled_for_YYMMDD",
-                "address_alias","address_1","address_2","local_time_window_start","local_time_window_end","local_time_window_start_2",
-                "local_time_window_end_2","service_time","EXT_FIELD_first_name","EXT_FIELD_last_name","EXT_FIELD_email","EXT_FIELD_phone",
-                "EXT_FIELD_custom_data","order_icon");
+        $allOrderFields = array("curbside_lat", "curbside_lng", "color", "day_scheduled_for_YYMMDD",
+                "address_alias", "address_1", "address_2", "local_time_window_start", "local_time_window_end", "local_time_window_start_2",
+                "local_time_window_end_2", "service_time", "EXT_FIELD_first_name", "EXT_FIELD_last_name", "EXT_FIELD_email", "EXT_FIELD_phone",
+                "EXT_FIELD_custom_data", "order_icon");
         
         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) {
@@ -336,19 +336,19 @@ 
                 $address = $rows[$ordersFieldsMapping['address_1']];
                 
                 if (isset($ordersFieldsMapping['order_city'])) {
-                    $address.=', '.$rows[$ordersFieldsMapping['order_city']];
+                    $address .= ', '.$rows[$ordersFieldsMapping['order_city']];
                 }
                 
                 if (isset($ordersFieldsMapping['order_state_id'])) {
-                    $address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
+                    $address .= ', '.$rows[$ordersFieldsMapping['order_state_id']];
                 }
                 
                 if (isset($ordersFieldsMapping['order_zip_code'])) {
-                    $address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
+                    $address .= ', '.$rows[$ordersFieldsMapping['order_zip_code']];
                 }
                 
                 if (isset($ordersFieldsMapping['order_country_id'])) {
-                    $address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
+                    $address .= ', '.$rows[$ordersFieldsMapping['order_country_id']];
                 }
                 
                 echo "$iRow --> ".$ordersFieldsMapping['day_scheduled_for_YYMMDD'].", ".$rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']]."<br>";

Braces +10 added lines, -5 removed lines

@@ -86,7 +86,9 @@ 
         'is_completed', 'custom_user_fields');
         
         foreach ($allAddOrderParameters as $addOrderParameter) {
-            if (isset($params->{$addOrderParameter})) $body[$addOrderParameter] = $params->{$addOrderParameter};
+            if (isset($params->{$addOrderParameter})) {
+            	$body[$addOrderParameter] = $params->{$addOrderParameter};
+            }
         }
        
         $response = Route4Me::makeRequst(array(
@@ -135,7 +137,9 @@ 
         $allGetParameters = array('order_id', 'fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit' );
         
         foreach ($allGetParameters as $getParameter) {
-            if (isset($params->{$getParameter})) $query[$getParameter] = $params->{$getParameter};
+            if (isset($params->{$getParameter})) {
+            	$query[$getParameter] = $params->{$getParameter};
+            }
         }
 
         $response = Route4Me::makeRequst(array(
@@ -233,7 +237,9 @@ 
         $allSearchParameters = array('fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit' );
         
         foreach ($allSearchParameters as $searchParameter) {
-            if (isset($params->{$searchParameter})) $query[$searchParameter] = $params->{$searchParameter};
+            if (isset($params->{$searchParameter})) {
+            	$query[$searchParameter] = $params->{$searchParameter};
+            }
         }
         
         $response = Route4Me::makeRequst(array(
@@ -372,8 +378,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"); 
             }
             

src/Route4Me/Route.php

Indentation +416 added lines, -416 removed lines

@@ -9,480 +9,480 @@
 
 class Route extends Common
 {
-    public $route_id;
-    public $member_id;
-    public $route_destination_id;
-    public $optimization_problem_id;
-    public $vehicle_alias;
-    public $driver_alias;
-    public $trip_distance;
-    public $mpg;
-    public $gas_price;
-    public $route_duration_sec;
-    public $destination_count;
-    public $parameters;
-    public $addresses = array();
-    public $links = array();
-    public $directions = array();
-    public $path = array();
-    public $tracking_history = array();
-    public $recipient_email;
-    public $httpheaders;
-    public $is_unrouted;
-    public $time;
+	public $route_id;
+	public $member_id;
+	public $route_destination_id;
+	public $optimization_problem_id;
+	public $vehicle_alias;
+	public $driver_alias;
+	public $trip_distance;
+	public $mpg;
+	public $gas_price;
+	public $route_duration_sec;
+	public $destination_count;
+	public $parameters;
+	public $addresses = array();
+	public $links = array();
+	public $directions = array();
+	public $path = array();
+	public $tracking_history = array();
+	public $recipient_email;
+	public $httpheaders;
+	public $is_unrouted;
+	public $time;
     
-    public $dev_lat;
-    public $dev_lng;
+	public $dev_lat;
+	public $dev_lng;
     
-    public $user_route_rating;
-    public $member_email;
-    public $member_first_name;
-    public $member_last_name;
-    public $channel_name;
-    public $route_cost;
-    public $route_revenue;
-    public $net_revenue_per_distance_unit;
-    public $created_timestamp;
-    public $planned_total_route_duration;
-    public $actual_travel_distance;
-    public $actual_travel_time;
-    public $actual_footsteps;
-    public $working_time;
-    public $driving_time;
-    public $idling_time;
-    public $paying_miles;
-    public $geofence_polygon_type;
-    public $geofence_polygon_size;
-    public $notes;
-    public $member_config_storage;
+	public $user_route_rating;
+	public $member_email;
+	public $member_first_name;
+	public $member_last_name;
+	public $channel_name;
+	public $route_cost;
+	public $route_revenue;
+	public $net_revenue_per_distance_unit;
+	public $created_timestamp;
+	public $planned_total_route_duration;
+	public $actual_travel_distance;
+	public $actual_travel_time;
+	public $actual_footsteps;
+	public $working_time;
+	public $driving_time;
+	public $idling_time;
+	public $paying_miles;
+	public $geofence_polygon_type;
+	public $geofence_polygon_size;
+	public $notes;
+	public $member_config_storage;
 
-    public static function fromArray(array $params) 
-    {
-        $route = new Route();
-        $route->route_id                = Common::getValue($params, 'route_id');
-        $route->member_id               = Common::getValue($params, 'member_id');
-        $route->optimization_problem_id = Common::getValue($params, 'optimization_problem_id');
-        $route->vehicle_alias           = Common::getValue($params, 'vehicle_alias');
-        $route->driver_alias            = Common::getValue($params, 'driver_alias');
-        $route->trip_distance           = Common::getValue($params, 'trip_distance');
-        $route->mpg                     = Common::getValue($params, 'mpg');
-        $route->gas_price               = Common::getValue($params, 'gas_price');
-        $route->route_duration_sec      = Common::getvalue($params, 'route_duration_sec');
-        $route->destination_count       = Common::getvalue($params, 'destination_count');
-        $route->is_unrouted             = Common::getvalue($params, 'is_unrouted');
+	public static function fromArray(array $params) 
+	{
+		$route = new Route();
+		$route->route_id                = Common::getValue($params, 'route_id');
+		$route->member_id               = Common::getValue($params, 'member_id');
+		$route->optimization_problem_id = Common::getValue($params, 'optimization_problem_id');
+		$route->vehicle_alias           = Common::getValue($params, 'vehicle_alias');
+		$route->driver_alias            = Common::getValue($params, 'driver_alias');
+		$route->trip_distance           = Common::getValue($params, 'trip_distance');
+		$route->mpg                     = Common::getValue($params, 'mpg');
+		$route->gas_price               = Common::getValue($params, 'gas_price');
+		$route->route_duration_sec      = Common::getvalue($params, 'route_duration_sec');
+		$route->destination_count       = Common::getvalue($params, 'destination_count');
+		$route->is_unrouted             = Common::getvalue($params, 'is_unrouted');
 
-        // Make RouteParameters
-        if (isset($params['parameters'])) {
-            $route->parameters = RouteParameters::fromArray($params['parameters']);
-        }
+		// Make RouteParameters
+		if (isset($params['parameters'])) {
+			$route->parameters = RouteParameters::fromArray($params['parameters']);
+		}
 
-        if (isset($params['addresses'])) {
-            $addresses = array();
-            foreach ($params['addresses'] as $address) {
-                $addresses[] = Address::fromArray($address);
-            }
+		if (isset($params['addresses'])) {
+			$addresses = array();
+			foreach ($params['addresses'] as $address) {
+				$addresses[] = Address::fromArray($address);
+			}
 
-            $route->addresses = $addresses;
-        }
+			$route->addresses = $addresses;
+		}
 
-        $route->links            = Common::getValue($params, 'links', array());
-        $route->directions       = Common::getValue($params, 'directions', array());
-        $route->path             = Common::getValue($params, 'path', array());
-        $route->tracking_history = Common::getValue($params, 'tracking_history', array());
+		$route->links            = Common::getValue($params, 'links', array());
+		$route->directions       = Common::getValue($params, 'directions', array());
+		$route->path             = Common::getValue($params, 'path', array());
+		$route->tracking_history = Common::getValue($params, 'tracking_history', array());
 
-        return $route;
-    }
+		return $route;
+	}
 
-    public static function getRoutes($routeId = null, $params = null)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'api_key'                  => Route4Me::getApiKey(),
-                'route_id'                 => !is_null($routeId) ? implode(',', (array)$routeId) : null,
-                'route_path_output'        => isset($params['route_path_output']) ? $params['route_path_output'] : null,
-                'query'                    => isset($params['query']) ? $params['query'] : null,
-                'directions'               => isset($params['directions']) ? $params['directions'] : null,
-                'device_tracking_history'  => isset($params['device_tracking_history']) ? $params['device_tracking_history'] : null,
-                'limit'                    => isset($params['limit']) ? $params['limit'] : null,
-                'offset'                   => isset($params['offset']) ? $params['offset'] : null
-            )
-        ));
+	public static function getRoutes($routeId = null, $params = null)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'api_key'                  => Route4Me::getApiKey(),
+				'route_id'                 => !is_null($routeId) ? implode(',', (array)$routeId) : null,
+				'route_path_output'        => isset($params['route_path_output']) ? $params['route_path_output'] : null,
+				'query'                    => isset($params['query']) ? $params['query'] : null,
+				'directions'               => isset($params['directions']) ? $params['directions'] : null,
+				'device_tracking_history'  => isset($params['device_tracking_history']) ? $params['device_tracking_history'] : null,
+				'limit'                    => isset($params['limit']) ? $params['limit'] : null,
+				'offset'                   => isset($params['offset']) ? $params['offset'] : null
+			)
+		));
         
-        if ($routeId) {
-            return Route::fromArray($result); die("");
-        } else {
-            $routes = array();
-            foreach ($result as $route) {
-                $routes[] = Route::fromArray($route);
-            }
-            return $routes;
-        }
-    }
+		if ($routeId) {
+			return Route::fromArray($result); die("");
+		} else {
+			$routes = array();
+			foreach ($result as $route) {
+				$routes[] = Route::fromArray($route);
+			}
+			return $routes;
+		}
+	}
 
-    public function getRoutePoints($routeId, $params)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'api_key'           => Route4Me::getApiKey(),
-                'route_id'          => $routeId,
-                'route_path_output' => isset($params['route_path_output']) ? $params['route_path_output'] : null,
-                'compress_path_points' => isset($params['compress_path_points']) ? $params['compress_path_points'] : null,
-                'directions'        => isset($params['directions']) ? $params['directions'] : null,
-            )
-        ));
+	public function getRoutePoints($routeId, $params)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'api_key'           => Route4Me::getApiKey(),
+				'route_id'          => $routeId,
+				'route_path_output' => isset($params['route_path_output']) ? $params['route_path_output'] : null,
+				'compress_path_points' => isset($params['compress_path_points']) ? $params['compress_path_points'] : null,
+				'directions'        => isset($params['directions']) ? $params['directions'] : null,
+			)
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function duplicateRoute($route_id)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_DUPLICATE,
-            'method' => 'GET',
-            'query'  => array(
-                'api_key'  => Route4Me::getApiKey(),
-                'route_id' => $route_id,
-                'to'       => 'none',
-            )
-        ));
+	public function duplicateRoute($route_id)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_DUPLICATE,
+			'method' => 'GET',
+			'query'  => array(
+				'api_key'  => Route4Me::getApiKey(),
+				'route_id' => $route_id,
+				'to'       => 'none',
+			)
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
-    public function resequenceRoute($params)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'PUT',
-            'query'  => array(
-                'api_key'              => Route4Me::getApiKey(),
-                'route_id'             => isset($params['route_id']) ? $params['route_id'] : null,
-                'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
-            ),
-            'body'   => array(
-                'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
-            )
-        ));
+	public function resequenceRoute($params)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'PUT',
+			'query'  => array(
+				'api_key'              => Route4Me::getApiKey(),
+				'route_id'             => isset($params['route_id']) ? $params['route_id'] : null,
+				'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
+			),
+			'body'   => array(
+				'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
+			)
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
-    public function resequenceAllAddresses($params)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::REOPTIMIZE_V3_2,
-            'method' => 'GET',
-            'query'  => array(
-                'api_key'              => Route4Me::getApiKey(),
-                'route_id'             => isset($params['route_id']) ? $params['route_id'] : null,
-                'disable_optimization' => isset($params['disable_optimization']) ? $params['disable_optimization'] : null,
-                'optimize'             => isset($params['optimize']) ? $params['optimize'] : null,
-            )
-        ));
+	public function resequenceAllAddresses($params)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::REOPTIMIZE_V3_2,
+			'method' => 'GET',
+			'query'  => array(
+				'api_key'              => Route4Me::getApiKey(),
+				'route_id'             => isset($params['route_id']) ? $params['route_id'] : null,
+				'disable_optimization' => isset($params['disable_optimization']) ? $params['disable_optimization'] : null,
+				'optimize'             => isset($params['optimize']) ? $params['optimize'] : null,
+			)
+		));
         
-        return $result;
-    }
+		return $result;
+	}
 
-    public function mergeRoutes($params)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTES_MERGE,
-            'method' => 'POST',
-            'query'  => array(
-                'api_key' => Route4Me::getApiKey(),
-              ),
-            'body'   => array(
-                'route_ids'     => isset($params['route_ids']) ? $params['route_ids'] : null,
-                'depot_address' => isset($params['depot_address']) ? $params['depot_address'] : null,
-                'remove_origin' => isset($params['remove_origin']) ? $params['remove_origin'] : null,
-                'depot_lat'     => isset($params['depot_lat']) ? $params['depot_lat'] : null,
-                'depot_lat'     => isset($params['depot_lat']) ? $params['depot_lat'] : null
-              ),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
+	public function mergeRoutes($params)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTES_MERGE,
+			'method' => 'POST',
+			'query'  => array(
+				'api_key' => Route4Me::getApiKey(),
+			  ),
+			'body'   => array(
+				'route_ids'     => isset($params['route_ids']) ? $params['route_ids'] : null,
+				'depot_address' => isset($params['depot_address']) ? $params['depot_address'] : null,
+				'remove_origin' => isset($params['remove_origin']) ? $params['remove_origin'] : null,
+				'depot_lat'     => isset($params['depot_lat']) ? $params['depot_lat'] : null,
+				'depot_lat'     => isset($params['depot_lat']) ? $params['depot_lat'] : null
+			  ),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
-    public function shareRoute($params)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_SHARE,
-            'method' => 'POST',
-            'query'  => array(
-                'api_key'         => Route4Me::getApiKey(),
-                'route_id'        => isset($params['route_id']) ? $params['route_id'] : null,
-                'response_format' => isset($params['response_format']) ? $params['response_format'] : null,
-            ),
-            'body'  => array(
-                'recipient_email' => isset($params['recipient_email']) ? $params['recipient_email'] : null,
-            ),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
+	public function shareRoute($params)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_SHARE,
+			'method' => 'POST',
+			'query'  => array(
+				'api_key'         => Route4Me::getApiKey(),
+				'route_id'        => isset($params['route_id']) ? $params['route_id'] : null,
+				'response_format' => isset($params['response_format']) ? $params['response_format'] : null,
+			),
+			'body'  => array(
+				'recipient_email' => isset($params['recipient_email']) ? $params['recipient_email'] : null,
+			),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
-    // Returns random route_id from existing routes between $offset and $offset+$limit
-    public function getRandomRouteId($offset, $limit)
-    {
-        $query['limit'] = !is_null($limit) ? $limit : 30;
-        $query['offset'] = !is_null($offset) ? $offset : 0;
+	// Returns random route_id from existing routes between $offset and $offset+$limit
+	public function getRandomRouteId($offset, $limit)
+	{
+		$query['limit'] = !is_null($limit) ? $limit : 30;
+		$query['offset'] = !is_null($offset) ? $offset : 0;
             
-        $json = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'GET',
-            'query'  => $query
-        ));
+		$json = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'GET',
+			'query'  => $query
+		));
         
-        if (sizeof($json)>0) {
-            $routes = array();
+		if (sizeof($json)>0) {
+			$routes = array();
             
-            foreach ($json as $route) {
-                $routes[] = Route::fromArray($route);
-            }
+			foreach ($json as $route) {
+				$routes[] = Route::fromArray($route);
+			}
             
-            $num = rand(0, sizeof($routes) - 1);
-            $rRoute = (array)$routes[$num];
+			$num = rand(0, sizeof($routes) - 1);
+			$rRoute = (array)$routes[$num];
             
-            if (is_array($rRoute)) {
-                return $rRoute["route_id"];
-            } else {
-                return null;
-            }
-        } else {
-            echo "<br> There are no routes in the account. Please, create the routes first. <br>";
-            return null;
-        }
-    }
+			if (is_array($rRoute)) {
+				return $rRoute["route_id"];
+			} else {
+				return null;
+			}
+		} else {
+			echo "<br> There are no routes in the account. Please, create the routes first. <br>";
+			return null;
+		}
+	}
 
-    public function update()
-    {
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'PUT',
-            'query'  => array(
-                'route_id'  => isset($this->route_id) ? $this->route_id : null
-            ),
-            'body' => array(
-                'parameters' => $this->parameters,
-                ),
-            'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
-        ));
+	public function update()
+	{
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'PUT',
+			'query'  => array(
+				'route_id'  => isset($this->route_id) ? $this->route_id : null
+			),
+			'body' => array(
+				'parameters' => $this->parameters,
+				),
+			'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
+		));
 
-        return Route::fromArray($route);
-    }
+		return Route::fromArray($route);
+	}
     
-    public function updateAddress($address = null)
-    {
-        $body = sizeof($this->addresses)<1 ? get_object_vars($this->parameters) 
-            : (isset($this->addresses[0]) ? $this->addresses[0] : get_object_vars($this->parameters));
+	public function updateAddress($address = null)
+	{
+		$body = sizeof($this->addresses)<1 ? get_object_vars($this->parameters) 
+			: (isset($this->addresses[0]) ? $this->addresses[0] : get_object_vars($this->parameters));
 
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            'method' => 'PUT',
-            'query'  => array(
-                'route_id'             => isset($this->route_id) ? $this->route_id : null,
-                'route_destination_id' => isset($this->route_destination_id) ? $this->route_destination_id : null,
-            ),
-            'body'        => $body,
-            'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'method' => 'PUT',
+			'query'  => array(
+				'route_id'             => isset($this->route_id) ? $this->route_id : null,
+				'route_destination_id' => isset($this->route_destination_id) ? $this->route_destination_id : null,
+			),
+			'body'        => $body,
+			'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function updateRouteAddress()
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            'method' => 'PUT',
-            'query'  => array(
-                'route_id'             => isset($this->route_id) ? $this->route_id : null,
-                'route_destination_id' => isset($this->route_destination_id) ? $this->route_destination_id : null,
-            ),
-            'body'        => array(
-                "parameters" => isset($this->parameters) ? get_object_vars($this->parameters) : null,
-                "addresses"  => isset($this->addresses) ? $this->addresses : null
-            ),
-            'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
-        ));
+	public function updateRouteAddress()
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'method' => 'PUT',
+			'query'  => array(
+				'route_id'             => isset($this->route_id) ? $this->route_id : null,
+				'route_destination_id' => isset($this->route_destination_id) ? $this->route_destination_id : null,
+			),
+			'body'        => array(
+				"parameters" => isset($this->parameters) ? get_object_vars($this->parameters) : null,
+				"addresses"  => isset($this->addresses) ? $this->addresses : null
+			),
+			'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function addAddresses($params)
-    {
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'PUT',
-            'query'  => array(
-                'api_key'   => Route4Me::getApiKey(),
-                'route_id'  => isset($params['route_id']) ? $params['route_id'] : null
-            ),
-            'body'   => array(
-                'addresses' => isset($params['addresses']) ? $params['addresses'] : null
-            ),
-            'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
-        ));
+	public function addAddresses($params)
+	{
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'PUT',
+			'query'  => array(
+				'api_key'   => Route4Me::getApiKey(),
+				'route_id'  => isset($params['route_id']) ? $params['route_id'] : null
+			),
+			'body'   => array(
+				'addresses' => isset($params['addresses']) ? $params['addresses'] : null
+			),
+			'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
+		));
 
-        return Route::fromArray($route);
-    }
+		return Route::fromArray($route);
+	}
     
-    public function insertAddressOptimalPosition(array $params)
-    {
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'PUT',
-            'query'  => array(
-                'api_key'  => Route4Me::getApiKey(),
-                'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
-            ),
-            'body'   => array(
-                'addresses'        => isset($params['addresses']) ? $params['addresses'] : null,
-                'optimal_position' => isset($params['optimal_position']) ? $params['optimal_position'] : null,
-            )
-        ));
+	public function insertAddressOptimalPosition(array $params)
+	{
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'PUT',
+			'query'  => array(
+				'api_key'  => Route4Me::getApiKey(),
+				'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
+			),
+			'body'   => array(
+				'addresses'        => isset($params['addresses']) ? $params['addresses'] : null,
+				'optimal_position' => isset($params['optimal_position']) ? $params['optimal_position'] : null,
+			)
+		));
 
-        return Route::fromArray($route);
-    }
+		return Route::fromArray($route);
+	}
     
-    public function addNoteFile($params)
-    {
-        $fname = isset($params['strFilename']) ? $params['strFilename'] : null;
-        $rpath = realpath($fname);
+	public function addNoteFile($params)
+	{
+		$fname = isset($params['strFilename']) ? $params['strFilename'] : null;
+		$rpath = realpath($fname);
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_NOTES_ADD,
-            'method' => 'POST',
-            'query'  => array(
-                'api_key'     => Route4Me::getApiKey(),
-                'route_id'    => isset($params['route_id']) ? $params['route_id'] : null,
-                'address_id'  => isset($params['address_id']) ? $params['address_id'] : null,
-                'dev_lat'     => isset($params['dev_lat']) ? $params['dev_lat'] : null,
-                'dev_lng'     => isset($params['dev_lng']) ? $params['dev_lng'] : null,
-                'device_type' => isset($params['device_type']) ? $params['device_type'] : null,
-                'dev_lng'     => isset($params['dev_lng']) ? $params['dev_lng'] : null,
-            ),
-            'body'  => array(
-                'strUpdateType'   => isset($params['strUpdateType']) ? $params['strUpdateType'] : null,
-                'strFilename'     => isset($params['strFilename']) ? $params['strFilename'] : null,
-                'strNoteContents' => isset($params['strNoteContents']) ? $params['strNoteContents'] : null,
-            ),
-            'FILE'  => $rpath,
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_NOTES_ADD,
+			'method' => 'POST',
+			'query'  => array(
+				'api_key'     => Route4Me::getApiKey(),
+				'route_id'    => isset($params['route_id']) ? $params['route_id'] : null,
+				'address_id'  => isset($params['address_id']) ? $params['address_id'] : null,
+				'dev_lat'     => isset($params['dev_lat']) ? $params['dev_lat'] : null,
+				'dev_lng'     => isset($params['dev_lng']) ? $params['dev_lng'] : null,
+				'device_type' => isset($params['device_type']) ? $params['device_type'] : null,
+				'dev_lng'     => isset($params['dev_lng']) ? $params['dev_lng'] : null,
+			),
+			'body'  => array(
+				'strUpdateType'   => isset($params['strUpdateType']) ? $params['strUpdateType'] : null,
+				'strFilename'     => isset($params['strFilename']) ? $params['strFilename'] : null,
+				'strNoteContents' => isset($params['strNoteContents']) ? $params['strNoteContents'] : null,
+			),
+			'FILE'  => $rpath,
 
-            'HTTPHEADER' => array(
-                'Content-Type: application/x-www-form-urlencoded'
-            )
-        ));
+			'HTTPHEADER' => array(
+				'Content-Type: application/x-www-form-urlencoded'
+			)
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function delete($route_id)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'DELETE',
-            'query'  => array('route_id' => $route_id )
-        ));
+	public function delete($route_id)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'DELETE',
+			'query'  => array('route_id' => $route_id )
+		));
         
-         $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTES_DELETE,
-            'method' => 'DELETE',
-            'query'  => array(
-                'api_key' => Route4Me::getApiKey(),
-                'route_id' => $route_id,
-            )
-        ));
+		 $result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTES_DELETE,
+			'method' => 'DELETE',
+			'query'  => array(
+				'api_key' => Route4Me::getApiKey(),
+				'route_id' => $route_id,
+			)
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
-    public function GetAddressesFromRoute($route_id)
-    {
-        $route1 = Route::getRoutes($route_id,null);
+	public function GetAddressesFromRoute($route_id)
+	{
+		$route1 = Route::getRoutes($route_id,null);
         
-        if (isset($route1)) {
-            return $route1->addresses;
-        } else {
-            return null;
-        }
-    }
+		if (isset($route1)) {
+			return $route1->addresses;
+		} else {
+			return null;
+		}
+	}
     
-    public function GetRandomAddressFromRoute($route_id)
-    {
-        $route1 = Route::getRoutes($route_id, null);
+	public function GetRandomAddressFromRoute($route_id)
+	{
+		$route1 = Route::getRoutes($route_id, null);
         
-        if (isset($route1)) {
-            $addresses = $route1->addresses;
+		if (isset($route1)) {
+			$addresses = $route1->addresses;
             
-            $rnd = rand(0, sizeof($addresses) - 1);
+			$rnd = rand(0, sizeof($addresses) - 1);
             
-            return $addresses[$rnd];
-        } else {
-            return null;
-        }
-    }
+			return $addresses[$rnd];
+		} else {
+			return null;
+		}
+	}
 
-    public function getRouteId()
-    {
-        return $this->route_id;
-    }
+	public function getRouteId()
+	{
+		return $this->route_id;
+	}
 
-    public function getOptimizationId()
-    {
-        return $this->optimization_problem_id;
-    }
+	public function getOptimizationId()
+	{
+		return $this->optimization_problem_id;
+	}
     
-    public function GetLastLocation(array $params)
-    {
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'api_key'                 => Route4Me::getApiKey(),
-                'route_id'                => isset($params['route_id']) ? $params['route_id'] : null,
-                'device_tracking_history' => isset($params['device_tracking_history']) ? $params['device_tracking_history'] : null
-            )
-        ));
+	public function GetLastLocation(array $params)
+	{
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'api_key'                 => Route4Me::getApiKey(),
+				'route_id'                => isset($params['route_id']) ? $params['route_id'] : null,
+				'device_tracking_history' => isset($params['device_tracking_history']) ? $params['device_tracking_history'] : null
+			)
+		));
 
-        return Route::fromArray($route);
-    }
+		return Route::fromArray($route);
+	}
     
-    public function GetTrackingHistoryFromTimeRange(array $params)
-    {
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::GET_DEVICE_LOCATION,
-            'method' => 'GET',
-            'query'  => array(
-                'api_key'     => Route4Me::getApiKey(),
-                'route_id'    => isset($params['route_id']) ? $params['route_id'] : null,
-                'format'      => isset($params['format']) ? $params['format'] : null,
-                'time_period' => isset($params['time_period']) ? $params['time_period'] : null,
-                'start_date'  => isset($params['start_date']) ? $params['start_date'] : null,
-                'end_date'    => isset($params['end_date']) ? $params['end_date'] : null
-                )
-        ));
+	public function GetTrackingHistoryFromTimeRange(array $params)
+	{
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::GET_DEVICE_LOCATION,
+			'method' => 'GET',
+			'query'  => array(
+				'api_key'     => Route4Me::getApiKey(),
+				'route_id'    => isset($params['route_id']) ? $params['route_id'] : null,
+				'format'      => isset($params['format']) ? $params['format'] : null,
+				'time_period' => isset($params['time_period']) ? $params['time_period'] : null,
+				'start_date'  => isset($params['start_date']) ? $params['start_date'] : null,
+				'end_date'    => isset($params['end_date']) ? $params['end_date'] : null
+				)
+		));
 
-        return $route;
-    }
+		return $route;
+	}
     
-    public function GetAssetTracking(array $params)
-    {
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::STATUS_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'api_key'  => Route4Me::getApiKey(),
-                'tracking' => isset($params['tracking']) ? $params['tracking'] : null
-                )
-        ));
+	public function GetAssetTracking(array $params)
+	{
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::STATUS_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'api_key'  => Route4Me::getApiKey(),
+				'tracking' => isset($params['tracking']) ? $params['tracking'] : null
+				)
+		));
 
-        return $route;
-    }
+		return $route;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -388,7 +388,7 @@ 
         $result = Route4Me::makeRequst(array(
             'url'    => Endpoint::ROUTE_V4,
             'method' => 'DELETE',
-            'query'  => array('route_id' => $route_id )
+            'query'  => array('route_id' => $route_id)
         ));
         
          $result = Route4Me::makeRequst(array(
@@ -405,7 +405,7 @@ 
     
     public function GetAddressesFromRoute($route_id)
     {
-        $route1 = Route::getRoutes($route_id,null);
+        $route1 = Route::getRoutes($route_id, null);
         
         if (isset($route1)) {
             return $route1->addresses;

src/Route4Me/AddressBookLocation.php

Indentation +427 added lines, -427 removed lines

@@ -6,510 +6,510 @@
 
 class AddressBookLocation extends Common
 {
-    public $address_id;
-    public $address_group;
-    public $address_alias;
-    public $address_1;
-    public $address_2;
-    public $first_name;
-    public $last_name;
-    public $address_email;
-    public $address_phone_number;
-    public $address_city;
-    public $address_state_id;
-    public $address_country_id;
-    public $address_zip;
-    public $cached_lat;
-    public $cached_lng;
-    public $curbside_lat;
-    public $curbside_lng;
-    public $color;
-    public $address_custom_data;
-    public $schedule;
+	public $address_id;
+	public $address_group;
+	public $address_alias;
+	public $address_1;
+	public $address_2;
+	public $first_name;
+	public $last_name;
+	public $address_email;
+	public $address_phone_number;
+	public $address_city;
+	public $address_state_id;
+	public $address_country_id;
+	public $address_zip;
+	public $cached_lat;
+	public $cached_lng;
+	public $curbside_lat;
+	public $curbside_lng;
+	public $color;
+	public $address_custom_data;
+	public $schedule;
     
-    public $created_timestamp;
-    public $member_id;
-    public $schedule_blacklist;
-    public $in_route_count;
-    public $last_visited_timestamp;
-    public $last_routed_timestamp;
-    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 $local_timezone_string;
-    public $address_icon;
-    public $address_stop_type;
-    public $address_cube;
-    public $address_pieces;
-    public $address_reference_no;
-    public $address_revenue;
-    public $address_weight;
-    public $address_priority;
-    public $address_customer_po;
+	public $created_timestamp;
+	public $member_id;
+	public $schedule_blacklist;
+	public $in_route_count;
+	public $last_visited_timestamp;
+	public $last_routed_timestamp;
+	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 $local_timezone_string;
+	public $address_icon;
+	public $address_stop_type;
+	public $address_cube;
+	public $address_pieces;
+	public $address_reference_no;
+	public $address_revenue;
+	public $address_weight;
+	public $address_priority;
+	public $address_customer_po;
     
-    public static function fromArray(array $params)
-    {
-        $addressbooklocation = new AddressBookLocation();
+	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;
-    }
+		return $addressbooklocation;
+	}
     
-    public static function getAddressBookLocation($addressId)
-    {
-        $ablocations = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'query' => $addressId,
-                'limit' => 30
-            )
-        ));
+	public static function getAddressBookLocation($addressId)
+	{
+		$ablocations = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'query' => $addressId,
+				'limit' => 30
+			)
+		));
 
-        return $ablocations;
-    }
+		return $ablocations;
+	}
     
-    public static function searchRoutedLocation($params)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            '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,
-            )
-        ));
+	public static function searchRoutedLocation($params)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'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;
-    }
+		return $result;
+	}
     
-    public static function getAddressBookLocations($params)
-    {
-        $ablocations = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'limit'  => isset($params['limit']) ? $params['limit'] : null,
-                'offset' => isset($params['offset']) ? $params['offset'] : null,
-            )
-        ));
+	public static function getAddressBookLocations($params)
+	{
+		$ablocations = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'limit'  => isset($params['limit']) ? $params['limit'] : null,
+				'offset' => isset($params['offset']) ? $params['offset'] : null,
+			)
+		));
 
-        return $ablocations;
-    }
+		return $ablocations;
+	}
     
-    public static function getAddressBookLocationsByIDs($ids)
-    {
-        $ablocations = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'address_id' => $ids
-            )
-        ));
+	public static function getAddressBookLocationsByIDs($ids)
+	{
+		$ablocations = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'address_id' => $ids
+			)
+		));
 
-        return $ablocations;
-    }
+		return $ablocations;
+	}
     
-    public static function getRandomAddressBookLocation($params)
-    {
-        $ablocations = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'limit'  => isset($params['limit']) ? $params['limit'] : 0,
-                'offset' => isset($params['offset']) ? $params['offset'] : 10,
-            )
-        ));
+	public static function getRandomAddressBookLocation($params)
+	{
+		$ablocations = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'limit'  => isset($params['limit']) ? $params['limit'] : 0,
+				'offset' => isset($params['offset']) ? $params['offset'] : 10,
+			)
+		));
         
-        if (isset($ablocations["results"])) {
-            $locationsSize = sizeof($ablocations["results"]);
+		if (isset($ablocations["results"])) {
+			$locationsSize = sizeof($ablocations["results"]);
             
-            if ($locationsSize>0) {
-                $randomLocationIndex = rand(0, $locationsSize - 1);
-                return $ablocations["results"][$randomLocationIndex];
-            } 
-        } 
+			if ($locationsSize>0) {
+				$randomLocationIndex = rand(0, $locationsSize - 1);
+				return $ablocations["results"][$randomLocationIndex];
+			} 
+		} 
 
-        return null;
-    }
+		return null;
+	}
     
-    /**
-     * @param AddressBookLocation $params
-    */
-    public static function addAdressBookLocation($params)
-    {
-        $body = array();
-        $abLocations = new AddressBookLocation();
+	/**
+	 * @param AddressBookLocation $params
+	 */
+	public static function addAdressBookLocation($params)
+	{
+		$body = array();
+		$abLocations = new AddressBookLocation();
         
-        foreach ($params as $key => $value) {
-            if ($key=="address_id") {
-                continue;
-            }
+		foreach ($params as $key => $value) {
+			if ($key=="address_id") {
+				continue;
+			}
             
-            if (property_exists($abLocations, $key)) {
-                if (isset($params->{$key})) {
-                    $body[$key] = $params->{$key};
-                } 
-            }
-        }
+			if (property_exists($abLocations, $key)) {
+				if (isset($params->{$key})) {
+					$body[$key] = $params->{$key};
+				} 
+			}
+		}
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'POST',
-            'body'   => $body
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'POST',
+			'body'   => $body
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public function deleteAdressBookLocation($address_ids)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'DELETEARRAY',
-            'query'  => array(
-                'address_ids' => $address_ids
-            )
-        ));
+	public function deleteAdressBookLocation($address_ids)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'DELETEARRAY',
+			'query'  => array(
+				'address_ids' => $address_ids
+			)
+		));
 
-        return $result;
-    }
+		return $result;
+	}
     
-    public function updateAdressBookLocation($params)
-    {
-        $body = array();
-        $abLocations = new AddressBookLocation();
+	public function updateAdressBookLocation($params)
+	{
+		$body = array();
+		$abLocations = new AddressBookLocation();
         
-        foreach ($params as $key => $value) {
-            if (property_exists($abLocations, $key)) {
-                if (isset($params->{$key})) {
-                    $body[$key] = $params->{$key};
-                } 
-            }
-        }
+		foreach ($params as $key => $value) {
+			if (property_exists($abLocations, $key)) {
+				if (isset($params->{$key})) {
+					$body[$key] = $params->{$key};
+				} 
+			}
+		}
 
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'PUT',
-            'body'   => $body,
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'PUT',
+			'body'   => $body,
+		));
 
-        return $response;
-    }
+		return $response;
+	}
         
-    public static function get($params)
-    {
-        $ablocations = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            '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,
-            )
-        ));
+	public static function get($params)
+	{
+		$ablocations = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'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;
-    }
+		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)
-    {
-        $schedEnables = array(TRUE, FALSE);
+	public static function validateScheduleEnable($scheduleEnabled)
+	{
+		$schedEnables = array(TRUE, FALSE);
         
-        if (in_array($scheduleEnabled, $schedEnables)) {
-            return TRUE;
-        } else {
-            return FALSE;
-        }
-    }
+		if (in_array($scheduleEnabled, $schedEnables)) {
+			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;
-            }
-        }
+		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;
+			}
+		}
         
-        return $isValid;
-    }
+		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);
+		$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;
+	public static function validateScheduleNthWhat($scheduleNthWhat)
+	{
+		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;
-        }
-    }
+		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);
+		$columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
         
-        $addressBookFields = array("cached_lat","cached_lng","curbside_lat","curbside_lng","address_alias","address_1","address_2","address_city",
-                "address_state_id","address_zip","address_phone_number","schedule","address_group","first_name","last_name","local_time_window_start",
-                "local_time_window_end","local_time_window_start_2","local_time_window_end_2","address_email","address_country_id","address_custom_data",
-                "schedule_blacklist","service_time","local_timezone_string","color","address_icon","address_stop_type","address_cube","address_pieces",
-                "address_reference_no","address_revenue","address_weight","address_priority","address_customer_po");
+		$addressBookFields = array("cached_lat","cached_lng","curbside_lat","curbside_lng","address_alias","address_1","address_2","address_city",
+				"address_state_id","address_zip","address_phone_number","schedule","address_group","first_name","last_name","local_time_window_start",
+				"local_time_window_end","local_time_window_start_2","local_time_window_end_2","address_email","address_country_id","address_custom_data",
+				"schedule_blacklist","service_time","local_timezone_string","color","address_icon","address_stop_type","address_cube","address_pieces",
+				"address_reference_no","address_revenue","address_weight","address_priority","address_customer_po");
 
-        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[$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 = "";
-                                            }
-                                        }
-                                        break;
-                                }
-                            }
-                            break;
-                        default:
-                            $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;
+								}
+							}
+							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);
                 
-                $parametersArray = array();
+				$parametersArray = array();
                 
-                foreach ($addressBookFields as $addressBookField) {
-                    if (isset($locationsFieldsMapping[$addressBookField])) {
-                        $parametersArray[$addressBookField] = $rows[$locationsFieldsMapping[$addressBookField]];
-                    }
-                }
+				foreach ($addressBookFields as $addressBookField) {
+					if (isset($locationsFieldsMapping[$addressBookField])) {
+						$parametersArray[$addressBookField] = $rows[$locationsFieldsMapping[$addressBookField]];
+					}
+				}
                 
-                $AdressBookLocationParameters = AddressBookLocation::fromArray($parametersArray);
+				$AdressBookLocationParameters = AddressBookLocation::fromArray($parametersArray);
                 
-                $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;
+	}
  }
-    
\ No newline at end of file
+	
\ No newline at end of file

Switch Indentation +60 added lines, -60 removed lines

@@ -404,79 +404,79 @@
                 
                 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 --> 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 parameters sched_weekdays is not set"); 
+                                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 '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']].'",';
+                            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 monthly mode"); 
+                                    array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_what"); 
                                     $curSchedule = "";
                                 }
                             } else {
-                                array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); 
+                                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 = "";
-                                        }
-                                        
-                                        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;
+                    default:
+                        $curSchedule = "";
+                        break;
                     }
                 }
 

Spacing +18 added lines, -18 removed lines

@@ -262,7 +262,7 @@ 
         
         $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;
@@ -289,14 +289,14 @@ 
     {
         $monthlyDates = explode(',', $scheduleMonthlyDates);
         
-        if (sizeof($monthlyDates) <1) return FALSE;
+        if (sizeof($monthlyDates)<1) return FALSE;
         
         $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;
+                if ($mday<1 || $mday>31) $isValid = FALSE;
             } else {
                 $isValid = FALSE;
             }
@@ -346,11 +346,11 @@ 
         
         $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
         
-        $addressBookFields = array("cached_lat","cached_lng","curbside_lat","curbside_lng","address_alias","address_1","address_2","address_city",
-                "address_state_id","address_zip","address_phone_number","schedule","address_group","first_name","last_name","local_time_window_start",
-                "local_time_window_end","local_time_window_start_2","local_time_window_end_2","address_email","address_country_id","address_custom_data",
-                "schedule_blacklist","service_time","local_timezone_string","color","address_icon","address_stop_type","address_cube","address_pieces",
-                "address_reference_no","address_revenue","address_weight","address_priority","address_customer_po");
+        $addressBookFields = array("cached_lat", "cached_lng", "curbside_lat", "curbside_lng", "address_alias", "address_1", "address_2", "address_city",
+                "address_state_id", "address_zip", "address_phone_number", "schedule", "address_group", "first_name", "last_name", "local_time_window_start",
+                "local_time_window_end", "local_time_window_start_2", "local_time_window_end_2", "address_email", "address_country_id", "address_custom_data",
+                "schedule_blacklist", "service_time", "local_timezone_string", "color", "address_icon", "address_stop_type", "address_cube", "address_pieces",
+                "address_reference_no", "address_revenue", "address_weight", "address_priority", "address_customer_po");
 
         if (empty($columns)) {
             array_push($results['fail'], 'Empty CSV table');
@@ -359,7 +359,7 @@ 
 
         $iRow = 1;
         
-        while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
+        while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr))!==false) {
             if ($rows[$locationsFieldsMapping['cached_lat']] 
                   && $rows[$locationsFieldsMapping['cached_lng']] 
                   && $rows[$locationsFieldsMapping['address_1']] 
@@ -391,10 +391,10 @@ 
                 
                 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.='}';
+                        $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"); 
@@ -432,7 +432,7 @@ 
                                 $curSchedule = "";
                             }
                             
-                            if ($monthlyMode != "") {
+                            if ($monthlyMode!="") {
                                 switch ($monthlyMode) {
                                     case 'dates':
                                         if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
@@ -457,7 +457,7 @@ 
                                             $curSchedule = "";
                                         }
                                         
-                                        if ($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']].'}}';
@@ -480,7 +480,7 @@ 
                     }
                 }
 
-                if (($mode == 'daily' || $mode == 'weekly' || $mode == 'monthy') && $curSchedule == "") {
+                if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {
                     $iRow++; 
                     continue;
                 }
@@ -489,7 +489,7 @@ 
                 
                 $curSchedule = '[{'.$curSchedule.'}]';
 
-                $oSchedule = json_decode($curSchedule,TRUE);
+                $oSchedule = json_decode($curSchedule, TRUE);
                 
                 $parametersArray = array();
                 

Braces +18 added lines, -6 removed lines

@@ -258,14 +258,18 @@ 
     {
         $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;
             }
@@ -289,14 +293,18 @@ 
     {
         $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;
             }
@@ -307,7 +315,9 @@ 
     
     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);
         
@@ -320,7 +330,9 @@ 
     
     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);