Merge pull request #5 from liftforward/feature/two-digit-state-codes

replacing state list with hashes of 2 digit state and province codes
liftforward · Nov 3, 2017 · 8f2d830 · 8f2d830
2 parents 00f2d2c + d78f22a
commit 8f2d830
Showing 1 changed file with 66 additions and 67 deletions.
diff --git a/addon/mixins/lift-enums.js b/addon/mixins/lift-enums.js
@@ -28,76 +28,77 @@ export default Mixin.create({
       locale: 'en',
       flagSrc: '/assets/flags/United-States.png',
       states: [
-        "Alabama",
-        "Alaska",
-        "Arizona",
-        "Arkansas",
-        "California",
-        "Colorado",
-        "Connecticut",
-        "Delaware",
-        "District Of Columbia",
-        "Florida",
-        "Georgia",
-        "Hawaii",
-        "Idaho",
-        "Illinois",
-        "Indiana",
-        "Iowa",
-        "Kansas",
-        "Kentucky",
-        "Louisiana",
-        "Maine",
-        "Maryland",
-        "Massachusetts",
-        "Michigan",
-        "Minnesota",
-        "Mississippi",
-        "Missouri",
-        "Montana",
-        "Nebraska",
-        "Nevada",
-        "New Hampshire",
-        "New Jersey",
-        "New Mexico",
-        "New York",
-        "North Carolina",
-        "North Dakota",
-        "Ohio",
-        "Oklahoma",
-        "Oregon",
-        "Pennsylvania",
-        "Rhode Island",
-        "South Carolina",
-        "South Dakota",
-        "Tennessee",
-        "Texas",
-        "Utah",
-        "Vermont",
-        "Virginia",
-        "Washington",
-        "West Virginia",
-        "Wisconsin",
-        "Wyoming"
+        { id: "AL", name: "Alabama" },
+        { id: "AK", name: "Alaska" },
+        { id: "AZ", name: "Arizona" },
+        { id: "AR", name: "Arkansas" },
+        { id: "CA", name: "California" },
+        { id: "CO", name: "Colorado" },
+        { id: "CT", name: "Connecticut" },
+        { id: "DE", name: "Delaware" },
+        { id: "DC", name: "District Of Columbia" },
+        { id: "FL", name: "Florida" },
+        { id: "GA", name: "Georgia" },
+        { id: "HI", name: "Hawaii" },
+        { id: "ID", name: "Idaho" },
+        { id: "IL", name: "Illinois" },
+        { id: "IN", name: "Indiana" },
+        { id: "IA", name: "Iowa" },
+        { id: "KS", name: "Kansas" },
+        { id: "KY", name: "Kentucky" },
+        { id: "LA", name: "Louisiana" },
+        { id: "ME", name: "Maine" },
+        { id: "MD", name: "Maryland" },
+        { id: "MA", name: "Massachusetts" },
+        { id: "MI", name: "Michigan" },
+        { id: "MN", name: "Minnesota" },
+        { id: "MS", name: "Mississippi" },
+        { id: "MO", name: "Missouri" },
+        { id: "MT", name: "Montana" },
+        { id: "NE", name: "Nebraska" },
+        { id: "NV", name: "Nevada" },
+        { id: "NH", name: "New Hampshire" },
+        { id: "NJ", name: "New Jersey" },
+        { id: "NM", name: "New Mexico" },
+        { id: "NY", name: "New York" },
+        { id: "NC", name: "North Carolina" },
+        { id: "ND", name: "North Dakota" },
+        { id: "OH", name: "Ohio" },
+        { id: "OK", name: "Oklahoma" },
+        { id: "OR", name: "Oregon" },
+        { id: "PA", name: "Pennsylvania" },
+        { id: "RI", name: "Rhode Island" },
+        { id: "SC", name: "South Carolina" },
+        { id: "SD", name: "South Dakota" },
+        { id: "TN", name: "Tennessee" },
+        { id: "TX", name: "Texas" },
+        { id: "UT", name: "Utah" },
+        { id: "VT", name: "Vermont" },
+        { id: "VA", name: "Virginia" },
+        { id: "WA", name: "Washington" },
+        { id: "WV", name: "West Virginia" },
+        { id: "WI", name: "Wisconsin" },
+        { id: "WY", name: "Wyoming" }
       ]
     },
     ca: {
       currency: 'CAD',
       locale: 'en-ca',
       flagSrc: '/assets/flags/Canada.png',
       states: [
-        "Alberta",
-        "British Columbia",
-        "Manitoba",
-        "New Brunswick",
-        "Newfoundland",
-        "Northwest Territories",
-        "Nova Scotia",
-        "Ontario",
-        "Prince Edward Island",
-        "Quebec",
-        "Saskatchewan",
-        "Yukon"
+        { id: "AB", name: "Alberta" },
+        { id: "BC", name: "British Columbia" },
+        { id: "MB", name: "Manitoba" },
+        { id: "NB", name: "New Brunswick" },
+        { id: "NL", name: "Newfoundland and Labrador" },
+        { id: "NS", name: "Nova Scotia" },
+        { id: "NT", name: "Northwest Territories" },
+        { id: "NU", name: "Nunavut" },
+        { id: "ON", name: "Ontario" },
+        { id: "PE", name: "Prince Edward Island" },
+        { id: "QC", name: "Québec" },
+        { id: "SK", name: "Saskatchewan" },
+        { id: "YT", name: "Yukon" }
       ]
     },
     uk: {
@@ -140,7 +141,6 @@ export default Mixin.create({
     "III",
     "IV"
   ],
-
   bankruptcyOptions: [
     {label: "yes", value: 'true'},
     {label: "no", value: 'false'}
@@ -152,10 +152,10 @@ export default Mixin.create({
     return this.getOptions("guarantorRoles");
   }),
   localesCaStatesOptions: computed('locales.ca.states', function () {
-    return this.getOptions('locales.ca.states');
+    return this.get('locales.ca.states');
   }),
   localesUsStatesOptions: computed('locales.us.states', function () {
-    return this.getOptions('locales.us.states');
+    return this.get('locales.us.states');
   }),
   suffixesOptions: computed('suffixes', function () {
     return this.getOptions('suffixes');
@@ -170,4 +170,3 @@ export default Mixin.create({
     return this.getOptions('purposeOfFundsList');
   })
 });
-