From 02e5333101f4d3f829402738a9a972d02b151970 Mon Sep 17 00:00:00 2001
From: Nick Peelman <nick@peelman.us>
Date: Wed, 27 Nov 2013 08:21:12 -0500
Subject: [PATCH 1/3] Add address fields to Location edit form

---
 app/models/Location.php                    |  4 +++-
 app/views/backend/locations/edit.blade.php | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/models/Location.php b/app/models/Location.php
index 22e55e4b12..a7053358b1 100644
--- a/app/models/Location.php
+++ b/app/models/Location.php
@@ -7,10 +7,12 @@ class Location extends Elegant {
 	protected $table = 'locations';
 	protected $rules = array(
 			'name'  		=> 'required|alpha_space|min:3',
+			'address'		=> 'required|alpha_space|min:5',
+			'address2'		=> 'optional|alpha_space|min:5',
 			'city'   		=> 'required|alpha_space|min:3',
 			'state'   		=> 'required|alpha|min:2|max:2',
 			'country'   	=> 'required|alpha|min:2|max:2',
-			'zip'   => 'alpha_dash|min:5',
+			'zip'   		=> 'alpha_dash|min:5',
 		);
 
 	public function has_users()
diff --git a/app/views/backend/locations/edit.blade.php b/app/views/backend/locations/edit.blade.php
index f4d1ebe5bc..d7f1c39c8f 100755
--- a/app/views/backend/locations/edit.blade.php
+++ b/app/views/backend/locations/edit.blade.php
@@ -45,6 +45,20 @@
 					{{ $errors->first('name', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>
+			<div class="control-group {{ $errors->has('address') ? 'error' : '' }}">
+				<label class="control-label" for="address">Street Address 1</label>
+				<div class="controls">
+					<input class="span4" type="text" name="address" id="address" value="{{ Input::old('address', $location->address) }}" />
+					{{ $errors->first('address', '<span class="help-inline">:message</span>') }}
+				</div>
+			</div>
+			<div class="control-group {{ $errors->has('address2') ? 'error' : '' }}">
+				<label class="control-label" for="address2">Street Address 2</label>
+				<div class="controls">
+					<input class="span4" type="text" name="address2" id="address2" value="{{ Input::old('address2', $location->address2) }}" />
+					{{ $errors->first('address2', '<span class="help-inline">:message</span>') }}
+				</div>
+			</div>
 			<div class="control-group {{ $errors->has('city') ? 'error' : '' }}">
 				<label class="control-label" for="name">City</label>
 				<div class="controls">

From bed78dd935cc5b95995b4296bf75c4c4d05c1193 Mon Sep 17 00:00:00 2001
From: Nick Peelman <nick@peelman.us>
Date: Wed, 27 Nov 2013 08:28:00 -0500
Subject: [PATCH 2/3] Remove erroneous rule from address2

---
 app/models/Location.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/Location.php b/app/models/Location.php
index a7053358b1..922207ce21 100644
--- a/app/models/Location.php
+++ b/app/models/Location.php
@@ -8,7 +8,7 @@ class Location extends Elegant {
 	protected $rules = array(
 			'name'  		=> 'required|alpha_space|min:3',
 			'address'		=> 'required|alpha_space|min:5',
-			'address2'		=> 'optional|alpha_space|min:5',
+			'address2'		=> 'alpha_space|min:5',
 			'city'   		=> 'required|alpha_space|min:3',
 			'state'   		=> 'required|alpha|min:2|max:2',
 			'country'   	=> 'required|alpha|min:2|max:2',

From 1314a1ffea48e768c502a7c073ffbc4c96b5b722 Mon Sep 17 00:00:00 2001
From: Nick Peelman <nick@peelman.us>
Date: Wed, 27 Nov 2013 08:30:51 -0500
Subject: [PATCH 3/3] Add location address values to controller save methods...

---
 app/controllers/admin/LocationsController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/controllers/admin/LocationsController.php b/app/controllers/admin/LocationsController.php
index a788205b50..4bb3716f5f 100644
--- a/app/controllers/admin/LocationsController.php
+++ b/app/controllers/admin/LocationsController.php
@@ -63,6 +63,8 @@ class LocationsController extends AdminController {
 
 			// Save the location data
 			$location->name            	= e(Input::get('name'));
+			$location->address			= e(Input::get('address'));
+			$location->address2			= e(Input::get('address2'));
 			$location->city    			= e(Input::get('city'));
 			$location->state    		= e(Input::get('state'));
 			$location->country    		= e(Input::get('country'));
@@ -139,6 +141,8 @@ class LocationsController extends AdminController {
 
 			// Update the location data
 			$location->name            	= e(Input::get('name'));
+			$location->address			= e(Input::get('address'));
+			$location->address2			= e(Input::get('address2'));
 			$location->city    			= e(Input::get('city'));
 			$location->state    		= e(Input::get('state'));
 			$location->country    		= e(Input::get('country'));