Fixed an error when changing a stored address

Author: ljl

README.md

@@ -19,6 +19,10 @@ Test cards can be located here: https://stripe.com/docs/testing
 When a order is complete, it can be viewed in admin with shipping details and completion status.
 
 ##Changelog
+### [1.0.6] - 2016-08-24
+#### Fixed
+- Fixed an error when changing a stored address
+
 ### [1.0.5] - 2016-08-24
 #### Added
 - Improved error handling when using wrong card input
@@ -51,9 +55,6 @@ When a order is complete, it can be viewed in admin with shipping details and co
 - Cart connection from Order
 - Stripe API-keys from import
 
-##Known issues
-- Changing a stored address gives payment error on the first payment 
-attempt. The second attempt stores the address and completes the payment
 
 ##Roadmap
 

gradle.properties

@@ -2,7 +2,7 @@
 # Project settings
 #
 group = no.iskald
-version = 1.0.5
+version = 1.0.6
 projectName = store
 appName = no.iskald.payup
 displayName = PayUp! Store

package.json

@@ -1,6 +1,6 @@
 {
   "name": "payup",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "",
   "scripts": {
     "build": "./gradlew build",

src/main/resources/site/lib/contentHelper.js

@@ -81,20 +81,23 @@ function modifyContent(params) {
     if (!params.id) throw "Cannot create content. Missing parameter: id";
     if (!params.editor) throw "Cannot create content. Missing parameter: editor";
     var branch = contextLib.get().branch;
-    return contextLib.run({
+    var modifiedContent;
+    contextLib.run({
         branch: 'draft',
         user: {
             login: 'su',
             userStore: 'system'
         }
     }, function () {
-        var c = contentLib.modify({
+        modifiedContent = contentLib.modify({
             key: params.id,
             editor: params.editor,
             branch: 'draft'
         });
-        publish(c._id, branch);
+
+        publish(modifiedContent._id, branch);
     });
+    return modifiedContent;
 }
 
 function contentCount(params) {

src/main/resources/site/services/checkout/checkout.js

@@ -88,17 +88,12 @@ function getShippingDetails(customer) {
 function getAddress(customer, data) {
     var shippingAddress = {};
     if (customer) {
-        var updatedCustomer = customerLib.updateAddress(customer, data);
-        shippingAddress.name = updatedCustomer.data.name;
-        shippingAddress.address = updatedCustomer.data.address;
-        shippingAddress.zip = updatedCustomer.data.zip;
-        shippingAddress.city = updatedCustomer.data.city;
-    } else {
-        shippingAddress.name = data.name;
-        shippingAddress.address = data.address;
-        shippingAddress.zip = data.zip;
-        shippingAddress.city = data.city;
+        customerLib.updateAddress(customer, data);
     }
+    shippingAddress.name = data.name;
+    shippingAddress.address = data.address;
+    shippingAddress.zip = data.zip;
+    shippingAddress.city = data.city;
 
     return shippingAddress;
 }