From fe0bb49bafcdc046ca6e06eb365c8a6a241e7149 Mon Sep 17 00:00:00 2001
From: Rob Harrington <oeoeaio@gmail.com>
Date: Thu, 20 Nov 2014 12:06:53 +1100
Subject: [PATCH] WIP: Adding templates for different order confirmation emails

---
 app/mailers/spree/order_mailer_decorator.rb   |   3 +
 .../confirm_email_for_customer.html.haml      | 178 ++++++++++++++++++
 .../confirm_email_for_shop.html.haml          | 139 ++++++++++++++
 3 files changed, 320 insertions(+)
 create mode 100644 app/views/spree/order_mailer/confirm_email_for_customer.html.haml
 create mode 100644 app/views/spree/order_mailer/confirm_email_for_shop.html.haml

diff --git a/app/mailers/spree/order_mailer_decorator.rb b/app/mailers/spree/order_mailer_decorator.rb
index 324e3e7ef9..e2c63257ae 100644
--- a/app/mailers/spree/order_mailer_decorator.rb
+++ b/app/mailers/spree/order_mailer_decorator.rb
@@ -1,7 +1,10 @@
 Spree::OrderMailer.class_eval do
+  layout 'mailer'
+  helper Spree::MailerHelper
   helper HtmlHelper
   helper CheckoutHelper
   helper SpreeCurrencyHelper
+
   def confirm_email_for_customer(order, resend = false)
     find_order(order) # Finds an order instance from an id
     subject = (resend ? "[#{t(:resend).upcase}] " : '')
diff --git a/app/views/spree/order_mailer/confirm_email_for_customer.html.haml b/app/views/spree/order_mailer/confirm_email_for_customer.html.haml
new file mode 100644
index 0000000000..50816370e5
--- /dev/null
+++ b/app/views/spree/order_mailer/confirm_email_for_customer.html.haml
@@ -0,0 +1,178 @@
+%h3{:style => "margin: 0;padding: 0;font-family: \"HelveticaNeue-Light\", \"Helvetica Neue Light\", \"Helvetica Neue\", Helvetica, Arial, \"Lucida Grande\", sans-serif;line-height: 1.1;margin-bottom: 15px;color: #000;font-weight: 500;font-size: 27px;"}
+  = "Hi #{@order.bill_address.firstname},"
+%table.social.white-bg{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;background-color: white!important;width: 100%;border: 1px solid  #ebebeb;", :width => "100%"}
+  %tr{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+    %td{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+      / column 1
+      %table.column{:align => "left", :style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;width: 280px;float: left;min-width: 279px;"}
+        %tr{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+          %td{:style => "margin: 0;padding: 15px;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+            %p{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 10px;font-weight: normal;font-size: 14px;line-height: 1.6;"}
+              %strong{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+                = "Order confirmation ##{@order.number}"
+            %p{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 10px;font-weight: normal;font-size: 14px;line-height: 1.6;"}
+              Thanks for shopping on
+              %strong= "#{Spree::Config.site_name}."
+              Here are your order details from
+              %strong= "#{@order.distributor.name}."
+      / /column 1
+      / column 2
+      %table.column{:align => "left", :style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;width: 280px;float: left;min-width: 279px;"}
+        %tr{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+          %td{:style => "margin: 0;padding: 15px;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+            %img.float-right{:src => "#{@order.distributor.logo.url(:thumb)}", :style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;max-width: 100%;float: right;display: block;"}/
+      / /column 2
+      %span.clear{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;display: block;clear: both;"}
+/ /intro
+
+/ Heading Panel
+%p{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 10px;font-weight: normal;font-size: 14px;line-height: 1.6;"}
+  &nbsp;
+
+%p.callout{:style => "margin: 0;padding: 15px;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 15px;font-weight: normal;font-size: 14px;line-height: 1.6;background-color: #e1f0f5;"}
+  %strong{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+    Order summary
+/ /Heading Panel
+/ Order Summary
+/ <p>Order for: <strong>Rob Harrington</strong></p>
+%table.order-summary{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;width: 100%;", :width => "100%"}
+  %tr{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+    %td{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+      %strong{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+        Item
+    %td{:align => "right", :style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;", :width => "25%"}
+      %strong{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+        Qty
+    %td{:align => "right", :style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;", :width => "25%"}
+      %strong{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+        Price
+  - @order.line_items.each do |item|
+    %tr{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+      %td{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+        = raw(item.variant.product.supplier.name)
+        %br
+        = "#{raw(item.variant.product.name)} #{raw(item.variant.options_text)}"
+      %td{:align => "right", :style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+        = item.quantity
+      %td{:align => "right", :style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+        = item.display_amount
+    %tr{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+      %td{:colspan => "3", :style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+        &nbsp;
+  %tr{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+    %td{:align => "right", :colspan => "2", :style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+      Subtotal:
+    %td{:align => "right", :style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+      = spree_number_to_currency checkout_cart_total_with_adjustments(@order)
+  - checkout_adjustments_for_summary(@order, exclude: [:distribution]).reject{ |a| a.amount == 0 }.each do |adjustment|
+    %tr{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+      %td{:align => "right", :colspan => "2", :style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+        = raw(adjustment.label)
+      %td{:align => "right", :style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+        = adjustment.display_amount
+  %tr{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+    %td{:align => "right", :colspan => "2", :style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+      %strong{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+        Total:
+    %td{:align => "right", :style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+      %strong{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+        = @order.display_total
+
+%p{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 10px;font-weight: normal;font-size: 14px;line-height: 1.6;"}
+  &nbsp;
+
+-# Payment Summary
+- if @order.payments.first.andand.payment_method.andand.type == "Spree::PaymentMethod::Check" and @order.payments.first.andand.payment_method.andand.description
+  / Heading Panel
+  %p.callout{:style => "margin: 0;padding: 15px;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 15px;font-weight: normal;font-size: 14px;line-height: 1.6;background-color: #e1f0f5;"}
+    %strong{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+      Payment summary
+  / /Heading Panel
+  / Payment Summary
+  %p{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 10px;font-weight: normal;font-size: 14px;line-height: 1.6;"}
+    = @order.payments.first.andand.payment_method.andand.description.andand.html_safe
+
+  -# Spacer
+  %p{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 10px;font-weight: normal;font-size: 14px;line-height: 1.6;"}
+    &nbsp;
+
+
+
+- if @order.shipping_method.andand.require_ship_address
+  -# Delivery details
+  %p.callout{:style => "margin: 0;padding: 15px;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 15px;font-weight: normal;font-size: 14px;line-height: 1.6;background-color: #e1f0f5;"}
+    %strong{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+      Delivery details
+  %p{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 10px;font-weight: normal;font-size: 14px;line-height: 1.6;"}
+    Your order will be delivered to:
+    %br
+    #{@order.ship_address.to_s}
+    %br
+
+    - if @order.shipping_method.andand.description
+      #{@order.shipping_method.description.html_safe}
+      %br
+
+    - if @order.order_cycle.andand.pickup_time_for(@order.distributor)
+      Delivery on: #{@order.order_cycle.pickup_time_for(@order.distributor)}
+      %br
+
+    - if @order.order_cycle.andand.pickup_instructions_for(@order.distributor)
+      Other delivery information: #{@order.order_cycle.pickup_instructions_for(@order.distributor)}
+      %br
+
+
+- else
+  -# Collection Details
+  %p.callout{:style => "margin: 0;padding: 15px;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 15px;font-weight: normal;font-size: 14px;line-height: 1.6;background-color: #e1f0f5;"}
+    %strong{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+      Collection details
+  %p{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 10px;font-weight: normal;font-size: 14px;line-height: 1.6;"}
+    - if @order.shipping_method.andand.description
+      = @order.shipping_method.description.html_safe
+      %br
+
+    - if @order.order_cycle.andand.pickup_time_for(@order.distributor)
+      Ready for collection: #{@order.order_cycle.pickup_time_for(@order.distributor)}
+      %br
+
+    - if @order.order_cycle.andand.pickup_instructions_for(@order.distributor)
+      Collection instructions: #{@order.order_cycle.pickup_instructions_for(@order.distributor)}
+      %br
+
+    - if @order.special_instructions.present?
+      Notes: #{@order.special_instructions}
+      %br
+
+    -# Your order will be ready for collection on
+    -# %strong{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+    -#   Tuesday 07 Dec
+    -# %p{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 10px;font-weight: normal;font-size: 14px;line-height: 1.6;"}
+    -#   Pick-up your order at the rear of 34 Mason Street, Warragul. See it on
+    -# %a{:href => "https://goo.gl/maps/T1ArU", :style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;color: #0096ad;", :target => "_blank"}
+    -#   google maps
+
+%p{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 10px;font-weight: normal;font-size: 14px;line-height: 1.6;"}
+  &nbsp;
+%hr{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}/
+%p{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 10px;font-weight: normal;font-size: 14px;line-height: 1.6;"}
+  &nbsp;
+%p{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 10px;font-weight: normal;font-size: 14px;line-height: 1.6;"}
+  Thanks for your support.
+%p{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 10px;font-weight: normal;font-size: 14px;line-height: 1.6;"}
+  &nbsp;
+
+-# Contact details
+%p.callout{:style => "margin: 0;padding: 15px;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 15px;font-weight: normal;font-size: 14px;line-height: 1.6;background-color: #e1f0f5;"}
+  #{@order.distributor.contact},
+  %br{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}/
+  %strong{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+    = @order.distributor.name
+  %br{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}/
+  %br{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}/
+  = @order.distributor.phone || ""
+  %br{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}/
+  %a{:href => "mailto:#{@order.distributor.email}", :style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;color: #0096ad;font-weight: bold;", :target => "_blank"}
+    = @order.distributor.email
+  %br{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}/
+  = @order.distributor.website || ""
\ No newline at end of file
diff --git a/app/views/spree/order_mailer/confirm_email_for_shop.html.haml b/app/views/spree/order_mailer/confirm_email_for_shop.html.haml
new file mode 100644
index 0000000000..8f40e0a148
--- /dev/null
+++ b/app/views/spree/order_mailer/confirm_email_for_shop.html.haml
@@ -0,0 +1,139 @@
+%h3 Hi #{@order.bill_address.firstname},
+%table.social.white-bg{:width => "100%"}
+  %tr
+    %td
+      %table.column{:align => "left"}
+        %tr
+          %td
+            %p
+              %strong Order confirmation ##{@order.number}
+            %p
+              Thanks for shopping on
+              %strong= "#{Spree::Config.site_name}."
+              Here are your order details from
+              %strong= "#{@order.distributor.name}."
+      %table.column{:align => "left"}
+        %tr
+          %td
+            %img.float-right{:src => "#{@order.distributor.logo.url(:thumb)}"}/
+      %span.clear
+%p &nbsp;
+
+
+%p.callout
+  %strong Order summary
+/ /Heading Panel
+/ Order Summary
+/ <p>Order for: <strong>Rob Harrington</strong></p>
+%table.order-summary{:width => "100%"}
+  %tr
+    %td
+      %strong Item
+    %td{:align => "right", :width => "25%"}
+      %strong Qty
+    %td{:align => "right", :width => "25%"}
+      %strong Price
+  - @order.line_items.each do |item|
+    %tr
+      %td
+        = raw(item.variant.product.supplier.name)
+        %br
+        = "#{raw(item.variant.product.name)} #{raw(item.variant.options_text)}"
+      %td{:align => "right"}
+        = item.quantity
+      %td{:align => "right"}
+        = item.display_amount
+  %tr
+    %td{:colspan => "3"} &nbsp;
+  %tr
+    %td{:align => "right", :colspan => "2"}
+      Subtotal:
+    %td{:align => "right"}
+      = spree_number_to_currency checkout_cart_total_with_adjustments(@order)
+  - checkout_adjustments_for_summary(@order, exclude: [:distribution]).reject{ |a| a.amount == 0 }.each do |adjustment|
+    %tr
+      %td{:align => "right", :colspan => "2"}
+        = raw(adjustment.label)
+      %td{:align => "right"}
+        = adjustment.display_amount
+  %tr
+    %td{:align => "right", :colspan => "2"}
+      %strong Total:
+    %td{:align => "right"}
+      %strong= @order.display_total
+%p &nbsp;
+
+- if @order.payments.first.andand.payment_method.andand.type == "Spree::PaymentMethod::Check" and @order.payments.first.andand.payment_method.andand.description
+  %p.callout
+    %strong Payment summary
+  / /Heading Panel
+  / Payment Summary
+  %p= @order.payments.first.andand.payment_method.andand.description.andand.html_safe
+  %p &nbsp;
+
+- if @order.shipping_method.andand.require_ship_address
+  / Delivery details
+  %p.callout
+    %strong
+      Delivery details
+  %p
+    Your order will be delivered to:
+    %br
+    #{@order.ship_address.to_s}
+    %br
+
+    - if @order.shipping_method.andand.description
+      #{@order.shipping_method.description.html_safe}
+      %br
+
+    - if @order.order_cycle.andand.pickup_time_for(@order.distributor)
+      Delivery on: #{@order.order_cycle.pickup_time_for(@order.distributor)}
+      %br
+
+    - if @order.order_cycle.andand.pickup_instructions_for(@order.distributor)
+      Other delivery information: #{@order.order_cycle.pickup_instructions_for(@order.distributor)}
+      %br
+
+
+- else
+  / Collection details
+  %p.callout
+    %strong
+      Collection details
+  %p
+    - if @order.shipping_method.andand.description
+      = @order.shipping_method.description.html_safe
+      %br
+
+    - if @order.order_cycle.andand.pickup_time_for(@order.distributor)
+      Ready for collection: #{@order.order_cycle.pickup_time_for(@order.distributor)}
+      %br
+
+    - if @order.order_cycle.andand.pickup_instructions_for(@order.distributor)
+      Collection instructions: #{@order.order_cycle.pickup_instructions_for(@order.distributor)}
+      %br
+
+    - if @order.special_instructions.present?
+      Notes: #{@order.special_instructions}
+      %br
+
+    -# Your order will be ready for collection on
+    -# %strong{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;"}
+    -#   Tuesday 07 Dec
+    -# %p{:style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;margin-bottom: 10px;font-weight: normal;font-size: 14px;line-height: 1.6;"}
+    -#   Pick-up your order at the rear of 34 Mason Street, Warragul. See it on
+    -# %a{:href => "https://goo.gl/maps/T1ArU", :style => "margin: 0;padding: 0;font-family: \"Helvetica Neue\", \"Helvetica\", Helvetica, Arial, sans-serif;color: #0096ad;", :target => "_blank"}
+    -#   google maps
+
+
+%p.callout
+  #{@order.distributor.contact},
+  %br/
+  %strong= @order.distributor.name
+  %br/
+  = @order.distributor.phone || ""
+  %br/
+  %a{:href => "mailto:#{@order.distributor.email}", :target => "_blank"}
+    = @order.distributor.email
+  %br/
+  = @order.distributor.website || ""
\ No newline at end of file