diff --git a/client_location_add_modal.php b/client_location_add_modal.php index 1781528b..1ce92dab 100644 --- a/client_location_add_modal.php +++ b/client_location_add_modal.php @@ -13,21 +13,25 @@
-
+
@@ -44,6 +48,25 @@
+
+ +
+
+ +
+ +
+
+ +
+ + +
+ +
+ +
+
@@ -151,10 +174,10 @@
-
+
- +
diff --git a/client_location_edit_modal.php b/client_location_edit_modal.php index 6ba5c573..0c771bd9 100644 --- a/client_location_edit_modal.php +++ b/client_location_edit_modal.php @@ -15,13 +15,16 @@ @@ -29,7 +32,47 @@
-
+
+ +
+ +
+
+ +
+ +
+
+ > +
+
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ + "> + +
+ +
+ + +
+ +
+ +
@@ -160,16 +203,10 @@
-
- -
- - "> - -
+
- +
diff --git a/client_location_import_modal.php b/client_location_import_modal.php index 1b499b03..42cf942e 100644 --- a/client_location_import_modal.php +++ b/client_location_import_modal.php @@ -10,7 +10,7 @@
-

Format csv file with headings & data:
Name, Address, City, State, Postal Code, Phone, Hours

+

Format csv file with headings & data:
Name, Description, Address, City, State, Postal Code, Phone, Hours

diff --git a/client_locations.php b/client_locations.php index 6745c39d..9b6a489a 100644 --- a/client_locations.php +++ b/client_locations.php @@ -15,7 +15,7 @@ $sql = mysqli_query( "SELECT SQL_CALC_FOUND_ROWS * FROM locations WHERE location_client_id = $client_id AND location_$archive_query - AND (location_name LIKE '%$q%' OR location_address LIKE '%$q%' OR location_phone LIKE '%$phone_query%') + AND (location_name LIKE '%$q%' OR location_description LIKE '%$q%' OR location_address LIKE '%$q%' OR location_phone LIKE '%$phone_query%') ORDER BY location_primary DESC, $sort $order LIMIT $record_from, $record_to" ); @@ -89,6 +89,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); while ($row = mysqli_fetch_array($sql)) { $location_id = intval($row['location_id']); $location_name = nullable_htmlentities($row['location_name']); + $location_description = nullable_htmlentities($row['location_description']); $location_country = nullable_htmlentities($row['location_country']); $location_address = nullable_htmlentities($row['location_address']); $location_city = nullable_htmlentities($row['location_city']); @@ -112,18 +113,28 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $location_contact_id = intval($row['location_contact_id']); $location_primary = intval($row['location_primary']); if ( $location_primary == 1 ) { - $location_primary_display = "

Primary Location

"; + $location_primary_display = " Primary"; } else { $location_primary_display = ""; } ?> - - - - - + + +
+ +
+

+ +
+ + +

+
+
+ + " target="_blank">
 diff --git a/post/client_locations_model.php b/post/client_locations_model.php index 0073ad41..8c9cd80c 100644 --- a/post/client_locations_model.php +++ b/post/client_locations_model.php @@ -1,6 +1,7 @@ fetch_assoc()){ - $lineData = array($row['location_name'], $row['location_address'], $row['location_city'], $row['location_state'], $row['location_zip'], $row['location_phone'], $row['location_hours']); + $lineData = array($row['location_name'], $row['location_description'], $row['location_address'], $row['location_city'], $row['location_state'], $row['location_zip'], $row['location_phone'], $row['location_hours']); fputcsv($f, $lineData, $delimiter); } @@ -258,7 +258,7 @@ if(isset($_POST["import_client_locations_csv"])){ //(Else)Check column count $f = fopen($file_name, "r"); $f_columns = fgetcsv($f, 1000, ","); - if(!$error & count($f_columns) != 7) { + if(!$error & count($f_columns) != 8) { $error = true; $_SESSION['alert_message'] = "Bad column count."; } @@ -278,28 +278,31 @@ if(isset($_POST["import_client_locations_csv"])){ } } if(isset($column[1])){ - $address = sanitizeInput($column[1]); + $description = sanitizeInput($column[1]); } if(isset($column[2])){ - $city = sanitizeInput($column[2]); + $address = sanitizeInput($column[2]); } if(isset($column[3])){ - $state = sanitizeInput($column[3]); + $city = sanitizeInput($column[3]); } if(isset($column[4])){ - $zip = sanitizeInput($column[4]); + $state = sanitizeInput($column[4]); } if(isset($column[5])){ - $phone = preg_replace("/[^0-9]/", '',$column[5]); + $zip = sanitizeInput($column[5]); } if(isset($column[6])){ - $hours = sanitizeInput($column[6]); + $phone = preg_replace("/[^0-9]/", '',$column[6]); + } + if(isset($column[7])){ + $hours = sanitizeInput($column[7]); } // Check if duplicate was detected if($duplicate_detect == 0){ //Add - mysqli_query($mysqli,"INSERT INTO locations SET location_name = '$name', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$phone', location_hours = '$hours', location_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO locations SET location_name = '$name', location_description = '$description', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$phone', location_hours = '$hours', location_client_id = $client_id"); $row_count = $row_count + 1; }else{ $duplicate_count = $duplicate_count + 1; @@ -336,7 +339,7 @@ if(isset($_GET['download_client_locations_csv_template'])){ $f = fopen('php://memory', 'w'); //set column headers - $fields = array('Name', 'Address', 'City', 'State', 'Postal Code', 'Phone', 'Hours'); + $fields = array('Name', 'Description', 'Address', 'City', 'State', 'Postal Code', 'Phone', 'Hours'); fputcsv($f, $fields, $delimiter); //move back to beginning of file