diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php index 4d1ebc4ee..e8589b62c 100755 --- a/app/Http/Controllers/LocationsController.php +++ b/app/Http/Controllers/LocationsController.php @@ -318,7 +318,7 @@ class LocationsController extends Controller $locations = $locations->OrderParent($order); break; default: - $allowed_columns = ['id','name','address','city','state','country','currency']; + $allowed_columns = ['id','name','address','city','state','country','currency','zip']; $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at'; $locations = $locations->orderBy($sort, $order); @@ -344,6 +344,7 @@ class LocationsController extends Controller 'address' => ($location->address) ? e($location->address): '', 'city' => e($location->city), 'state' => e($location->state), + 'zip' => e($location->zip), 'country' => e($location->country), 'currency' => e($location->currency), 'actions' => $actions diff --git a/resources/views/locations/index.blade.php b/resources/views/locations/index.blade.php index eed041a2f..87df061d9 100755 --- a/resources/views/locations/index.blade.php +++ b/resources/views/locations/index.blade.php @@ -41,6 +41,9 @@