caboose-cms 0.5.138 → 0.5.139

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmE0ZDk4ZDA0N2U5Y2IzM2U2Yjc2ZGFhZDJhN2E1YmU3NmUyODY4MA==
+    MGVlNzZjMGJmNTYxNTkzZDcyY2RmNWIxMDIyNTA2ZjJlOWJjYjAzYQ==
   data.tar.gz: !binary |-
-    YTBhZTlkYzBlOWEwOGI5ZmY3Y2ZmODllOWEzY2UyNDBmZjg0MDljNw==
+    NjQzZGU0OTlkOTQ5YzBmYTQyMzYzZjJiNWM5MDk5Y2I3ZGI5NWQyNg==
 SHA512:
   metadata.gz: !binary |-
-    MjQ4MTY2YmRjNGMyMjhkZTBhZDc4YzgwMWIwOGZjODkxZThlMDI3NTJmYWE1
-    MmIwY2JkNTczMTcxYWE5YmZmODM2MzM5MTQzY2U0ZmI2MTk3NTBhZDJlNTA0
-    YjdiZGM3MDBkMzliMDNhZTBjZWY2NWMxOGJlOWJkOWZhNmE5YTM=
+    NzRjMGQ5MGJhYTkxYTBjMTUzY2RkYjNkZmUxZDIyMDMxZTdiOTQzZDUxMGZm
+    ZjI0Y2QzNDgwOGUyZWNiMDU1NmRlYTJkNTRiMGQ2OThiNjdlOGExYTg5MmUz
+    MzE1ODIwMDBkNmIwNjM0ZTIwMzVhYjA5YmExZmI4MDNiMDVkMjE=
   data.tar.gz: !binary |-
-    NjBlZGVkZTM3OTE1NWZjOTc1YTZjMTY1MzEzZmQ3N2M3NThkNjM2NjcxNTVk
-    N2M1MTkzMGVmYjhjZTQ3MTg0YmFkMDUyMDg5MDMzMDk3YmQ0OWFhMjZiZTEw
-    NjhiMzRkZjE4YTAwMDNjM2ZiNDgzOGQyYzg4MzI0NmI2M2RlNjg=
+    ZjE1ZTk4YjkzMjUwMjMzNTg1YjYzZWRkZDVjMGM5N2E3ZTliZjhhNGIwYzlj
+    NTMyMWUxMTE4OTlmMTI2NGMyYWQyNWE3NmUzNGFiYmY5NTNjMzJjNjc3MTlh
+    YjEzMGEyNWU1Y2Y4NTRjNzZlOGYxZjA0ZDNmYzQ2NjZmMjMzZTQ=

data/app/models/caboose/#Untitled-1#

@@ -0,0 +1,6 @@
+
+GL Hardware 500
+LVL
+  16' 2   68
+Brackets
+

data/app/views/caboose/orders_mailer/customer_new_order.html.erb

@@ -21,7 +21,7 @@
       <tr>
         <% if i == 0 %>
           <td rowspan="<%= op.line_items.count %>">
-            <div><%= op.shipping_method.name %></div>
+            <div><%= op.shipping_method.service_name %></div>
             <div><%= op.status %></div>
             <% if op.tracking_number %><div><%= op.tracking_number %></div><% end %>
           </td>
@@ -31,15 +31,15 @@
           <% if li.is_gift %>
             <p>This item is a gift.</p>
             <ul>
-              <li><% if li.gift_wrap %>Gift wrap (<%= number_as_currency(p.gift_wrap_price) %>)<% else %>Do not gift wrap<% end %></li>
+              <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_as_currency(li.unit_price) %></td>
+        <td align='right'><%= number_to_currency(li.unit_price) %></td>
         <td align='right'><%= li.quantity %></td>
-        <td align='right'><%= number_as_currency(li.subtotal) %></td>
+        <td align='right'><%= number_to_currency(li.subtotal) %></td>
       </tr>
     <% end %>
   <% end %>  
@@ -50,26 +50,26 @@
     <tr>
       <td>Not assigned to a package</td>                
       <td><%= p.title %></td></td>
-      <td align='right'><%= number_as_currency(li.unit_price) %></td>
+      <td align='right'><%= number_to_currency(li.unit_price) %></td>
       <td align='right'><%= li.quantity %></td>
-      <td align='right'><%= number_as_currency(li.subtotal) %></td>
+      <td align='right'><%= number_to_currency(li.subtotal) %></td>
     </tr>  
   <% end %>
-  <tr><td colspan="4">Subtotal:               </td><td><%= number_as_currency(@order.subtotal) %></td></tr>
-  <tr><td colspan="4">Tax:                    </td><td><%= number_as_currency(@order.tax)      %></td></tr>
-  <tr><td colspan="4">Shipping and Handling:  </td><td><%= number_as_currency(@order.shipping + @order.handling) %></td></tr>
+  <tr><td colspan="4">Subtotal:               </td><td><%= number_to_currency(@order.subtotal) %></td></tr>
+  <tr><td colspan="4">Tax:                    </td><td><%= number_to_currency(@order.tax)      %></td></tr>
+  <tr><td colspan="4">Shipping and Handling:  </td><td><%= number_to_currency(@order.shipping + @order.handling) %></td></tr>
   <% if @order.gift_wrap && @order.gift_wrap > 0 %>  
-    <tr><td colspan="4">Gift wrap:            </td><td><%= number_as_currency(@order.gift_wrap) %></td></tr>
+    <tr><td colspan="4">Gift wrap:            </td><td><%= number_to_currency(@order.gift_wrap) %></td></tr>
   <% end %>
   <% if @order.discounts %>
     <% @order.discounts.each do |d| %>
-      <tr><td colspan="4">"<%= d.gift_card.code %>" gift card: </td><td><%= number_as_currency(d.amount) %></td></tr>
+      <tr><td colspan="4">"<%= d.gift_card.code %>" gift card: </td><td><%= number_to_currency(d.amount) %></td></tr>
     <% end %>
   <% end %>
   <% if @order.custom_discount %>
-    <tr><td colspan="4">Discount: </td><td><%= number_as_currency(d.custom_discount) %></td></tr>
+    <tr><td colspan="4">Discount: </td><td><%= number_to_currency(d.custom_discount) %></td></tr>
   <% end %>      
-  <tr><td colspan="4">Total:     </td><td><%= number_as_currency(@order.total) %></td></tr>
+  <tr><td colspan="4">Total:     </td><td><%= number_to_currency(@order.total) %></td></tr>
 </table>
 
 <% if @order.shipping_address %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.138'
+  VERSION = '0.5.139'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.138
+  version: 0.5.139
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -564,6 +564,7 @@ files:
 - app/helpers/caboose/products_helper.rb
 - app/mailers/caboose/login_mailer.rb
 - app/mailers/caboose/orders_mailer.rb
+- app/models/caboose/#Untitled-1#
 - app/models/caboose/ab_option.rb
 - app/models/caboose/ab_testing.rb
 - app/models/caboose/ab_value.rb