caboose-cms 0.9.38 → 0.9.40

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e6956c7a0af6d782edf99ca1c54bb6c84a7c6e83
4
- data.tar.gz: 329fe6bc6074b0d4d854c475f2dc410507887a4f
3
+ metadata.gz: 557a48644a25e482b5a82bf4706a380098a79894
4
+ data.tar.gz: 12d204b0795d0c62da83aea8bb07c5b97a952f04
5
5
  SHA512:
6
- metadata.gz: a7f42b5ea1ddd2b9218f55a8af8ee27ca8d08956da7f4dfee81d8db9c8d63e8cb3394d895c56a18e3f30964a6c835e25f39e2bd764064499fe0bad1a82ed4c8d
7
- data.tar.gz: 822cf82b940659dc581d4f10b1fbf8be56ac5729f453ac05e735f5f66c6284292dbeed77d441447c936e95bccbfa5295c992c4a8073ce41b8b465af0608b0b17
6
+ metadata.gz: 744ddcc5e6559b8e3d7488711ef8f80b7fd50e2b97c3007db25a3cb56b354fd62ffc3813a92446db3119b8af983f768b14384d296b6390a4ce46aaae82a37dcb
7
+ data.tar.gz: e981f6e660a0ef93683c7ce8f8542d8e85ae2de837349b6007dc4deba66f69b00c97d230c00532bf97fd2ce62362e29ae72864ecaab908124b48e615f3ab672f
@@ -2,13 +2,31 @@
2
2
 
3
3
  <!-- <h1>Thank you for your invoice!</h1> -->
4
4
  <h1>New Order Received</h1>
5
+ <p><a href="http://<%= @invoice.site.primary_domain.domain %>/admin/invoices/<%= @invoice.id %>" target="_blank" title="View Order">View Order</a></p>
5
6
 
6
- <h4><a href="http://<%= @invoice.site.primary_domain.domain %>/admin/invoices/<%= @invoice.id %>" target="_blank" title="View Order">View Order</a></h4>
7
+ <p>Order #<%= @invoice.invoice_number %></p>
7
8
 
8
- <h2>Order Details</h2>
9
+ <% if @invoice.customer %>
10
+ <h2>Customer</h2>
11
+ <p>
12
+ <%= @customer.first_name %> <%= @customer.last_name %><br />
13
+ <a href='mailto:<%= @customer.email %>'><%= @customer.email %></a><br />
14
+ <% if @customer.phone %><%= raw @customer.phone %><% end %>
15
+ </p>
16
+ <% end %>
9
17
 
10
- <p>Order #<%= @invoice.invoice_number %></p>
18
+ <% if @invoice.shipping_address %>
19
+ <% sa = @invoice.shipping_address %>
20
+ <h2>Shipping Address</h2>
21
+ <p>
22
+ <%= sa.first_name %> <%= sa.last_name %><br />
23
+ <%= sa.address1 %><br />
24
+ <% if sa.address2 && sa.address2.strip.length > 0 %><%= sa.address2 %><br /><% end %>
25
+ <%= sa.city %>, <%= sa.state %> <%= sa.zip %>
26
+ </p>
27
+ <% end %>
11
28
 
29
+ <h2>Order Details</h2>
12
30
  <table binvoice='1' style='binvoice-collapse: collapse;'>
13
31
  <tr>
14
32
  <th>Package</th>
@@ -91,25 +109,3 @@
91
109
  <% end %>
92
110
  <tr><td colspan="4" align='right'>Total: </td><td align='right'><%= number_to_currency(@invoice.total) %></td></tr>
93
111
  </table>
94
-
95
- <% if @invoice.shipping_address %>
96
- <% sa = @invoice.shipping_address %>
97
- <h2>Shipping Address</h2>
98
- <p>
99
- <%= sa.first_name %> <%= sa.last_name %><br />
100
- <%= sa.address1 %><br />
101
- <% if sa.address2 && sa.address2.strip.length > 0 %><%= sa.address2 %><br /><% end %>
102
- <%= sa.city %>, <%= sa.state %> <%= sa.zip %>
103
- </p>
104
- <% end %>
105
-
106
- <% if @invoice.billing_address %>
107
- <% ba = @invoice.billing_address %>
108
- <h2>Billing Address</h2>
109
- <p>
110
- <%= ba.first_name %> <%= ba.last_name %><br />
111
- <%= ba.address1 %><br />
112
- <% if ba.address2 && ba.address2.strip.length > 0 %><%= ba.address2 %><br /><% end %>
113
- <%= ba.city %>, <%= ba.state %> <%= ba.zip %>
114
- </p>
115
- <% end %>
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.9.38'
2
+ VERSION = '0.9.40'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.38
4
+ version: 0.9.40
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-01-03 00:00:00.000000000 Z
11
+ date: 2017-01-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pg