effective_orders 1.6.6 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 454888d9685c161b640cb1704d16ed37089a843b
-  data.tar.gz: e21c978af3d83dd4104a0b56929dc000f3daf8dc
+  metadata.gz: cb1d6669051ee4a4c2caf28dccbac451bdd3221b
+  data.tar.gz: 6ad503455f871663204142a019802e58e0761139
 SHA512:
-  metadata.gz: b2bab5bcdf09101c8bd475e27c0db23e2cba18b52b4b8bc8247d20361eb5d8c5c0ae597a4eefeb1d5d1bda7d6143e55068914cedf42a967267e3bbcc0532f7c1
-  data.tar.gz: c8bf6d21f7f4e312c21a9693b246f8c81f5a525ab40c9d130c3398c3ac219141fb696e3b35366d77aacbe6acb794ce026e43f44de6a613d3dd33bb6585f78f8e
+  metadata.gz: 384f81697a59dce11cd020734531dc460d4d2e6fbb771687d13179375ad166d7f4c01d9a21b819018e2d91ddf760e605f1c1e022645a72e9bbfa7f92b212f63d
+  data.tar.gz: 49ed6f3e16ca6745070ac459f181f20c89767b3dd7a472a2424aec5415f91724237c589ac667e853010e58458cc545015771e04f0c1242db8bb80a84c8fea4fe

data/app/mailers/effective/orders_mailer.rb

@@ -1,9 +1,10 @@
 module Effective
   class OrdersMailer < ActionMailer::Base
     helper EffectiveOrdersHelper
-
     default :from => EffectiveOrders.mailer[:default_from]
 
+    layout EffectiveOrders.mailer[:layout].presence || 'effective_orders_mailer_layout'
+
     def order_receipt_to_admin(order)
       @order = order
       mail(:to => EffectiveOrders.mailer[:admin_email], :subject => receipt_to_admin_subject(order))

data/app/views/effective/orders/_order_header.html.haml

@@ -14,10 +14,7 @@
     .col-sm-6
       - if order.purchased?
         %p Receipt: ##{order.to_param}
+        %p Purchased at: #{order.purchased_at.strftime("%Y-%m-%d %H:%M")}
       - elsif order.persisted?
         %p Order: ##{order.to_param}
-
-      - if order.purchased?
-        %p Purchased at: #{order.purchased_at.strftime("%Y-%m-%d %H:%M")}
-      - else
         %p Date: #{Time.zone.now.strftime("%Y-%m-%d %H:%M")}

data/app/views/effective/orders/_order_items.html.haml

@@ -1,48 +1,54 @@
 - include_download_column = order.purchased? && order.order_items.any? { |order_item| order_item.purchased_download_url.present? rescue false }
+- include_quantity_column = order.order_items.any? { |order_item| order_item.quantity > 1 }
 
-.effective-order
+.effective-order-items
   %table.table
     %thead
       %tr
-        %th.quantity Qty
-        %th.item= order.order_items.length > 1 ? 'Items' : 'Item'
+        - if include_quantity_column
+          %th.quantity Qty
         - if include_download_column
           %th.download Download
+        %th.item= order.order_items.length > 1 ? 'Items' : 'Item'
         %th.price Price
 
     %tbody
       - order.order_items.each do |item|
         %tr
-          %td.quantity= item.quantity
-          %td.item
-            = item.title.html_safe
-            - if order.new_record? && item.purchasable.kind_of?(Effective::Subscription)
-              = render :partial => 'effective/orders/stripe/subscription_fields', :locals => {:form => form, :subscription => item.purchasable }
-
+          - if include_quantity_column
+            %td.quantity= item.quantity
           - if include_download_column
             %td.download
               - if item.purchased? && (item.purchased_download_url rescue nil).present?
                 = link_to 'download', item.purchased_download_url
               - else
                 = '-'
+          %td.item
+            = item.title.html_safe
+            - if order.new_record? && item.purchasable.kind_of?(Effective::Subscription)
+              = render :partial => 'effective/orders/stripe/subscription_fields', :locals => {:form => form, :subscription => item.purchasable }
+
           %td.price= price_to_currency(item.price)
 
     %tfoot
       - if order.tax > 0
         %tr
-          %th.quantity
+          - if include_quantity_column
+            %th.quantity
           - if include_download_column
             %th.download
           %th.subtotal Subtotal
           %td.price.subtotal-price= price_to_currency(order.subtotal)
         %tr
-          %th.quantity
+          - if include_quantity_column
+            %th.quantity
           - if include_download_column
             %th.download
           %th.tax Tax
           %td.price.tax-price= price_to_currency(order.tax)
       %tr
-        %th.quantity
+        - if include_quantity_column
+          %th.quantity
         - if include_download_column
           %th.download
         %th.total Total Due

data/app/views/effective/orders_mailer/order_receipt_to_admin.html.haml

@@ -1,8 +1,2 @@
-!!!
-%html
-  %head
-    %meta{:content => 'text/html; charset=UTF-8', 'http-equiv' => "Content-Type"}
-  %body
-    %p An order has been successfully purchased:
-
-    = render(@order, no_order_actions: true)
+%p.effective-orders-receipt-info An order has been successfully purchased:
+= render(@order, no_order_actions: true)

data/app/views/effective/orders_mailer/order_receipt_to_buyer.html.haml

@@ -1,8 +1,2 @@
-!!!
-%html
-  %head
-    %meta{:content => 'text/html; charset=UTF-8', 'http-equiv' => "Content-Type"}
-  %body
-    %p Your order has been successfully purchased:
-
-    = render(@order, no_order_actions: true)
+%p.effective-orders-receipt-info Your order has been successfully purchased:
+= render(@order, no_order_actions: true)

data/app/views/effective/orders_mailer/order_receipt_to_seller.html.haml

@@ -1,30 +1,25 @@
-!!!
-%html
-  %head
-    %meta{:content => 'text/html; charset=UTF-8', 'http-equiv' => "Content-Type"}
-  %body
-    %p= @subject
+%p.effective-orders-receipt-info= @subject
 
-    %table.table
-      %thead
-        %tr
-          %th Item
-          %th Price
-      %tbody
-        - @order_items.each do |item|
-          %tr
-            %td
-              - if item.quantity > 1
-                = "#{item.quantity}x "
-              = item.title
-            %td= price_to_currency(item.subtotal)
-      %tfoot
-        %tr
-          %th Subtotal
-          %td= price_to_currency(@order_items.map { |oi| oi.subtotal }.sum)
-        %tr
-          %th Tax
-          %td= price_to_currency(@order_items.map { |oi| oi.tax }.sum)
-        %tr
-          %th Total
-          %td= price_to_currency(@order_items.map { |oi| oi.total }.sum)
+%table.table
+  %thead
+    %tr
+      %th Item
+      %th Price
+  %tbody
+    - @order_items.each do |item|
+      %tr
+        %td
+          - if item.quantity > 1
+            = "#{item.quantity}x "
+          = item.title
+        %td= price_to_currency(item.subtotal)
+  %tfoot
+    %tr
+      %th Subtotal
+      %td= price_to_currency(@order_items.map { |oi| oi.subtotal }.sum)
+    %tr
+      %th Tax
+      %td= price_to_currency(@order_items.map { |oi| oi.tax }.sum)
+    %tr
+      %th Total
+      %td= price_to_currency(@order_items.map { |oi| oi.total }.sum)

data/app/views/layouts/effective_orders_mailer_layout.html.haml

@@ -0,0 +1,27 @@
+!!!
+%html{style: 'background: #fff;'}
+  %head
+    %meta{:content => 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type'}
+  :css
+    .effective-order table.table { min-width: 650px; }
+    .effective-order { text-align: left; }
+    .effective-order .price { text-align: right; }
+    .effective-order tfoot th { text-align: right; }
+    .effective-order tfoot tr:first-child td { padding-top: 24px; }
+    .effective-order tfoot tr:first-child th { padding-top: 24px; }
+    .effective-order-shipping { padding-top: 12px; padding-bottom: 12px; }
+
+  %body{style: 'background: #fff;'}
+    %table{style: 'width: 100%;'}
+      %tr
+        %td
+          %table{style: 'max-width: 650px; margin: 4px auto 30px;'}
+            %thead{style: 'border-bottom: 2px solid transparent; width: 100%;'}
+              %tr{style: 'background: #000; color: #fff;'}
+                %th{style: 'padding-top: 2px;'}
+            %tbody{style: 'background: #fff; width: 100%; margin-bottom: 4px;'}
+              %tr
+                %td= yield
+            %tfoot{style: 'border-bottom: 2px solid transparent; width: 100%;'}
+              %tr{style: 'background: #000; color: #fff;'}
+                %th{style: 'padding-top: 2px;'}

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.6.6'.freeze
+  VERSION = '1.7.0'.freeze
 end

data/lib/generators/templates/effective_orders.rb

@@ -139,6 +139,7 @@ EffectiveOrders.setup do |config|
     :send_order_receipt_to_admin => true,
     :send_order_receipt_to_buyer => true,
     :send_order_receipt_to_seller => true,   # Only applies to StripeConnect
+    :layout => 'effective_orders_mailer_layout',
     :admin_email => 'admin@example.com',
     :default_from => 'info@example.com',
     :subject_prefix => '[example]',

data/spec/controllers/orders_controller_spec.rb

@@ -345,7 +345,7 @@ describe Effective::OrdersController, type: :controller do
     it 'creates a purchased order' do
       post :create, valid_order_attributes
       assigns(:order).purchased?.should eq true
-      assigns(:order).payment[:details].should eq 'zero-dollar order'
+      assigns(:order).payment[:details].should eq 'automatic purchase of free order.'
     end
 
     it 'destroys the current user cart' do

data/spec/dummy/log/test.log

@@ -205,3 +205,5 @@
    (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
    (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
    (0.4ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.4ms)  SELECT MAX("orders"."id") FROM "orders"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.7.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -380,6 +380,7 @@ files:
 - app/views/effective/subscriptions/index.html.haml
 - app/views/effective/subscriptions/new.html.haml
 - app/views/effective/subscriptions/show.html.haml
+- app/views/layouts/effective_orders_mailer_layout.html.haml
 - config/routes.rb
 - db/migrate/01_create_effective_orders.rb.erb
 - db/upgrade/02_upgrade_effective_orders_from03x.rb.erb