GitHub Access Token became invalid

It seems like the GitHub access token used for retrieving details about this repository from GitHub became invalid. This might prevent certain types of inspections from being run (in particular, everything related to pull requests).
Please ask an admin of your repository to re-new the access token on this website.
Test Failed
Branch master (a95c84)
by Oleg
02:35
created
src/Route4Me/Order.php 3 patches
Indentation   +174 added lines, -174 removed lines patch added patch discarded remove patch
@@ -10,11 +10,11 @@  discard block
 block discarded – undo
10 10
 		static public $apiUrlOpt = '/api.v4/optimization_problem.php';
11 11
 		
12 12
 		public $address_1;
13
-        public $address_2;
13
+		public $address_2;
14 14
 		public $cached_lat;
15 15
 		public $cached_lng;
16
-        public $curbside_lat;
17
-        public $curbside_lng;
16
+		public $curbside_lat;
17
+		public $curbside_lng;
18 18
 		public $address_alias;
19 19
 		public $address_city;
20 20
 		public $EXT_FIELD_first_name;
@@ -23,15 +23,15 @@  discard block
 block discarded – undo
23 23
 		public $EXT_FIELD_phone;
24 24
 		public $EXT_FIELD_custom_data;
25 25
         
26
-        public $color;
27
-        public $order_icon;
28
-        public $local_time_window_start;
29
-        public $local_time_window_end;
30
-        public $local_time_window_start_2;
31
-        public $local_time_window_end_2;
32
-        public $service_time;
26
+		public $color;
27
+		public $order_icon;
28
+		public $local_time_window_start;
29
+		public $local_time_window_end;
30
+		public $local_time_window_start_2;
31
+		public $local_time_window_end_2;
32
+		public $service_time;
33 33
         
34
-        public $day_scheduled_for_YYMMDD;
34
+		public $day_scheduled_for_YYMMDD;
35 35
 		
36 36
 		public $route_id;
37 37
 		public $redirect;
@@ -50,56 +50,56 @@  discard block
 block discarded – undo
50 50
 		
51 51
 		public static function fromArray(array $params) {
52 52
 			$order= new Order();
53
-	        foreach($params as $key => $value) {
54
-	            if (property_exists($order, $key)) {
55
-	                $order->{$key} = $value;
56
-	            }
53
+			foreach($params as $key => $value) {
54
+				if (property_exists($order, $key)) {
55
+					$order->{$key} = $value;
56
+				}
57 57
 			}
58 58
 			
59 59
 			return $order;
60 60
 		}
61 61
 		
62 62
 		public static function addOrder($params)
63
-	    {
64
-	    	$response = Route4Me::makeRequst(array(
65
-	            'url'    => self::$apiUrl,
66
-	            'method' => 'POST',
67
-	            'body'  => array(
63
+		{
64
+			$response = Route4Me::makeRequst(array(
65
+				'url'    => self::$apiUrl,
66
+				'method' => 'POST',
67
+				'body'  => array(
68 68
 					'address_1' => 	isset($params->address_1) ? $params->address_1: null,
69 69
 					'address_2' =>     isset($params->address_2) ? $params->address_2: null,
70
-	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
71
-	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
72
-	                'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
73
-                    'curbside_lng' => isset($params->curbside_lng) ? $params->curbside_lng : null,
74
-	                'color' => isset($params->color) ? $params->color : null,
75
-	                'order_icon' => isset($params->order_icon) ? $params->order_icon : null,
76
-	                'day_scheduled_for_YYMMDD' => isset($params->day_scheduled_for_YYMMDD) ? $params->day_scheduled_for_YYMMDD : null,
77
-	                'address_alias' => isset($params->address_alias) ? $params->address_alias : null,
78
-	                'address_city' => 	isset($params->address_city) ? $params->address_city: null,
79
-	                'local_time_window_start' =>  isset($params->local_time_window_start) ? $params->local_time_window_start: null,
80
-	                'local_time_window_end' =>  isset($params->local_time_window_end) ? $params->local_time_window_end: null,
81
-	                'local_time_window_start_2' =>  isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
82
-	                'local_time_window_end_2' =>  isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
83
-	                'service_time' =>  isset($params->service_time) ? $params->service_time: null,
84
-	                'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name: null,
85
-	                'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name: null,
86
-	                'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email: null,
87
-	                'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone: null,
88
-	                'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data: null,
70
+					'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
71
+					'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
72
+					'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
73
+					'curbside_lng' => isset($params->curbside_lng) ? $params->curbside_lng : null,
74
+					'color' => isset($params->color) ? $params->color : null,
75
+					'order_icon' => isset($params->order_icon) ? $params->order_icon : null,
76
+					'day_scheduled_for_YYMMDD' => isset($params->day_scheduled_for_YYMMDD) ? $params->day_scheduled_for_YYMMDD : null,
77
+					'address_alias' => isset($params->address_alias) ? $params->address_alias : null,
78
+					'address_city' => 	isset($params->address_city) ? $params->address_city: null,
79
+					'local_time_window_start' =>  isset($params->local_time_window_start) ? $params->local_time_window_start: null,
80
+					'local_time_window_end' =>  isset($params->local_time_window_end) ? $params->local_time_window_end: null,
81
+					'local_time_window_start_2' =>  isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
82
+					'local_time_window_end_2' =>  isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
83
+					'service_time' =>  isset($params->service_time) ? $params->service_time: null,
84
+					'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name: null,
85
+					'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name: null,
86
+					'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email: null,
87
+					'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone: null,
88
+					'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data: null,
89 89
 				)
90
-	        ));
90
+			));
91 91
 
92 92
 			return $response;
93 93
 		}
94 94
 
95 95
 		public static function addOrder2Route($params,$body)
96
-	    {
97
-	    	$response = Route4Me::makeRequst(array(
98
-	            'url'    => self::$apiUrlRoute,
99
-	            'method' => 'PUT',
100
-	            'query'  => array(
96
+		{
97
+			$response = Route4Me::makeRequst(array(
98
+				'url'    => self::$apiUrlRoute,
99
+				'method' => 'PUT',
100
+				'query'  => array(
101 101
 					'route_id' => 	isset($params->route_id) ? $params->route_id: null,
102
-	                'redirect' => isset($params->redirect) ? $params->redirect : null
102
+					'redirect' => isset($params->redirect) ? $params->redirect : null
103 103
 				),
104 104
 				'body'  => (array)$body
105 105
 			));
@@ -108,13 +108,13 @@  discard block
 block discarded – undo
108 108
 		}
109 109
 		
110 110
 		public static function addOrder2Destination($params,$body)
111
-	    {
112
-	    	$response = Route4Me::makeRequst(array(
113
-	            'url'    => self::$apiUrlOpt,
114
-	            'method' => 'PUT',
115
-	            'query'  => array(
111
+		{
112
+			$response = Route4Me::makeRequst(array(
113
+				'url'    => self::$apiUrlOpt,
114
+				'method' => 'PUT',
115
+				'query'  => array(
116 116
 					'optimization_problem_id' => 	isset($params->optimization_problem_id) ? $params->optimization_problem_id: null,
117
-	                'redirect' => isset($params->redirect) ? $params->redirect : null
117
+					'redirect' => isset($params->redirect) ? $params->redirect : null
118 118
 				),
119 119
 				'body'  => (array)$body
120 120
 			));
@@ -123,58 +123,58 @@  discard block
 block discarded – undo
123 123
 		}
124 124
 		
125 125
 		public static function getOrder($params)
126
-	    {
127
-	    	$response = Route4Me::makeRequst(array(
128
-	            'url'    => self::$apiUrl,
129
-	            'method' => 'GET',
130
-	            'query'  => array(
126
+		{
127
+			$response = Route4Me::makeRequst(array(
128
+				'url'    => self::$apiUrl,
129
+				'method' => 'GET',
130
+				'query'  => array(
131 131
 					'order_id' => 	isset($params->order_id) ? $params->order_id: null,
132 132
 				)
133
-	        ));
133
+			));
134 134
 
135 135
 			return $response;
136 136
 		}
137 137
 		
138 138
 		public static function getOrders()
139
-	    {
140
-	    	$response = Route4Me::makeRequst(array(
141
-	            'url'    => self::$apiUrl,
142
-	            'method' => 'GET'
143
-	        ));
139
+		{
140
+			$response = Route4Me::makeRequst(array(
141
+				'url'    => self::$apiUrl,
142
+				'method' => 'GET'
143
+			));
144 144
 
145 145
 			return $response;
146 146
 		}
147 147
 		
148 148
 		public static function removeOrder($params)
149
-	    {
150
-	    	$response = Route4Me::makeRequst(array(
151
-	            'url'    => self::$apiUrl,
152
-	            'method' => 'DELETE',
153
-	            'body'  => array(
149
+		{
150
+			$response = Route4Me::makeRequst(array(
151
+				'url'    => self::$apiUrl,
152
+				'method' => 'DELETE',
153
+				'body'  => array(
154 154
 					'order_ids' => 	isset($params->order_ids) ? $params->order_ids: null
155 155
 				)
156
-	        ));
156
+			));
157 157
 
158 158
 			return $response;
159 159
 		}
160 160
 		
161 161
 		public static function updateOrder($body)
162
-	    {
163
-	    	$response = Route4Me::makeRequst(array(
164
-	            'url'    => self::$apiUrl,
165
-	            'method' => 'PUT',
166
-	            'body'  => (array)$body
167
-	        ));
162
+		{
163
+			$response = Route4Me::makeRequst(array(
164
+				'url'    => self::$apiUrl,
165
+				'method' => 'PUT',
166
+				'body'  => (array)$body
167
+			));
168 168
 
169 169
 			return $response;
170 170
 		}
171 171
 		
172 172
 		public static function searchOrder($params)
173
-	    {
174
-	    	$response = Route4Me::makeRequst(array(
175
-	            'url'    => self::$apiUrl,
176
-	            'method' => 'GET',
177
-	            'query'  => array(
173
+		{
174
+			$response = Route4Me::makeRequst(array(
175
+				'url'    => self::$apiUrl,
176
+				'method' => 'GET',
177
+				'query'  => array(
178 178
 					'day_added_YYMMDD' => 	isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD: null,
179 179
 					'scheduled_for_YYMMDD' => 	isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD: null,
180 180
 					'fields' => 	isset($params->fields) ? $params->fields: null,
@@ -182,129 +182,129 @@  discard block
 block discarded – undo
182 182
 					'limit' => 	isset($params->limit) ? $params->limit: null,
183 183
 					'query' => 	isset($params->query) ? $params->query: null,
184 184
 				)
185
-	        ));
185
+			));
186 186
 
187 187
 			return $response;
188 188
 		}
189 189
         
190
-        public static function validateLatitude($lat)
191
-        {
192
-            if (!is_numeric($lat)) return false;
190
+		public static function validateLatitude($lat)
191
+		{
192
+			if (!is_numeric($lat)) return false;
193 193
             
194
-            if ($lat>90 || $lat<-90) return false;
194
+			if ($lat>90 || $lat<-90) return false;
195 195
             
196
-            return true;
197
-        }
196
+			return true;
197
+		}
198 198
         
199
-        public static function validateLongitude($lng)
200
-        {
201
-            if (!is_numeric($lng)) return false;
199
+		public static function validateLongitude($lng)
200
+		{
201
+			if (!is_numeric($lng)) return false;
202 202
             
203
-            if ($lng>180 || $lng<-180) return false;
203
+			if ($lng>180 || $lng<-180) return false;
204 204
             
205
-            return true;
206
-        }
205
+			return true;
206
+		}
207 207
         
208
-        public function addOrdersFromCsvFile($csvFileHandle, $ordersFieldsMapping)
209
-        {
210
-            $max_line_length = 512;
211
-            $delemietr=',';
208
+		public function addOrdersFromCsvFile($csvFileHandle, $ordersFieldsMapping)
209
+		{
210
+			$max_line_length = 512;
211
+			$delemietr=',';
212 212
             
213
-            $results=array();
214
-            $results['fail']=array();
215
-            $results['success']=array();
213
+			$results=array();
214
+			$results['fail']=array();
215
+			$results['success']=array();
216 216
             
217
-            $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
217
+			$columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
218 218
             
219
-            if (!empty($columns)) {
220
-                 array_push($results['fail'],'Empty CSV table');
221
-                 return ($results);
222
-            }
219
+			if (!empty($columns)) {
220
+				 array_push($results['fail'],'Empty CSV table');
221
+				 return ($results);
222
+			}
223 223
                      
224
-            $iRow=1;
224
+			$iRow=1;
225 225
             
226
-            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
227
-                if ($rows[$ordersFieldsMapping['cached_lat']] && $rows[$ordersFieldsMapping['cached_lng']] && $rows[$ordersFieldsMapping['address_1']] && array(null) !== $rows) {
226
+			while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
227
+				if ($rows[$ordersFieldsMapping['cached_lat']] && $rows[$ordersFieldsMapping['cached_lng']] && $rows[$ordersFieldsMapping['address_1']] && array(null) !== $rows) {
228 228
                     
229
-                    $cached_lat=0.000;
229
+					$cached_lat=0.000;
230 230
                     
231
-                    if (!$this->validateLatitude($rows[$ordersFieldsMapping['cached_lat']])) {
232
-                        array_push($results['fail'],"$iRow --> Wrong cached_lat"); 
233
-                        $iRow++;
234
-                        continue;
235
-                    }
236
-                    else $cached_lat=doubleval($rows[$ordersFieldsMapping['cached_lat']]);
231
+					if (!$this->validateLatitude($rows[$ordersFieldsMapping['cached_lat']])) {
232
+						array_push($results['fail'],"$iRow --> Wrong cached_lat"); 
233
+						$iRow++;
234
+						continue;
235
+					}
236
+					else $cached_lat=doubleval($rows[$ordersFieldsMapping['cached_lat']]);
237 237
                     
238
-                    $cached_lng=0.000;
238
+					$cached_lng=0.000;
239 239
                     
240
-                    if (!$this->validateLongitude($rows[$ordersFieldsMapping['cached_lng']])) {
241
-                        array_push($results['fail'],"$iRow --> Wrong cached_lng"); 
242
-                        $iRow++;
243
-                        continue;
244
-                    }
245
-                    else $cached_lng=doubleval($rows[$ordersFieldsMapping['cached_lng']]);
240
+					if (!$this->validateLongitude($rows[$ordersFieldsMapping['cached_lng']])) {
241
+						array_push($results['fail'],"$iRow --> Wrong cached_lng"); 
242
+						$iRow++;
243
+						continue;
244
+					}
245
+					else $cached_lng=doubleval($rows[$ordersFieldsMapping['cached_lng']]);
246 246
                     
247
-                    if (isset($ordersFieldsMapping['curbside_lat'])) {
248
-                        if (!$this->validateLatitude($rows[$ordersFieldsMapping['curbside_lat']])) {
249
-                            array_push($results['fail'],"$iRow --> Wrong curbside_lat"); 
250
-                            $iRow++;
251
-                            continue;
252
-                        }
253
-                    }
247
+					if (isset($ordersFieldsMapping['curbside_lat'])) {
248
+						if (!$this->validateLatitude($rows[$ordersFieldsMapping['curbside_lat']])) {
249
+							array_push($results['fail'],"$iRow --> Wrong curbside_lat"); 
250
+							$iRow++;
251
+							continue;
252
+						}
253
+					}
254 254
                     
255
-                    if (isset($ordersFieldsMapping['curbside_lng'])) {
256
-                        if (!$this->validateLongitude($rows[$ordersFieldsMapping['curbside_lng']])) {
257
-                            array_push($results['fail'],"$iRow --> Wrong curbside_lng"); 
258
-                            $iRow++;
259
-                            continue;
260
-                        }
261
-                    }
255
+					if (isset($ordersFieldsMapping['curbside_lng'])) {
256
+						if (!$this->validateLongitude($rows[$ordersFieldsMapping['curbside_lng']])) {
257
+							array_push($results['fail'],"$iRow --> Wrong curbside_lng"); 
258
+							$iRow++;
259
+							continue;
260
+						}
261
+					}
262 262
                     
263
-                    $address=$rows[$ordersFieldsMapping['address_1']];
263
+					$address=$rows[$ordersFieldsMapping['address_1']];
264 264
                     
265
-                    if (isset($ordersFieldsMapping['order_city'])) $address.=', '.$rows[$ordersFieldsMapping['order_city']];
266
-                    if (isset($ordersFieldsMapping['order_state_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
267
-                    if (isset($ordersFieldsMapping['order_zip_code'])) $address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
268
-                    if (isset($ordersFieldsMapping['order_country_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
265
+					if (isset($ordersFieldsMapping['order_city'])) $address.=', '.$rows[$ordersFieldsMapping['order_city']];
266
+					if (isset($ordersFieldsMapping['order_state_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
267
+					if (isset($ordersFieldsMapping['order_zip_code'])) $address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
268
+					if (isset($ordersFieldsMapping['order_country_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
269 269
                     
270
-                    echo "$iRow --> ".$ordersFieldsMapping['day_scheduled_for_YYMMDD'].", ".$rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']]."<br>";
270
+					echo "$iRow --> ".$ordersFieldsMapping['day_scheduled_for_YYMMDD'].", ".$rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']]."<br>";
271 271
                     
272
-                    $orderParameters = Order::fromArray(array(
273
-                        "cached_lat"    => $cached_lat,
274
-                        "cached_lng"    => $cached_lng,
275
-                        "curbside_lat"     => isset($ordersFieldsMapping['curbside_lat']) ? $rows[$ordersFieldsMapping['curbside_lat']] : null,
276
-                        "curbside_lng"     => isset($ordersFieldsMapping['curbside_lng']) ? $rows[$ordersFieldsMapping['curbside_lng']] : null,
277
-                        "color"     => isset($ordersFieldsMapping['color']) ? $rows[$ordersFieldsMapping['color']] : null,
278
-                        "day_scheduled_for_YYMMDD"     => isset($ordersFieldsMapping['day_scheduled_for_YYMMDD']) ? $rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']] : null,
279
-                        "address_alias"     => isset($ordersFieldsMapping['address_alias']) ? $rows[$ordersFieldsMapping['address_alias']] : null,
280
-                        "address_1"     => $address,
281
-                        "address_2"     => isset($ordersFieldsMapping['address_2']) ? $rows[$ordersFieldsMapping['address_2']] : null,
282
-                        "local_time_window_start"     => isset($ordersFieldsMapping['local_time_window_start']) ? $rows[$ordersFieldsMapping['local_time_window_start']] : null,
283
-                        "local_time_window_end"     => isset($ordersFieldsMapping['local_time_window_end']) ? $rows[$ordersFieldsMapping['local_time_window_end']] : null,
284
-                        "local_time_window_start_2"     => isset($ordersFieldsMapping['local_time_window_start_2']) ? $rows[$ordersFieldsMapping['local_time_window_start_2']] : null,
285
-                        "local_time_window_end_2"     => isset($ordersFieldsMapping['local_time_window_end_2']) ? $rows[$ordersFieldsMapping['local_time_window_end_2']] : null,
286
-                        "service_time"     => isset($ordersFieldsMapping['service_time']) ? $rows[$ordersFieldsMapping['service_time']] : null,
287
-                        "EXT_FIELD_first_name"     => isset($ordersFieldsMapping['EXT_FIELD_first_name']) ? $rows[$ordersFieldsMapping['EXT_FIELD_first_name']] : null,
288
-                        "EXT_FIELD_last_name"     => isset($ordersFieldsMapping['EXT_FIELD_last_name']) ? $rows[$ordersFieldsMapping['EXT_FIELD_last_name']] : null,
289
-                        "EXT_FIELD_email"     => isset($ordersFieldsMapping['EXT_FIELD_email']) ? $rows[$ordersFieldsMapping['EXT_FIELD_email']] : null,
290
-                        "EXT_FIELD_phone"     => isset($ordersFieldsMapping['EXT_FIELD_phone']) ? $rows[$ordersFieldsMapping['EXT_FIELD_phone']] : null,
291
-                        "EXT_FIELD_custom_data"     => isset($ordersFieldsMapping['EXT_FIELD_custom_data']) ? $rows[$ordersFieldsMapping['EXT_FIELD_custom_data']] : null,
292
-                        "order_icon"     => isset($ordersFieldsMapping['order_icon']) ? $rows[$ordersFieldsMapping['order_icon']] : null,
293
-                    ));
272
+					$orderParameters = Order::fromArray(array(
273
+						"cached_lat"    => $cached_lat,
274
+						"cached_lng"    => $cached_lng,
275
+						"curbside_lat"     => isset($ordersFieldsMapping['curbside_lat']) ? $rows[$ordersFieldsMapping['curbside_lat']] : null,
276
+						"curbside_lng"     => isset($ordersFieldsMapping['curbside_lng']) ? $rows[$ordersFieldsMapping['curbside_lng']] : null,
277
+						"color"     => isset($ordersFieldsMapping['color']) ? $rows[$ordersFieldsMapping['color']] : null,
278
+						"day_scheduled_for_YYMMDD"     => isset($ordersFieldsMapping['day_scheduled_for_YYMMDD']) ? $rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']] : null,
279
+						"address_alias"     => isset($ordersFieldsMapping['address_alias']) ? $rows[$ordersFieldsMapping['address_alias']] : null,
280
+						"address_1"     => $address,
281
+						"address_2"     => isset($ordersFieldsMapping['address_2']) ? $rows[$ordersFieldsMapping['address_2']] : null,
282
+						"local_time_window_start"     => isset($ordersFieldsMapping['local_time_window_start']) ? $rows[$ordersFieldsMapping['local_time_window_start']] : null,
283
+						"local_time_window_end"     => isset($ordersFieldsMapping['local_time_window_end']) ? $rows[$ordersFieldsMapping['local_time_window_end']] : null,
284
+						"local_time_window_start_2"     => isset($ordersFieldsMapping['local_time_window_start_2']) ? $rows[$ordersFieldsMapping['local_time_window_start_2']] : null,
285
+						"local_time_window_end_2"     => isset($ordersFieldsMapping['local_time_window_end_2']) ? $rows[$ordersFieldsMapping['local_time_window_end_2']] : null,
286
+						"service_time"     => isset($ordersFieldsMapping['service_time']) ? $rows[$ordersFieldsMapping['service_time']] : null,
287
+						"EXT_FIELD_first_name"     => isset($ordersFieldsMapping['EXT_FIELD_first_name']) ? $rows[$ordersFieldsMapping['EXT_FIELD_first_name']] : null,
288
+						"EXT_FIELD_last_name"     => isset($ordersFieldsMapping['EXT_FIELD_last_name']) ? $rows[$ordersFieldsMapping['EXT_FIELD_last_name']] : null,
289
+						"EXT_FIELD_email"     => isset($ordersFieldsMapping['EXT_FIELD_email']) ? $rows[$ordersFieldsMapping['EXT_FIELD_email']] : null,
290
+						"EXT_FIELD_phone"     => isset($ordersFieldsMapping['EXT_FIELD_phone']) ? $rows[$ordersFieldsMapping['EXT_FIELD_phone']] : null,
291
+						"EXT_FIELD_custom_data"     => isset($ordersFieldsMapping['EXT_FIELD_custom_data']) ? $rows[$ordersFieldsMapping['EXT_FIELD_custom_data']] : null,
292
+						"order_icon"     => isset($ordersFieldsMapping['order_icon']) ? $rows[$ordersFieldsMapping['order_icon']] : null,
293
+					));
294 294
                     
295
-                    $order = new Order();
295
+					$order = new Order();
296 296
                     
297
-                    $orderResults = $order->addOrder($orderParameters);
297
+					$orderResults = $order->addOrder($orderParameters);
298 298
                     
299
-                    array_push($results['success'],"The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
300
-                }
301
-                else {
302
-                    array_push($results['fail'],"$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
303
-                }
299
+					array_push($results['success'],"The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
300
+				}
301
+				else {
302
+					array_push($results['fail'],"$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
303
+				}
304 304
                 
305
-                $iRow++;
306
-            }
307
-        }
305
+				$iRow++;
306
+			}
307
+		}
308 308
 
309 309
 	}
310 310
 	
Please login to merge, or discard this patch.
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
 		public $limit;
47 47
 		public $query;
48 48
 		
49
-		public function __construct () {  }
49
+		public function __construct() {  }
50 50
 		
51 51
 		public static function fromArray(array $params) {
52
-			$order= new Order();
53
-	        foreach($params as $key => $value) {
52
+			$order = new Order();
53
+	        foreach ($params as $key => $value) {
54 54
 	            if (property_exists($order, $key)) {
55 55
 	                $order->{$key} = $value;
56 56
 	            }
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
65 65
 	            'url'    => self::$apiUrl,
66 66
 	            'method' => 'POST',
67 67
 	            'body'  => array(
68
-					'address_1' => 	isset($params->address_1) ? $params->address_1: null,
69
-					'address_2' =>     isset($params->address_2) ? $params->address_2: null,
68
+					'address_1' => 	isset($params->address_1) ? $params->address_1 : null,
69
+					'address_2' =>     isset($params->address_2) ? $params->address_2 : null,
70 70
 	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
71 71
 	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
72 72
 	                'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
@@ -75,30 +75,30 @@  discard block
 block discarded – undo
75 75
 	                'order_icon' => isset($params->order_icon) ? $params->order_icon : null,
76 76
 	                'day_scheduled_for_YYMMDD' => isset($params->day_scheduled_for_YYMMDD) ? $params->day_scheduled_for_YYMMDD : null,
77 77
 	                'address_alias' => isset($params->address_alias) ? $params->address_alias : null,
78
-	                'address_city' => 	isset($params->address_city) ? $params->address_city: null,
79
-	                'local_time_window_start' =>  isset($params->local_time_window_start) ? $params->local_time_window_start: null,
80
-	                'local_time_window_end' =>  isset($params->local_time_window_end) ? $params->local_time_window_end: null,
81
-	                'local_time_window_start_2' =>  isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
82
-	                'local_time_window_end_2' =>  isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
83
-	                'service_time' =>  isset($params->service_time) ? $params->service_time: null,
84
-	                'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name: null,
85
-	                'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name: null,
86
-	                'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email: null,
87
-	                'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone: null,
88
-	                'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data: null,
78
+	                'address_city' => 	isset($params->address_city) ? $params->address_city : null,
79
+	                'local_time_window_start' =>  isset($params->local_time_window_start) ? $params->local_time_window_start : null,
80
+	                'local_time_window_end' =>  isset($params->local_time_window_end) ? $params->local_time_window_end : null,
81
+	                'local_time_window_start_2' =>  isset($params->local_time_window_start_2) ? $params->local_time_window_start_2 : null,
82
+	                'local_time_window_end_2' =>  isset($params->local_time_window_end_2) ? $params->local_time_window_end_2 : null,
83
+	                'service_time' =>  isset($params->service_time) ? $params->service_time : null,
84
+	                'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name : null,
85
+	                'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name : null,
86
+	                'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email : null,
87
+	                'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone : null,
88
+	                'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data : null,
89 89
 				)
90 90
 	        ));
91 91
 
92 92
 			return $response;
93 93
 		}
94 94
 
95
-		public static function addOrder2Route($params,$body)
95
+		public static function addOrder2Route($params, $body)
96 96
 	    {
97 97
 	    	$response = Route4Me::makeRequst(array(
98 98
 	            'url'    => self::$apiUrlRoute,
99 99
 	            'method' => 'PUT',
100 100
 	            'query'  => array(
101
-					'route_id' => 	isset($params->route_id) ? $params->route_id: null,
101
+					'route_id' => 	isset($params->route_id) ? $params->route_id : null,
102 102
 	                'redirect' => isset($params->redirect) ? $params->redirect : null
103 103
 				),
104 104
 				'body'  => (array)$body
@@ -107,13 +107,13 @@  discard block
 block discarded – undo
107 107
 			return $response;
108 108
 		}
109 109
 		
110
-		public static function addOrder2Destination($params,$body)
110
+		public static function addOrder2Destination($params, $body)
111 111
 	    {
112 112
 	    	$response = Route4Me::makeRequst(array(
113 113
 	            'url'    => self::$apiUrlOpt,
114 114
 	            'method' => 'PUT',
115 115
 	            'query'  => array(
116
-					'optimization_problem_id' => 	isset($params->optimization_problem_id) ? $params->optimization_problem_id: null,
116
+					'optimization_problem_id' => 	isset($params->optimization_problem_id) ? $params->optimization_problem_id : null,
117 117
 	                'redirect' => isset($params->redirect) ? $params->redirect : null
118 118
 				),
119 119
 				'body'  => (array)$body
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	            'url'    => self::$apiUrl,
129 129
 	            'method' => 'GET',
130 130
 	            'query'  => array(
131
-					'order_id' => 	isset($params->order_id) ? $params->order_id: null,
131
+					'order_id' => 	isset($params->order_id) ? $params->order_id : null,
132 132
 				)
133 133
 	        ));
134 134
 
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 	            'url'    => self::$apiUrl,
152 152
 	            'method' => 'DELETE',
153 153
 	            'body'  => array(
154
-					'order_ids' => 	isset($params->order_ids) ? $params->order_ids: null
154
+					'order_ids' => 	isset($params->order_ids) ? $params->order_ids : null
155 155
 				)
156 156
 	        ));
157 157
 
@@ -175,12 +175,12 @@  discard block
 block discarded – undo
175 175
 	            'url'    => self::$apiUrl,
176 176
 	            'method' => 'GET',
177 177
 	            'query'  => array(
178
-					'day_added_YYMMDD' => 	isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD: null,
179
-					'scheduled_for_YYMMDD' => 	isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD: null,
180
-					'fields' => 	isset($params->fields) ? $params->fields: null,
181
-					'offset' => 	isset($params->offset) ? $params->offset: null,
182
-					'limit' => 	isset($params->limit) ? $params->limit: null,
183
-					'query' => 	isset($params->query) ? $params->query: null,
178
+					'day_added_YYMMDD' => 	isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD : null,
179
+					'scheduled_for_YYMMDD' => 	isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD : null,
180
+					'fields' => 	isset($params->fields) ? $params->fields : null,
181
+					'offset' => 	isset($params->offset) ? $params->offset : null,
182
+					'limit' => 	isset($params->limit) ? $params->limit : null,
183
+					'query' => 	isset($params->query) ? $params->query : null,
184 184
 				)
185 185
 	        ));
186 186
 
@@ -208,45 +208,45 @@  discard block
 block discarded – undo
208 208
         public function addOrdersFromCsvFile($csvFileHandle, $ordersFieldsMapping)
209 209
         {
210 210
             $max_line_length = 512;
211
-            $delemietr=',';
211
+            $delemietr = ',';
212 212
             
213
-            $results=array();
214
-            $results['fail']=array();
215
-            $results['success']=array();
213
+            $results = array();
214
+            $results['fail'] = array();
215
+            $results['success'] = array();
216 216
             
217 217
             $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
218 218
             
219 219
             if (!empty($columns)) {
220
-                 array_push($results['fail'],'Empty CSV table');
220
+                 array_push($results['fail'], 'Empty CSV table');
221 221
                  return ($results);
222 222
             }
223 223
                      
224
-            $iRow=1;
224
+            $iRow = 1;
225 225
             
226
-            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
227
-                if ($rows[$ordersFieldsMapping['cached_lat']] && $rows[$ordersFieldsMapping['cached_lng']] && $rows[$ordersFieldsMapping['address_1']] && array(null) !== $rows) {
226
+            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr))!==false) {
227
+                if ($rows[$ordersFieldsMapping['cached_lat']] && $rows[$ordersFieldsMapping['cached_lng']] && $rows[$ordersFieldsMapping['address_1']] && array(null)!==$rows) {
228 228
                     
229
-                    $cached_lat=0.000;
229
+                    $cached_lat = 0.000;
230 230
                     
231 231
                     if (!$this->validateLatitude($rows[$ordersFieldsMapping['cached_lat']])) {
232
-                        array_push($results['fail'],"$iRow --> Wrong cached_lat"); 
232
+                        array_push($results['fail'], "$iRow --> Wrong cached_lat"); 
233 233
                         $iRow++;
234 234
                         continue;
235 235
                     }
236
-                    else $cached_lat=doubleval($rows[$ordersFieldsMapping['cached_lat']]);
236
+                    else $cached_lat = doubleval($rows[$ordersFieldsMapping['cached_lat']]);
237 237
                     
238
-                    $cached_lng=0.000;
238
+                    $cached_lng = 0.000;
239 239
                     
240 240
                     if (!$this->validateLongitude($rows[$ordersFieldsMapping['cached_lng']])) {
241
-                        array_push($results['fail'],"$iRow --> Wrong cached_lng"); 
241
+                        array_push($results['fail'], "$iRow --> Wrong cached_lng"); 
242 242
                         $iRow++;
243 243
                         continue;
244 244
                     }
245
-                    else $cached_lng=doubleval($rows[$ordersFieldsMapping['cached_lng']]);
245
+                    else $cached_lng = doubleval($rows[$ordersFieldsMapping['cached_lng']]);
246 246
                     
247 247
                     if (isset($ordersFieldsMapping['curbside_lat'])) {
248 248
                         if (!$this->validateLatitude($rows[$ordersFieldsMapping['curbside_lat']])) {
249
-                            array_push($results['fail'],"$iRow --> Wrong curbside_lat"); 
249
+                            array_push($results['fail'], "$iRow --> Wrong curbside_lat"); 
250 250
                             $iRow++;
251 251
                             continue;
252 252
                         }
@@ -254,18 +254,18 @@  discard block
 block discarded – undo
254 254
                     
255 255
                     if (isset($ordersFieldsMapping['curbside_lng'])) {
256 256
                         if (!$this->validateLongitude($rows[$ordersFieldsMapping['curbside_lng']])) {
257
-                            array_push($results['fail'],"$iRow --> Wrong curbside_lng"); 
257
+                            array_push($results['fail'], "$iRow --> Wrong curbside_lng"); 
258 258
                             $iRow++;
259 259
                             continue;
260 260
                         }
261 261
                     }
262 262
                     
263
-                    $address=$rows[$ordersFieldsMapping['address_1']];
263
+                    $address = $rows[$ordersFieldsMapping['address_1']];
264 264
                     
265
-                    if (isset($ordersFieldsMapping['order_city'])) $address.=', '.$rows[$ordersFieldsMapping['order_city']];
266
-                    if (isset($ordersFieldsMapping['order_state_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
267
-                    if (isset($ordersFieldsMapping['order_zip_code'])) $address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
268
-                    if (isset($ordersFieldsMapping['order_country_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
265
+                    if (isset($ordersFieldsMapping['order_city'])) $address .= ', '.$rows[$ordersFieldsMapping['order_city']];
266
+                    if (isset($ordersFieldsMapping['order_state_id'])) $address .= ', '.$rows[$ordersFieldsMapping['order_state_id']];
267
+                    if (isset($ordersFieldsMapping['order_zip_code'])) $address .= ', '.$rows[$ordersFieldsMapping['order_zip_code']];
268
+                    if (isset($ordersFieldsMapping['order_country_id'])) $address .= ', '.$rows[$ordersFieldsMapping['order_country_id']];
269 269
                     
270 270
                     echo "$iRow --> ".$ordersFieldsMapping['day_scheduled_for_YYMMDD'].", ".$rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']]."<br>";
271 271
                     
@@ -296,10 +296,10 @@  discard block
 block discarded – undo
296 296
                     
297 297
                     $orderResults = $order->addOrder($orderParameters);
298 298
                     
299
-                    array_push($results['success'],"The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
299
+                    array_push($results['success'], "The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
300 300
                 }
301 301
                 else {
302
-                    array_push($results['fail'],"$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
302
+                    array_push($results['fail'], "$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
303 303
                 }
304 304
                 
305 305
                 $iRow++;
Please login to merge, or discard this patch.
Braces   +29 added lines, -12 removed lines patch added patch discarded remove patch
@@ -189,18 +189,26 @@  discard block
 block discarded – undo
189 189
         
190 190
         public static function validateLatitude($lat)
191 191
         {
192
-            if (!is_numeric($lat)) return false;
192
+            if (!is_numeric($lat)) {
193
+            	return false;
194
+            }
193 195
             
194
-            if ($lat>90 || $lat<-90) return false;
196
+            if ($lat>90 || $lat<-90) {
197
+            	return false;
198
+            }
195 199
             
196 200
             return true;
197 201
         }
198 202
         
199 203
         public static function validateLongitude($lng)
200 204
         {
201
-            if (!is_numeric($lng)) return false;
205
+            if (!is_numeric($lng)) {
206
+            	return false;
207
+            }
202 208
             
203
-            if ($lng>180 || $lng<-180) return false;
209
+            if ($lng>180 || $lng<-180) {
210
+            	return false;
211
+            }
204 212
             
205 213
             return true;
206 214
         }
@@ -232,8 +240,9 @@  discard block
 block discarded – undo
232 240
                         array_push($results['fail'],"$iRow --> Wrong cached_lat"); 
233 241
                         $iRow++;
234 242
                         continue;
243
+                    } else {
244
+                    	$cached_lat=doubleval($rows[$ordersFieldsMapping['cached_lat']]);
235 245
                     }
236
-                    else $cached_lat=doubleval($rows[$ordersFieldsMapping['cached_lat']]);
237 246
                     
238 247
                     $cached_lng=0.000;
239 248
                     
@@ -241,8 +250,9 @@  discard block
 block discarded – undo
241 250
                         array_push($results['fail'],"$iRow --> Wrong cached_lng"); 
242 251
                         $iRow++;
243 252
                         continue;
253
+                    } else {
254
+                    	$cached_lng=doubleval($rows[$ordersFieldsMapping['cached_lng']]);
244 255
                     }
245
-                    else $cached_lng=doubleval($rows[$ordersFieldsMapping['cached_lng']]);
246 256
                     
247 257
                     if (isset($ordersFieldsMapping['curbside_lat'])) {
248 258
                         if (!$this->validateLatitude($rows[$ordersFieldsMapping['curbside_lat']])) {
@@ -262,10 +272,18 @@  discard block
 block discarded – undo
262 272
                     
263 273
                     $address=$rows[$ordersFieldsMapping['address_1']];
264 274
                     
265
-                    if (isset($ordersFieldsMapping['order_city'])) $address.=', '.$rows[$ordersFieldsMapping['order_city']];
266
-                    if (isset($ordersFieldsMapping['order_state_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
267
-                    if (isset($ordersFieldsMapping['order_zip_code'])) $address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
268
-                    if (isset($ordersFieldsMapping['order_country_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
275
+                    if (isset($ordersFieldsMapping['order_city'])) {
276
+                    	$address.=', '.$rows[$ordersFieldsMapping['order_city']];
277
+                    }
278
+                    if (isset($ordersFieldsMapping['order_state_id'])) {
279
+                    	$address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
280
+                    }
281
+                    if (isset($ordersFieldsMapping['order_zip_code'])) {
282
+                    	$address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
283
+                    }
284
+                    if (isset($ordersFieldsMapping['order_country_id'])) {
285
+                    	$address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
286
+                    }
269 287
                     
270 288
                     echo "$iRow --> ".$ordersFieldsMapping['day_scheduled_for_YYMMDD'].", ".$rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']]."<br>";
271 289
                     
@@ -297,8 +315,7 @@  discard block
 block discarded – undo
297 315
                     $orderResults = $order->addOrder($orderParameters);
298 316
                     
299 317
                     array_push($results['success'],"The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
300
-                }
301
-                else {
318
+                } else {
302 319
                     array_push($results['fail'],"$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
303 320
                 }
304 321
                 
Please login to merge, or discard this patch.
src/Route4Me/AddressBookLocation.php 2 patches
Indentation   +325 added lines, -325 removed lines patch added patch discarded remove patch
@@ -23,11 +23,11 @@  discard block
 block discarded – undo
23 23
 		public $address_zip;
24 24
 		public $cached_lat;
25 25
 		public $cached_lng;
26
-        public $curbside_lat;
27
-        public $curbside_lng;
26
+		public $curbside_lat;
27
+		public $curbside_lng;
28 28
 		public $color;
29
-        public $address_custom_data;
30
-        public $schedule;
29
+		public $address_custom_data;
30
+		public $schedule;
31 31
 		
32 32
 		//public $offset;
33 33
 		//public $limit;
@@ -36,415 +36,415 @@  discard block
 block discarded – undo
36 36
 		
37 37
 		public static function fromArray(array $params) {
38 38
 			$addressbooklocation = new AddressBookLocation();
39
-	        foreach($params as $key => $value) {
40
-	            if (property_exists($addressbooklocation, $key)) {
41
-	                $addressbooklocation->{$key} = $value;
42
-	            }
39
+			foreach($params as $key => $value) {
40
+				if (property_exists($addressbooklocation, $key)) {
41
+					$addressbooklocation->{$key} = $value;
42
+				}
43 43
 			}
44 44
 			
45 45
 			return $addressbooklocation;
46 46
 		}
47 47
 		
48 48
 		public static function getAddressBookLocation($addressId)
49
-	    {
50
-	    	$ablocations = Route4Me::makeRequst(array(
51
-	            'url'    => self::$apiUrl,
52
-	            'method' => 'GET',
53
-	            'query'  => array(
54
-	                'query' => $addressId,
55
-	                'limit' => 30
56
-	            )
57
-	        ));
49
+		{
50
+			$ablocations = Route4Me::makeRequst(array(
51
+				'url'    => self::$apiUrl,
52
+				'method' => 'GET',
53
+				'query'  => array(
54
+					'query' => $addressId,
55
+					'limit' => 30
56
+				)
57
+			));
58 58
 
59 59
 			return $ablocations;
60 60
 		}
61 61
 		
62 62
 		public static function searchRoutedLocation($params)
63
-	    {
64
-	    	$result= Route4Me::makeRequst(array(
65
-	            'url'    => self::$apiUrl,
66
-	            'method' => 'GET',
67
-	            'query'  => array(
68
-	                'display' => isset($params['display']) ? $params['display']: null,
69
-	                'query' => isset($params['query']) ? $params['query']: null,
70
-	                'fields' => isset($params['fields']) ? $params['fields']: null,
71
-	                'limit' => isset($params['limit']) ? $params['limit']: null,
72
-	                'offset' => isset($params['offset']) ? $params['offset'] : null,
73
-	            )
74
-	        ));
63
+		{
64
+			$result= Route4Me::makeRequst(array(
65
+				'url'    => self::$apiUrl,
66
+				'method' => 'GET',
67
+				'query'  => array(
68
+					'display' => isset($params['display']) ? $params['display']: null,
69
+					'query' => isset($params['query']) ? $params['query']: null,
70
+					'fields' => isset($params['fields']) ? $params['fields']: null,
71
+					'limit' => isset($params['limit']) ? $params['limit']: null,
72
+					'offset' => isset($params['offset']) ? $params['offset'] : null,
73
+				)
74
+			));
75 75
 
76 76
 			return $result;
77 77
 		}
78 78
 		
79 79
 		public static function getAddressBookLocations($params)
80
-	    {
81
-	    	$ablocations = Route4Me::makeRequst(array(
82
-	            'url'    => self::$apiUrl,
83
-	            'method' => 'GET',
84
-	            'query'  => array(
85
-	                'limit' => isset($params->limit) ? $params->limit: null,
86
-	                'offset' => isset($params->offset) ? $params->offset : null,
87
-	            )
88
-	        ));
80
+		{
81
+			$ablocations = Route4Me::makeRequst(array(
82
+				'url'    => self::$apiUrl,
83
+				'method' => 'GET',
84
+				'query'  => array(
85
+					'limit' => isset($params->limit) ? $params->limit: null,
86
+					'offset' => isset($params->offset) ? $params->offset : null,
87
+				)
88
+			));
89 89
 
90 90
 			return $ablocations;
91 91
 		}
92 92
 		
93 93
 		public static function getAddressBookLocationsByIds($ids)
94
-	    {
95
-	    	$ablocations = Route4Me::makeRequst(array(
96
-	            'url'    => self::$apiUrl,
97
-	            'method' => 'GET',
98
-	            'query'  => array(
99
-	                'address_id' => $ids
100
-	            )
101
-	        ));
94
+		{
95
+			$ablocations = Route4Me::makeRequst(array(
96
+				'url'    => self::$apiUrl,
97
+				'method' => 'GET',
98
+				'query'  => array(
99
+					'address_id' => $ids
100
+				)
101
+			));
102 102
 
103 103
 			return $ablocations;
104 104
 		}
105 105
 		
106 106
 		public static function addAdressBookLocation($params)
107
-	    {
108
-	    	$ablocations = Route4Me::makeRequst(array(
109
-	            'url'    => self::$apiUrl,
110
-	            'method' => 'POST',
111
-	            'body'  => array(
112
-	            	'address_1' => 	isset($params->address_1) ? $params->address_1: null,
113
-	            	'address_2' =>    isset($params->address_2) ? $params->address_2: null,
114
-	            	'address_alias' =>    isset($params->address_alias) ? $params->address_alias: null,
115
-	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
116
-	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
117
-	                'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
118
-                    'curbside_lng' => isset($params->curbside_lng) ? $params->curbside_lng : null,
119
-	                'address_phone_number' =>    isset($params->address_phone_number) ? $params->address_phone_number: null,
120
-	                'address_group' =>    isset($params->address_group) ? $params->address_group: null,
121
-	                'first_name' =>    isset($params->first_name) ? $params->first_name: null,
122
-	                'last_name' =>    isset($params->last_name) ? $params->last_name: null,
123
-                    'local_time_window_start' =>    isset($params->local_time_window_start) ? $params->local_time_window_start: null,
124
-                    'local_time_window_end' =>    isset($params->local_time_window_end) ? $params->local_time_window_end: null,
125
-                    'local_time_window_start_2' =>    isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
126
-                    'local_time_window_end_2' =>    isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
127
-	                'address_email' =>    isset($params->address_email) ? $params->address_email: null,
128
-	                'address_city' =>    isset($params->address_city) ? $params->address_city: null,
129
-	                'address_state_id' =>    isset($params->address_state_id) ? $params->address_state_id: null,
130
-	                'address_country_id' =>    isset($params->address_country_id) ? $params->address_country_id: null,
131
-	                'address_zip' =>    isset($params->address_zip) ? $params->address_zip: null,
132
-	                'address_custom_data' =>    isset($params->address_custom_data) ? $params->address_custom_data: null,
133
-	                'schedule' =>    isset($params->schedule) ? $params->schedule: null,
134
-	                'schedule_blacklist' =>    isset($params->schedule_blacklist) ? $params->schedule_blacklist: null,
135
-	                'service_time' =>    isset($params->service_time) ? $params->service_time: null,
136
-	                'local_timezone_string' =>    isset($params->local_timezone_string) ? $params->local_timezone_string: null,
137
-	                'color' =>    isset($params->color) ? $params->color: null,
138
-	                'address_icon' =>    isset($params->address_icon) ? $params->address_icon: null,
139
-	                'address_stop_type' =>    isset($params->address_stop_type) ? $params->address_stop_type: null,
140
-	                'address_cube' =>    isset($params->address_cube) ? $params->address_cube: null,
141
-	                'address_pieces' =>    isset($params->address_pieces) ? $params->address_pieces: null,
142
-	                'address_reference_no' =>    isset($params->address_reference_no) ? $params->address_reference_no: null,
143
-	                'address_revenue' =>    isset($params->address_revenue) ? $params->address_revenue: null,
144
-	                'address_weight' =>    isset($params->address_weight) ? $params->address_weight: null,
145
-	                'address_priority' =>    isset($params->address_priority) ? $params->address_priority: null,
146
-	                'address_customer_po' =>    isset($params->address_customer_po) ? $params->address_customer_po: null,
147
-	            )
148
-	        ));
107
+		{
108
+			$ablocations = Route4Me::makeRequst(array(
109
+				'url'    => self::$apiUrl,
110
+				'method' => 'POST',
111
+				'body'  => array(
112
+					'address_1' => 	isset($params->address_1) ? $params->address_1: null,
113
+					'address_2' =>    isset($params->address_2) ? $params->address_2: null,
114
+					'address_alias' =>    isset($params->address_alias) ? $params->address_alias: null,
115
+					'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
116
+					'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
117
+					'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
118
+					'curbside_lng' => isset($params->curbside_lng) ? $params->curbside_lng : null,
119
+					'address_phone_number' =>    isset($params->address_phone_number) ? $params->address_phone_number: null,
120
+					'address_group' =>    isset($params->address_group) ? $params->address_group: null,
121
+					'first_name' =>    isset($params->first_name) ? $params->first_name: null,
122
+					'last_name' =>    isset($params->last_name) ? $params->last_name: null,
123
+					'local_time_window_start' =>    isset($params->local_time_window_start) ? $params->local_time_window_start: null,
124
+					'local_time_window_end' =>    isset($params->local_time_window_end) ? $params->local_time_window_end: null,
125
+					'local_time_window_start_2' =>    isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
126
+					'local_time_window_end_2' =>    isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
127
+					'address_email' =>    isset($params->address_email) ? $params->address_email: null,
128
+					'address_city' =>    isset($params->address_city) ? $params->address_city: null,
129
+					'address_state_id' =>    isset($params->address_state_id) ? $params->address_state_id: null,
130
+					'address_country_id' =>    isset($params->address_country_id) ? $params->address_country_id: null,
131
+					'address_zip' =>    isset($params->address_zip) ? $params->address_zip: null,
132
+					'address_custom_data' =>    isset($params->address_custom_data) ? $params->address_custom_data: null,
133
+					'schedule' =>    isset($params->schedule) ? $params->schedule: null,
134
+					'schedule_blacklist' =>    isset($params->schedule_blacklist) ? $params->schedule_blacklist: null,
135
+					'service_time' =>    isset($params->service_time) ? $params->service_time: null,
136
+					'local_timezone_string' =>    isset($params->local_timezone_string) ? $params->local_timezone_string: null,
137
+					'color' =>    isset($params->color) ? $params->color: null,
138
+					'address_icon' =>    isset($params->address_icon) ? $params->address_icon: null,
139
+					'address_stop_type' =>    isset($params->address_stop_type) ? $params->address_stop_type: null,
140
+					'address_cube' =>    isset($params->address_cube) ? $params->address_cube: null,
141
+					'address_pieces' =>    isset($params->address_pieces) ? $params->address_pieces: null,
142
+					'address_reference_no' =>    isset($params->address_reference_no) ? $params->address_reference_no: null,
143
+					'address_revenue' =>    isset($params->address_revenue) ? $params->address_revenue: null,
144
+					'address_weight' =>    isset($params->address_weight) ? $params->address_weight: null,
145
+					'address_priority' =>    isset($params->address_priority) ? $params->address_priority: null,
146
+					'address_customer_po' =>    isset($params->address_customer_po) ? $params->address_customer_po: null,
147
+				)
148
+			));
149 149
 
150 150
 			return $ablocations;
151 151
 		}
152 152
 		
153 153
 		public function deleteAdressBookLocation($address_ids)
154
-	    {
155
-	        $address = Route4Me::makeRequst(array(
156
-	            'url'    => self::$apiUrl,
157
-	            'method' => 'DELETEARRAY',
158
-	            'query'  => array(
159
-	                'address_ids'     => $address_ids
160
-	            )
161
-	        ));
154
+		{
155
+			$address = Route4Me::makeRequst(array(
156
+				'url'    => self::$apiUrl,
157
+				'method' => 'DELETEARRAY',
158
+				'query'  => array(
159
+					'address_ids'     => $address_ids
160
+				)
161
+			));
162 162
 	
163
-	        return $address;
164
-	    }
163
+			return $address;
164
+		}
165 165
 		
166 166
 		public function updateAdressBookLocation($params)
167
-	    {
168
-	    	//echo "address_id --> ".$params["address_id"]."<br";
169
-	        $address = Route4Me::makeRequst(array(
170
-	            'url'    => self::$apiUrl,
171
-	            'method' => 'PUT',
172
-	            'query'   => $params,
167
+		{
168
+			//echo "address_id --> ".$params["address_id"]."<br";
169
+			$address = Route4Me::makeRequst(array(
170
+				'url'    => self::$apiUrl,
171
+				'method' => 'PUT',
172
+				'query'   => $params,
173 173
 
174
-	        ));
174
+			));
175 175
 	
176
-	        return $address;
177
-	    }
176
+			return $address;
177
+		}
178 178
 			
179 179
 		public static function get($params)
180
-	    {
181
-	    	$ablocations = Route4Me::makeRequst(array(
182
-	            'url'    => self::$apiUrl,
183
-	            'method' => 'ADD',
184
-	            'query'  => array(
185
-	                'first_name' => isset($params->first_name) ? $params->first_name : null,
186
-	                'address_1' => isset($params->address_1) ? $params->address_1: null,
187
-	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
188
-	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
189
-	            )
190
-	        ));
180
+		{
181
+			$ablocations = Route4Me::makeRequst(array(
182
+				'url'    => self::$apiUrl,
183
+				'method' => 'ADD',
184
+				'query'  => array(
185
+					'first_name' => isset($params->first_name) ? $params->first_name : null,
186
+					'address_1' => isset($params->address_1) ? $params->address_1: null,
187
+					'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
188
+					'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
189
+				)
190
+			));
191 191
 
192 192
 			return $ablocations;
193 193
 		}
194 194
         
195
-        public static function validateScheduleMode($scheduleMode)
196
-        {
197
-            $schedMmodes=array("daily","weekly","monthly","annually");
195
+		public static function validateScheduleMode($scheduleMode)
196
+		{
197
+			$schedMmodes=array("daily","weekly","monthly","annually");
198 198
             
199
-            if (in_array($scheduleMode, $schedMmodes)) return TRUE; else return FALSE;
200
-        }
199
+			if (in_array($scheduleMode, $schedMmodes)) return TRUE; else return FALSE;
200
+		}
201 201
         
202
-        public static function validateScheduleEnable($scheduleEnabled)
203
-        {
204
-            $schedEnambles=array(TRUE,FALSE);
202
+		public static function validateScheduleEnable($scheduleEnabled)
203
+		{
204
+			$schedEnambles=array(TRUE,FALSE);
205 205
             
206
-            if (in_array($scheduleEnabled, $schedEnambles)) return TRUE; else return FALSE;
207
-        }
206
+			if (in_array($scheduleEnabled, $schedEnambles)) return TRUE; else return FALSE;
207
+		}
208 208
         
209
-        public static function validateScheduleEvery($scheduleEvery)
210
-        {
211
-            if (is_numeric($scheduleEvery)) return TRUE; else return FALSE;
212
-        }
209
+		public static function validateScheduleEvery($scheduleEvery)
210
+		{
211
+			if (is_numeric($scheduleEvery)) return TRUE; else return FALSE;
212
+		}
213 213
         
214
-        public static function validateScheduleWeekDays($scheduleWeekDays)
215
-        {
216
-            $weekdays = explode(',', $scheduleWeekDays);
214
+		public static function validateScheduleWeekDays($scheduleWeekDays)
215
+		{
216
+			$weekdays = explode(',', $scheduleWeekDays);
217 217
             
218
-            if (sizeof($weekdays)<1) return FALSE;
218
+			if (sizeof($weekdays)<1) return FALSE;
219 219
             
220
-            $isValid=TRUE;
220
+			$isValid=TRUE;
221 221
             
222
-            for ($i=0; $i < sizeof($weekdays); $i++) { 
223
-                if (is_numeric($weekdays[$i])) {
224
-                    $wday=intval($weekdays[$i]);
225
-                    if ($wday<1 || $wday>7) $isValid=FALSE;
226
-                }
227
-                else $isValid=FALSE;
228
-            }
229
-            //echo $scheduleWeekDays.' --- '. $isValid."<br>";
230
-            return $isValid;
231
-        }
222
+			for ($i=0; $i < sizeof($weekdays); $i++) { 
223
+				if (is_numeric($weekdays[$i])) {
224
+					$wday=intval($weekdays[$i]);
225
+					if ($wday<1 || $wday>7) $isValid=FALSE;
226
+				}
227
+				else $isValid=FALSE;
228
+			}
229
+			//echo $scheduleWeekDays.' --- '. $isValid."<br>";
230
+			return $isValid;
231
+		}
232 232
         
233
-        public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
234
-        {
235
-            $schedMonthlyMmodes=array("dates","nth");
233
+		public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
234
+		{
235
+			$schedMonthlyMmodes=array("dates","nth");
236 236
             
237
-            if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) return TRUE; else return FALSE;
238
-        }
237
+			if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) return TRUE; else return FALSE;
238
+		}
239 239
         
240
-        public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
241
-        {
242
-            $monthlyDates = explode(',', $scheduleMonthlyDates);
240
+		public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
241
+		{
242
+			$monthlyDates = explode(',', $scheduleMonthlyDates);
243 243
             
244
-            if (sizeof($monthlyDates)<1) return FALSE;
244
+			if (sizeof($monthlyDates)<1) return FALSE;
245 245
             
246
-            $isValid=TRUE;
246
+			$isValid=TRUE;
247 247
             
248
-            for ($i=0; $i < sizeof($monthlyDates); $i++) { 
249
-                if (is_numeric($monthlyDates[$i])) {
250
-                    $mday=intval($monthlyDates[$i]);
251
-                    if ($mday<1 || $mday>31) $isValid=FALSE;
252
-                }
253
-                else $isValid=FALSE;
254
-            }
248
+			for ($i=0; $i < sizeof($monthlyDates); $i++) { 
249
+				if (is_numeric($monthlyDates[$i])) {
250
+					$mday=intval($monthlyDates[$i]);
251
+					if ($mday<1 || $mday>31) $isValid=FALSE;
252
+				}
253
+				else $isValid=FALSE;
254
+			}
255 255
 
256
-            return $isValid;
257
-        }
256
+			return $isValid;
257
+		}
258 258
         
259
-        public static function validateScheduleNthN($scheduleNthN)
260
-        {
261
-            if (!is_numeric($scheduleNthN)) return FALSE;
259
+		public static function validateScheduleNthN($scheduleNthN)
260
+		{
261
+			if (!is_numeric($scheduleNthN)) return FALSE;
262 262
             
263
-            $schedNthNs=array(1,2,3,4,5,-1);
264
-            if (in_array($scheduleNthN, $schedNthNs)) return TRUE; else return FALSE;
265
-        }
263
+			$schedNthNs=array(1,2,3,4,5,-1);
264
+			if (in_array($scheduleNthN, $schedNthNs)) return TRUE; else return FALSE;
265
+		}
266 266
         
267
-        public static function validateScheduleNthWhat($scheduleNthWhat)
268
-        {
269
-            if (!is_numeric($scheduleNthWhat)) return FALSE;
267
+		public static function validateScheduleNthWhat($scheduleNthWhat)
268
+		{
269
+			if (!is_numeric($scheduleNthWhat)) return FALSE;
270 270
             
271
-            $schedNthWhats=array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
272
-            if (in_array($scheduleNthWhat, $schedNthWhats)) return TRUE; else return FALSE;
273
-        }
271
+			$schedNthWhats=array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
272
+			if (in_array($scheduleNthWhat, $schedNthWhats)) return TRUE; else return FALSE;
273
+		}
274 274
         
275
-        /* Function adds the locations (with/without schedule) from the CSV file. 
275
+		/* Function adds the locations (with/without schedule) from the CSV file. 
276 276
          * $csvFileHandle - a file handler.
277 277
          * Returns array $results which contains two arrays: fail and succes.
278 278
          */
279
-        public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
280
-        {
281
-            $max_line_length = 512;
282
-            $delemietr=',';
279
+		public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
280
+		{
281
+			$max_line_length = 512;
282
+			$delemietr=',';
283 283
             
284
-            $results=array();
285
-            $results['fail']=array();
286
-            $results['success']=array();
284
+			$results=array();
285
+			$results['fail']=array();
286
+			$results['success']=array();
287 287
             
288
-            $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
289
-            if (!empty($columns)) {
290
-                array_push($results['fail'],'Empty CSV table');
291
-                return ($results);
292
-            }
288
+			$columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
289
+			if (!empty($columns)) {
290
+				array_push($results['fail'],'Empty CSV table');
291
+				return ($results);
292
+			}
293 293
                      
294
-            $iRow=1;
294
+			$iRow=1;
295 295
             
296
-            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
297
-                if ($rows[$locationsFieldsMapping['cached_lat']] && $rows[$locationsFieldsMapping['cached_lng']] && $rows[$locationsFieldsMapping['address_1']] && array(null) !== $rows) {
298
-                    $schedule="";
299
-                    $mode="";
296
+			while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
297
+				if ($rows[$locationsFieldsMapping['cached_lat']] && $rows[$locationsFieldsMapping['cached_lng']] && $rows[$locationsFieldsMapping['address_1']] && array(null) !== $rows) {
298
+					$schedule="";
299
+					$mode="";
300 300
                     
301
-                    if (isset($rows[$locationsFieldsMapping['schedule_mode']])) {
302
-                        if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
303
-                            $schedule='"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
304
-                            $mode=$rows[$locationsFieldsMapping['schedule_mode']];
305
-                        }
306
-                        else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $schedule="";}
307
-                    }
308
-                    else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $schedule="";}
301
+					if (isset($rows[$locationsFieldsMapping['schedule_mode']])) {
302
+						if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
303
+							$schedule='"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
304
+							$mode=$rows[$locationsFieldsMapping['schedule_mode']];
305
+						}
306
+						else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $schedule="";}
307
+					}
308
+					else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $schedule="";}
309 309
                     
310
-                    if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
311
-                        if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
312
-                            $schedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
313
-                        }
314
-                        else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $schedule="";}
315
-                    }
310
+					if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
311
+						if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
312
+							$schedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
313
+						}
314
+						else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $schedule="";}
315
+					}
316 316
                     
317
-                    if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
318
-                        if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
319
-                            $schedule.='"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
320
-                            if ($mode=='daily') {
321
-                                $schedule=trim($schedule,',');
322
-                                $schedule.='}';
323
-                            }
324
-                        }
325
-                        else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $schedule=""; }
326
-                    }
317
+					if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
318
+						if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
319
+							$schedule.='"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
320
+							if ($mode=='daily') {
321
+								$schedule=trim($schedule,',');
322
+								$schedule.='}';
323
+							}
324
+						}
325
+						else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $schedule=""; }
326
+					}
327 327
                     
328
-                    if ($mode!='daily') {
329
-                        switch ($mode) {
330
-                            case 'weekly':
331
-                                if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
332
-                                    if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
333
-                                         $schedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
334
-                                    }
335
-                                    else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $schedule="";}
336
-                                }
337
-                                else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $schedule="";}
338
-                                break;
339
-                            case 'monthly':
340
-                                $monthlyMode="";
341
-                                if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
342
-                                    if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
343
-                                         $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
344
-                                         $schedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
345
-                                    }
346
-                                    else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $schedule="";}
347
-                                }
348
-                                else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $schedule="";}
328
+					if ($mode!='daily') {
329
+						switch ($mode) {
330
+							case 'weekly':
331
+								if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
332
+									if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
333
+										 $schedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
334
+									}
335
+									else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $schedule="";}
336
+								}
337
+								else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $schedule="";}
338
+								break;
339
+							case 'monthly':
340
+								$monthlyMode="";
341
+								if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
342
+									if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
343
+										 $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
344
+										 $schedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
345
+									}
346
+									else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $schedule="";}
347
+								}
348
+								else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $schedule="";}
349 349
                                 
350
-                                if ($monthlyMode!="") {
351
-                                    switch ($monthlyMode) {
352
-                                        case 'dates':
353
-                                            if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
354
-                                                if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
355
-                                                     $schedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
356
-                                                }
357
-                                                else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $schedule="";}
358
-                                            }
359
-                                            break;
360
-                                        case 'nth':
361
-                                            if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
362
-                                                if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
363
-                                                     $schedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
364
-                                                }
365
-                                                else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $schedule="";}
366
-                                            }
367
-                                            else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $schedule="";}
350
+								if ($monthlyMode!="") {
351
+									switch ($monthlyMode) {
352
+										case 'dates':
353
+											if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
354
+												if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
355
+													 $schedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
356
+												}
357
+												else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $schedule="";}
358
+											}
359
+											break;
360
+										case 'nth':
361
+											if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
362
+												if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
363
+													 $schedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
364
+												}
365
+												else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $schedule="";}
366
+											}
367
+											else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $schedule="";}
368 368
                                             
369
-                                            if ($schedule!="") {
370
-                                                if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
371
-                                                    if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
372
-                                                         $schedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
373
-                                                    }
374
-                                                    else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $schedule="";}
375
-                                                }
376
-                                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $schedule="";}
377
-                                            }
369
+											if ($schedule!="") {
370
+												if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
371
+													if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
372
+														 $schedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
373
+													}
374
+													else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $schedule="";}
375
+												}
376
+												else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $schedule="";}
377
+											}
378 378
                                             
379
-                                            break;
380
-                                    }
381
-                                }
382
-                                break;
383
-                            default:
384
-                                $schedule=="";
385
-                                break;
386
-                        }
379
+											break;
380
+									}
381
+								}
382
+								break;
383
+							default:
384
+								$schedule=="";
385
+								break;
386
+						}
387 387
                         
388
-                    }
388
+					}
389 389
 
390
-                    if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $schedule=="") {$iRow++; continue;}
390
+					if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $schedule=="") {$iRow++; continue;}
391 391
                     
392
-                    $schedule=strtolower($schedule);
392
+					$schedule=strtolower($schedule);
393 393
                     
394
-                    $schedule='[{'.$schedule.'}]';
394
+					$schedule='[{'.$schedule.'}]';
395 395
 
396
-                    $oSchedule= json_decode($schedule,TRUE);
396
+					$oSchedule= json_decode($schedule,TRUE);
397 397
                     
398
-                    $AdressBookLocationParameters=AddressBookLocation::fromArray(array(
399
-                        "cached_lat"    => $rows[$locationsFieldsMapping['cached_lat']],
400
-                        "cached_lng"    => $rows[$locationsFieldsMapping['cached_lng']],
401
-                        "curbside_lat"     => isset($locationsFieldsMapping['curbside_lat']) ? $rows[$locationsFieldsMapping['curbside_lat']] : null,
402
-                        "curbside_lng"     => isset($locationsFieldsMapping['curbside_lng']) ? $rows[$locationsFieldsMapping['curbside_lng']] : null,
403
-                        "address_alias"     => isset($locationsFieldsMapping['address_alias']) ? $rows[$locationsFieldsMapping['address_alias']] : null,
404
-                        "address_1"     => $rows[$locationsFieldsMapping['address_1']],
405
-                        "address_2"     => isset($locationsFieldsMapping['address_2']) ? $rows[$locationsFieldsMapping['address_2']] : null,
406
-                        "address_city"     => isset($locationsFieldsMapping['address_city']) ? $rows[$locationsFieldsMapping['address_city']] : null,
407
-                        "address_state_id"     => isset($locationsFieldsMapping['address_state_id']) ? $rows[$locationsFieldsMapping['address_state_id']] : null,
408
-                        "address_zip"     => isset($locationsFieldsMapping['address_zip']) ? $rows[$locationsFieldsMapping['address_zip']] : null,
409
-                        "address_phone_number"  => isset($locationsFieldsMapping['address_phone_number']) ? $rows[$locationsFieldsMapping['address_phone_number']] : null,
410
-                        "schedule" => isset($oSchedule) ? $oSchedule : null,
411
-                        "address_group"  => isset($locationsFieldsMapping['address_group']) ? $rows[$locationsFieldsMapping['address_group']] : null,
412
-                        "first_name"  => isset($locationsFieldsMapping['first_name']) ? $rows[$locationsFieldsMapping['first_name']] : null,
413
-                        "last_name"  => isset($locationsFieldsMapping['last_name']) ? $rows[$locationsFieldsMapping['last_name']] : null,
414
-                        "local_time_window_start"  => isset($locationsFieldsMapping['local_time_window_start']) ? $rows[$locationsFieldsMapping['local_time_window_start']] : null,
415
-                        "local_time_window_end"  => isset($locationsFieldsMapping['local_time_window_end']) ? $rows[$locationsFieldsMapping['local_time_window_end']] : null,
416
-                        "local_time_window_start_2"  => isset($locationsFieldsMapping['local_time_window_start_2']) ? $rows[$locationsFieldsMapping['local_time_window_start_2']] : null,
417
-                        "local_time_window_end_2"  => isset($locationsFieldsMapping['local_time_window_end_2']) ? $rows[$locationsFieldsMapping['local_time_window_end_2']] : null,
418
-                        "address_email"  => isset($locationsFieldsMapping['address_email']) ? $rows[$locationsFieldsMapping['address_email']] : null,
419
-                        "address_country_id"  => isset($locationsFieldsMapping['address_country_id']) ? $rows[$locationsFieldsMapping['address_country_id']] : null,
420
-                        "address_custom_data"  => isset($locationsFieldsMapping['address_custom_data']) ? $rows[$locationsFieldsMapping['address_custom_data']] : null,
421
-                        "schedule_blacklist"  => isset($locationsFieldsMapping['schedule_blacklist']) ? $rows[$locationsFieldsMapping['schedule_blacklist']] : null,
422
-                        "service_time"  => isset($locationsFieldsMapping['service_time']) ? $rows[$locationsFieldsMapping['service_time']] : null,
423
-                        "local_timezone_string"  => isset($locationsFieldsMapping['local_timezone_string']) ? $rows[$locationsFieldsMapping['local_timezone_string']] : null,
424
-                        "color"  => isset($locationsFieldsMapping['color']) ? $rows[$locationsFieldsMapping['color']] : null,
425
-                        "address_icon"  => isset($locationsFieldsMapping['address_icon']) ? $rows[$locationsFieldsMapping['address_icon']] : null,
426
-                        "address_stop_type"  => isset($locationsFieldsMapping['address_stop_type']) ? $rows[$locationsFieldsMapping['address_stop_type']] : null,
427
-                        "address_cube"  => isset($locationsFieldsMapping['address_cube']) ? $rows[$locationsFieldsMapping['address_cube']] : null,
428
-                        "address_pieces"  => isset($locationsFieldsMapping['address_pieces']) ? $rows[$locationsFieldsMapping['address_pieces']] : null,
429
-                        "address_reference_no"  => isset($locationsFieldsMapping['address_reference_no']) ? $rows[$locationsFieldsMapping['address_reference_no']] : null,
430
-                        "address_revenue"  => isset($locationsFieldsMapping['address_revenue']) ? $rows[$locationsFieldsMapping['address_revenue']] : null,
431
-                        "address_weight"  => isset($locationsFieldsMapping['address_weight']) ? $rows[$locationsFieldsMapping['address_weight']] : null,
432
-                        "address_priority"  => isset($locationsFieldsMapping['address_priority']) ? $rows[$locationsFieldsMapping['address_priority']] : null,
433
-                        "address_customer_po"  => isset($locationsFieldsMapping['address_customer_po']) ? $rows[$locationsFieldsMapping['address_customer_po']] : null,
434
-                    ));
398
+					$AdressBookLocationParameters=AddressBookLocation::fromArray(array(
399
+						"cached_lat"    => $rows[$locationsFieldsMapping['cached_lat']],
400
+						"cached_lng"    => $rows[$locationsFieldsMapping['cached_lng']],
401
+						"curbside_lat"     => isset($locationsFieldsMapping['curbside_lat']) ? $rows[$locationsFieldsMapping['curbside_lat']] : null,
402
+						"curbside_lng"     => isset($locationsFieldsMapping['curbside_lng']) ? $rows[$locationsFieldsMapping['curbside_lng']] : null,
403
+						"address_alias"     => isset($locationsFieldsMapping['address_alias']) ? $rows[$locationsFieldsMapping['address_alias']] : null,
404
+						"address_1"     => $rows[$locationsFieldsMapping['address_1']],
405
+						"address_2"     => isset($locationsFieldsMapping['address_2']) ? $rows[$locationsFieldsMapping['address_2']] : null,
406
+						"address_city"     => isset($locationsFieldsMapping['address_city']) ? $rows[$locationsFieldsMapping['address_city']] : null,
407
+						"address_state_id"     => isset($locationsFieldsMapping['address_state_id']) ? $rows[$locationsFieldsMapping['address_state_id']] : null,
408
+						"address_zip"     => isset($locationsFieldsMapping['address_zip']) ? $rows[$locationsFieldsMapping['address_zip']] : null,
409
+						"address_phone_number"  => isset($locationsFieldsMapping['address_phone_number']) ? $rows[$locationsFieldsMapping['address_phone_number']] : null,
410
+						"schedule" => isset($oSchedule) ? $oSchedule : null,
411
+						"address_group"  => isset($locationsFieldsMapping['address_group']) ? $rows[$locationsFieldsMapping['address_group']] : null,
412
+						"first_name"  => isset($locationsFieldsMapping['first_name']) ? $rows[$locationsFieldsMapping['first_name']] : null,
413
+						"last_name"  => isset($locationsFieldsMapping['last_name']) ? $rows[$locationsFieldsMapping['last_name']] : null,
414
+						"local_time_window_start"  => isset($locationsFieldsMapping['local_time_window_start']) ? $rows[$locationsFieldsMapping['local_time_window_start']] : null,
415
+						"local_time_window_end"  => isset($locationsFieldsMapping['local_time_window_end']) ? $rows[$locationsFieldsMapping['local_time_window_end']] : null,
416
+						"local_time_window_start_2"  => isset($locationsFieldsMapping['local_time_window_start_2']) ? $rows[$locationsFieldsMapping['local_time_window_start_2']] : null,
417
+						"local_time_window_end_2"  => isset($locationsFieldsMapping['local_time_window_end_2']) ? $rows[$locationsFieldsMapping['local_time_window_end_2']] : null,
418
+						"address_email"  => isset($locationsFieldsMapping['address_email']) ? $rows[$locationsFieldsMapping['address_email']] : null,
419
+						"address_country_id"  => isset($locationsFieldsMapping['address_country_id']) ? $rows[$locationsFieldsMapping['address_country_id']] : null,
420
+						"address_custom_data"  => isset($locationsFieldsMapping['address_custom_data']) ? $rows[$locationsFieldsMapping['address_custom_data']] : null,
421
+						"schedule_blacklist"  => isset($locationsFieldsMapping['schedule_blacklist']) ? $rows[$locationsFieldsMapping['schedule_blacklist']] : null,
422
+						"service_time"  => isset($locationsFieldsMapping['service_time']) ? $rows[$locationsFieldsMapping['service_time']] : null,
423
+						"local_timezone_string"  => isset($locationsFieldsMapping['local_timezone_string']) ? $rows[$locationsFieldsMapping['local_timezone_string']] : null,
424
+						"color"  => isset($locationsFieldsMapping['color']) ? $rows[$locationsFieldsMapping['color']] : null,
425
+						"address_icon"  => isset($locationsFieldsMapping['address_icon']) ? $rows[$locationsFieldsMapping['address_icon']] : null,
426
+						"address_stop_type"  => isset($locationsFieldsMapping['address_stop_type']) ? $rows[$locationsFieldsMapping['address_stop_type']] : null,
427
+						"address_cube"  => isset($locationsFieldsMapping['address_cube']) ? $rows[$locationsFieldsMapping['address_cube']] : null,
428
+						"address_pieces"  => isset($locationsFieldsMapping['address_pieces']) ? $rows[$locationsFieldsMapping['address_pieces']] : null,
429
+						"address_reference_no"  => isset($locationsFieldsMapping['address_reference_no']) ? $rows[$locationsFieldsMapping['address_reference_no']] : null,
430
+						"address_revenue"  => isset($locationsFieldsMapping['address_revenue']) ? $rows[$locationsFieldsMapping['address_revenue']] : null,
431
+						"address_weight"  => isset($locationsFieldsMapping['address_weight']) ? $rows[$locationsFieldsMapping['address_weight']] : null,
432
+						"address_priority"  => isset($locationsFieldsMapping['address_priority']) ? $rows[$locationsFieldsMapping['address_priority']] : null,
433
+						"address_customer_po"  => isset($locationsFieldsMapping['address_customer_po']) ? $rows[$locationsFieldsMapping['address_customer_po']] : null,
434
+					));
435 435
                     
436
-                    $abContacts=new AddressBookLocation();
436
+					$abContacts=new AddressBookLocation();
437 437
     
438
-                    $abcResults=$abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
438
+					$abcResults=$abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
439 439
                     
440
-                    array_push($results['success'],"The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
440
+					array_push($results['success'],"The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
441 441
 
442
-                }
442
+				}
443 443
                 
444
-            }
444
+			}
445 445
 
446
-            return $results;
447
-        }
446
+			return $results;
447
+		}
448 448
 	
449 449
 	   
450 450
 	}
Please login to merge, or discard this patch.
Spacing   +99 added lines, -99 removed lines patch added patch discarded remove patch
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
 		//public $offset;
33 33
 		//public $limit;
34 34
 		
35
-		public function __construct () {  }
35
+		public function __construct() {  }
36 36
 		
37 37
 		public static function fromArray(array $params) {
38 38
 			$addressbooklocation = new AddressBookLocation();
39
-	        foreach($params as $key => $value) {
39
+	        foreach ($params as $key => $value) {
40 40
 	            if (property_exists($addressbooklocation, $key)) {
41 41
 	                $addressbooklocation->{$key} = $value;
42 42
 	            }
@@ -61,14 +61,14 @@  discard block
 block discarded – undo
61 61
 		
62 62
 		public static function searchRoutedLocation($params)
63 63
 	    {
64
-	    	$result= Route4Me::makeRequst(array(
64
+	    	$result = Route4Me::makeRequst(array(
65 65
 	            'url'    => self::$apiUrl,
66 66
 	            'method' => 'GET',
67 67
 	            'query'  => array(
68
-	                'display' => isset($params['display']) ? $params['display']: null,
69
-	                'query' => isset($params['query']) ? $params['query']: null,
70
-	                'fields' => isset($params['fields']) ? $params['fields']: null,
71
-	                'limit' => isset($params['limit']) ? $params['limit']: null,
68
+	                'display' => isset($params['display']) ? $params['display'] : null,
69
+	                'query' => isset($params['query']) ? $params['query'] : null,
70
+	                'fields' => isset($params['fields']) ? $params['fields'] : null,
71
+	                'limit' => isset($params['limit']) ? $params['limit'] : null,
72 72
 	                'offset' => isset($params['offset']) ? $params['offset'] : null,
73 73
 	            )
74 74
 	        ));
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 	            'url'    => self::$apiUrl,
83 83
 	            'method' => 'GET',
84 84
 	            'query'  => array(
85
-	                'limit' => isset($params->limit) ? $params->limit: null,
85
+	                'limit' => isset($params->limit) ? $params->limit : null,
86 86
 	                'offset' => isset($params->offset) ? $params->offset : null,
87 87
 	            )
88 88
 	        ));
@@ -109,41 +109,41 @@  discard block
 block discarded – undo
109 109
 	            'url'    => self::$apiUrl,
110 110
 	            'method' => 'POST',
111 111
 	            'body'  => array(
112
-	            	'address_1' => 	isset($params->address_1) ? $params->address_1: null,
113
-	            	'address_2' =>    isset($params->address_2) ? $params->address_2: null,
114
-	            	'address_alias' =>    isset($params->address_alias) ? $params->address_alias: null,
112
+	            	'address_1' => 	isset($params->address_1) ? $params->address_1 : null,
113
+	            	'address_2' =>    isset($params->address_2) ? $params->address_2 : null,
114
+	            	'address_alias' =>    isset($params->address_alias) ? $params->address_alias : null,
115 115
 	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
116 116
 	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
117 117
 	                'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
118 118
                     'curbside_lng' => isset($params->curbside_lng) ? $params->curbside_lng : null,
119
-	                'address_phone_number' =>    isset($params->address_phone_number) ? $params->address_phone_number: null,
120
-	                'address_group' =>    isset($params->address_group) ? $params->address_group: null,
121
-	                'first_name' =>    isset($params->first_name) ? $params->first_name: null,
122
-	                'last_name' =>    isset($params->last_name) ? $params->last_name: null,
123
-                    'local_time_window_start' =>    isset($params->local_time_window_start) ? $params->local_time_window_start: null,
124
-                    'local_time_window_end' =>    isset($params->local_time_window_end) ? $params->local_time_window_end: null,
125
-                    'local_time_window_start_2' =>    isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
126
-                    'local_time_window_end_2' =>    isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
127
-	                'address_email' =>    isset($params->address_email) ? $params->address_email: null,
128
-	                'address_city' =>    isset($params->address_city) ? $params->address_city: null,
129
-	                'address_state_id' =>    isset($params->address_state_id) ? $params->address_state_id: null,
130
-	                'address_country_id' =>    isset($params->address_country_id) ? $params->address_country_id: null,
131
-	                'address_zip' =>    isset($params->address_zip) ? $params->address_zip: null,
132
-	                'address_custom_data' =>    isset($params->address_custom_data) ? $params->address_custom_data: null,
133
-	                'schedule' =>    isset($params->schedule) ? $params->schedule: null,
134
-	                'schedule_blacklist' =>    isset($params->schedule_blacklist) ? $params->schedule_blacklist: null,
135
-	                'service_time' =>    isset($params->service_time) ? $params->service_time: null,
136
-	                'local_timezone_string' =>    isset($params->local_timezone_string) ? $params->local_timezone_string: null,
137
-	                'color' =>    isset($params->color) ? $params->color: null,
138
-	                'address_icon' =>    isset($params->address_icon) ? $params->address_icon: null,
139
-	                'address_stop_type' =>    isset($params->address_stop_type) ? $params->address_stop_type: null,
140
-	                'address_cube' =>    isset($params->address_cube) ? $params->address_cube: null,
141
-	                'address_pieces' =>    isset($params->address_pieces) ? $params->address_pieces: null,
142
-	                'address_reference_no' =>    isset($params->address_reference_no) ? $params->address_reference_no: null,
143
-	                'address_revenue' =>    isset($params->address_revenue) ? $params->address_revenue: null,
144
-	                'address_weight' =>    isset($params->address_weight) ? $params->address_weight: null,
145
-	                'address_priority' =>    isset($params->address_priority) ? $params->address_priority: null,
146
-	                'address_customer_po' =>    isset($params->address_customer_po) ? $params->address_customer_po: null,
119
+	                'address_phone_number' =>    isset($params->address_phone_number) ? $params->address_phone_number : null,
120
+	                'address_group' =>    isset($params->address_group) ? $params->address_group : null,
121
+	                'first_name' =>    isset($params->first_name) ? $params->first_name : null,
122
+	                'last_name' =>    isset($params->last_name) ? $params->last_name : null,
123
+                    'local_time_window_start' =>    isset($params->local_time_window_start) ? $params->local_time_window_start : null,
124
+                    'local_time_window_end' =>    isset($params->local_time_window_end) ? $params->local_time_window_end : null,
125
+                    'local_time_window_start_2' =>    isset($params->local_time_window_start_2) ? $params->local_time_window_start_2 : null,
126
+                    'local_time_window_end_2' =>    isset($params->local_time_window_end_2) ? $params->local_time_window_end_2 : null,
127
+	                'address_email' =>    isset($params->address_email) ? $params->address_email : null,
128
+	                'address_city' =>    isset($params->address_city) ? $params->address_city : null,
129
+	                'address_state_id' =>    isset($params->address_state_id) ? $params->address_state_id : null,
130
+	                'address_country_id' =>    isset($params->address_country_id) ? $params->address_country_id : null,
131
+	                'address_zip' =>    isset($params->address_zip) ? $params->address_zip : null,
132
+	                'address_custom_data' =>    isset($params->address_custom_data) ? $params->address_custom_data : null,
133
+	                'schedule' =>    isset($params->schedule) ? $params->schedule : null,
134
+	                'schedule_blacklist' =>    isset($params->schedule_blacklist) ? $params->schedule_blacklist : null,
135
+	                'service_time' =>    isset($params->service_time) ? $params->service_time : null,
136
+	                'local_timezone_string' =>    isset($params->local_timezone_string) ? $params->local_timezone_string : null,
137
+	                'color' =>    isset($params->color) ? $params->color : null,
138
+	                'address_icon' =>    isset($params->address_icon) ? $params->address_icon : null,
139
+	                'address_stop_type' =>    isset($params->address_stop_type) ? $params->address_stop_type : null,
140
+	                'address_cube' =>    isset($params->address_cube) ? $params->address_cube : null,
141
+	                'address_pieces' =>    isset($params->address_pieces) ? $params->address_pieces : null,
142
+	                'address_reference_no' =>    isset($params->address_reference_no) ? $params->address_reference_no : null,
143
+	                'address_revenue' =>    isset($params->address_revenue) ? $params->address_revenue : null,
144
+	                'address_weight' =>    isset($params->address_weight) ? $params->address_weight : null,
145
+	                'address_priority' =>    isset($params->address_priority) ? $params->address_priority : null,
146
+	                'address_customer_po' =>    isset($params->address_customer_po) ? $params->address_customer_po : null,
147 147
 	            )
148 148
 	        ));
149 149
 
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 	            'method' => 'ADD',
184 184
 	            'query'  => array(
185 185
 	                'first_name' => isset($params->first_name) ? $params->first_name : null,
186
-	                'address_1' => isset($params->address_1) ? $params->address_1: null,
186
+	                'address_1' => isset($params->address_1) ? $params->address_1 : null,
187 187
 	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
188 188
 	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
189 189
 	            )
@@ -194,14 +194,14 @@  discard block
 block discarded – undo
194 194
         
195 195
         public static function validateScheduleMode($scheduleMode)
196 196
         {
197
-            $schedMmodes=array("daily","weekly","monthly","annually");
197
+            $schedMmodes = array("daily", "weekly", "monthly", "annually");
198 198
             
199 199
             if (in_array($scheduleMode, $schedMmodes)) return TRUE; else return FALSE;
200 200
         }
201 201
         
202 202
         public static function validateScheduleEnable($scheduleEnabled)
203 203
         {
204
-            $schedEnambles=array(TRUE,FALSE);
204
+            $schedEnambles = array(TRUE, FALSE);
205 205
             
206 206
             if (in_array($scheduleEnabled, $schedEnambles)) return TRUE; else return FALSE;
207 207
         }
@@ -217,14 +217,14 @@  discard block
 block discarded – undo
217 217
             
218 218
             if (sizeof($weekdays)<1) return FALSE;
219 219
             
220
-            $isValid=TRUE;
220
+            $isValid = TRUE;
221 221
             
222
-            for ($i=0; $i < sizeof($weekdays); $i++) { 
222
+            for ($i = 0; $i<sizeof($weekdays); $i++) { 
223 223
                 if (is_numeric($weekdays[$i])) {
224
-                    $wday=intval($weekdays[$i]);
225
-                    if ($wday<1 || $wday>7) $isValid=FALSE;
224
+                    $wday = intval($weekdays[$i]);
225
+                    if ($wday<1 || $wday>7) $isValid = FALSE;
226 226
                 }
227
-                else $isValid=FALSE;
227
+                else $isValid = FALSE;
228 228
             }
229 229
             //echo $scheduleWeekDays.' --- '. $isValid."<br>";
230 230
             return $isValid;
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
         
233 233
         public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
234 234
         {
235
-            $schedMonthlyMmodes=array("dates","nth");
235
+            $schedMonthlyMmodes = array("dates", "nth");
236 236
             
237 237
             if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) return TRUE; else return FALSE;
238 238
         }
@@ -243,14 +243,14 @@  discard block
 block discarded – undo
243 243
             
244 244
             if (sizeof($monthlyDates)<1) return FALSE;
245 245
             
246
-            $isValid=TRUE;
246
+            $isValid = TRUE;
247 247
             
248
-            for ($i=0; $i < sizeof($monthlyDates); $i++) { 
248
+            for ($i = 0; $i<sizeof($monthlyDates); $i++) { 
249 249
                 if (is_numeric($monthlyDates[$i])) {
250
-                    $mday=intval($monthlyDates[$i]);
251
-                    if ($mday<1 || $mday>31) $isValid=FALSE;
250
+                    $mday = intval($monthlyDates[$i]);
251
+                    if ($mday<1 || $mday>31) $isValid = FALSE;
252 252
                 }
253
-                else $isValid=FALSE;
253
+                else $isValid = FALSE;
254 254
             }
255 255
 
256 256
             return $isValid;
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
         {
261 261
             if (!is_numeric($scheduleNthN)) return FALSE;
262 262
             
263
-            $schedNthNs=array(1,2,3,4,5,-1);
263
+            $schedNthNs = array(1, 2, 3, 4, 5, -1);
264 264
             if (in_array($scheduleNthN, $schedNthNs)) return TRUE; else return FALSE;
265 265
         }
266 266
         
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
         {
269 269
             if (!is_numeric($scheduleNthWhat)) return FALSE;
270 270
             
271
-            $schedNthWhats=array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
271
+            $schedNthWhats = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
272 272
             if (in_array($scheduleNthWhat, $schedNthWhats)) return TRUE; else return FALSE;
273 273
         }
274 274
         
@@ -279,50 +279,50 @@  discard block
 block discarded – undo
279 279
         public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
280 280
         {
281 281
             $max_line_length = 512;
282
-            $delemietr=',';
282
+            $delemietr = ',';
283 283
             
284
-            $results=array();
285
-            $results['fail']=array();
286
-            $results['success']=array();
284
+            $results = array();
285
+            $results['fail'] = array();
286
+            $results['success'] = array();
287 287
             
288 288
             $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
289 289
             if (!empty($columns)) {
290
-                array_push($results['fail'],'Empty CSV table');
290
+                array_push($results['fail'], 'Empty CSV table');
291 291
                 return ($results);
292 292
             }
293 293
                      
294
-            $iRow=1;
294
+            $iRow = 1;
295 295
             
296
-            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
297
-                if ($rows[$locationsFieldsMapping['cached_lat']] && $rows[$locationsFieldsMapping['cached_lng']] && $rows[$locationsFieldsMapping['address_1']] && array(null) !== $rows) {
298
-                    $schedule="";
299
-                    $mode="";
296
+            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr))!==false) {
297
+                if ($rows[$locationsFieldsMapping['cached_lat']] && $rows[$locationsFieldsMapping['cached_lng']] && $rows[$locationsFieldsMapping['address_1']] && array(null)!==$rows) {
298
+                    $schedule = "";
299
+                    $mode = "";
300 300
                     
301 301
                     if (isset($rows[$locationsFieldsMapping['schedule_mode']])) {
302 302
                         if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
303
-                            $schedule='"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
304
-                            $mode=$rows[$locationsFieldsMapping['schedule_mode']];
303
+                            $schedule = '"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
304
+                            $mode = $rows[$locationsFieldsMapping['schedule_mode']];
305 305
                         }
306
-                        else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $schedule="";}
306
+                        else {array_push($results['fail'], "$iRow --> Wrong schedule mode parameter"); $schedule = ""; }
307 307
                     }
308
-                    else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $schedule="";}
308
+                    else {array_push($results['fail'], "$iRow --> The schedule mode parameter is not set"); $schedule = ""; }
309 309
                     
310 310
                     if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
311 311
                         if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
312
-                            $schedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
312
+                            $schedule .= '"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
313 313
                         }
314
-                        else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $schedule="";}
314
+                        else {array_push($results['fail'], "$iRow --> The schedule enabled parameter is not set "); $schedule = ""; }
315 315
                     }
316 316
                     
317 317
                     if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
318 318
                         if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
319
-                            $schedule.='"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
319
+                            $schedule .= '"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
320 320
                             if ($mode=='daily') {
321
-                                $schedule=trim($schedule,',');
322
-                                $schedule.='}';
321
+                                $schedule = trim($schedule, ',');
322
+                                $schedule .= '}';
323 323
                             }
324 324
                         }
325
-                        else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $schedule=""; }
325
+                        else {array_push($results['fail'], "$iRow --> The parameter sched_every is not set"); $schedule = ""; }
326 326
                     }
327 327
                     
328 328
                     if ($mode!='daily') {
@@ -330,50 +330,50 @@  discard block
 block discarded – undo
330 330
                             case 'weekly':
331 331
                                 if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
332 332
                                     if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
333
-                                         $schedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
333
+                                         $schedule .= '"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
334 334
                                     }
335
-                                    else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $schedule="";}
335
+                                    else {array_push($results['fail'], "$iRow --> Wrong weekdays"); $schedule = ""; }
336 336
                                 }
337
-                                else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $schedule="";}
337
+                                else {array_push($results['fail'], "$iRow --> The parameters sched_weekdays is not set"); $schedule = ""; }
338 338
                                 break;
339 339
                             case 'monthly':
340
-                                $monthlyMode="";
340
+                                $monthlyMode = "";
341 341
                                 if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
342 342
                                     if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
343
-                                         $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
344
-                                         $schedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
343
+                                         $monthlyMode = $rows[$locationsFieldsMapping['monthly_mode']];
344
+                                         $schedule .= '"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
345 345
                                     }
346
-                                    else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $schedule="";}
346
+                                    else {array_push($results['fail'], "$iRow --> Wrong monthly mode"); $schedule = ""; }
347 347
                                 }
348
-                                else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $schedule="";}
348
+                                else {array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); $schedule = ""; }
349 349
                                 
350 350
                                 if ($monthlyMode!="") {
351 351
                                     switch ($monthlyMode) {
352 352
                                         case 'dates':
353 353
                                             if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
354 354
                                                 if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
355
-                                                     $schedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
355
+                                                     $schedule .= '"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
356 356
                                                 }
357
-                                                else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $schedule="";}
357
+                                                else {array_push($results['fail'], "$iRow --> Wrong monthly dates"); $schedule = ""; }
358 358
                                             }
359 359
                                             break;
360 360
                                         case 'nth':
361 361
                                             if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
362 362
                                                 if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
363
-                                                     $schedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
363
+                                                     $schedule .= '"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
364 364
                                                 }
365
-                                                else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $schedule="";}
365
+                                                else {array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_n"); $schedule = ""; }
366 366
                                             }
367
-                                            else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $schedule="";}
367
+                                            else {array_push($results['fail'], "$iRow --> The parameter sched_nth_n is not set"); $schedule = ""; }
368 368
                                             
369 369
                                             if ($schedule!="") {
370 370
                                                 if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
371 371
                                                     if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
372
-                                                         $schedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
372
+                                                         $schedule .= '"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
373 373
                                                     }
374
-                                                    else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $schedule="";}
374
+                                                    else {array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_what"); $schedule = ""; }
375 375
                                                 }
376
-                                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $schedule="";}
376
+                                                else {array_push($results['fail'], "$iRow --> The parameter sched_nth_what is not set"); $schedule = ""; }
377 377
                                             }
378 378
                                             
379 379
                                             break;
@@ -387,15 +387,15 @@  discard block
 block discarded – undo
387 387
                         
388 388
                     }
389 389
 
390
-                    if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $schedule=="") {$iRow++; continue;}
390
+                    if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $schedule=="") {$iRow++; continue; }
391 391
                     
392
-                    $schedule=strtolower($schedule);
392
+                    $schedule = strtolower($schedule);
393 393
                     
394
-                    $schedule='[{'.$schedule.'}]';
394
+                    $schedule = '[{'.$schedule.'}]';
395 395
 
396
-                    $oSchedule= json_decode($schedule,TRUE);
396
+                    $oSchedule = json_decode($schedule, TRUE);
397 397
                     
398
-                    $AdressBookLocationParameters=AddressBookLocation::fromArray(array(
398
+                    $AdressBookLocationParameters = AddressBookLocation::fromArray(array(
399 399
                         "cached_lat"    => $rows[$locationsFieldsMapping['cached_lat']],
400 400
                         "cached_lng"    => $rows[$locationsFieldsMapping['cached_lng']],
401 401
                         "curbside_lat"     => isset($locationsFieldsMapping['curbside_lat']) ? $rows[$locationsFieldsMapping['curbside_lat']] : null,
@@ -433,11 +433,11 @@  discard block
 block discarded – undo
433 433
                         "address_customer_po"  => isset($locationsFieldsMapping['address_customer_po']) ? $rows[$locationsFieldsMapping['address_customer_po']] : null,
434 434
                     ));
435 435
                     
436
-                    $abContacts=new AddressBookLocation();
436
+                    $abContacts = new AddressBookLocation();
437 437
     
438
-                    $abcResults=$abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
438
+                    $abcResults = $abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
439 439
                     
440
-                    array_push($results['success'],"The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
440
+                    array_push($results['success'], "The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
441 441
 
442 442
                 }
443 443
                 
Please login to merge, or discard this patch.