From 2d9be9ea06958c579d765c07a0ab440064982f3e Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 11 Apr 2014 17:49:51 +1000
Subject: [PATCH] Fixing the scope issue

---
 .../darkswarm/controllers/checkout_controller.js.coffee    | 7 ++++++-
 app/views/shop/checkout/_form.html.haml                    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/controllers/checkout_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/checkout_controller.js.coffee
index d7ce700b9c..585fa6dc3f 100644
--- a/app/assets/javascripts/darkswarm/controllers/checkout_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/checkout_controller.js.coffee
@@ -1,6 +1,12 @@
 Darkswarm.controller "CheckoutCtrl", ($scope, Order, storage, CheckoutFormState) ->
+
+  # We put Order.order into the scope for convenience
+  # However, storage.bind replaces Order.order
+  # So we must put Order.order into the scope AFTER it's bound to localStorage
   $scope.Order = Order
+  storage.bind $scope, "Order.order", {storeName: "order_#{Order.order.id}"}
   $scope.order = Order.order
+
   $scope.CheckoutFormState = CheckoutFormState
   #$scope.order = Order.order 
   $scope.accordion = {}
@@ -15,7 +21,6 @@ Darkswarm.controller "CheckoutCtrl", ($scope, Order, storage, CheckoutFormState)
   storage.bind $scope, "accordion.payment"
 
   storage.bind $scope, "CheckoutFormState.ship_address_same_as_billing", { defaultValue: true}
-  storage.bind $scope, "order", {storeName: "order_#{$scope.order.id}"}
 
   $scope.purchase = (event)->
     event.preventDefault()
diff --git a/app/views/shop/checkout/_form.html.haml b/app/views/shop/checkout/_form.html.haml
index a93b118ff1..a198213397 100644
--- a/app/views/shop/checkout/_form.html.haml
+++ b/app/views/shop/checkout/_form.html.haml
@@ -8,7 +8,7 @@
     angular.module('Darkswarm').value('order', #{render "shop/checkout/order"})
 
   -#%pre
-    -#{{ order | json }}
+    -#{{ Order.order == order }}
 
   .large-12.columns
     = render partial: "shop/checkout/details", locals: {f: f}