From df660ff53608e307d75c7f4477a704bf692f0a01 Mon Sep 17 00:00:00 2001 From: Rob H Date: Thu, 19 Jun 2014 16:34:28 +1000 Subject: [PATCH] Adding shipping method description to checkout --- app/views/checkout/_order.rabl | 3 +- app/views/checkout/_shipping.html.haml | 93 +++++++++++++------------- 2 files changed, 49 insertions(+), 47 deletions(-) diff --git a/app/views/checkout/_order.rabl b/app/views/checkout/_order.rabl index af37d2edf1..a4a7673c62 100644 --- a/app/views/checkout/_order.rabl +++ b/app/views/checkout/_order.rabl @@ -25,7 +25,8 @@ node :shipping_methods do [method.id, { require_ship_address: method.require_ship_address, price: method.compute_amount(current_order).to_f, - name: method.name + name: method.name, + description: method.description }] }] end diff --git a/app/views/checkout/_shipping.html.haml b/app/views/checkout/_shipping.html.haml index 8c88acf02a..410fef7e2d 100644 --- a/app/views/checkout/_shipping.html.haml +++ b/app/views/checkout/_shipping.html.haml @@ -23,54 +23,55 @@ %span.accordion-down.right %i.ofn-i_005-caret-down - - for ship_method, i in current_distributor.shipping_methods.uniq - .row - .small-12.columns - %label - -#= radio_button_tag "order[shipping_method_id]", ship_method.id, false, - -#"ng-model" => "order.shipping_method_id" - %input{type: :radio, value: ship_method.id, - required: true, - "ng-model" => "order.shipping_method_id"} - = ship_method.name - - #distributor_address.panel{"ng-show" => "!Order.requireShipAddress()"} - = @order.distributor.distributor_info.andand.html_safe - = @order.order_cycle.pickup_time_for(@order.distributor) - = @order.order_cycle.pickup_instructions_for(@order.distributor) + .small-12.columns.medium-6.columns.large-6.columns + - for ship_method, i in current_distributor.shipping_methods.uniq + %label + -#= radio_button_tag "order[shipping_method_id]", ship_method.id, false, + -#"ng-model" => "order.shipping_method_id" + %input{type: :radio, value: ship_method.id, + required: true, + "ng-model" => "order.shipping_method_id"} + = ship_method.name + %label{"ng-if" => "Order.requireShipAddress()"} + %input{type: :checkbox, "ng-model" => "Order.ship_address_same_as_billing"} + Shipping address same as billing address? + .small-12.columns.medium-6.columns.large-6.columns + #distributor_address.panel{"ng-show" => "Order.shippingMethod().description"} + %span{ style: "white-space: pre-wrap;" }{{ Order.shippingMethod().description }} + %br/ + %br/ + = 'Ready for:' if @order.order_cycle.pickup_time_for(@order.distributor) + = @order.order_cycle.pickup_time_for(@order.distributor) = f.fields_for :ship_address, @order.ship_address do |sa| - #ship_address{"ng-if" => "Order.requireShipAddress()"} - %label - %input{type: :checkbox, "ng-model" => "Order.ship_address_same_as_billing"} - Shipping address same as billing address? - - %div.visible{"ng-if" => "!Order.ship_address_same_as_billing"} - .row - .small-12.columns - = validated_input "Address", "order.ship_address.address1", "ofn-focus" => "accordion['shipping']" - .row - .small-12.columns - = validated_input "Address (contd.)", "order.ship_address.address2", required: false - .row - .small-6.columns - = validated_input "City", "order.ship_address.city" - .small-6.columns - = sa.select :state_id, @order.shipping_address.country.states.map{|c|[c.name, c.id]} - .row - .small-6.columns - = validated_input "Postcode", "order.ship_address.zipcode" - .small-6.columns.right - = sa.select :country_id, available_countries.map{|c|[c.name, c.id]}, - {include_blank: false} - .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" + .small-12.columns + #ship_address{"ng-if" => "Order.requireShipAddress()"} + %div.visible{"ng-if" => "!Order.ship_address_same_as_billing"} + .row + .small-12.columns + = validated_input "Address", "order.ship_address.address1", "ofn-focus" => "accordion['shipping']" + .row + .small-12.columns + = validated_input "Address (contd.)", "order.ship_address.address2", required: false + .row + .small-6.columns + = validated_input "City", "order.ship_address.city" + .small-6.columns + = sa.select :state_id, @order.shipping_address.country.states.map{|c|[c.name, c.id]} + .row + .small-6.columns + = validated_input "Postcode", "order.ship_address.zipcode" + .small-6.columns.right + = sa.select :country_id, available_countries.map{|c|[c.name, c.id]}, + {include_blank: false} + .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" .row .small-12.columns.text-right %button.primary{"ng-disabled" => "shipping.$invalid", "ng-click" => "next($event)", "ofn-focus" => "accordion['shipping']"} Next