route4me / route4me-php-sdk

src/Route4Me/Order.php

Braces +29 added lines, -12 removed lines

@@ -189,18 +189,26 @@ 
         
         public static function validateLatitude($lat)
         {
-            if (!is_numeric($lat)) return false;
+            if (!is_numeric($lat)) {
+            	return false;
+            }
             
-            if ($lat>90 || $lat<-90) return false;
+            if ($lat>90 || $lat<-90) {
+            	return false;
+            }
             
             return true;
         }
         
         public static function validateLongitude($lng)
         {
-            if (!is_numeric($lng)) return false;
+            if (!is_numeric($lng)) {
+            	return false;
+            }
             
-            if ($lng>180 || $lng<-180) return false;
+            if ($lng>180 || $lng<-180) {
+            	return false;
+            }
             
             return true;
         }
@@ -232,8 +240,9 @@ 
                         array_push($results['fail'],"$iRow --> Wrong cached_lat"); 
                         $iRow++;
                         continue;
+                    } else {
+                    	$cached_lat=doubleval($rows[$ordersFieldsMapping['cached_lat']]);
                     }
-                    else $cached_lat=doubleval($rows[$ordersFieldsMapping['cached_lat']]);
                     
                     $cached_lng=0.000;
                     
@@ -241,8 +250,9 @@ 
                         array_push($results['fail'],"$iRow --> Wrong cached_lng"); 
                         $iRow++;
                         continue;
+                    } else {
+                    	$cached_lng=doubleval($rows[$ordersFieldsMapping['cached_lng']]);
                     }
-                    else $cached_lng=doubleval($rows[$ordersFieldsMapping['cached_lng']]);
                     
                     if (isset($ordersFieldsMapping['curbside_lat'])) {
                         if (!$this->validateLatitude($rows[$ordersFieldsMapping['curbside_lat']])) {
@@ -262,10 +272,18 @@ 
                     
                     $address=$rows[$ordersFieldsMapping['address_1']];
                     
-                    if (isset($ordersFieldsMapping['order_city'])) $address.=', '.$rows[$ordersFieldsMapping['order_city']];
-                    if (isset($ordersFieldsMapping['order_state_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
-                    if (isset($ordersFieldsMapping['order_zip_code'])) $address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
-                    if (isset($ordersFieldsMapping['order_country_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
+                    if (isset($ordersFieldsMapping['order_city'])) {
+                    	$address.=', '.$rows[$ordersFieldsMapping['order_city']];
+                    }
+                    if (isset($ordersFieldsMapping['order_state_id'])) {
+                    	$address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
+                    }
+                    if (isset($ordersFieldsMapping['order_zip_code'])) {
+                    	$address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
+                    }
+                    if (isset($ordersFieldsMapping['order_country_id'])) {
+                    	$address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
+                    }
                     
                     echo "$iRow --> ".$ordersFieldsMapping['day_scheduled_for_YYMMDD'].", ".$rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']]."<br>";
                     
@@ -297,8 +315,7 @@ 
                     $orderResults = $order->addOrder($orderParameters);
                     
                     array_push($results['success'],"The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
-                }
-                else {
+                } else {
                     array_push($results['fail'],"$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
                 }