From 38e6575781a5d4df7772ade388da183c7d9a8d7e Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 30 Oct 2014 15:46:32 +1100 Subject: [PATCH] Move first and last name fields to top of shipping address accordion --- app/views/checkout/_shipping.html.haml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/views/checkout/_shipping.html.haml b/app/views/checkout/_shipping.html.haml index 5ba5ed15e4..b535908c53 100644 --- a/app/views/checkout/_shipping.html.haml +++ b/app/views/checkout/_shipping.html.haml @@ -51,9 +51,14 @@ .small-12.columns #ship_address{"ng-if" => "Checkout.requireShipAddress()"} %div.visible{"ng-if" => "!Checkout.ship_address_same_as_billing"} + .row + .small-6.columns + = validated_input "First Name", "order.ship_address.firstname", "ofn-focus" => "accordion['shipping']" + .small-6.columns + = validated_input "Last Name", "order.ship_address.lastname" .row .small-12.columns - = validated_input "Address", "order.ship_address.address1", "ofn-focus" => "accordion['shipping']" + = validated_input "Address", "order.ship_address.address1" .row .small-12.columns = validated_input "Address (contd.)", "order.ship_address.address2", required: false @@ -69,11 +74,7 @@ .small-6.columns.right = sa.select :country_id, available_countries.map{|c|[c.name, c.id]}, "ng-model" => "order.ship_address.country_id", required: true - .row - .small-6.columns - = validated_input "First Name", "order.ship_address.firstname" - .small-6.columns - = validated_input "Last Name", "order.ship_address.lastname" + .row .small-6.columns = validated_input "Phone", "order.ship_address.phone"