2 files changed, 25 insertions, 2 deletions
diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/AddressView.js b/StoneIsland/platforms/ios/www/js/lib/nav/AddressView.js
index 31e9d802..ad5745fb 100644
--- a/StoneIsland/platforms/ios/www/js/lib/nav/AddressView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/nav/AddressView.js
@@ -6,6 +6,7 @@ var AddressView = SerializableView.extend({
   disabled: false,
   
   events: {
+    "change [name=Province]": 'update_country',
   },
   
   initialize: function(opt){
@@ -22,6 +23,7 @@ var AddressView = SerializableView.extend({
     data.Address2 = address[1]
     this.$(".address input").val("")
     this.load_data(data)
+    this.update_country()
   },
   
   validate_presence: {
@@ -43,8 +45,22 @@ var AddressView = SerializableView.extend({
     delete data.Address2
   },
 
+  update_country: function(){
+    var state = this.$("[name=Province]").val()
+      console.log(state)
+    if (CANADIAN_LOOKUP[state]) {
+      this.$(".country-label").html("CANADA")
+    }
+    else {
+      this.$(".country-label").html("UNITED STATES")
+    }
+  },
+
 })
 
+var CANADIAN_PROVINCES = "AB BC MB NB NL NS NT NU ON PE SK QC YT".split(" ")
+var CANADIAN_LOOKUP = {}
+CANADIAN_PROVINCES.forEach(function(k){ CANADIAN_LOOKUP[k] = true })
 
 var COUNTRIES = [
   ['Country Name', 'NONE'],
diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/CreditCardView.js b/StoneIsland/platforms/ios/www/js/lib/nav/CreditCardView.js
index 1855b7a9..ba3ac54a 100644
--- a/StoneIsland/platforms/ios/www/js/lib/nav/CreditCardView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/nav/CreditCardView.js
@@ -4,7 +4,7 @@ var CreditCardView = SerializableView.extend({
   template: $("#creditcard_template").html(),
   
   cardOptions: {
-    accept: ['visa', 'mastercard', 'amex'],
+    accept: ['visa', 'mastercard', 'amex', 'jcb'],
   },
   
   events: {
@@ -46,8 +46,15 @@ var CreditCardView = SerializableView.extend({
     if (! data.ExpirationYear || data.ExpirationYear == "NONE") { errors.push([ "ExpirationYear", "Please select the expiration month." ]) }
     data.UserId = auth.user_id
     if (card.valid) {
-      data.Type = card.card_type.name
+      data.Type = YOOX_CREDIT_CARD_NAME_LOOKUP[ card.card_type.name ]
     }
   },
 
 })
+
+var YOOX_CREDIT_CARD_NAME_LOOKUP = {
+  "visa": "Visa",
+  "mastercard": "Mastercard",
+  "amex": "AmericanExpress",
+  "jcb": "JCB",
+}