From e89184de02540e2b0b1dba7b804df8db082c99fb Mon Sep 17 00:00:00 2001 From: Lynne Davis Date: Fri, 14 Nov 2014 14:24:22 +0000 Subject: [PATCH 1/3] 286: Last sneaky dollar sign. Updated to use spree_number_to_currency --- app/views/spree/order_mailer/confirm_email.text.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/spree/order_mailer/confirm_email.text.haml b/app/views/spree/order_mailer/confirm_email.text.haml index c9ad50fb63..719201b6ae 100644 --- a/app/views/spree/order_mailer/confirm_email.text.haml +++ b/app/views/spree/order_mailer/confirm_email.text.haml @@ -9,7 +9,7 @@ Order for: #{@order.bill_address.full_name} - @order.line_items.each do |item| #{item.variant.sku} #{raw(item.variant.product.supplier.name)} #{raw(item.variant.product.name)} #{raw(item.variant.options_text)} (QTY: #{item.quantity}) @ #{item.single_money} = #{item.display_amount} ============================================================ -Subtotal: #{number_to_currency checkout_cart_total_with_adjustments(@order)} +Subtotal: #{spree_number_to_currency checkout_cart_total_with_adjustments(@order)} - checkout_adjustments_for_summary(@order, exclude: [:distribution]).each do |adjustment| #{raw(adjustment.label)} #{adjustment.display_amount} Order Total: #{@order.display_total} From cc0da142b72291c0452260a6618c6d47892e2244 Mon Sep 17 00:00:00 2001 From: Lynne Davis Date: Tue, 18 Nov 2014 19:28:49 +0000 Subject: [PATCH 2/3] 267: Adding to new product form ability to add shipping category to record frozen/chilled --- .../spree/admin/products/new/replace_form.html.haml.deface | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/overrides/spree/admin/products/new/replace_form.html.haml.deface b/app/overrides/spree/admin/products/new/replace_form.html.haml.deface index 7c627eec4e..be664baf5b 100644 --- a/app/overrides/spree/admin/products/new/replace_form.html.haml.deface +++ b/app/overrides/spree/admin/products/new/replace_form.html.haml.deface @@ -36,8 +36,10 @@ = f.label :product_variant_unit_name, t(:unit_name) %input.fullwidth{ id: 'product_variant_unit_name','ng-model' => 'product.variant_unit_name', :name => 'product[variant_unit_name]', :placeholder => 'eg. bunches', :type => 'text' } .twelve.columns.alpha - .six.columns.alpha + .three.columns.alpha = render 'spree/admin/products/primary_taxon_form', f: f + .three.columns.alpha + = render 'spree/admin/products/shipping_category_form', f: f .three.columns = f.field_container :price do = f.label :price, t(:price) From b81bf60dc2c4d7e7e46cca7774631c29e15bdebe Mon Sep 17 00:00:00 2001 From: Lynne Davis Date: Tue, 18 Nov 2014 19:30:44 +0000 Subject: [PATCH 3/3] 267: Cont. Didn't realise commit -a doesn't add a file --- .../spree/admin/products/_shipping_category_form.html.haml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 app/views/spree/admin/products/_shipping_category_form.html.haml diff --git a/app/views/spree/admin/products/_shipping_category_form.html.haml b/app/views/spree/admin/products/_shipping_category_form.html.haml new file mode 100644 index 0000000000..8460f2c32b --- /dev/null +++ b/app/views/spree/admin/products/_shipping_category_form.html.haml @@ -0,0 +1,4 @@ += f.field_container :shipping_categories do + = f.label :shipping_category_id, t(:shipping_categories) + = f.collection_select(:shipping_category_id, Spree::ShippingCategory.all, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth'}) + = f.error_message_on :shipping_category_id