caboose-cms 0.5.138 → 0.5.139

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MmE0ZDk4ZDA0N2U5Y2IzM2U2Yjc2ZGFhZDJhN2E1YmU3NmUyODY4MA==
4
+ MGVlNzZjMGJmNTYxNTkzZDcyY2RmNWIxMDIyNTA2ZjJlOWJjYjAzYQ==
5
5
  data.tar.gz: !binary |-
6
- YTBhZTlkYzBlOWEwOGI5ZmY3Y2ZmODllOWEzY2UyNDBmZjg0MDljNw==
6
+ NjQzZGU0OTlkOTQ5YzBmYTQyMzYzZjJiNWM5MDk5Y2I3ZGI5NWQyNg==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- MjQ4MTY2YmRjNGMyMjhkZTBhZDc4YzgwMWIwOGZjODkxZThlMDI3NTJmYWE1
10
- MmIwY2JkNTczMTcxYWE5YmZmODM2MzM5MTQzY2U0ZmI2MTk3NTBhZDJlNTA0
11
- YjdiZGM3MDBkMzliMDNhZTBjZWY2NWMxOGJlOWJkOWZhNmE5YTM=
9
+ NzRjMGQ5MGJhYTkxYTBjMTUzY2RkYjNkZmUxZDIyMDMxZTdiOTQzZDUxMGZm
10
+ ZjI0Y2QzNDgwOGUyZWNiMDU1NmRlYTJkNTRiMGQ2OThiNjdlOGExYTg5MmUz
11
+ MzE1ODIwMDBkNmIwNjM0ZTIwMzVhYjA5YmExZmI4MDNiMDVkMjE=
12
12
  data.tar.gz: !binary |-
13
- NjBlZGVkZTM3OTE1NWZjOTc1YTZjMTY1MzEzZmQ3N2M3NThkNjM2NjcxNTVk
14
- N2M1MTkzMGVmYjhjZTQ3MTg0YmFkMDUyMDg5MDMzMDk3YmQ0OWFhMjZiZTEw
15
- NjhiMzRkZjE4YTAwMDNjM2ZiNDgzOGQyYzg4MzI0NmI2M2RlNjg=
13
+ ZjE1ZTk4YjkzMjUwMjMzNTg1YjYzZWRkZDVjMGM5N2E3ZTliZjhhNGIwYzlj
14
+ NTMyMWUxMTE4OTlmMTI2NGMyYWQyNWE3NmUzNGFiYmY5NTNjMzJjNjc3MTlh
15
+ YjEzMGEyNWU1Y2Y4NTRjNzZlOGYxZjA0ZDNmYzQ2NjZmMjMzZTQ=
@@ -0,0 +1,6 @@
1
+
2
+ GL Hardware 500
3
+ LVL
4
+ 16' 2 68
5
+ Brackets
6
+
@@ -21,7 +21,7 @@
21
21
  <tr>
22
22
  <% if i == 0 %>
23
23
  <td rowspan="<%= op.line_items.count %>">
24
- <div><%= op.shipping_method.name %></div>
24
+ <div><%= op.shipping_method.service_name %></div>
25
25
  <div><%= op.status %></div>
26
26
  <% if op.tracking_number %><div><%= op.tracking_number %></div><% end %>
27
27
  </td>
@@ -31,15 +31,15 @@
31
31
  <% if li.is_gift %>
32
32
  <p>This item is a gift.</p>
33
33
  <ul>
34
- <li><% if li.gift_wrap %>Gift wrap (<%= number_as_currency(p.gift_wrap_price) %>)<% else %>Do not gift wrap<% end %></li>
34
+ <li><% if li.gift_wrap %>Gift wrap (<%= number_to_currency(p.gift_wrap_price) %>)<% else %>Do not gift wrap<% end %></li>
35
35
  <li><% if li.include_gift_message %>Gift message: <%= li.gift_message %><% else %>No gift message<% end %></li>
36
36
  <li><% if li.hide_prices %>Hide all prices<% else %>Show all prices<% end %></li>
37
37
  </ul>
38
38
  <% end %>
39
39
  </td>
40
- <td align='right'><%= number_as_currency(li.unit_price) %></td>
40
+ <td align='right'><%= number_to_currency(li.unit_price) %></td>
41
41
  <td align='right'><%= li.quantity %></td>
42
- <td align='right'><%= number_as_currency(li.subtotal) %></td>
42
+ <td align='right'><%= number_to_currency(li.subtotal) %></td>
43
43
  </tr>
44
44
  <% end %>
45
45
  <% end %>
@@ -50,26 +50,26 @@
50
50
  <tr>
51
51
  <td>Not assigned to a package</td>
52
52
  <td><%= p.title %></td></td>
53
- <td align='right'><%= number_as_currency(li.unit_price) %></td>
53
+ <td align='right'><%= number_to_currency(li.unit_price) %></td>
54
54
  <td align='right'><%= li.quantity %></td>
55
- <td align='right'><%= number_as_currency(li.subtotal) %></td>
55
+ <td align='right'><%= number_to_currency(li.subtotal) %></td>
56
56
  </tr>
57
57
  <% end %>
58
- <tr><td colspan="4">Subtotal: </td><td><%= number_as_currency(@order.subtotal) %></td></tr>
59
- <tr><td colspan="4">Tax: </td><td><%= number_as_currency(@order.tax) %></td></tr>
60
- <tr><td colspan="4">Shipping and Handling: </td><td><%= number_as_currency(@order.shipping + @order.handling) %></td></tr>
58
+ <tr><td colspan="4">Subtotal: </td><td><%= number_to_currency(@order.subtotal) %></td></tr>
59
+ <tr><td colspan="4">Tax: </td><td><%= number_to_currency(@order.tax) %></td></tr>
60
+ <tr><td colspan="4">Shipping and Handling: </td><td><%= number_to_currency(@order.shipping + @order.handling) %></td></tr>
61
61
  <% if @order.gift_wrap && @order.gift_wrap > 0 %>
62
- <tr><td colspan="4">Gift wrap: </td><td><%= number_as_currency(@order.gift_wrap) %></td></tr>
62
+ <tr><td colspan="4">Gift wrap: </td><td><%= number_to_currency(@order.gift_wrap) %></td></tr>
63
63
  <% end %>
64
64
  <% if @order.discounts %>
65
65
  <% @order.discounts.each do |d| %>
66
- <tr><td colspan="4">"<%= d.gift_card.code %>" gift card: </td><td><%= number_as_currency(d.amount) %></td></tr>
66
+ <tr><td colspan="4">"<%= d.gift_card.code %>" gift card: </td><td><%= number_to_currency(d.amount) %></td></tr>
67
67
  <% end %>
68
68
  <% end %>
69
69
  <% if @order.custom_discount %>
70
- <tr><td colspan="4">Discount: </td><td><%= number_as_currency(d.custom_discount) %></td></tr>
70
+ <tr><td colspan="4">Discount: </td><td><%= number_to_currency(d.custom_discount) %></td></tr>
71
71
  <% end %>
72
- <tr><td colspan="4">Total: </td><td><%= number_as_currency(@order.total) %></td></tr>
72
+ <tr><td colspan="4">Total: </td><td><%= number_to_currency(@order.total) %></td></tr>
73
73
  </table>
74
74
 
75
75
  <% if @order.shipping_address %>
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.5.138'
2
+ VERSION = '0.5.139'
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.5.138
4
+ version: 0.5.139
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-12 00:00:00.000000000 Z
11
+ date: 2015-03-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pg
@@ -564,6 +564,7 @@ files:
564
564
  - app/helpers/caboose/products_helper.rb
565
565
  - app/mailers/caboose/login_mailer.rb
566
566
  - app/mailers/caboose/orders_mailer.rb
567
+ - app/models/caboose/#Untitled-1#
567
568
  - app/models/caboose/ab_option.rb
568
569
  - app/models/caboose/ab_testing.rb
569
570
  - app/models/caboose/ab_value.rb