caboose-store 0.0.26 → 0.0.27

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTNkNWVhMzg2NGY1Njg0MDg1MTE5ZmVjODU0NTliZTI5ZjA0NzBlYw==
+    OTlhYWY2MDc3YjY0YmYyZGE3YTBjODRjNDUxNzI2OTY1OGJmZmRjNQ==
   data.tar.gz: !binary |-
-    ZDYyZDNjNjU3MTMyNDY5MTJhZjIzNGQxNDg3ZDQ4YmE4NGIzNTBkYg==
+    YWQ2Y2I1NmJkZTU4YzJmYjM2MzAwOTllMzQ4MDcwZTA4Yzg4Yzg1Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmNjN2JjZTFkNzBiMGVlMWEzODE1ZDRiN2I3NTQ0OTk3NmUxZmIwNDNlZDBl
-    Y2NkMmYwZDVlODAzNjkzODNhMDc3MWVkMzI1OGQ4MjI3OTM1MTg3MjFmYTdk
-    MDEzMDZjMmZhMGY4N2QwMzRmZDVlMGYwZGM0MzgwMGE3Mzg3NDQ=
+    NjVkYWY1MDM0YjI4MDEzZWU1NTBiZjEzNGMwMGI3YjhlOGUxYTM3YzZhOGUw
+    ZWM5MzU3YTVjNDA1NDM3OTVjOWM1OWMzZTYyYmQ0YTFhNzI4MjJiZTZmNGM0
+    OGNmMWExNWMzYmVmM2NlYjQ1MzFlMjZmODc4NWJkMzJmMzJjNGE=
   data.tar.gz: !binary |-
-    Y2Y1YzhlMmU4NWIyYWJiM2QyYTFkYzk3YzQxY2Q4OTM3NWFlMDc1NmZlYTU1
-    ODdiYzZjNTc3NjA3OWEwYjI2YTJlNzAxMWVhZjE1OTY3NzliMjQxYTA5ZDEw
-    ZDU0ZmY5Y2RlMmMyYjA2ZGI3ZTdiNTFhNzU4NDkyOTZjZjJiZWM=
+    YzQ3MWQ5ODczNTYwYmIwM2U4OTAwYzAzMjc4ODM2MDlmZTMzMjg2YjM1Yjk3
+    YjQzN2IwMzRlZjY3NmM3NDU5OTAzMTc2MzI2ZGIzMzEzNTI4ZWY4ZTJiZjhj
+    MDc2MWYzOGFlNzQ5YWE0ZjVkYTA2ODlkMjY2NTJhNWVlZjExYWE=

data/app/models/caboose_store/line_item.rb

@@ -72,6 +72,10 @@ module CabooseStore
         :product => { :images => self.variant.product.product_images }
       })
     end
+    
+    def subtotal
+      return self.quantity * self.price
+    end
   end
 end
 

data/app/models/caboose_store/order.rb

@@ -182,6 +182,10 @@ module CabooseStore
     def calculate_total
       [self.subtotal, self.tax, self.shipping, self.handling].compact.inject { |sum, price| sum + price }
     end
+    
+    def shipping_and_handling
+      (self.shipping ? self.shipping : 0.0) + (self.handling ? self.handling : 0.0)      
+    end
   end
 end
 

data/app/models/caboose_store/order_pdf.rb

@@ -53,8 +53,7 @@ module CabooseStore
         { :content => "Item"            , :align => :center, :valign => :bottom },
         { :content => "Tracking Number" , :align => :center, :valign => :bottom },
         { :content => "Unit Price"      , :align => :center, :valign => :bottom },
-        { :content => "Qty Ordered"     , :align => :center, :valign => :bottom },
-        { :content => "Qty Shipped"     , :align => :center, :valign => :bottom },        
+        { :content => "Quantity"        , :align => :center, :valign => :bottom },                
         { :content => "Subtotal"        , :align => :center, :valign => :bottom, :width => 60 }
       ]
       
@@ -63,16 +62,15 @@ module CabooseStore
           "#{li.variant.product.title}\n#{li.variant.sku}\n#{li.variant.title}",
           { :content => li.tracking_number },
           { :content => sprintf("%.2f", li.variant.price) , :align => :right },
-          { :content => "#{li.quantity}"                  , :align => :right },
-          { :content => "#{li.quantity_shipped}"          , :align => :right },
+          { :content => "#{li.quantity}"                  , :align => :right },          
           { :content => sprintf("%.2f", li.subtotal)      , :align => :right }
         ]
       end            
-      tbl << [{ :content => "Subtotal"                                      , :colspan => 5, :align => :right }, { :content => sprintf("%.2f", order.subtotal )                 , :align => :right }]
-      tbl << [{ :content => "Tax"                                           , :colspan => 5, :align => :right }, { :content => sprintf("%.2f", order.tax      )                 , :align => :right }]
-      tbl << [{ :content => "#{order.shipping_method} Shipping & Handling"  , :colspan => 5, :align => :right }, { :content => sprintf("%.2f", order.shipping + order.handling) , :align => :right }]    
-      tbl << [{ :content => "Discount"                                      , :colspan => 5, :align => :right }, { :content => sprintf("%.2f", order.discount )                 , :align => :right }]
-      tbl << [{ :content => "Total"                                         , :colspan => 5, :align => :right }, { :content => sprintf("%.2f", order.total    )                 , :align => :right }]
+      tbl << [{ :content => "Subtotal"                                      , :colspan => 4, :align => :right }, { :content => sprintf("%.2f", order.subtotal                        ) , :align => :right }]
+      tbl << [{ :content => "Tax"                                           , :colspan => 4, :align => :right }, { :content => sprintf("%.2f", order.tax ? order.tax : 0.0           ) , :align => :right }]
+      tbl << [{ :content => "#{order.shipping_method} Shipping & Handling"  , :colspan => 4, :align => :right }, { :content => sprintf("%.2f", order.shipping_and_handling           ) , :align => :right }]    
+      tbl << [{ :content => "Discount"                                      , :colspan => 4, :align => :right }, { :content => sprintf("%.2f", order.discount ? order.discount : 0.0 ) , :align => :right }]
+      tbl << [{ :content => "Total"                                         , :colspan => 4, :align => :right }, { :content => sprintf("%.2f", order.total                           ) , :align => :right }]
       
       table tbl
     end

data/lib/caboose-store/version.rb

@@ -1,3 +1,3 @@
 module CabooseStore
-  VERSION = '0.0.26'
+  VERSION = '0.0.27'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-store
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms