caboose-cms 0.5.137 → 0.5.138

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmUwYjU0OGY4YjY2MTQzNDQwMGFkNjE3ZjIzMDk0NDIxN2E2M2IyMg==
+    MmE0ZDk4ZDA0N2U5Y2IzM2U2Yjc2ZGFhZDJhN2E1YmU3NmUyODY4MA==
   data.tar.gz: !binary |-
-    YWQwNDA0OGYxY2YxYWNhZTU5MmEyMjljMGJhNDM5MDk0YjI4NjllZA==
+    YTBhZTlkYzBlOWEwOGI5ZmY3Y2ZmODllOWEzY2UyNDBmZjg0MDljNw==
 SHA512:
   metadata.gz: !binary |-
-    ZDE2MzRlZGQwMzEzZDNlZTBhN2NlZTY4MjlhMWQ4OTUzOWQ0NzI0OTkzYzQx
-    YWNlOTlhN2E5ZWU5ZTI4NDQ2MjMwMzMyYWFiNDJjYmI4ZjQwMDJmOTZjZDFi
-    NTE2YmJjMGNjZDBjOTFkNzIzYjhlYjM0MGQzMjY2Yzg3NGU0MDA=
+    MjQ4MTY2YmRjNGMyMjhkZTBhZDc4YzgwMWIwOGZjODkxZThlMDI3NTJmYWE1
+    MmIwY2JkNTczMTcxYWE5YmZmODM2MzM5MTQzY2U0ZmI2MTk3NTBhZDJlNTA0
+    YjdiZGM3MDBkMzliMDNhZTBjZWY2NWMxOGJlOWJkOWZhNmE5YTM=
   data.tar.gz: !binary |-
-    YmRmZTVkNzVmZDMzZGIzZmRkYTAzYmU0YmQ5OTVhMGVkZGY2ZmY2ZmE2NTEz
-    YTU0YTA1YWQ0NDA3NTlkNGQ4NmY4OWE1ODU1OWIxY2ZlNWQ0YjY0ZmFmNzFj
-    MDEwYzc2YjkzNjE4ZmJkYTZlYzAyOWI1OTAxOTRiYWQ1N2U4YTA=
+    NjBlZGVkZTM3OTE1NWZjOTc1YTZjMTY1MzEzZmQ3N2M3NThkNjM2NjcxNTVk
+    N2M1MTkzMGVmYjhjZTQ3MTg0YmFkMDUyMDg5MDMzMDk3YmQ0OWFhMjZiZTEw
+    NjhiMzRkZjE4YTAwMDNjM2ZiNDgzOGQyYzg4MzI0NmI2M2RlNjg=

data/app/controllers/caboose/orders_controller.rb

@@ -215,7 +215,7 @@ module Caboose
       return if !user_is_allowed('orders', 'edit')    
       
       pdf = PendingOrdersPdf.new
-      pdf.orders = Order.where(:status => Order::STATUS_PENDING).all      
+      pdf.orders = Order.where(:site_id => @site.id, :status => Order::STATUS_PENDING).all      
       send_data pdf.to_pdf, :filename => "pending_orders.pdf", :type => "application/pdf", :disposition => "inline"            
     end
       

data/app/models/caboose/order_pdf.rb

@@ -196,11 +196,11 @@ module Caboose
         tbl << arr
       end
 
-      tbl << [{ :content => "Subtotal"                                      , :colspan => 6, :align => :right }, { :content => "$" + sprintf("%.2f", order.subtotal                        ) , :align => :right }]
-      tbl << [{ :content => "Discount"                                      , :colspan => 6, :align => :right }, { :content => "(-) $" + sprintf("%.2f", order.discount ? order.discount : 0.0 ) , :align => :right }]
-      tbl << [{ :content => "Shipping and Handling Charges"  , :colspan => 6, :align => :right }, { :content => "(+) $" + sprintf("%.2f", order.shipping_and_handling           ) , :align => :right }]    
-      tbl << [{ :content => "Sales Tax"                                           , :colspan => 6, :align => :right }, { :content => "(+) $" + sprintf("%.2f", order.tax ? order.tax : 0.0           ) , :align => :right }]
-      tbl << [{ :content => "Grand Total"                                         , :colspan => 6, :font_style => :bold, :align => :right }, { :content => "$" + sprintf("%.2f", order.total                           ) , :align => :right, :font_style => :bold }]
+      tbl << [{ :content => "Subtotal"                       , :colspan => 6, :align => :right                       }, { :content => "$"     + sprintf("%.2f", order.subtotal                        ) , :align => :right }]
+      tbl << [{ :content => "Discount"                       , :colspan => 6, :align => :right                       }, { :content => "(-) $" + sprintf("%.2f", order.discount ? order.discount : 0.0 ) , :align => :right }]
+      tbl << [{ :content => "Shipping and Handling Charges"  , :colspan => 6, :align => :right                       }, { :content => "(+) $" + sprintf("%.2f", order.shipping_and_handling           ) , :align => :right }]    
+      tbl << [{ :content => "Sales Tax"                      , :colspan => 6, :align => :right                       }, { :content => "(+) $" + sprintf("%.2f", order.tax ? order.tax : 0.0           ) , :align => :right }]
+      tbl << [{ :content => "Grand Total"                    , :colspan => 6, :align => :right, :font_style => :bold }, { :content => "$"     + sprintf("%.2f", order.total                           ) , :align => :right, :font_style => :bold }]
       
       table tbl , :position => 7, :width => 530
     end

data/app/models/caboose/pending_orders_pdf.rb

@@ -9,7 +9,7 @@ module Caboose
     def to_pdf
       #image open("https://dmwwflw4i3miv.cloudfront.net/logo.png"), :position => :center
       text " "
-      self.orders.each_with_index do |o, i|
+      self.orders.each_with_index do |o, i|        
         start_new_page if i > 0
         self.order = o        
         customer_info
@@ -66,7 +66,7 @@ module Caboose
         tbl << [        
           "#{li.variant.product.title}\n#{li.variant.sku}\n#{li.variant.title}",
           { :content => li.tracking_number },
-          { :content => sprintf("%.2f", li.unit_price) , :align => :right },
+          { :content => sprintf("%.2f", li.unit_price)    , :align => :right },
           { :content => "#{li.quantity}"                  , :align => :right },          
           { :content => sprintf("%.2f", li.subtotal)      , :align => :right }
         ]

data/lib/caboose/version.rb

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

metadata

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