From 67922f38df674ffefe9a47ef44b69c12ccca5512 Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Thu, 17 Jul 2014 14:46:46 +1000 Subject: [PATCH] Fixing some regressions to data submission --- .../javascripts/darkswarm/services/checkout.js.coffee | 6 +++--- app/views/checkout/_payment.html.haml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/darkswarm/services/checkout.js.coffee b/app/assets/javascripts/darkswarm/services/checkout.js.coffee index c9e72f9dd9..920c01dad9 100644 --- a/app/assets/javascripts/darkswarm/services/checkout.js.coffee +++ b/app/assets/javascripts/darkswarm/services/checkout.js.coffee @@ -25,10 +25,10 @@ Darkswarm.factory 'Checkout', (CurrentOrder, ShippingMethods, PaymentMethods, $h munged_order["ship_address_attributes"] = value when "payment_method_id" munged_order["payments_attributes"] = [{payment_method_id: value}] - - when "form_state" # don't keep this shit - else + when "shipping_method_id", "payment_method_id", "email" munged_order[name] = value + else + # Ignore everything else if @ship_address_same_as_billing munged_order.ship_address_attributes = munged_order.bill_address_attributes diff --git a/app/views/checkout/_payment.html.haml b/app/views/checkout/_payment.html.haml index 2d1dd2422d..75c04f5e08 100644 --- a/app/views/checkout/_payment.html.haml +++ b/app/views/checkout/_payment.html.haml @@ -34,7 +34,7 @@ "ng-model" => "order.payment_method_id" = method.name - .row{"ng-if" => "order.payment_method_id == method.id"} + .row{"ng-show" => "order.payment_method_id == #{method.id}"} .small-12.columns = render partial: "spree/checkout/payment/#{method.method_type}", :locals => { :payment_method => method }