caboose-cms 0.5.160 → 0.5.161

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTZmYjMwNTE1OTY0OWNjYzRkMTczOWRlZTgyMzI4ZWExOTc3MjJlMA==
+    YTQ1MTU0YjcyN2E4MjYwOGUwYzgzZDNmMTc5NmMxYWViYzNlZmIyZg==
   data.tar.gz: !binary |-
-    MDRiYjE5ZjNkMTQwNDI1M2IzMTRjNWQ5ZWUzZDg1MjE3NzdkMjYxMg==
+    OTk0Y2NjZmE1M2NkYzgyNTYwM2Y2NzNjMjE0MWE2Y2M0MDkwZWUwNQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjUxM2NjMDBmMGM1NDVmMjJkZmZhNDRmYzk3YzJkNDEyNTllZDAzOGQ3NjJj
-    N2Y3OWFmYzM5MTE2ZTVhNjIwNzljN2I2ZjgyYzI1MzA4MTdhNWRlODUxN2Jh
-    NzYwMDU2MzM3N2MyNWZlNmQ3NzdhZWI5ZWU3NTY1NmQ2ZTkyOTk=
+    YWJlMGU1OGY4YTE3ODcxZWY5MmRiOWVkMTJlNzdhMTI5OTJkZmNmNTEyZjU3
+    MGJkZjUzZjRlMWE2MjdkYTQ5NTU0OWNmMjk3ZTdhNGQzZTNlNTI0YmMwMmM0
+    ZDZmYWY1NzI5MGY1ZDAxMzU0YWMwMDE3ZGRhMWE5ZWM2MjI0YzM=
   data.tar.gz: !binary |-
-    MTRhN2M3OTQ5MDg0MjUwOTE3MjFhOGE4YTZlYzQxYjZkNDFhMTdiOWE5ODk1
-    Yjc2ZTM2YTA5MGRmOTgwZjNlNmVhOTk2MDNlNmJmN2RmMzM5NTRmNmQ2MDc3
-    M2FhNmU0NTQ5ZDM5NGI2ZmQ3Yjc0YTgxM2NjMjI3OGJiNWIyNmM=
+    ZjYzYWQ1MmZlMjU4NGEzNDExMTc4ZDJiNGYyZGY4MzA5NzE3OTk0YzYzNGZi
+    NzJjODAxNWUzYWNlYzkwZGIwNTk2YzA4ZDI5NTdkMWM2MmFkYTkyNmY0Y2Iy
+    ZmMyNjQ2NTMxY2M1ZmZlYTkyMGIzZWYxNmI3NTQzYjg2MzNiMDI=

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

@@ -35,9 +35,6 @@
               <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 %>          
-          <% if li.variant.downloadable %>
-            <p><a href='<%= @order.site.store_config.pp_relay_domain %>/my-account/orders/<%= @order.id %>/line-items/<%= li.id %>/download' target="_blank">Download</a></li>
           <% end %>
         </td>
         <td align='right'><%= number_to_currency(li.unit_price) %></td>
@@ -51,8 +48,25 @@
     <% v = li.variant %>
     <% p = v.product %>
     <tr>
-      <td>Not assigned to a package</td>                
-      <td><%= p.title %></td></td>
+      <td>
+        <% if v.downloadable %>
+          <p>This item is downloadable.</p>          
+          <p><a href='<%= @order.site.store_config.pp_relay_domain %>/my-account/orders/<%= @order.id %>/line-items/<%= li.id %>/download' target="_blank">Download</a></li>        
+        <% else %>
+          Not assigned to a package
+        <% end %>
+      </td>      
+      <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>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.160'
+  VERSION = '0.5.161'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.160
+  version: 0.5.161
 platform: ruby
 authors:
 - William Barry