caboose-cms 0.5.199 → 0.5.200

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzQ3ZmY5MGQxOTFkZmNjNzE1YTJiMmMwZTllMTU2MDM2NjFhMTlkOQ==
+    YzQwYWQxZGViMmI1ODlkNjNkMjJjODc3ZmE3NjZhYWY0NjViYTAwNA==
   data.tar.gz: !binary |-
-    OGE1ZmZlMWNhMmZmNmE1NjE0YTE2NWJmODE2NTY4NDkwMWQ4Y2NkMA==
+    MDcwMDA0Y2M4MTRmMWI3Y2NiN2Q1N2U3YTM5MzAzZWQ3NzI0NjgyNQ==
 SHA512:
   metadata.gz: !binary |-
-    OWUxNTY3MDU3YjgyYmQwMGMyNDJjZWExNDhkOTVlMGQ5N2FmYzU1OWNiZmNk
-    ZmE3MGI5NjM4OWQ2Yzc3YmNlZjY2NjllMWFmMDE5NDlkZjhmZTRiMTg4OTAw
-    OGJiYzI3MGU2OTE2YWFlMmM1NTNjMzViMGMwNTlkNmJjZDBhMjI=
+    NTUxNTM5MjEyYmM2OWJiYTZiZjEzODQ1YmUxOTE4MTY0NTRkYjg3MjliNjIx
+    OGJlY2JkYTVmNTRlMWQ3ZTYzZDYwMWE2ZDMwMDEzZDIyZjliMzI0ZDk3MThk
+    ODViZjRlYTQ2NGZhZjZkNWYwYTQwNGVlN2ZmZGIxOWYzZjg3MDQ=
   data.tar.gz: !binary |-
-    YTdkMWJmMDYzMDMxMDhjOTUyZjQzNjVmMzQzNDc3ZjEwYWZjMmNmNmFmYmE0
-    Y2Y2ODMxNzNkYzViNGYzM2VlYTJiMDZiNjk3ZGVjM2RkNzMxMDZhMDY1ZWFl
-    N2ExZDZhOGU2MDNjOGNiNjQ5OTM5ZTc2Mzc3ZWUwNzcxOWQyMGM=
+    MmRiMWViNTgzYmFmMDE0NTQyOTMwMDJhOGRkZmZlNDAxZmY1MjExN2FmZTU3
+    NTNjZmY4NzdlYmEyODI1YjczYWY3MDI1ZTkzM2ZmNDRhYTk4NjliY2M4M2I0
+    NDZjYjM3MjM5M2EwNjg1OTFkZjQ4NzVjODI5NmQxYTFmN2VlYmY=

data/app/models/caboose/order_pdf.rb

@@ -147,7 +147,7 @@ module Caboose
           else
             arr << { :content => "No Image" }
           end
-          arr << { :content => "#{li.variant.product.title}\n#{li.variant.sku}", :borders => [:top, :right, :bottom], :width => 100 }
+          arr << { :content => "#{li.variant.product.title}\n#{li.variant.sku}\n#{self.gift_options(li)}", :borders => [:top, :right, :bottom], :width => 100 }
           arr << { :content => options }
           arr << { :content => "#{li.quantity}"                     , :align => :right }
           arr << { :content => "$" + sprintf("%.2f", li.unit_price) , :align => :right }
@@ -177,8 +177,8 @@ module Caboose
           arr << { :image => image, :fit => [40, 40], :borders => [:top, :bottom, :left], :width => 50 }
         else
           arr << { :content => "No Image" }
-        end
-        arr << { :content => "#{li.variant.product.title}\n#{li.variant.sku}", :borders => [:top, :right, :bottom], :width => 100 }
+        end        
+        arr << { :content => "#{li.variant.product.title}\n#{li.variant.sku}\n#{self.gift_options(li)}", :borders => [:top, :right, :bottom], :width => 100 }
         arr << { :content => options }
         arr << { :content => "#{li.quantity}"               , :align => :right }
         if li.unit_price
@@ -198,6 +198,15 @@ module Caboose
       
       table tbl , :position => 7, :width => 530
     end
+    
+    def gift_options(li)          
+      return "This item is not a gift." if !li.is_gift                  
+      str = "This item is a gift.\n"
+      str << "- Gift wrap: #{li.gift_wrap ? 'Yes' : 'No'}\n"
+      str << "- Hide prices: #{li.hide_prices ? 'Yes' : 'No'}\n"
+      str << "- Gift message:\n #{li.gift_message && li.gift_message.length > 0 ? li.gift_message : '[Empty]'}"
+      return str        
+    end
 
     def payment_info
 

data/app/models/caboose/pending_orders_pdf.rb

@@ -151,8 +151,8 @@ module Caboose
             arr << { :image => image, :fit => [40, 40], :borders => [:top, :bottom, :left], :width => 50 }
           else
             arr << { :content => "No Image" }
-          end
-          arr << { :content => "#{li.variant.product.title}\n#{li.variant.sku}", :borders => [:top, :right, :bottom], :width => 100 }
+          end          
+          arr << { :content => "#{li.variant.product.title}\n#{li.variant.sku}\n#{self.gift_options(li)}", :borders => [:top, :right, :bottom], :width => 100 }
           arr << { :content => options }
           arr << { :content => "#{li.quantity}"                     , :align => :right }
           arr << { :content => "$" + sprintf("%.2f", li.unit_price) , :align => :right }
@@ -184,8 +184,8 @@ module Caboose
           arr << { :image => image, :fit => [40, 40], :borders => [:top, :bottom, :left], :width => 50 }
         else
           arr << { :content => "No Image" }
-        end
-        arr << { :content => "#{li.variant.product.title}\n#{li.variant.sku}", :borders => [:top, :right, :bottom], :width => 100 }
+        end        
+        arr << { :content => "#{li.variant.product.title}\n#{li.variant.sku}\n#{self.gift_options(li)}", :borders => [:top, :right, :bottom], :width => 100 }
         arr << { :content => options }
         arr << { :content => "#{li.quantity}"               , :align => :right }
         if li.unit_price
@@ -205,6 +205,15 @@ module Caboose
       
       table tbl , :position => 7, :width => 530
     end
+    
+    def gift_options(li)          
+      return "This item is not a gift." if !li.is_gift                  
+      str = "This item is a gift.\n"
+      str << "- Gift wrap: #{li.gift_wrap ? 'Yes' : 'No'}\n"
+      str << "- Hide prices: #{li.hide_prices ? 'Yes' : 'No'}\n"
+      str << "- Gift message:\n #{li.gift_message && li.gift_message.length > 0 ? li.gift_message : '[Empty]'}"
+      return str        
+    end
 
     def payment_info(order)
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.199'
+  VERSION = '0.5.200'
 end

metadata

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