route4me / route4me-php-sdk

examples/Territories/AddTerritory.php

Indentation +5 added lines, -5 removed lines

@@ -13,14 +13,14 @@
 $territory = new Territory();
 $territory->type =  TerritoryTypes::CIRCLE;
 $territory->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"        => $territory
+	"territory_name"   => "Test Territory ".strval(rand(10000,99999)),
+	"territory_color"  => "ff7700",
+	"territory"        => $territory
 ));
 
 $territory = new Territory();

examples/multiple_depot_with_time_window.php

Indentation +21 added lines, -21 removed lines

@@ -26,23 +26,23 @@ 
 
 $addresses = array();
 foreach($json as $address) {
-    $addresses[] = Address::fromArray($address);
+	$addresses[] = Address::fromArray($address);
 }
 
 $parameters = RouteParameters::fromArray(array(
-    "algorithm_type"          => Algorithmtype::CVRP_TW_SD,
-    "route_name"              => "Multiple Depot, Multiple Driver, Time Window",
-    "route_date"              => time() + 24*60*60,
-    "route_time"              => 60 * 60 * 7,
-    "rt"                      => TRUE,
-    "distance_unit"           => DistanceUnit::MILES,
-    "device_type"             => DeviceType::WEB,
-    "optimize"                => OptimizationType::TIME,
-    "metric"                  => Metric::GEODESIC,
-    "route_max_duration"      => 86400 * 3,
-    "travel_mode"             => TravelMode::DRIVING,
-    "vehicle_capacity"        => 99,
-    "vehicle_max_distance_mi" => 99999
+	"algorithm_type"          => Algorithmtype::CVRP_TW_SD,
+	"route_name"              => "Multiple Depot, Multiple Driver, Time Window",
+	"route_date"              => time() + 24*60*60,
+	"route_time"              => 60 * 60 * 7,
+	"rt"                      => TRUE,
+	"distance_unit"           => DistanceUnit::MILES,
+	"device_type"             => DeviceType::WEB,
+	"optimize"                => OptimizationType::TIME,
+	"metric"                  => Metric::GEODESIC,
+	"route_max_duration"      => 86400 * 3,
+	"travel_mode"             => TravelMode::DRIVING,
+	"vehicle_capacity"        => 99,
+	"vehicle_max_distance_mi" => 99999
 ));
 
 $optimizationParams = new OptimizationProblemParams;
@@ -52,12 +52,12 @@ 
 $problem = OptimizationProblem::optimize($optimizationParams);
 
 foreach ((array)$problem as $key => $value) {
-    if (is_string($value)) {
-        echo $key." --> ".$value."<br>";
-    } else {
-        echo "************ $key ************* <br>";
-        Route4Me::simplePrint((array)$value, true);
-        echo "******************************* <br>";
-    }
+	if (is_string($value)) {
+		echo $key." --> ".$value."<br>";
+	} else {
+		echo "************ $key ************* <br>";
+		Route4Me::simplePrint((array)$value, true);
+		echo "******************************* <br>";
+	}
 }
 

src/Route4Me/Track.php

Indentation +12 added lines, -12 removed lines

@@ -8,18 +8,18 @@
 
 class Track extends Common
 {
-    public static function set(TrackSetParams $param)
-    {
-        $query = array_merge($param->toArray(), array(
-            'api_key' => Route4Me::getApiKey()
-        ));
+	public static function set(TrackSetParams $param)
+	{
+		$query = array_merge($param->toArray(), array(
+			'api_key' => Route4Me::getApiKey()
+		));
 
-        $json = Route4Me::makeRequst(array(
-            'url'    => Endpoint::TRACK_SET,
-            'method' => 'GET',
-            'query'  => $query
-        ));
+		$json = Route4Me::makeRequst(array(
+			'url'    => Endpoint::TRACK_SET,
+			'method' => 'GET',
+			'query'  => $query
+		));
 
-        return $json;
-    }
+		return $json;
+	}
 }

src/Route4Me/OptimizationProblem.php

Indentation +216 added lines, -216 removed lines

@@ -12,267 +12,267 @@
 
 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'] = isset($params['limit']) ? $params['limit'] : 30;
-        $query['offset'] = isset($params['offset']) ? $params['offset'] : 0;
+	public function getRandomOptimizationId($offset,$limit)
+	{
+		$query['limit'] = isset($params['limit']) ? $params['limit'] : 30;
+		$query['offset'] = isset($params['offset']) ? $params['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;
+	}
 }

src/Route4Me/Order.php

Indentation +315 added lines, -315 removed lines

@@ -6,380 +6,380 @@
 
 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;
+	}
     
-    public static function addOrder($params)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'POST',
-            'body'   => array(
-                'address_1'                 =>  isset($params->address_1) ? $params->address_1: null,
-                'address_2'                 =>  isset($params->address_2) ? $params->address_2: null,
-                'member_id'                 =>  isset($params->member_id) ? $params->member_id: null,
-                'cached_lat'                =>  isset($params->cached_lat) ? $params->cached_lat : null,
-                'cached_lng'                =>  isset($params->cached_lng) ? $params->cached_lng : null,
-                'curbside_lat'              =>  isset($params->curbside_lat) ? $params->curbside_lat : null,
-                'curbside_lng'              =>  isset($params->curbside_lng) ? $params->curbside_lng : null,
-                'color'                     =>  isset($params->color) ? $params->color : null,
-                'order_icon'                =>  isset($params->order_icon) ? $params->order_icon : null,
-                'day_scheduled_for_YYMMDD'  =>  isset($params->day_scheduled_for_YYMMDD) ? $params->day_scheduled_for_YYMMDD : null,
-                'address_alias'             =>  isset($params->address_alias) ? $params->address_alias : null,
-                'address_city'              =>  isset($params->address_city) ? $params->address_city: null,
-                'address_state_id'          =>  isset($params->address_state_id) ? $params->address_state_id: null,
-                'address_country_id'        =>  isset($params->address_country_id) ? $params->address_country_id: null,
-                'address_zip'               =>  isset($params->address_zip) ? $params->address_zip: null,
-                'local_time_window_start'   =>  isset($params->local_time_window_start) ? $params->local_time_window_start: null,
-                'local_time_window_end'     =>  isset($params->local_time_window_end) ? $params->local_time_window_end: null,
-                'local_time_window_start_2' =>  isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
-                'local_time_window_end_2'   =>  isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
-                'service_time'              =>  isset($params->service_time) ? $params->service_time: null,
-                'local_timezone_string'     =>  isset($params->local_timezone_string) ? $params->local_timezone_string: null,
-                'EXT_FIELD_first_name'      =>  isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name: null,
-                'EXT_FIELD_last_name'       =>  isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name: null,
-                'EXT_FIELD_email'           =>  isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email: null,
-                'EXT_FIELD_phone'           =>  isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone: null,
-                'EXT_FIELD_custom_data'     =>  isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data: null,
-                'is_validated'              =>  isset($params->is_validated) ? $params->is_validated: null,
-                'is_pending'                =>  isset($params->is_pending) ? $params->is_pending: null,
-                'is_accepted'               =>  isset($params->is_accepted) ? $params->is_accepted: null,
-                'is_started'                =>  isset($params->is_started) ? $params->is_started: null,
-                'is_completed'              =>  isset($params->is_completed) ? $params->is_completed: null,
-                'custom_user_fields'        =>  isset($params->custom_user_fields) ? $params->custom_user_fields: null
-            )
-        ));
+	public static function addOrder($params)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'POST',
+			'body'   => array(
+				'address_1'                 =>  isset($params->address_1) ? $params->address_1: null,
+				'address_2'                 =>  isset($params->address_2) ? $params->address_2: null,
+				'member_id'                 =>  isset($params->member_id) ? $params->member_id: null,
+				'cached_lat'                =>  isset($params->cached_lat) ? $params->cached_lat : null,
+				'cached_lng'                =>  isset($params->cached_lng) ? $params->cached_lng : null,
+				'curbside_lat'              =>  isset($params->curbside_lat) ? $params->curbside_lat : null,
+				'curbside_lng'              =>  isset($params->curbside_lng) ? $params->curbside_lng : null,
+				'color'                     =>  isset($params->color) ? $params->color : null,
+				'order_icon'                =>  isset($params->order_icon) ? $params->order_icon : null,
+				'day_scheduled_for_YYMMDD'  =>  isset($params->day_scheduled_for_YYMMDD) ? $params->day_scheduled_for_YYMMDD : null,
+				'address_alias'             =>  isset($params->address_alias) ? $params->address_alias : null,
+				'address_city'              =>  isset($params->address_city) ? $params->address_city: null,
+				'address_state_id'          =>  isset($params->address_state_id) ? $params->address_state_id: null,
+				'address_country_id'        =>  isset($params->address_country_id) ? $params->address_country_id: null,
+				'address_zip'               =>  isset($params->address_zip) ? $params->address_zip: null,
+				'local_time_window_start'   =>  isset($params->local_time_window_start) ? $params->local_time_window_start: null,
+				'local_time_window_end'     =>  isset($params->local_time_window_end) ? $params->local_time_window_end: null,
+				'local_time_window_start_2' =>  isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
+				'local_time_window_end_2'   =>  isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
+				'service_time'              =>  isset($params->service_time) ? $params->service_time: null,
+				'local_timezone_string'     =>  isset($params->local_timezone_string) ? $params->local_timezone_string: null,
+				'EXT_FIELD_first_name'      =>  isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name: null,
+				'EXT_FIELD_last_name'       =>  isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name: null,
+				'EXT_FIELD_email'           =>  isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email: null,
+				'EXT_FIELD_phone'           =>  isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone: null,
+				'EXT_FIELD_custom_data'     =>  isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data: null,
+				'is_validated'              =>  isset($params->is_validated) ? $params->is_validated: null,
+				'is_pending'                =>  isset($params->is_pending) ? $params->is_pending: null,
+				'is_accepted'               =>  isset($params->is_accepted) ? $params->is_accepted: null,
+				'is_started'                =>  isset($params->is_started) ? $params->is_started: null,
+				'is_completed'              =>  isset($params->is_completed) ? $params->is_completed: null,
+				'custom_user_fields'        =>  isset($params->custom_user_fields) ? $params->custom_user_fields: null
+			)
+		));
 
-        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)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'order_id'             => isset($params->order_id) ? $params->order_id: null,
-                'fields'               => isset($params->fields) ? $params->fields: null,
-                'day_added_YYMMDD'     => isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD: null,
-                'scheduled_for_YYMMDD' => isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD: null,
-                'query'                => isset($params->query) ? $params->query: null,
-                'offset'               => isset($params->offset) ? $params->offset: null,
-                'limit'                => isset($params->limit) ? $params->limit: null
-            )
-        ));
+	public static function getOrder($params)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'order_id'             => isset($params->order_id) ? $params->order_id: null,
+				'fields'               => isset($params->fields) ? $params->fields: null,
+				'day_added_YYMMDD'     => isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD: null,
+				'scheduled_for_YYMMDD' => isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD: null,
+				'query'                => isset($params->query) ? $params->query: null,
+				'offset'               => isset($params->offset) ? $params->offset: null,
+				'limit'                => isset($params->limit) ? $params->limit: null
+			)
+		));
 
-        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 (!isset($orders['results'])) return null;
+		if (is_null($orders)) 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 (!isset($orders['results'])) return null;
+		if (is_null($orders)) 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)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'day_added_YYMMDD'     =>  isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD: null,
-                'scheduled_for_YYMMDD' =>  isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD: null,
-                'fields'               =>  isset($params->fields) ? $params->fields: null,
-                'offset'               =>  isset($params->offset) ? $params->offset: null,
-                'limit'                =>  isset($params->limit) ? $params->limit: null,
-                'query'                =>  isset($params->query) ? $params->query: null,
-            )
-        ));
+	public static function searchOrder($params)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'day_added_YYMMDD'     =>  isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD: null,
+				'scheduled_for_YYMMDD' =>  isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD: null,
+				'fields'               =>  isset($params->fields) ? $params->fields: null,
+				'offset'               =>  isset($params->offset) ? $params->offset: null,
+				'limit'                =>  isset($params->limit) ? $params->limit: null,
+				'query'                =>  isset($params->query) ? $params->query: null,
+			)
+		));
 
-        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);
         
-        if (!empty($columns)) {
-             array_push($results['fail'],'Empty CSV table');
-             return ($results);
-        }
+		if (!empty($columns)) {
+			 array_push($results['fail'],'Empty CSV table');
+			 return ($results);
+		}
                  
-        $iRow=1;
+		$iRow=1;
         
-        while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
-            if ($rows[$ordersFieldsMapping['cached_lat']] && $rows[$ordersFieldsMapping['cached_lng']] && $rows[$ordersFieldsMapping['address_1']] && array(null) !== $rows) {
+		while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
+			if ($rows[$ordersFieldsMapping['cached_lat']] && $rows[$ordersFieldsMapping['cached_lng']] && $rows[$ordersFieldsMapping['address_1']] && array(null) !== $rows) {
                 
-                $cached_lat = 0.000;
+				$cached_lat = 0.000;
                 
-                if (!$this->validateLatitude($rows[$ordersFieldsMapping['cached_lat']])) {
-                    array_push($results['fail'],"$iRow --> Wrong cached_lat"); 
-                    $iRow++;
-                    continue;
-                }
-                else $cached_lat = doubleval($rows[$ordersFieldsMapping['cached_lat']]);
+				if (!$this->validateLatitude($rows[$ordersFieldsMapping['cached_lat']])) {
+					array_push($results['fail'],"$iRow --> Wrong cached_lat"); 
+					$iRow++;
+					continue;
+				}
+				else $cached_lat = doubleval($rows[$ordersFieldsMapping['cached_lat']]);
                 
-                $cached_lng = 0.000;
+				$cached_lng = 0.000;
                 
-                if (!$this->validateLongitude($rows[$ordersFieldsMapping['cached_lng']])) {
-                    array_push($results['fail'],"$iRow --> Wrong cached_lng"); 
-                    $iRow++;
-                    continue;
-                }
-                else $cached_lng = doubleval($rows[$ordersFieldsMapping['cached_lng']]);
+				if (!$this->validateLongitude($rows[$ordersFieldsMapping['cached_lng']])) {
+					array_push($results['fail'],"$iRow --> Wrong cached_lng"); 
+					$iRow++;
+					continue;
+				}
+				else $cached_lng = doubleval($rows[$ordersFieldsMapping['cached_lng']]);
                 
-                if (isset($ordersFieldsMapping['curbside_lat'])) {
-                    if (!$this->validateLatitude($rows[$ordersFieldsMapping['curbside_lat']])) {
-                        array_push($results['fail'],"$iRow --> Wrong curbside_lat"); 
-                        $iRow++;
-                        continue;
-                    }
-                }
+				if (isset($ordersFieldsMapping['curbside_lat'])) {
+					if (!$this->validateLatitude($rows[$ordersFieldsMapping['curbside_lat']])) {
+						array_push($results['fail'],"$iRow --> Wrong curbside_lat"); 
+						$iRow++;
+						continue;
+					}
+				}
                 
-                if (isset($ordersFieldsMapping['curbside_lng'])) {
-                    if (!$this->validateLongitude($rows[$ordersFieldsMapping['curbside_lng']])) {
-                        array_push($results['fail'],"$iRow --> Wrong curbside_lng"); 
-                        $iRow++;
-                        continue;
-                    }
-                }
+				if (isset($ordersFieldsMapping['curbside_lng'])) {
+					if (!$this->validateLongitude($rows[$ordersFieldsMapping['curbside_lng']])) {
+						array_push($results['fail'],"$iRow --> Wrong curbside_lng"); 
+						$iRow++;
+						continue;
+					}
+				}
                 
-                $address = $rows[$ordersFieldsMapping['address_1']];
+				$address = $rows[$ordersFieldsMapping['address_1']];
                 
-                if (isset($ordersFieldsMapping['order_city'])) $address.=', '.$rows[$ordersFieldsMapping['order_city']];
-                if (isset($ordersFieldsMapping['order_state_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
-                if (isset($ordersFieldsMapping['order_zip_code'])) $address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
-                if (isset($ordersFieldsMapping['order_country_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
+				if (isset($ordersFieldsMapping['order_city'])) $address.=', '.$rows[$ordersFieldsMapping['order_city']];
+				if (isset($ordersFieldsMapping['order_state_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
+				if (isset($ordersFieldsMapping['order_zip_code'])) $address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
+				if (isset($ordersFieldsMapping['order_country_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
                 
-                echo "$iRow --> ".$ordersFieldsMapping['day_scheduled_for_YYMMDD'].", ".$rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']]."<br>";
+				echo "$iRow --> ".$ordersFieldsMapping['day_scheduled_for_YYMMDD'].", ".$rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']]."<br>";
                 
-                $orderParameters = Order::fromArray(array(
-                    "cached_lat"                => $cached_lat,
-                    "cached_lng"                => $cached_lng,
-                    "curbside_lat"              => isset($ordersFieldsMapping['curbside_lat']) ? $rows[$ordersFieldsMapping['curbside_lat']] : null,
-                    "curbside_lng"              => isset($ordersFieldsMapping['curbside_lng']) ? $rows[$ordersFieldsMapping['curbside_lng']] : null,
-                    "color"                     => isset($ordersFieldsMapping['color']) ? $rows[$ordersFieldsMapping['color']] : null,
-                    "day_scheduled_for_YYMMDD"  => isset($ordersFieldsMapping['day_scheduled_for_YYMMDD'])
-                                                      ? $rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']] : null,
-                    "address_alias"             => isset($ordersFieldsMapping['address_alias']) ? $rows[$ordersFieldsMapping['address_alias']] : null,
-                    "address_1"                 => $address,
-                    "address_2"                 => isset($ordersFieldsMapping['address_2']) ? $rows[$ordersFieldsMapping['address_2']] : null,
-                    "local_time_window_start"   => isset($ordersFieldsMapping['local_time_window_start'])
-                                                      ? $rows[$ordersFieldsMapping['local_time_window_start']] : null,
-                    "local_time_window_end"     => isset($ordersFieldsMapping['local_time_window_end'])
-                                                      ? $rows[$ordersFieldsMapping['local_time_window_end']] : null,
-                    "local_time_window_start_2" => isset($ordersFieldsMapping['local_time_window_start_2'])
-                                                      ? $rows[$ordersFieldsMapping['local_time_window_start_2']] : null,
-                    "local_time_window_end_2"   => isset($ordersFieldsMapping['local_time_window_end_2'])
-                                                      ? $rows[$ordersFieldsMapping['local_time_window_end_2']] : null,
-                    "service_time"              => isset($ordersFieldsMapping['service_time'])
-                                                      ? $rows[$ordersFieldsMapping['service_time']] : null,
-                    "EXT_FIELD_first_name"      => isset($ordersFieldsMapping['EXT_FIELD_first_name'])
-                                                      ? $rows[$ordersFieldsMapping['EXT_FIELD_first_name']] : null,
-                    "EXT_FIELD_last_name"       => isset($ordersFieldsMapping['EXT_FIELD_last_name'])
-                                                      ? $rows[$ordersFieldsMapping['EXT_FIELD_last_name']] : null,
-                    "EXT_FIELD_email"           => isset($ordersFieldsMapping['EXT_FIELD_email'])
-                                                      ? $rows[$ordersFieldsMapping['EXT_FIELD_email']] : null,
-                    "EXT_FIELD_phone"           => isset($ordersFieldsMapping['EXT_FIELD_phone'])
-                                                      ? $rows[$ordersFieldsMapping['EXT_FIELD_phone']] : null,
-                    "EXT_FIELD_custom_data"     => isset($ordersFieldsMapping['EXT_FIELD_custom_data'])
-                                                      ? $rows[$ordersFieldsMapping['EXT_FIELD_custom_data']] : null,
-                    "order_icon"                => isset($ordersFieldsMapping['order_icon']) ? $rows[$ordersFieldsMapping['order_icon']] : null,
-                ));
+				$orderParameters = Order::fromArray(array(
+					"cached_lat"                => $cached_lat,
+					"cached_lng"                => $cached_lng,
+					"curbside_lat"              => isset($ordersFieldsMapping['curbside_lat']) ? $rows[$ordersFieldsMapping['curbside_lat']] : null,
+					"curbside_lng"              => isset($ordersFieldsMapping['curbside_lng']) ? $rows[$ordersFieldsMapping['curbside_lng']] : null,
+					"color"                     => isset($ordersFieldsMapping['color']) ? $rows[$ordersFieldsMapping['color']] : null,
+					"day_scheduled_for_YYMMDD"  => isset($ordersFieldsMapping['day_scheduled_for_YYMMDD'])
+													  ? $rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']] : null,
+					"address_alias"             => isset($ordersFieldsMapping['address_alias']) ? $rows[$ordersFieldsMapping['address_alias']] : null,
+					"address_1"                 => $address,
+					"address_2"                 => isset($ordersFieldsMapping['address_2']) ? $rows[$ordersFieldsMapping['address_2']] : null,
+					"local_time_window_start"   => isset($ordersFieldsMapping['local_time_window_start'])
+													  ? $rows[$ordersFieldsMapping['local_time_window_start']] : null,
+					"local_time_window_end"     => isset($ordersFieldsMapping['local_time_window_end'])
+													  ? $rows[$ordersFieldsMapping['local_time_window_end']] : null,
+					"local_time_window_start_2" => isset($ordersFieldsMapping['local_time_window_start_2'])
+													  ? $rows[$ordersFieldsMapping['local_time_window_start_2']] : null,
+					"local_time_window_end_2"   => isset($ordersFieldsMapping['local_time_window_end_2'])
+													  ? $rows[$ordersFieldsMapping['local_time_window_end_2']] : null,
+					"service_time"              => isset($ordersFieldsMapping['service_time'])
+													  ? $rows[$ordersFieldsMapping['service_time']] : null,
+					"EXT_FIELD_first_name"      => isset($ordersFieldsMapping['EXT_FIELD_first_name'])
+													  ? $rows[$ordersFieldsMapping['EXT_FIELD_first_name']] : null,
+					"EXT_FIELD_last_name"       => isset($ordersFieldsMapping['EXT_FIELD_last_name'])
+													  ? $rows[$ordersFieldsMapping['EXT_FIELD_last_name']] : null,
+					"EXT_FIELD_email"           => isset($ordersFieldsMapping['EXT_FIELD_email'])
+													  ? $rows[$ordersFieldsMapping['EXT_FIELD_email']] : null,
+					"EXT_FIELD_phone"           => isset($ordersFieldsMapping['EXT_FIELD_phone'])
+													  ? $rows[$ordersFieldsMapping['EXT_FIELD_phone']] : null,
+					"EXT_FIELD_custom_data"     => isset($ordersFieldsMapping['EXT_FIELD_custom_data'])
+													  ? $rows[$ordersFieldsMapping['EXT_FIELD_custom_data']] : null,
+					"order_icon"                => isset($ordersFieldsMapping['order_icon']) ? $rows[$ordersFieldsMapping['order_icon']] : null,
+				));
                 
-                $order = new Order();
+				$order = new Order();
                 
-                $orderResults = $order->addOrder($orderParameters);
+				$orderResults = $order->addOrder($orderParameters);
                 
-                array_push($results['success'],"The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
-            }
-            else {
-                array_push($results['fail'],"$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
-            }
+				array_push($results['success'],"The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
+			}
+			else {
+				array_push($results['fail'],"$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
+			}
             
-            $iRow++;
-        }
-    }
+			$iRow++;
+		}
+	}
 }

src/Route4Me/Geocoding.php

Indentation +110 added lines, -110 removed lines

@@ -6,141 +6,141 @@
 
 class Geocoding extends Common
 {
-    public $strExportFormat;
-    public $format;
-    public $addresses;
-    public $pk;
-    public $offset;
-    public $limit;
-    public $housenumber;
-    public $zipcode;
+	public $strExportFormat;
+	public $format;
+	public $addresses;
+	public $pk;
+	public $offset;
+	public $limit;
+	public $housenumber;
+	public $zipcode;
     
-    public static function fromArray(array $params) 
-    {
-        $geocoding = new Geocoding();
-        
-        foreach($params as $key => $value) {
-            if (property_exists($geocoding, $key)) {
-                $geocoding->{$key} = $value;
-            }
-        }
-        
-        return $geocoding;
-    }
+	public static function fromArray(array $params) 
+	{
+		$geocoding = new Geocoding();
+        
+		foreach($params as $key => $value) {
+			if (property_exists($geocoding, $key)) {
+				$geocoding->{$key} = $value;
+			}
+		}
+        
+		return $geocoding;
+	}
     
-    public static function forwardGeocoding($params)
-    {
-        $body = array(
-                'strExportFormat'    => isset($params['strExportFormat']) ? $params['strExportFormat']: null,
-                'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
-            );
+	public static function forwardGeocoding($params)
+	{
+		$body = array(
+				'strExportFormat'    => isset($params['strExportFormat']) ? $params['strExportFormat']: null,
+				'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
+			);
 
-        $fgCoding = Route4Me::makeRequst(array(
-            'url'    => Endpoint::GEOCODER,
-            'method' => 'POST',
-            'body'   => $body,
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
-        
-        return $fgCoding;
-    }
+		$fgCoding = Route4Me::makeRequst(array(
+			'url'    => Endpoint::GEOCODER,
+			'method' => 'POST',
+			'body'   => $body,
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
+        
+		return $fgCoding;
+	}
     
-    public static function reverseGeocoding($params)
-    {
-        $query = array(
-                'format' => isset($params['format']) ? $params['format']: null,
-                'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
-                'detailed' => isset($params['detailed']) ? $params['detailed'] : null,
-            );
+	public static function reverseGeocoding($params)
+	{
+		$query = array(
+				'format' => isset($params['format']) ? $params['format']: null,
+				'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
+				'detailed' => isset($params['detailed']) ? $params['detailed'] : null,
+			);
 
-        $fgcoding = Route4Me::makeRequst(array(
-            'url'    => Endpoint::GEOCODER,
-            'method' => 'POST',
-            'query'  => $query
-        ));
-        
-        return $fgcoding;
-    }
+		$fgcoding = Route4Me::makeRequst(array(
+			'url'    => Endpoint::GEOCODER,
+			'method' => 'POST',
+			'query'  => $query
+		));
+        
+		return $fgcoding;
+	}
     
-    public static function getStreetData($params)
-    {
-        $url_query = Endpoint::STREET_DATA;
+	public static function getStreetData($params)
+	{
+		$url_query = Endpoint::STREET_DATA;
         
-        if (isset($params['pk'])) {
-            $url_query.=$params['pk'].'/';
-        }
+		if (isset($params['pk'])) {
+			$url_query.=$params['pk'].'/';
+		}
         
-        if (isset($params['offset'])) {
-            $url_query.=$params['offset'].'/';
-        }
+		if (isset($params['offset'])) {
+			$url_query.=$params['offset'].'/';
+		}
         
-        if (isset($params['limit'])) {
-            $url_query.=$params['limit'].'/';
-        }
+		if (isset($params['limit'])) {
+			$url_query.=$params['limit'].'/';
+		}
 
-        $query = array();
+		$query = array();
         
-        $response = Route4Me::makeUrlRequst($url_query, array(
-            'method' => 'GET',
-            'query'  => $query
-        ));
+		$response = Route4Me::makeUrlRequst($url_query, array(
+			'method' => 'GET',
+			'query'  => $query
+		));
         
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getZipCode($params)
-    {
-        $url_query = Endpoint::STREET_DATA_ZIPCODE;
+	public static function getZipCode($params)
+	{
+		$url_query = Endpoint::STREET_DATA_ZIPCODE;
         
-        if (isset($params['zipcode'])) {
-            $url_query.=$params['zipcode'].'/';
-        }
+		if (isset($params['zipcode'])) {
+			$url_query.=$params['zipcode'].'/';
+		}
         
-        if (isset($params['offset'])) {
-            $url_query.=$params['offset'].'/';
-        }
+		if (isset($params['offset'])) {
+			$url_query.=$params['offset'].'/';
+		}
         
-        if (isset($params['limit'])) {
-            $url_query.=$params['limit'].'/';
-        }
+		if (isset($params['limit'])) {
+			$url_query.=$params['limit'].'/';
+		}
 
-        $query = array();
+		$query = array();
         
-        $response = Route4Me::makeUrlRequst($url_query, array(
-            'method' => 'GET',
-            'query'  => $query
-        ));
+		$response = Route4Me::makeUrlRequst($url_query, array(
+			'method' => 'GET',
+			'query'  => $query
+		));
         
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getService($params)
-    {
-        $url_query = Endpoint::STREET_DATA_SERVICE;
+	public static function getService($params)
+	{
+		$url_query = Endpoint::STREET_DATA_SERVICE;
         
-        if (isset($params['zipcode'])) {
-            $url_query.=$params['zipcode'].'/';
-        }
+		if (isset($params['zipcode'])) {
+			$url_query.=$params['zipcode'].'/';
+		}
         
-        if (isset($params['housenumber'])) {
-            $url_query.=$params['housenumber'].'/';
-        }
+		if (isset($params['housenumber'])) {
+			$url_query.=$params['housenumber'].'/';
+		}
         
-        if (isset($params['offset'])) {
-            $url_query.=$params['offset'].'/';
-        }
+		if (isset($params['offset'])) {
+			$url_query.=$params['offset'].'/';
+		}
         
-        if (isset($params['limit'])) {
-            $url_query.=$params['limit'].'/';
-        }
+		if (isset($params['limit'])) {
+			$url_query.=$params['limit'].'/';
+		}
 
-        $query = array();
+		$query = array();
         
-        $response = Route4Me::makeUrlRequst($url_query, array(
-            'method' => 'GET',
-            'query'  => $query
-        ));
+		$response = Route4Me::makeUrlRequst($url_query, array(
+			'method' => 'GET',
+			'query'  => $query
+		));
         
-        return $response;
-    }
+		return $response;
+	}
 }

src/Route4Me/ActivityParameters.php

Indentation +73 added lines, -73 removed lines

@@ -6,88 +6,88 @@
 
 class ActivityParameters extends Common
 {
-    public $route_id;
-    public $device_id;
-    public $member_id;
-    public $team;
-    public $limit;
-    public $offset;
-    public $start;
-    public $end;
-    public $activity_type;
-    public $activity_message;
+	public $route_id;
+	public $device_id;
+	public $member_id;
+	public $team;
+	public $limit;
+	public $offset;
+	public $start;
+	public $end;
+	public $activity_type;
+	public $activity_message;
     
-    public $activity_id;
-    public $activity_timestamp;
-    public $route_destination_id;
-    public $note_id;
-    public $member;
-    public $note_type;
-    public $note_contents;
-    public $route_name;
-    public $note_file;
-    public $destination_name;
-    public $destination_alias;
+	public $activity_id;
+	public $activity_timestamp;
+	public $route_destination_id;
+	public $note_id;
+	public $member;
+	public $note_type;
+	public $note_contents;
+	public $route_name;
+	public $note_file;
+	public $destination_name;
+	public $destination_alias;
     
-    public static function fromArray(array $params) 
-    {
-        $activityparameters = new ActivityParameters();
+	public static function fromArray(array $params) 
+	{
+		$activityparameters = new ActivityParameters();
         
-        foreach($params as $key => $value) {
-            if (property_exists($activityparameters, $key)) {
-                $activityparameters->{$key} = $value;
-            }
-        }
+		foreach($params as $key => $value) {
+			if (property_exists($activityparameters, $key)) {
+				$activityparameters->{$key} = $value;
+			}
+		}
         
-        return $activityparameters;
-    }
+		return $activityparameters;
+	}
     
-    public static function get($params)
-    {
-        $activity = Route4Me::makeRequst(array(
-            'url'    => Endpoint::GET_ACTIVITIES,
-            'method' => 'GET',
-            'query'  => array(
-                'route_id' => isset($params->route_id) ? $params->route_id : null,
-                'team'     => isset($params->team) ? $params->team : null,
-                'limit'    => isset($params->limit) ? $params->limit : null,
-                'offset'   => isset($params->offset) ? $params->offset : null,
-                'start'   => isset($params->start) ? $params->start : null,
-            )
-        ));
+	public static function get($params)
+	{
+		$activity = Route4Me::makeRequst(array(
+			'url'    => Endpoint::GET_ACTIVITIES,
+			'method' => 'GET',
+			'query'  => array(
+				'route_id' => isset($params->route_id) ? $params->route_id : null,
+				'team'     => isset($params->team) ? $params->team : null,
+				'limit'    => isset($params->limit) ? $params->limit : null,
+				'offset'   => isset($params->offset) ? $params->offset : null,
+				'start'   => isset($params->start) ? $params->start : null,
+			)
+		));
 
-        return $activity;
-    }
+		return $activity;
+	}
 
-    public static function searcActivities($params)
-    {
-        $activity = Route4Me::makeRequst(array(
-            'url'    => Endpoint::GET_ACTIVITIES,
-            'method' => 'GET',
-            'query'  => array(
-                'route_id'      => isset($params->route_id) ? $params->route_id : null,
-                'limit'         => isset($params->limit) ? $params->limit : null,
-                'offset'        => isset($params->offset) ? $params->offset : null,
-                'activity_type' => isset($params->activity_type) ? $params->activity_type : null,
-            )
-        ));
+	public static function searcActivities($params)
+	{
+		$activity = Route4Me::makeRequst(array(
+			'url'    => Endpoint::GET_ACTIVITIES,
+			'method' => 'GET',
+			'query'  => array(
+				'route_id'      => isset($params->route_id) ? $params->route_id : null,
+				'limit'         => isset($params->limit) ? $params->limit : null,
+				'offset'        => isset($params->offset) ? $params->offset : null,
+				'activity_type' => isset($params->activity_type) ? $params->activity_type : null,
+			)
+		));
 
-        return $activity;
-    }
+		return $activity;
+	}
     
-    public static function sendUserMessage($postParameters)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ACTIVITY_FEED,
-            'method' => 'POST',
-            'body'   => array(
-                'activity_type'    => isset($postParameters->activity_type) ? $postParameters->activity_type : null,
-                'activity_message' => isset($postParameters->activity_message) ? $postParameters->activity_message : null,
-                'route_id'         => isset($postParameters->route_id) ? $postParameters->route_id : null,
-            )
-        ));
+	public static function sendUserMessage($postParameters)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ACTIVITY_FEED,
+			'method' => 'POST',
+			'body'   => array(
+				'activity_type'    => isset($postParameters->activity_type) ? $postParameters->activity_type : null,
+				'activity_message' => isset($postParameters->activity_message) ? $postParameters->activity_message : null,
+				'route_id'         => isset($postParameters->route_id) ? $postParameters->route_id : null,
+			)
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
 }

src/Route4Me/Territory.php

Indentation +9 added lines, -9 removed lines

@@ -97,19 +97,19 @@
 	
 	public function updateTerritory($params)
 	{
-	    //var_dump($params); die("");
+		//var_dump($params); die("");
 		$response = Route4Me::makeRequst(array(
 			'url'    => Endpoint::TERRITORY_V4,
 			'method' => 'PUT',
 			'query'  => array(
-                'territory_id'  => isset($params->territory_id) ? $params->territory_id : null
-            ),
-            'body'   => array(
-                'territory_name'   => isset($params->territory_name) ? $params->territory_name : null,
-                'member_id'        => isset($params->member_id) ? $params->member_id : null,
-                'territory_color'  => isset($params->territory_color) ? $params->territory_color : null,
-                'territory'        => isset($params->territory) ? $params->territory : null
-            ) 
+				'territory_id'  => isset($params->territory_id) ? $params->territory_id : null
+			),
+			'body'   => array(
+				'territory_name'   => isset($params->territory_name) ? $params->territory_name : null,
+				'member_id'        => isset($params->member_id) ? $params->member_id : null,
+				'territory_color'  => isset($params->territory_color) ? $params->territory_color : null,
+				'territory'        => isset($params->territory) ? $params->territory : null
+			) 
 
 		));
 

src/Route4Me/Route4Me.php

Indentation +282 added lines, -282 removed lines

@@ -7,341 +7,341 @@
 
 class Route4Me
 {
-    static public $apiKey;
-    static public $baseUrl = Endpoint::BASE_URL;
+	static public $apiKey;
+	static public $baseUrl = Endpoint::BASE_URL;
 
-    public static function setApiKey($apiKey)
-    {
-        self::$apiKey = $apiKey;
-    }
+	public static function setApiKey($apiKey)
+	{
+		self::$apiKey = $apiKey;
+	}
 
-    public static function getApiKey()
-    {
-        return self::$apiKey;
-    }
+	public static function getApiKey()
+	{
+		return self::$apiKey;
+	}
 
-    public static function setBaseUrl($baseUrl)
-    {
-        self::$baseUrl = $baseUrl;
-    }
+	public static function setBaseUrl($baseUrl)
+	{
+		self::$baseUrl = $baseUrl;
+	}
 
-    public static function getBaseUrl()
-    {
-        return self::$baseUrl;
-    }
+	public static function getBaseUrl()
+	{
+		return self::$baseUrl;
+	}
     
-    public static function fileUploadRequest($options) {
-        $query = isset($options['query']) ?
-            array_filter($options['query']) : array();
+	public static function fileUploadRequest($options) {
+		$query = isset($options['query']) ?
+			array_filter($options['query']) : array();
 
-        if (sizeof($query)==0) return null;
+		if (sizeof($query)==0) return null;
 
-        $body = isset($options['body']) ?
-            array_filter($options['body']) : null;
+		$body = isset($options['body']) ?
+			array_filter($options['body']) : null;
             
-        $fname = isset($body['strFilename']) ? $body['strFilename'] : '';
-        if ($fname=='') return null;
+		$fname = isset($body['strFilename']) ? $body['strFilename'] : '';
+		if ($fname=='') return null;
 
-        $rpath = function_exists('curl_file_create') ? curl_file_create(realpath($fname)) : '@'.realpath($fname);
+		$rpath = function_exists('curl_file_create') ? curl_file_create(realpath($fname)) : '@'.realpath($fname);
         
-        $url = self::$baseUrl.$options['url'] . '?' . http_build_query(array_merge(
-            array( 'api_key' => self::getApiKey()), $query)
-        );
+		$url = self::$baseUrl.$options['url'] . '?' . http_build_query(array_merge(
+			array( 'api_key' => self::getApiKey()), $query)
+		);
         
-        $ch = curl_init($url);
+		$ch = curl_init($url);
         
-        $curlOpts = array(
-            CURLOPT_POST => true,
-            CURLOPT_RETURNTRANSFER => false,
-            CURLOPT_TIMEOUT        => 60,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSL_VERIFYHOST => FALSE,
-            CURLOPT_SSL_VERIFYPEER => FALSE
-        );
+		$curlOpts = array(
+			CURLOPT_POST => true,
+			CURLOPT_RETURNTRANSFER => false,
+			CURLOPT_TIMEOUT        => 60,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_SSL_VERIFYHOST => FALSE,
+			CURLOPT_SSL_VERIFYPEER => FALSE
+		);
         
-        curl_setopt_array($ch, $curlOpts);
+		curl_setopt_array($ch, $curlOpts);
         
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
         
-        curl_setopt($ch, CURLOPT_HTTPHEADER, array(
-            "Content-Type: multipart/form-data",
-            'Content-Disposition: form-data; name="strFilename"'
-        ));
-        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
-        curl_setopt($ch, CURLOPT_POSTFIELDS, array('strFilename' => $rpath)); 
+		curl_setopt($ch, CURLOPT_HTTPHEADER, array(
+			"Content-Type: multipart/form-data",
+			'Content-Disposition: form-data; name="strFilename"'
+		));
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
+		curl_setopt($ch, CURLOPT_POSTFIELDS, array('strFilename' => $rpath)); 
         
-        $result = curl_exec($ch);
+		$result = curl_exec($ch);
 
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		curl_close($ch);
 
-        $json = json_decode($result, true);
+		$json = json_decode($result, true);
         
-        if (200 == $code) {
-            return $json;
-        } elseif (isset($json['errors'])) {
-            throw new ApiError(implode(', ', $json['errors']));
-        } else {
-            throw new ApiError('Something wrong');
-        }
-    }
+		if (200 == $code) {
+			return $json;
+		} elseif (isset($json['errors'])) {
+			throw new ApiError(implode(', ', $json['errors']));
+		} else {
+			throw new ApiError('Something wrong');
+		}
+	}
 
-    public static function makeRequst($options) {
-        $errorHandler = new myErrorHandler();
+	public static function makeRequst($options) {
+		$errorHandler = new myErrorHandler();
         
-        $old_error_handler = set_error_handler(array( $errorHandler, "proc_error"));
-        $method = isset($options['method']) ? $options['method'] : 'GET';
-        $query = isset($options['query']) ?
-            array_filter($options['query'], function($x) { return !is_null($x); } ) : array();
+		$old_error_handler = set_error_handler(array( $errorHandler, "proc_error"));
+		$method = isset($options['method']) ? $options['method'] : 'GET';
+		$query = isset($options['query']) ?
+			array_filter($options['query'], function($x) { return !is_null($x); } ) : array();
 
-        $body = isset($options['body']) ? $options['body'] : null;
-        $file = isset($options['FILE']) ? $options['FILE'] : null;
-        $headers = array(
-            "User-Agent: Route4Me php-sdk"
-        );
+		$body = isset($options['body']) ? $options['body'] : null;
+		$file = isset($options['FILE']) ? $options['FILE'] : null;
+		$headers = array(
+			"User-Agent: Route4Me php-sdk"
+		);
         
-        if (isset($options['HTTPHEADER'])) {
-            $headers[]=$options['HTTPHEADER'];
-        }
+		if (isset($options['HTTPHEADER'])) {
+			$headers[]=$options['HTTPHEADER'];
+		}
          
-        if (isset($options['HTTPHEADERS'])) {
-            foreach ($options['HTTPHEADERS'] As $header) $headers[]=$header;
-        }
+		if (isset($options['HTTPHEADERS'])) {
+			foreach ($options['HTTPHEADERS'] As $header) $headers[]=$header;
+		}
 
-        $ch = curl_init();
-        $url = $options['url'] . '?' . http_build_query(array_merge(
-            $query, array( 'api_key' => self::getApiKey())
-        ));
+		$ch = curl_init();
+		$url = $options['url'] . '?' . http_build_query(array_merge(
+			$query, array( 'api_key' => self::getApiKey())
+		));
 
-        $baseUrl=self::getBaseUrl();
+		$baseUrl=self::getBaseUrl();
 
-        $curlOpts = arraY(
-            CURLOPT_URL            => $baseUrl. $url,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_TIMEOUT        => 80,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSL_VERIFYHOST => FALSE,
-            CURLOPT_SSL_VERIFYPEER => FALSE,
-            CURLOPT_HTTPHEADER     => $headers
-        );
+		$curlOpts = arraY(
+			CURLOPT_URL            => $baseUrl. $url,
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_TIMEOUT        => 80,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_SSL_VERIFYHOST => FALSE,
+			CURLOPT_SSL_VERIFYPEER => FALSE,
+			CURLOPT_HTTPHEADER     => $headers
+		);
         
-        curl_setopt_array($ch, $curlOpts);
+		curl_setopt_array($ch, $curlOpts);
         
-        if ($file !=null) {
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
-            $fp=fopen($file,'r');
-            curl_setopt($ch, CURLOPT_INFILE , $fp);
-            curl_setopt($ch, CURLOPT_INFILESIZE, filesize($file));
-        }
+		if ($file !=null) {
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
+			$fp=fopen($file,'r');
+			curl_setopt($ch, CURLOPT_INFILE , $fp);
+			curl_setopt($ch, CURLOPT_INFILESIZE, filesize($file));
+		}
 
-        switch($method) {
-        case 'DELETE':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+		switch($method) {
+		case 'DELETE':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
-            if (isset($body)) {
+			if (isset($body)) {
                 
-                curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
-            }
-            break;
-        case 'DELETEARRAY':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
-            break;
-        case 'PUT':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
+				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
+			}
+			break;
+		case 'DELETEARRAY':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
+			break;
+		case 'PUT':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
 
-            if (isset($body)) {
-                curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
-            }
-            break;
-        case 'POST':
-           if (isset($body)) {
-                $bodyData = json_encode($body);
-               if (isset($options['HTTPHEADER'])) {
-                  if (strpos($options['HTTPHEADER'], "multipart/form-data")>0) $bodyData = $body;
-               }
+			if (isset($body)) {
+				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
+			}
+			break;
+		case 'POST':
+		   if (isset($body)) {
+				$bodyData = json_encode($body);
+			   if (isset($options['HTTPHEADER'])) {
+				  if (strpos($options['HTTPHEADER'], "multipart/form-data")>0) $bodyData = $body;
+			   }
                
-               curl_setopt($ch, CURLOPT_POSTFIELDS, $bodyData); 
-            } 
-            break;
-        case 'ADD':
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
-        }
+			   curl_setopt($ch, CURLOPT_POSTFIELDS, $bodyData); 
+			} 
+			break;
+		case 'ADD':
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
+		}
 
-        $result = curl_exec($ch);
+		$result = curl_exec($ch);
         
-        $isxml=FALSE;
-        $jxml="";
-        if (strpos($result, '<?xml')>-1)
-        {
-            $xml = simplexml_load_string($result);
-            //$jxml = json_encode($xml);
-            $jxml=self::object2array($xml);
-            $isxml = TRUE;
-        }
+		$isxml=FALSE;
+		$jxml="";
+		if (strpos($result, '<?xml')>-1)
+		{
+			$xml = simplexml_load_string($result);
+			//$jxml = json_encode($xml);
+			$jxml=self::object2array($xml);
+			$isxml = TRUE;
+		}
         
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		curl_close($ch);
         
-        if (200 == $code) {
-            if ($isxml) {
-                $json = $jxml;
-            } else $json = json_decode($result, true);
+		if (200 == $code) {
+			if ($isxml) {
+				$json = $jxml;
+			} else $json = json_decode($result, true);
             
-            if (isset($json['errors'])) {
-                throw new ApiError(implode(', ', $json['errors']));
-            } else {
-                return $json;
-            }
-        }  elseif (409 == $code) {
-            throw new ApiError('Wrong API key');
-        } else {
-            throw new ApiError('Something wrong');
-        }
-    }
+			if (isset($json['errors'])) {
+				throw new ApiError(implode(', ', $json['errors']));
+			} else {
+				return $json;
+			}
+		}  elseif (409 == $code) {
+			throw new ApiError('Wrong API key');
+		} else {
+			throw new ApiError('Something wrong');
+		}
+	}
 
-    public static function object2array($object)
-    {
-        return @json_decode(@json_encode($object),1);
-    }
+	public static function object2array($object)
+	{
+		return @json_decode(@json_encode($object),1);
+	}
 
-    public static function makeUrlRequst($url, $options) {
-        $method = isset($options['method']) ? $options['method'] : 'GET';
-        $query = isset($options['query']) ?
-            array_filter($options['query'], function($x) { return !is_null($x); } ) : array();
-        $body = isset($options['body']) ? $options['body'] : null;
-        $ch = curl_init();
+	public static function makeUrlRequst($url, $options) {
+		$method = isset($options['method']) ? $options['method'] : 'GET';
+		$query = isset($options['query']) ?
+			array_filter($options['query'], function($x) { return !is_null($x); } ) : array();
+		$body = isset($options['body']) ? $options['body'] : null;
+		$ch = curl_init();
         
-        $curlOpts = arraY(
-            CURLOPT_URL            => $url,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_TIMEOUT        => 60,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSL_VERIFYHOST => FALSE,
-            CURLOPT_SSL_VERIFYPEER => FALSE,
-            CURLOPT_HTTPHEADER     => array(
-                'User-Agent' => 'Route4Me php-sdk'
-            )
-        );
+		$curlOpts = arraY(
+			CURLOPT_URL            => $url,
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_TIMEOUT        => 60,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_SSL_VERIFYHOST => FALSE,
+			CURLOPT_SSL_VERIFYPEER => FALSE,
+			CURLOPT_HTTPHEADER     => array(
+				'User-Agent' => 'Route4Me php-sdk'
+			)
+		);
         
-        curl_setopt_array($ch, $curlOpts);
+		curl_setopt_array($ch, $curlOpts);
         
-        switch($method) {
-        case 'DELETE':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+		switch($method) {
+		case 'DELETE':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
-            if (isset($body)) {
-                curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
-            }
-            break;
-        case 'DELETEARRAY':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
-            break;
-        case 'PUT':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
-            if (isset($query)) {
-                curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
-            }
+			if (isset($body)) {
+				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
+			}
+			break;
+		case 'DELETEARRAY':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
+			break;
+		case 'PUT':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
+			if (isset($query)) {
+				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
+			}
 
-            if (isset($body)) {
-                curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
-            }
-            break;
-        case 'POST':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); 
-            if (isset($query)) {
-                curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); 
-            }
+			if (isset($body)) {
+				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
+			}
+			break;
+		case 'POST':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); 
+			if (isset($query)) {
+				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); 
+			}
 
-            if (isset($body)) {
-                curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
-            } 
-            break;
-        case 'ADD':
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
-        }
+			if (isset($body)) {
+				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
+			} 
+			break;
+		case 'ADD':
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
+		}
 
-        $result = curl_exec($ch);
+		$result = curl_exec($ch);
         
-        $isxml=FALSE;
-        $jxml="";
-        if (strpos($result, '<?xml')>-1)
-        {
-            $xml = simplexml_load_string($result);
-            $jxml = json_encode($xml);
-            $isxml = TRUE;
-        }
+		$isxml=FALSE;
+		$jxml="";
+		if (strpos($result, '<?xml')>-1)
+		{
+			$xml = simplexml_load_string($result);
+			$jxml = json_encode($xml);
+			$isxml = TRUE;
+		}
         
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		curl_close($ch);
         
-        if ($isxml) {
-            $json = $jxml;
-        } else $json = json_decode($result, true);
+		if ($isxml) {
+			$json = $jxml;
+		} else $json = json_decode($result, true);
         
-        if (200 == $code) {
-            return $json;
-        } elseif (isset($json['errors'])) {
-            throw new ApiError(implode(', ', $json['errors']));
-        } else {
-            throw new ApiError('Something wrong');
-        }
-    }
+		if (200 == $code) {
+			return $json;
+		} elseif (isset($json['errors'])) {
+			throw new ApiError(implode(', ', $json['errors']));
+		} else {
+			throw new ApiError('Something wrong');
+		}
+	}
     
-    /**
-     * Prints on the screen main keys and values of the array 
-     *
-     */
-    public static function simplePrint($results, $deepPrinting=null)
-    {
-        if (isset($results)) {
-            if (is_array($results)) {
-                foreach ($results as $key=>$result) {
-                    if (is_array($result)) {
-                        foreach ($result as $key1=>$result1) {
-                            if (is_array($result1)) {
-                                  if ($deepPrinting) {
-                                      echo "<br>$key1 ------><br>";
-                                      Route4Me::simplePrint($result1,true);
-                                      echo "------<br>";
-                                  } else {
-                                      echo $key1." --> "."Array() <br>";
-                                  } 
-                            } else {
-                                if (is_object($result1)) {
-                                    if ($deepPrinting) {
-                                        echo "<br>$key1 ------><br>";
-                                        $oarray=(array)$result1;
-                                        Route4Me::simplePrint($oarray,true);
-                                        echo "------<br>";
-                                    } else {
-                                        echo $key1." --> "."Object <br>";
-                                    } 
-                                } else {
-                                    if (!is_null($result1)) echo $key1." --> ".$result1."<br>";    
-                                }
-                            }
-                        }
-                    } else {
-                        if (is_object($result)) {
-                            if ($deepPrinting) {
-                                echo "<br>$key ------><br>";
-                                $oarray=(array)$result;
-                                Route4Me::simplePrint($oarray,true);
-                                echo "------<br>";
-                            } else {
-                                echo $key." --> "."Object <br>";
-                            } 
-                        } else {
-                            if (!is_null($result)) echo $key." --> ".$result."<br>";
-                        }
+	/**
+	 * Prints on the screen main keys and values of the array 
+	 *
+	 */
+	public static function simplePrint($results, $deepPrinting=null)
+	{
+		if (isset($results)) {
+			if (is_array($results)) {
+				foreach ($results as $key=>$result) {
+					if (is_array($result)) {
+						foreach ($result as $key1=>$result1) {
+							if (is_array($result1)) {
+								  if ($deepPrinting) {
+									  echo "<br>$key1 ------><br>";
+									  Route4Me::simplePrint($result1,true);
+									  echo "------<br>";
+								  } else {
+									  echo $key1." --> "."Array() <br>";
+								  } 
+							} else {
+								if (is_object($result1)) {
+									if ($deepPrinting) {
+										echo "<br>$key1 ------><br>";
+										$oarray=(array)$result1;
+										Route4Me::simplePrint($oarray,true);
+										echo "------<br>";
+									} else {
+										echo $key1." --> "."Object <br>";
+									} 
+								} else {
+									if (!is_null($result1)) echo $key1." --> ".$result1."<br>";    
+								}
+							}
+						}
+					} else {
+						if (is_object($result)) {
+							if ($deepPrinting) {
+								echo "<br>$key ------><br>";
+								$oarray=(array)$result;
+								Route4Me::simplePrint($oarray,true);
+								echo "------<br>";
+							} else {
+								echo $key." --> "."Object <br>";
+							} 
+						} else {
+							if (!is_null($result)) echo $key." --> ".$result."<br>";
+						}
                         
-                    }
-                    //echo "<br>";
-                }
-            } 
-        }
-    }
+					}
+					//echo "<br>";
+				}
+			} 
+		}
+	}
 
 }