feat(tax): datatable now supports key/value pairs again

Author: daftspunk

models/Tax.php

@@ -401,25 +401,41 @@ public function getDataTableOptions($attribute, $field, $data)
      */
     protected function getCountryList($term)
     {
-        $codes = Country::applyEnabled()->lists('code');
+        $result = ['*' => __("* - Any Country")];
 
-        return array_merge(['*'], $codes);
+        $countries = Country::applyEnabled()->lists('name', 'code');
+
+        foreach ($countries as $code => $name) {
+            $result[$code] = $code .' - ' . $name;
+        }
+
+        return $result;
     }
 
     /**
      * getStateList
      */
     protected function getStateList($countryCode, $term)
     {
+        $result = ['*' => __("* - Any State")];
+
         if (!$countryCode || $countryCode == '*') {
-            return ['*'];
+            return $result;
         }
 
-        $codes = State::whereHas('country', function($query) use ($countryCode) {
-            $query->where('code', $countryCode);
-        })->limit(10)->lists('code');
+        if ($countryCode) {
+            $states = State::whereHas('country', function($query) use ($countryCode) {
+                $query->where('code', $countryCode);
+            });
+        }
+
+        $states = $states->limit(10)->lists('name', 'code');
 
-        return array_merge(['*'], $codes);
+        foreach ($states as $code => $name) {
+            $result[$code] = $code .' - ' . $name;
+        }
+
+        return $result;
     }
 
     /**