route4me /
route4me-php-sdk
@@ -235,18 +235,18 @@ discard block |
||
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | switch (variable) { |
| 238 | - case 'cached_lat': |
|
| 239 | - case 'curbside_lat': |
|
| 240 | - if ($lat>90 || $lat<-90) { |
|
| 241 | - return false; |
|
| 242 | - } |
|
| 243 | - break; |
|
| 244 | - case 'cached_lng': |
|
| 245 | - case 'curbside_lng': |
|
| 246 | - if ($lng>180 || $lng<-180) { |
|
| 247 | - return false; |
|
| 248 | - } |
|
| 249 | - break; |
|
| 238 | + case 'cached_lat': |
|
| 239 | + case 'curbside_lat': |
|
| 240 | + if ($lat>90 || $lat<-90) { |
|
| 241 | + return false; |
|
| 242 | + } |
|
| 243 | + break; |
|
| 244 | + case 'cached_lng': |
|
| 245 | + case 'curbside_lng': |
|
| 246 | + if ($lng>180 || $lng<-180) { |
|
| 247 | + return false; |
|
| 248 | + } |
|
| 249 | + break; |
|
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | return true; |
@@ -288,12 +288,12 @@ discard block |
||
| 288 | 288 | continue; |
| 289 | 289 | } else { |
| 290 | 290 | switch ($coord) { |
| 291 | - case 'cached_lat': |
|
| 292 | - $cached_lat = doubleval($rows[$ordersFieldsMapping[$coord]]); |
|
| 293 | - break; |
|
| 294 | - case 'cached_lng': |
|
| 295 | - $cached_lng = doubleval($rows[$ordersFieldsMapping[$coord]]); |
|
| 296 | - break; |
|
| 291 | + case 'cached_lat': |
|
| 292 | + $cached_lat = doubleval($rows[$ordersFieldsMapping[$coord]]); |
|
| 293 | + break; |
|
| 294 | + case 'cached_lng': |
|
| 295 | + $cached_lng = doubleval($rows[$ordersFieldsMapping[$coord]]); |
|
| 296 | + break; |
|
| 297 | 297 | } |
| 298 | 298 | } |
| 299 | 299 | } |
@@ -351,70 +351,70 @@ |
||
| 351 | 351 | |
| 352 | 352 | if ($mode!='daily') { |
| 353 | 353 | switch ($mode) { |
| 354 | - case 'weekly': |
|
| 355 | - if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) { |
|
| 356 | - if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) { |
|
| 357 | - $curSchedule .= '"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}'; |
|
| 358 | - } else { |
|
| 359 | - array_push($results['fail'], "$iRow --> Wrong weekdays"); |
|
| 360 | - } |
|
| 354 | + case 'weekly': |
|
| 355 | + if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) { |
|
| 356 | + if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) { |
|
| 357 | + $curSchedule .= '"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}'; |
|
| 361 | 358 | } else { |
| 362 | - array_push($results['fail'], "$iRow --> The parameters sched_weekdays is not set"); |
|
| 359 | + array_push($results['fail'], "$iRow --> Wrong weekdays"); |
|
| 363 | 360 | } |
| 364 | - break; |
|
| 365 | - case 'monthly': |
|
| 366 | - $monthlyMode = ""; |
|
| 367 | - if (isset($rows[$locationsFieldsMapping['monthly_mode']])) { |
|
| 368 | - if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) { |
|
| 369 | - $monthlyMode = $rows[$locationsFieldsMapping['monthly_mode']]; |
|
| 370 | - $curSchedule .= '"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",'; |
|
| 371 | - } else { |
|
| 372 | - array_push($results['fail'], "$iRow --> Wrong monthly mode"); |
|
| 373 | - } |
|
| 361 | + } else { |
|
| 362 | + array_push($results['fail'], "$iRow --> The parameters sched_weekdays is not set"); |
|
| 363 | + } |
|
| 364 | + break; |
|
| 365 | + case 'monthly': |
|
| 366 | + $monthlyMode = ""; |
|
| 367 | + if (isset($rows[$locationsFieldsMapping['monthly_mode']])) { |
|
| 368 | + if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) { |
|
| 369 | + $monthlyMode = $rows[$locationsFieldsMapping['monthly_mode']]; |
|
| 370 | + $curSchedule .= '"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",'; |
|
| 374 | 371 | } else { |
| 375 | - array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); |
|
| 372 | + array_push($results['fail'], "$iRow --> Wrong monthly mode"); |
|
| 376 | 373 | } |
| 374 | + } else { |
|
| 375 | + array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); |
|
| 376 | + } |
|
| 377 | 377 | |
| 378 | - if ($monthlyMode!="") { |
|
| 379 | - switch ($monthlyMode) { |
|
| 380 | - case 'dates': |
|
| 381 | - if (isset($rows[$locationsFieldsMapping['monthly_dates']])) { |
|
| 382 | - if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) { |
|
| 383 | - $curSchedule .= '"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}'; |
|
| 384 | - } else { |
|
| 385 | - array_push($results['fail'], "$iRow --> Wrong monthly dates"); |
|
| 386 | - } |
|
| 387 | - } |
|
| 388 | - break; |
|
| 389 | - case 'nth': |
|
| 390 | - if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) { |
|
| 391 | - if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) { |
|
| 392 | - $curSchedule .= '"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].','; |
|
| 393 | - } else { |
|
| 394 | - array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_n"); |
|
| 395 | - } |
|
| 396 | - } else { |
|
| 397 | - array_push($results['fail'], "$iRow --> The parameter sched_nth_n is not set"); |
|
| 398 | - } |
|
| 378 | + if ($monthlyMode!="") { |
|
| 379 | + switch ($monthlyMode) { |
|
| 380 | + case 'dates': |
|
| 381 | + if (isset($rows[$locationsFieldsMapping['monthly_dates']])) { |
|
| 382 | + if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) { |
|
| 383 | + $curSchedule .= '"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}'; |
|
| 384 | + } else { |
|
| 385 | + array_push($results['fail'], "$iRow --> Wrong monthly dates"); |
|
| 386 | + } |
|
| 387 | + } |
|
| 388 | + break; |
|
| 389 | + case 'nth': |
|
| 390 | + if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) { |
|
| 391 | + if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) { |
|
| 392 | + $curSchedule .= '"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].','; |
|
| 393 | + } else { |
|
| 394 | + array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_n"); |
|
| 395 | + } |
|
| 396 | + } else { |
|
| 397 | + array_push($results['fail'], "$iRow --> The parameter sched_nth_n is not set"); |
|
| 398 | + } |
|
| 399 | 399 | |
| 400 | - if ($curSchedule!="") { |
|
| 401 | - if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) { |
|
| 402 | - if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) { |
|
| 403 | - $curSchedule .= '"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}'; |
|
| 404 | - } else { |
|
| 405 | - array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_what"); |
|
| 406 | - } |
|
| 407 | - } else { |
|
| 408 | - array_push($results['fail'], "$iRow --> The parameter sched_nth_what is not set"); |
|
| 409 | - } |
|
| 410 | - } |
|
| 411 | - break; |
|
| 400 | + if ($curSchedule!="") { |
|
| 401 | + if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) { |
|
| 402 | + if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) { |
|
| 403 | + $curSchedule .= '"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}'; |
|
| 404 | + } else { |
|
| 405 | + array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_what"); |
|
| 412 | 406 | } |
| 407 | + } else { |
|
| 408 | + array_push($results['fail'], "$iRow --> The parameter sched_nth_what is not set"); |
|
| 409 | + } |
|
| 413 | 410 | } |
| 414 | 411 | break; |
| 415 | - default: |
|
| 416 | - $curSchedule = ""; |
|
| 412 | + } |
|
| 413 | + } |
|
| 417 | 414 | break; |
| 415 | + default: |
|
| 416 | + $curSchedule = ""; |
|
| 417 | + break; |
|
| 418 | 418 | } |
| 419 | 419 | } |
| 420 | 420 | |
