diff --git a/assets/js/scripts.js b/assets/js/scripts.js index 8677b89..039dc93 100644 --- a/assets/js/scripts.js +++ b/assets/js/scripts.js @@ -22,8 +22,8 @@ jQuery('document').ready(function ($) { $('#' + $(this).attr('id') + '-answer').text($(this).val()); }); - $('#price_min,#price_max,#num_baths,#num_beds').each(function () { - var numbers_comma = /^[0-9,]*$/; + $('#price').each(function () { + var numbers_comma = /^[0-9,$+-]*$/; if (!numbers_comma.test($(this).val())) { var label = $("label[for='" + $(this).attr('id') + "']").text(); diff --git a/assets/vendor/composer/autoload_classmap.php b/assets/vendor/composer/autoload_classmap.php index 4e7ef2c..0d82373 100644 --- a/assets/vendor/composer/autoload_classmap.php +++ b/assets/vendor/composer/autoload_classmap.php @@ -6,7 +6,7 @@ $baseDir = dirname($vendorDir); return array( - 'ColdTurkey\\HouseHunter\\FrontDesk' => $baseDir . '/../classes/class-frontdesk.php', - 'ColdTurkey\\HouseHunter\\HouseHunter' => $baseDir . '/../classes/class-homes-report.php', - 'ColdTurkey\\HouseHunter\\HouseHunter_Admin' => $baseDir . '/../classes/class-homes-report-admin.php', + 'ColdTurkey\\HomesReport\\FrontDesk' => $baseDir . '/../classes/class-frontdesk.php', + 'ColdTurkey\\HomesReport\\HomesReport' => $baseDir . '/../classes/class-homes-report.php', + 'ColdTurkey\\HomesReport\\HomesReport_Admin' => $baseDir . '/../classes/class-homes-report-admin.php', ); diff --git a/classes/class-homes-report-admin.php b/classes/class-homes-report-admin.php index b86adec..0ff8178 100755 --- a/classes/class-homes-report-admin.php +++ b/classes/class-homes-report-admin.php @@ -275,8 +275,6 @@ public function leads_page() Email Location Price Range - # Beds - # Baths Submitted @@ -294,9 +292,7 @@ public function leads_page() ' . $lead->first_name . ' ' . $lead->email . ' ' . $lead->location . ' - $' . number_format( $lead->price_min ) . ' - $' . number_format( $lead->price_max ) . ' - ' . $lead->num_beds . ' - ' . $lead->num_baths . ' + ' . $lead->price_range . ' ' . date( "M j Y, h:i:a", strtotime( $lead->created_at ) ) . ' '; } @@ -309,8 +305,6 @@ public function leads_page() Email Location Price Range - # Beds - # Baths Submitted diff --git a/classes/class-homes-report.php b/classes/class-homes-report.php index 172bfab..1b2186c 100755 --- a/classes/class-homes-report.php +++ b/classes/class-homes-report.php @@ -157,10 +157,7 @@ public function build_database_table() `first_name` varchar(255) DEFAULT NULL, `email` varchar(255) DEFAULT NULL, `location` varchar(255) NOT NULL, - `price_min` varchar(255) DEFAULT NULL, - `price_max` varchar(20) DEFAULT NULL, - `num_beds` int(10) DEFAULT NULL, - `num_baths` int(10) DEFAULT NULL, + `price_range` varchar(255) DEFAULT NULL, `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`) ) $charset_collate;"; @@ -284,6 +281,11 @@ public function meta_box_content($post, $meta) $html .= ''; $html .= '

' . $v['description'] . '

' . "\n"; $html .= '' . "\n"; + } elseif ($type == 'textarea') { + $html .= ''; + $html .= ''; + $html .= '

' . $v['description'] . '

' . "\n"; + $html .= '' . "\n"; } elseif ($type == 'posts') { $html .= ''; $html .= ' + + -
-
- - -
- - -
- $ - -
-
-
-
- - -
- - -
- $ - -
-
-
-
- -
-
- - -
-
- - -
-
+
+ + +
@@ -168,9 +144,7 @@