From 541fe9ec37632154fceb973c7c9f29c00a8f80e1 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 17 Jul 2014 14:26:54 +1000
Subject: [PATCH] Switching Checkout service to use CurrentOrder

---
 app/assets/javascripts/darkswarm/services/checkout.js.coffee  | 4 ++--
 app/views/checkout/_payment.html.haml                         | 1 +
 .../unit/darkswarm/services/checkout_spec.js.coffee           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/services/checkout.js.coffee b/app/assets/javascripts/darkswarm/services/checkout.js.coffee
index 4d0a6de5ec..c9e72f9dd9 100644
--- a/app/assets/javascripts/darkswarm/services/checkout.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/checkout.js.coffee
@@ -1,8 +1,8 @@
-Darkswarm.factory 'Checkout', (Order, ShippingMethods, PaymentMethods, $http, Navigation, CurrentHub, RailsFlashLoader, Loading)->
+Darkswarm.factory 'Checkout', (CurrentOrder, ShippingMethods, PaymentMethods, $http, Navigation, CurrentHub, RailsFlashLoader, Loading)->
   new class Checkout
     errors: {}
     secrets: {}
-    order: Order.order
+    order: CurrentOrder.order
     ship_address_same_as_billing: true
 
     submit: ->
diff --git a/app/views/checkout/_payment.html.haml b/app/views/checkout/_payment.html.haml
index 789127a39b..2d1dd2422d 100644
--- a/app/views/checkout/_payment.html.haml
+++ b/app/views/checkout/_payment.html.haml
@@ -24,6 +24,7 @@
               %i.ofn-i_005-caret-down 
 
       -# TODO render this in Angular instead of server-side
+      -# The problem being how to render the partials
       - current_order.available_payment_methods.each do |method|
         .row
           .small-12.columns
diff --git a/spec/javascripts/unit/darkswarm/services/checkout_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/checkout_spec.js.coffee
index 73f6b9a342..e3ba3f51de 100644
--- a/spec/javascripts/unit/darkswarm/services/checkout_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/checkout_spec.js.coffee
@@ -39,10 +39,10 @@ describe 'Checkout service', ->
       ship_address: {test: "bar"}
       user_id: 901
 
-    angular.module('Darkswarm').value('order', orderData)
     module 'Darkswarm'
     module ($provide)->
       $provide.value "RailsFlashLoader", FlashLoaderMock 
+      $provide.value "currentOrder", orderData 
       $provide.value "shippingMethods", shippingMethods 
       $provide.value "paymentMethods", paymentMethods 
       null