route4me / route4me-php-sdk

examples/Members/webinar_registration.php

Indentation +7 added lines, -7 removed lines

@@ -13,13 +13,13 @@
 Route4Me::setApiKey('11111111111111111111111111111111');
 
 $recordParameters = Member::fromArray(array(
-    'email_address' => 'oooooo@yahoo.com',
-    'first_name'    => 'Mmmmm',
-    'last_name'     => 'Ccccc',
-    'phone_number'  => '454-454544',
-    'company_name'  => 'c_name',
-    'member_id'     => '123456',
-    'webinar_date' => '2016-06-05 10:00:00'
+	'email_address' => 'oooooo@yahoo.com',
+	'first_name'    => 'Mmmmm',
+	'last_name'     => 'Ccccc',
+	'phone_number'  => '454-454544',
+	'company_name'  => 'c_name',
+	'member_id'     => '123456',
+	'webinar_date' => '2016-06-05 10:00:00'
 ));
 
 $member = new Member();

examples/AddressBook/GetAddressBookLocationsByIDs.php

Indentation +4 added lines, -4 removed lines

@@ -12,8 +12,8 @@ 
 
 // Get two random locations IDs
 $adressBookLocationParameters = array(
-    "limit"   => 30,
-    "offset"  => 0
+	"limit"   => 30,
+	"offset"  => 0
 ); 
 
 $abContacts = new AddressBookLocation();
@@ -37,6 +37,6 @@ 
 $results = $ablocation->getValue($abcResult,"results");
 
 foreach ($results as $result) {
-    Route4Me::simplePrint($result);
-    echo "<br>";
+	Route4Me::simplePrint($result);
+	echo "<br>";
 }

src/Route4Me/Order.php

Indentation +258 added lines, -258 removed lines

@@ -6,333 +6,333 @@
 
 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 $addresses = array();
+	public $addresses = array();
     
-    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)
-    {
-        $excludeFields = array('route_id', 'redirect', 'optimization_problem_id', 'order_id', 
-        'order_ids', 'fields', 'offset', 'limit', 'query', 'created_timestamp');
+	/**
+	 * @param Order $params
+	 */
+	public static function addOrder($params)
+	{
+		$excludeFields = array('route_id', 'redirect', 'optimization_problem_id', 'order_id', 
+		'order_ids', 'fields', 'offset', 'limit', 'query', 'created_timestamp');
         
-        $allBodyFields = Route4Me::getObjectProperties(new Order(), $excludeFields);
+		$allBodyFields = Route4Me::getObjectProperties(new Order(), $excludeFields);
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
 
-    public static function addOrder2Route($params)
-    {
-        $allQueryFields = array('route_id', 'redirect');
-        $allBodyFields = array('addresses');
+	public static function addOrder2Route($params)
+	{
+		$allQueryFields = array('route_id', 'redirect');
+		$allBodyFields = array('addresses');
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'PUT',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'PUT',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function addOrder2Optimization($params)
-    {
-        $allQueryFields = array('optimization_problem_id', 'redirect', 'device_type');
-        $allBodyFields = array('addresses');
+	public static function addOrder2Optimization($params)
+	{
+		$allQueryFields = array('optimization_problem_id', 'redirect', 'device_type');
+		$allBodyFields = array('addresses');
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::OPTIMIZATION_PROBLEM,
-            'method' => 'PUT',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::OPTIMIZATION_PROBLEM,
+			'method' => 'PUT',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getOrder($params)
-    {
-        $allQueryFields = array('order_id', 'fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit');
+	public static function getOrder($params)
+	{
+		$allQueryFields = array('order_id', 'fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit');
 
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getOrders($params)
-    {
-        $allQueryFields = array('offset', 'limit');
+	public static function getOrders($params)
+	{
+		$allQueryFields = array('offset', 'limit');
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public function getRandomOrderId($offset, $limit)
-    {
-        $randomOrder = $this->getRandomOrder($offset, $limit);
+	public function getRandomOrderId($offset, $limit)
+	{
+		$randomOrder = $this->getRandomOrder($offset, $limit);
         
-        if (is_null($randomOrder)) {
-            return null;
-        }
+		if (is_null($randomOrder)) {
+			return null;
+		}
         
-        if (!isset($randomOrder)) {
-            return null;
-        }
+		if (!isset($randomOrder)) {
+			return null;
+		}
         
-        return $randomOrder['order_id'];
-    }
+		return $randomOrder['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)
-    {
-        $allBodyFields = array('order_ids');
+	public static function removeOrder($params)
+	{
+		$allBodyFields = array('order_ids');
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'DELETE',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'DELETE',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function updateOrder($params)
-    {
-        $excludeFields = array('route_id', 'redirect', 'optimization_problem_id', 
-        'order_ids', 'fields', 'offset', 'limit', 'query', 'created_timestamp');
+	public static function updateOrder($params)
+	{
+		$excludeFields = array('route_id', 'redirect', 'optimization_problem_id', 
+		'order_ids', 'fields', 'offset', 'limit', 'query', 'created_timestamp');
         
-        $allBodyFields = Route4Me::getObjectProperties(new Order(), $excludeFields);
+		$allBodyFields = Route4Me::getObjectProperties(new Order(), $excludeFields);
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'PUT',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'PUT',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function searchOrder($params)
-    {
-        $allQueryFields = array('fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit' );
+	public static function searchOrder($params)
+	{
+		$allQueryFields = array('fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit' );
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function validateCoordinate($coord)
-    {
-        $key = key($coord);
+	public static function validateCoordinate($coord)
+	{
+		$key = key($coord);
         
-        if (!is_numeric($coord[$key])) {
-            return false;
-        }
+		if (!is_numeric($coord[$key])) {
+			return false;
+		}
         
-        switch ($key) {
-            case 'cached_lat':
-            case 'curbside_lat':
-                if ($coord[$key]>90 || $coord[$key]<-90) {
-                    return false;
-                }
-                break;
-            case 'cached_lng':
-            case 'curbside_lng':
-                if ($coord[$key]>180 || $coord[$key]<-180) {
-                    return false;
-                }
-                break;
-        }
+		switch ($key) {
+			case 'cached_lat':
+			case 'curbside_lat':
+				if ($coord[$key]>90 || $coord[$key]<-90) {
+					return false;
+				}
+				break;
+			case 'cached_lng':
+			case 'curbside_lng':
+				if ($coord[$key]>180 || $coord[$key]<-180) {
+					return false;
+				}
+				break;
+		}
         
-        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);
         
-        $excludeFields = array('route_id', 'redirect', 'optimization_problem_id', 'order_id', 
-        'order_ids', 'fields', 'offset', 'limit', 'query', 'created_timestamp');
+		$excludeFields = array('route_id', 'redirect', 'optimization_problem_id', 'order_id', 
+		'order_ids', 'fields', 'offset', 'limit', 'query', 'created_timestamp');
         
-        $allOrderFields = Route4Me::getObjectProperties(new Order(), $excludeFields);
+		$allOrderFields = Route4Me::getObjectProperties(new Order(), $excludeFields);
         
-        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_lng = 0.000;
+				$cached_lat = 0.000;
+				$cached_lng = 0.000;
                 
-                foreach (array('cached_lat', 'cached_lng', 'curbside_lat', 'curbside_lng') as $coord) {
-                    if (!$this->validateCoordinate(array($coord => $rows[$ordersFieldsMapping[$coord]]))) {
-                        array_push($results['fail'], "$iRow --> Wrong "+$coord); 
-                        $iRow++;
-                        continue;
-                    } else {
-                        switch ($coord) {
-                            case 'cached_lat':
-                                $cached_lat = doubleval($rows[$ordersFieldsMapping[$coord]]);
-                                break;
-                            case 'cached_lng':
-                                $cached_lng = doubleval($rows[$ordersFieldsMapping[$coord]]);
-                                break;
-                        }
-                    }
-                }
+				foreach (array('cached_lat', 'cached_lng', 'curbside_lat', 'curbside_lng') as $coord) {
+					if (!$this->validateCoordinate(array($coord => $rows[$ordersFieldsMapping[$coord]]))) {
+						array_push($results['fail'], "$iRow --> Wrong "+$coord); 
+						$iRow++;
+						continue;
+					} else {
+						switch ($coord) {
+							case 'cached_lat':
+								$cached_lat = doubleval($rows[$ordersFieldsMapping[$coord]]);
+								break;
+							case 'cached_lng':
+								$cached_lng = doubleval($rows[$ordersFieldsMapping[$coord]]);
+								break;
+						}
+					}
+				}
                 
-                $address = $rows[$ordersFieldsMapping['address_1']];
+				$address = $rows[$ordersFieldsMapping['address_1']];
                 
-                foreach (array('order_city', 'order_state_id', 'order_zip_code', 'order_country_id') as $addressPart) {
-                    if (isset($ordersFieldsMapping[$addressPart])) {
-                        $address .= ', '.$rows[$ordersFieldsMapping[$addressPart]];
-                    }
-                }
+				foreach (array('order_city', 'order_state_id', 'order_zip_code', 'order_country_id') as $addressPart) {
+					if (isset($ordersFieldsMapping[$addressPart])) {
+						$address .= ', '.$rows[$ordersFieldsMapping[$addressPart]];
+					}
+				}
 
-                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++;
+		}
+	}
 }

src/Route4Me/ActivityParameters.php

Indentation +61 added lines, -61 removed lines

@@ -6,79 +6,79 @@
 
 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 getActivities($params)
-    {
-        $allQueryFields = array('route_id', 'team', 'limit', 'offset', 'start');
+	public static function getActivities($params)
+	{
+		$allQueryFields = array('route_id', 'team', 'limit', 'offset', 'start');
         
-        $activity = Route4Me::makeRequst(array(
-            'url'    => Endpoint::GET_ACTIVITIES,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$activity = Route4Me::makeRequst(array(
+			'url'    => Endpoint::GET_ACTIVITIES,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $activity;
-    }
+		return $activity;
+	}
 
-    public static function searcActivities($params)
-    {
-        $allQueryFields = array('route_id', 'limit', 'offset', 'activity_type');
+	public static function searcActivities($params)
+	{
+		$allQueryFields = array('route_id', 'limit', 'offset', 'activity_type');
         
-        $activity = Route4Me::makeRequst(array(
-            'url'    => Endpoint::GET_ACTIVITIES,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$activity = Route4Me::makeRequst(array(
+			'url'    => Endpoint::GET_ACTIVITIES,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $activity;
-    }
+		return $activity;
+	}
     
-    public static function sendUserMessage($params)
-    {
-        $allBodyFields = array('activity_type', 'activity_message', 'route_id');
+	public static function sendUserMessage($params)
+	{
+		$allBodyFields = array('activity_type', 'activity_message', 'route_id');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ACTIVITY_FEED,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ACTIVITY_FEED,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
 }

src/Route4Me/AddressBookLocation.php

Indentation +357 added lines, -357 removed lines

@@ -6,439 +6,439 @@
 
 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 searchAddressBookLocations($params)
-    {
-        $allQueryFields = array('display', 'query', 'fields', 'limit', 'offset');
+	public static function searchAddressBookLocations($params)
+	{
+		$allQueryFields = array('display', 'query', 'fields', 'limit', 'offset');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $result;
-    }
+		return $result;
+	}
     
-    public static function getAddressBookLocations($params)
-    {
-        $allQueryFields = array('limit', 'offset', 'address_id');
+	public static function getAddressBookLocations($params)
+	{
+		$allQueryFields = array('limit', 'offset', 'address_id');
         
-        $ablocations = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$ablocations = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $ablocations;
-    }
+		return $ablocations;
+	}
     
-    public static function getRandomAddressBookLocation($params)
-    {
-        $ablocations = self::getAddressBookLocations($params);
+	public static function getRandomAddressBookLocation($params)
+	{
+		$ablocations = self::getAddressBookLocations($params);
         
-        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)
-    {
-        $allBodyFields = Route4Me::getObjectProperties(new AddressBookLocation(), array('address_id', 'in_route_count'));
+	/**
+	 * @param AddressBookLocation $params
+	 */
+	public static function addAdressBookLocation($params)
+	{
+		$allBodyFields = Route4Me::getObjectProperties(new AddressBookLocation(), array('address_id', 'in_route_count'));
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
 
-        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)
-    {
-        $allBodyFields = Route4Me::getObjectProperties(new AddressBookLocation(), array('in_route_count'));
+	public function updateAdressBookLocation($params)
+	{
+		$allBodyFields = Route4Me::getObjectProperties(new AddressBookLocation(), array('in_route_count'));
 
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'PUT',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'PUT',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
         
-    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. 
-     * $csvFileHandle - a file handler.
-     * Returns array $results which contains two arrays: fail and succes.
-     */
-    public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
-    {
-        $max_line_length = 512;
-        $delemietr = ',';
+	/** 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 = ',';
         
-        $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 = Route4Me::getObjectProperties(new AddressBookLocation(), array('address_id', 'in_route_count'));
+		$addressBookFields = Route4Me::getObjectProperties(new AddressBookLocation(), array('address_id', 'in_route_count'));
 
-        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 (!isset($rows[$locationsFieldsMapping['cached_lat']]) || !isset($rows[$locationsFieldsMapping['cached_lng']]) 
-                  || !isset($rows[$locationsFieldsMapping['address_1']]) || array(null)==$rows) {
-                continue;
-            }
+		while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr))!==false) {
+			if (!isset($rows[$locationsFieldsMapping['cached_lat']]) || !isset($rows[$locationsFieldsMapping['cached_lng']]) 
+				  || !isset($rows[$locationsFieldsMapping['address_1']]) || array(null)==$rows) {
+				continue;
+			}
                       
-            $curSchedule = "";
-            $mode = "";
+			$curSchedule = "";
+			$mode = "";
             
-            $failCount = sizeof($results['fail']); 
+			$failCount = sizeof($results['fail']); 
             
-            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"); 
-                }
-            } else {
-                array_push($results['fail'], "$iRow --> The schedule mode parameter is not set"); 
-            }
+			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"); 
+				}
+			} else {
+				array_push($results['fail'], "$iRow --> The schedule mode parameter is not set"); 
+			}
             
-            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 ");  
-                }
-            }
+			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 ");  
+				}
+			}
             
-            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"); 
-                }
-            }
+			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"); 
+				}
+			}
             
-            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"); 
-                            }
-                        } else {
-                            array_push($results['fail'], "$iRow --> The parameters sched_weekdays is not set"); 
-                        }
-                        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"); 
-                            }
-                        } else {
-                            array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); 
-                        }
+			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"); 
+							}
+						} else {
+							array_push($results['fail'], "$iRow --> The parameters sched_weekdays is not set"); 
+						}
+						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"); 
+							}
+						} else {
+							array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); 
+						}
                         
-                        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"); 
-                                        }
-                                    }
-                                    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"); 
-                                        }
-                                    } else {
-                                        array_push($results['fail'], "$iRow --> The parameter sched_nth_n is not set"); 
-                                    }
+						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"); 
+										}
+									}
+									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"); 
+										}
+									} else {
+										array_push($results['fail'], "$iRow --> The parameter sched_nth_n is not set"); 
+									}
                                     
-                                    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"); 
-                                            }
-                                        } else {
-                                            array_push($results['fail'], "$iRow --> The parameter sched_nth_what is not set"); 
-                                        }
-                                    }
-                                    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"); 
+											}
+										} else {
+											array_push($results['fail'], "$iRow --> The parameter sched_nth_what is not set"); 
+										}
+									}
+									break;
+							}
+						}
+						break;
+					default:
+						$curSchedule = "";
+						break;
+				}
+			}
 
-            if (sizeof($results['fail'])>$failCount) {
-                $curSchedule = "";
-            }
+			if (sizeof($results['fail'])>$failCount) {
+				$curSchedule = "";
+			}
 
-            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

src/Route4Me/Member.php

Indentation +274 added lines, -274 removed lines

@@ -6,320 +6,320 @@
 
 class Member extends Common
 {
-    public $device_id;
-    public $device_type;
-    public $format;
+	public $device_id;
+	public $device_type;
+	public $format;
     
-    public $strEmail;
-    public $strPassword;
-    public $strPassword_1;
-    public $strPassword_2;
-    public $strFirstName;
-    public $strLastName;
-    public $strIndustry;
-    public $chkTerms;
-    public $plan;
+	public $strEmail;
+	public $strPassword;
+	public $strPassword_1;
+	public $strPassword_2;
+	public $strFirstName;
+	public $strLastName;
+	public $strIndustry;
+	public $chkTerms;
+	public $plan;
     
-    public $session_guid;
-    public $member_id;
+	public $session_guid;
+	public $member_id;
     
-    public $email_address;
-    public $first_name;
-    public $last_name;
-    public $phone_number;
-    public $company_name;
-    public $webinar_date;
+	public $email_address;
+	public $first_name;
+	public $last_name;
+	public $phone_number;
+	public $company_name;
+	public $webinar_date;
     
-    public $subscription_name;
-    public $token;
-    public $payload;
+	public $subscription_name;
+	public $token;
+	public $payload;
     
-    public $HIDE_ROUTED_ADDRESSES;
-    public $member_phone;
-    public $member_zipcode;
-    public $route_count;
-    public $member_email;
-    public $HIDE_VISITED_ADDRESSES;
-    public $READONLY_USER;
-    public $member_type;
-    public $date_of_birth;
-    public $member_first_name;
-    public $member_password;
-    public $HIDE_NONFUTURE_ROUTES;
-    public $member_last_name;
-    public $SHOW_ALL_VEHICLES;
-    public $SHOW_ALL_DRIVERS;
+	public $HIDE_ROUTED_ADDRESSES;
+	public $member_phone;
+	public $member_zipcode;
+	public $route_count;
+	public $member_email;
+	public $HIDE_VISITED_ADDRESSES;
+	public $READONLY_USER;
+	public $member_type;
+	public $date_of_birth;
+	public $member_first_name;
+	public $member_password;
+	public $HIDE_NONFUTURE_ROUTES;
+	public $member_last_name;
+	public $SHOW_ALL_VEHICLES;
+	public $SHOW_ALL_DRIVERS;
     
-    public $config_key;
-    public $config_value;
+	public $config_key;
+	public $config_value;
     
-    public $preferred_units;
-    public $preferred_language;
-    public $timezone;
-    public $OWNER_MEMBER_ID;
-    public $user_reg_state_id;
-    public $user_reg_country_id;
-    public $member_picture;
-    public $api_key;
-    public $custom_data;
+	public $preferred_units;
+	public $preferred_language;
+	public $timezone;
+	public $OWNER_MEMBER_ID;
+	public $user_reg_state_id;
+	public $user_reg_country_id;
+	public $member_picture;
+	public $api_key;
+	public $custom_data;
     
-    public static function fromArray(array $params) 
-    {
-        $member= new Member();
-        
-        foreach($params as $key => $value) {
-            if (property_exists($member, $key)) {
-                $member->{$key} = $value;
-            }
-        }
-        
-        return $member;
-    }
+	public static function fromArray(array $params) 
+	{
+		$member= new Member();
+        
+		foreach($params as $key => $value) {
+			if (property_exists($member, $key)) {
+				$member->{$key} = $value;
+			}
+		}
+        
+		return $member;
+	}
     
-    public static function getUsers()
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_V4,
-            'method' => 'GET'
-        ));
+	public static function getUsers()
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_V4,
+			'method' => 'GET'
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getUser($params)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'member_id' => isset($params['member_id']) ? $params['member_id'] : null
-            )
-        ));
+	public static function getUser($params)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'member_id' => isset($params['member_id']) ? $params['member_id'] : null
+			)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getUserLocations($param)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::VIEW_USER_LOCATIONS,
-            'method' => 'GET',
-            'query'  => array(
-                'query' => $param
-            )
-        ));
+	public static function getUserLocations($param)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::VIEW_USER_LOCATIONS,
+			'method' => 'GET',
+			'query'  => array(
+				'query' => $param
+			)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function addDeviceRecord($params)
-    {
-        $allQueryFields = array('device_id', 'device_type');
-        $allBodyFields = array('device_id', 'device_type', 'format');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::VERIFY_DEVICE_LICENSE,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function addDeviceRecord($params)
+	{
+		$allQueryFields = array('device_id', 'device_type');
+		$allBodyFields = array('device_id', 'device_type', 'format');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::VERIFY_DEVICE_LICENSE,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function createMember($params)
-    {
-        $excludeFields = array('session_guid', 'member_id', 'token', 'payload', 'webinar_date', 
-        'company_name', 'config_key', 'config_value', 'api_key');
+	public static function createMember($params)
+	{
+		$excludeFields = array('session_guid', 'member_id', 'token', 'payload', 'webinar_date', 
+		'company_name', 'config_key', 'config_value', 'api_key');
         
-        $allBodyFields = Route4Me::getObjectProperties(new Member(), $excludeFields);
+		$allBodyFields = Route4Me::getObjectProperties(new Member(), $excludeFields);
 
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_V4,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_V4,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
 
-    public static function getRandomMemberByType($memberType)
-    {
-        $members = self::getUsers();
+	public static function getRandomMemberByType($memberType)
+	{
+		$members = self::getUsers();
         
-        if (is_null($members)) return null;
-        if (!isset($members['results'])) return null;
+		if (is_null($members)) return null;
+		if (!isset($members['results'])) return null;
         
-        $memberIDs = array();
+		$memberIDs = array();
         
-        foreach ($members['results'] as $memb) {
-            if (isset($memb['member_id']) && isset($memb['member_type'])) {
-                if ($memberType==$memb['member_type']) $memberIDs[]=$memb['member_id'];
-            }
-        }
+		foreach ($members['results'] as $memb) {
+			if (isset($memb['member_id']) && isset($memb['member_type'])) {
+				if ($memberType==$memb['member_type']) $memberIDs[]=$memb['member_id'];
+			}
+		}
         
-        if (sizeof($memberIDs)<1) return null;
+		if (sizeof($memberIDs)<1) return null;
         
-        $randomIndex = rand(0, sizeof($memberIDs)-1);
+		$randomIndex = rand(0, sizeof($memberIDs)-1);
         
-        return $memberIDs[$randomIndex];
-    }
+		return $memberIDs[$randomIndex];
+	}
 
 
-    public static function updateMember($body)
-    {
-        $excludeFields = array('session_guid', 'token', 'payload', 'webinar_date', 
-        'company_name', 'config_key', 'config_value', 'api_key');
+	public static function updateMember($body)
+	{
+		$excludeFields = array('session_guid', 'token', 'payload', 'webinar_date', 
+		'company_name', 'config_key', 'config_value', 'api_key');
         
-        $allBodyFields = Route4Me::getObjectProperties(new Member(), $excludeFields);
+		$allBodyFields = Route4Me::getObjectProperties(new Member(), $excludeFields);
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_V4,
-            'method' => 'PUT',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $body)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_V4,
+			'method' => 'PUT',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $body)
+		));
         
-        return $response;
-    }
+		return $response;
+	}
 
-    public static function deleteMember($body)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_V4,
-            'method' => 'DELETE',
-            'body'   => array(
-                'member_id' =>  isset($body->member_id) ? $body->member_id : null
-            )
+	public static function deleteMember($body)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_V4,
+			'method' => 'DELETE',
+			'body'   => array(
+				'member_id' =>  isset($body->member_id) ? $body->member_id : null
+			)
 
-        ));
+		));
         
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function newAccountRegistration($params)
-    {
-        $allQueryFields = array('plan');
-        $allBodyFields = array('strEmail', 'strPassword_1', 'strPassword_2', 'strFirstName', 
-        'strLastName', 'format', 'strIndustry', 'chkTerms', 
-        'device_type', 'strSubAccountType', 'blDisableMarketing', 'blDisableAccountActivationEmail');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::REGISTER_ACTION,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
-        
-        return $response;
-    }
+	public static function newAccountRegistration($params)
+	{
+		$allQueryFields = array('plan');
+		$allBodyFields = array('strEmail', 'strPassword_1', 'strPassword_2', 'strFirstName', 
+		'strLastName', 'format', 'strIndustry', 'chkTerms', 
+		'device_type', 'strSubAccountType', 'blDisableMarketing', 'blDisableAccountActivationEmail');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::REGISTER_ACTION,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
+        
+		return $response;
+	}
     
-    public static function validateSession($params)
-    {
-        $allQueryFields = array('session_guid', 'member_id', 'format');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::VALIDATE_SESSION,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function validateSession($params)
+	{
+		$allQueryFields = array('session_guid', 'member_id', 'format');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::VALIDATE_SESSION,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function memberAuthentication($params)
-    {
-        $allBodyFields = array('strEmail', 'strPassword', 'format');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::AUTHENTICATE,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
-        
-        return $response;
-    }
+	public static function memberAuthentication($params)
+	{
+		$allBodyFields = array('strEmail', 'strPassword', 'format');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::AUTHENTICATE,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
+        
+		return $response;
+	}
     
-    public static function webinarRegistration($params)
-    {
-        $allBodyFields = array('email_address', 'first_name', 'last_name', 'phone_number', 
-        'company_name', 'member_id', 'webinar_date');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::WEBINAR_REGISTER,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function webinarRegistration($params)
+	{
+		$allBodyFields = array('email_address', 'first_name', 'last_name', 'phone_number', 
+		'company_name', 'member_id', 'webinar_date');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::WEBINAR_REGISTER,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function purchaseUserLicense($params)
-    {
-        $allQueryFields = array('device_id');
-        $allBodyFields = array('member_id', 'session_guid', 'device_id', 'device_type', 
-        'subscription_name', 'token', 'payload', 'format');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_LICENSE,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function purchaseUserLicense($params)
+	{
+		$allQueryFields = array('device_id');
+		$allBodyFields = array('member_id', 'session_guid', 'device_id', 'device_type', 
+		'subscription_name', 'token', 'payload', 'format');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_LICENSE,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function newMemberConfigKey($params)
-    {
-        $allBodyFields = array('config_key', 'config_value');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::CONFIGURATION_SETTINGS,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function newMemberConfigKey($params)
+	{
+		$allBodyFields = array('config_key', 'config_value');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::CONFIGURATION_SETTINGS,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function removeMemberConfigKey($params)
-    {
-        $allBodyFields = array('config_key');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::CONFIGURATION_SETTINGS,
-            'method' => 'DELETE',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function removeMemberConfigKey($params)
+	{
+		$allBodyFields = array('config_key');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::CONFIGURATION_SETTINGS,
+			'method' => 'DELETE',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function getMemberConfigData($params)
-    {
-        $allQueryFields = array('config_key');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::CONFIGURATION_SETTINGS,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function getMemberConfigData($params)
+	{
+		$allQueryFields = array('config_key');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::CONFIGURATION_SETTINGS,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
+        
+		return $response;
+	}
 
-    public static function updateMemberConfigKey($params)
-    {
-        $allBodyFields = array('config_key', 'config_value');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::CONFIGURATION_SETTINGS,
-            'method' => 'PUT',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function updateMemberConfigKey($params)
+	{
+		$allBodyFields = array('config_key', 'config_value');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::CONFIGURATION_SETTINGS,
+			'method' => 'PUT',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
 }