shoppe 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f538931e1391e057d5cecff9e2f104dfc1dffc65
-  data.tar.gz: e44da7a5e997c681c74b8727aec174af98063ad7
+  metadata.gz: 752b9615632da0d234db4ce429f3ce320ee2042c
+  data.tar.gz: 1ef71710c0b97b62b5b964da53e655f596206b38
 SHA512:
-  metadata.gz: 0006cf0c9d160cac11c1fc694a219204a114423c09f79c8b87e8b328b7cd3b939f0e398e364c3c7b3c880d113cde4009f1314724098c82a0119cb86be0f5627a
-  data.tar.gz: f2b9eb945cb343a3ec1ebd2e6e2f91a9f6acb752ed7bd1d1a8f6c4d0bbb7570409a24d7e00c65b0c10afd30e9676cc2a16b2f918580f9c9aaecb3a19c0d512df
+  metadata.gz: 9a482542a767728e88f99a8ef1ffe56e550e9f38854d07056132d0229264e9d66fc2f32fd09b3009e7fad9591a757cbda61856712210991ab3033e7b97102690
+  data.tar.gz: 41a7a43caa70822b11602bc66fb8224bfbe7cb2e37162899c3385aa3cf0489232648ad5f8fe7509775df13138db64a1f56173bc687cd96ec18f318a6b1ee0343

data/app/models/shoppe/order/billing.rb

@@ -41,13 +41,19 @@ module Shoppe
     def profit
       total_before_tax - total_cost
     end
+    
+    # The total price of all items in the basket excluding delivery
+    #
+    # @return [BigDecimal]
+    def items_sub_total
+      order_items.inject(BigDecimal(0)) { |t, i| t + i.sub_total }
+    end
   
     # The total price of the order before tax
     #
     # @return [BigDecimal]
     def total_before_tax
-      self.delivery_price +
-      order_items.inject(BigDecimal(0)) { |t, i| t + i.sub_total }
+      self.delivery_price + self.items_sub_total
     end
   
     # The total amount of tax due on this order

data/lib/shoppe/version.rb

@@ -1,3 +1,3 @@
 module Shoppe
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoppe
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -184,16 +184,22 @@ dependencies:
   name: nifty-key-value-store
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: nifty-utils
   requirement: !ruby/object:Gem::Requirement
@@ -212,16 +218,22 @@ dependencies:
   name: nifty-attachments
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: nifty-dialog
   requirement: !ruby/object:Gem::Requirement