caboose-cms 0.9.73 → 0.9.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9e9e64838a7f575101955f5a8d1f845382f1158
-  data.tar.gz: 53189bf7780c15285dcce693d12a265d1cc18236
+  metadata.gz: d5d538f792c9137c2945007d71f917c9b6de7069
+  data.tar.gz: 0c8b0d4826bc3291f1cb981585690183abde002f
 SHA512:
-  metadata.gz: b5176348512047678b9678354533c377079a482abec7c173dd8b19ab092de2d0152893a51c8d3c178d14d27446512c1ff38dac1e0d2d08b4bdbe9fe08d017a72
-  data.tar.gz: 8b2eefcc46638da42f2806afc0304dd3e3a346b377552d0c5b0d1a3834d6eda5b962acc147419dee9e491b20e79f186ea21707b54a3e9c922ac93628eee801b9
+  metadata.gz: 82df711cad5b8fcaeffca31a1ccc8fb723d5c31675f6181c8df60af453c010b3dacce98a596aa9ea8b15a0b676fe318a1d4a4311d6c869008efd895e86d50439
+  data.tar.gz: b741a2ac1c6220e557fda96490dd83584fa225da01e3ac7dcc5ceb420ccd388bd545046fbaea052e33780656eff2ca1663160f16a401efa47d636fa8c9862ad3

data/app/controllers/caboose/invoices_controller.rb

@@ -287,7 +287,7 @@ module Caboose
     end
     
     # @route GET /admin/invoices/:id/send-receipt
-    def admin_send_for_authorization
+    def admin_send_receipt
       return if !user_is_allowed('invoices', 'edit')
       invoice = Invoice.find(params[:id])
       invoice.delay(:queue => 'caboose_store').send_receipt_email      

data/app/views/caboose/invoices_mailer/customer_payment_authorization.html.erb

@@ -5,6 +5,92 @@ logo = logo.gsub('//','https://') if !logo.nil?
 
 <p><img src='<%= logo %>' /></p>
 
-<h1>Order <%= @invoice.invoice_number %> is ready for payment!</h1>
-<p>Please <a href='http://<%= raw @invoice.site.primary_domain.domain %>/my-account/invoices/<%= @invoice.id %>'>review your order</a> and submit payment.</p>
-<p>Thank you!</p>
+<h1>Invoice</h1>
+
+<p>Your invoice number #<%= @invoice.id %> is ready for payment!</p>
+
+<p>Click <a href="https://<%== @invoice.site.primary_domain.domain %>/my-account">here</a> to login to your account to update billing information.</p>
+
+<% if !@invoice.site.store_config.download_instructions.blank? %>
+	<p><%== @invoice.site.store_config.download_instructions %></p>
+<% end %>
+
+<% if defined?(Colonnade::SuiteMenu) %>
+	<%
+	sm = Colonnade::SuiteMenu.where(:invoice_id => @invoice.id).first
+	game = sm.menu.game if sm && sm.menu
+	%>
+	<% if game %>
+		<p>Game: <%= game.opponent %> on <%= game.date.strftime('%B %-d, %Y') %></p>
+	<% end %> 
+<% end %>
+
+<table border='1' style='border-collapse: collapse;'>
+  <tr>    
+    <th>Line Item</th>
+    <th>Unit Price</th>
+    <th>Quantity</th>
+    <th>Subtotal</th>
+  </tr>
+  <% @invoice.line_items.each do |li| %>    
+    <% v = li.variant %>
+    <% p = v.product %>
+    <tr>            
+      <td>
+        <p><%= p.title %></td></p>
+        <% if li.is_gift %>
+          <p>This item is a gift.</p>
+          <ul>
+            <li><% if li.gift_wrap %>Gift wrap (<%= number_to_currency(p.gift_wrap_price) %>)<% else %>Do not gift wrap<% end %></li>
+            <li><% if li.include_gift_message %>Gift message: <%= li.gift_message %><% else %>No gift message<% end %></li>
+            <li><% if li.hide_prices %>Hide all prices<% else %>Show all prices<% end %></li>
+          </ul>
+        <% end %>
+      </td>
+      <td align='right'><%= number_to_currency(li.unit_price) %></td>
+      <td align='right'><%= li.quantity %></td>
+      <td align='right'><%= number_to_currency(li.subtotal) %></td>
+    </tr>  
+  <% end %>
+  <tr><td colspan="3" align='right'>Subtotal:               </td><td align='right'><%= number_to_currency(@invoice.subtotal) %></td></tr>
+  <tr><td colspan="3" align='right'>Tax:                    </td><td align='right'><%= number_to_currency(@invoice.tax)      %></td></tr>
+  <tr><td colspan="3" align='right'>Shipping and Handling:  </td><td align='right'><%= number_to_currency(@invoice.shipping + @invoice.handling) %></td></tr>
+  <% if @invoice.gift_wrap && @invoice.gift_wrap > 0 %>  
+    <tr><td colspan="3" align='right'>Gift wrap:            </td><td align='right'><%= number_to_currency(@invoice.gift_wrap) %></td></tr>
+  <% end %>
+  <% if @invoice.discounts %>
+    <% @invoice.discounts.each do |d| %>
+      <tr><td colspan="3" align='right'>"<%= d.gift_card.code %>" gift card: </td><td align='right'><%= number_to_currency(d.amount) %></td></tr>
+    <% end %>
+  <% end %>
+  <% if @invoice.custom_discount %>
+    <tr><td colspan="3" align='right'>Discount: </td><td align='right'><%= number_to_currency(@invoice.custom_discount) %></td></tr>
+  <% end %>      
+  <tr><td colspan="3" align='right'>Total:     </td><td align='right'><%= number_to_currency(@invoice.total) %></td></tr>
+</table>
+
+<% if @invoice.shipping_address %>
+  <% sa = @invoice.shipping_address %>
+  <% if !sa.address1.blank? %>
+	  <h2>Shipping Address</h2>
+	  <p>
+	    <%= sa.first_name %> <%= sa.last_name %><br />
+	    <%= sa.address1 %><br />
+	    <% if sa.address2 && sa.address2.strip.length > 0 %><%= sa.address2 %><br /><% end %>
+	    <%= sa.city %>, <%= sa.state %> <%= sa.zip %>
+	  </p>
+	<% end %>
+<% end %>
+
+<% if @invoice.billing_address %>
+  <% ba = @invoice.billing_address %>
+  <% if !ba.address1.blank? %>
+	  <h2>Billing Address</h2>
+	  <p>
+	    <%= ba.first_name %> <%= ba.last_name %><br />
+	    <%= ba.address1 %><br />
+	    <% if ba.address2 && ba.address2.strip.length > 0 %><%= ba.address2 %><br /><% end %>
+	    <%= ba.city %>, <%= ba.state %> <%= ba.zip %>
+	  </p>
+	<% end %>
+<% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.73'
+  VERSION = '0.9.74'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.73
+  version: 0.9.74
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg