From 1c98f10c2056d3a33df3cedc4ec5b28feea06c0f Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Wed, 14 May 2014 11:08:21 +1000 Subject: [PATCH] Adding indexing by user id --- .../controllers/checkout/checkout_controller.js.coffee | 2 +- app/views/checkout/_order.rabl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/darkswarm/controllers/checkout/checkout_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/checkout/checkout_controller.js.coffee index 7eddc75035..64f0184e98 100644 --- a/app/assets/javascripts/darkswarm/controllers/checkout/checkout_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/checkout/checkout_controller.js.coffee @@ -1,6 +1,6 @@ Darkswarm.controller "CheckoutCtrl", ($scope, storage, CheckoutFormState, Order, CurrentUser) -> $scope.Order = Order - storage.bind $scope, "Order.order", {storeName: "order_#{Order.order.id}"} + storage.bind $scope, "Order.order", {storeName: "order_#{Order.order.id}#{Order.order.user_id}"} $scope.order = Order.order # Ordering is important $scope.enabled = if CurrentUser then true else false diff --git a/app/views/checkout/_order.rabl b/app/views/checkout/_order.rabl index 93575facab..9903795493 100644 --- a/app/views/checkout/_order.rabl +++ b/app/views/checkout/_order.rabl @@ -1,5 +1,5 @@ object current_order -attributes :id, :email, :shipping_method_id +attributes :id, :email, :shipping_method_id, :user_id node :display_total do current_order.display_total.money.to_f