xsys 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a827bdbae0d2ad9595a966e968404f083f61b5ab
-  data.tar.gz: 21f0a0a3917fcac505deaa3e44625842729d6bdd
+  metadata.gz: 6fb62153eeb269bd03c7b39b09742eae6a861d32
+  data.tar.gz: 67e032fb51aa2be9d634cbf8759a70b7cc1965ed
 SHA512:
-  metadata.gz: a1f6e51742a4d44094f8bf14d0332356e7a1afe7e3d9d21978c312644a5ea05cc45fcbacdcda8c411153fe940d30f51cd8d0f1c2f315bac64e41c118486ec2d2
-  data.tar.gz: bd9dc492e2315e52630e516275ac7146e5ffcb9a5aacdf692968b42bfbeba7502cb9124547f43979b20bf75ca70209b735b18d1912ede0087bebd02dacb09167
+  metadata.gz: 491249a982193eecb15d80fc61da96b4b87dc6fdb194b1d37f83684b175df6a8f70c970b7df685d5efaaddcd319763a095aa9dfc4e53b88f0368a91a034f411f
+  data.tar.gz: 224a735d55669453c63d5228a8d942cc3a63d1508d5b050bd41e06b327a020550f63e1264ec11ab529b0d24690a2029053da7a220b35854b26e9acb25cb30cbf

data/CHANGELOG.md

@@ -313,3 +313,7 @@
 ## v0.12.0
 
 * Fixes for products and stocks
+
+## v0.13.0
+
+* Refactor on product fields

data/lib/xsys/model/product.rb

@@ -40,27 +40,39 @@ module Xsys
         end
       end
 
-      def stock_quantity(shop_codes=[])
-        if shop_codes.empty?
+      def stock_quantity(shop_code_or_array=nil)
+        if shop_code_or_array.nil?
           stocks.map(&:quantity).sum
+        elsif shop_code_or_array.is_a?(Array)
+          stocks.find_all { |s| shop_code_or_array.include?(s.code) }.map(&:quantity).sum
+        elsif shop_code_or_array.is_a?(String)
+          stocks.find_all { |s| shop_code_or_array.upcase == s.code }.map(&:quantity).sum
         else
-          stocks.find_all { |s| shop_codes.include?(s.code) }.map(&:quantity).sum
+          raise 'invalid input!'
         end
       end
 
-      def stock_available(shop_codes=[])
-        if shop_codes.empty?
+      def stock_available(shop_code_or_array=nil)
+        if shop_code_or_array.nil?
           stocks.map(&:available).sum
+        elsif shop_code_or_array.is_a?(Array)
+          stocks.find_all { |s| shop_code_or_array.include?(s.code) }.map(&:available).sum
+        elsif shop_code_or_array.is_a?(String)
+          stocks.find_all { |s| shop_code_or_array.upcase == s.code }.map(&:available).sum
         else
-          stocks.find_all { |s| shop_codes.include?(s.code) }.map(&:available).sum
+          raise 'invalid input!'
         end
       end
 
-      def stock_reserved(shop_codes=[])
-        if shop_codes.empty?
+      def stock_reserved(shop_code_or_array=nil)
+        if shop_code_or_array.nil?
           stocks.map(&:reserved).sum
+        elsif shop_code_or_array.is_a?(Array)
+          stocks.find_all { |s| shop_code_or_array.include?(s.code) }.map(&:reserved).sum
+        elsif shop_code_or_array.is_a?(String)
+          stocks.find_all { |s| shop_code_or_array.upcase == s.code }.map(&:reserved).sum
         else
-          stocks.find_all { |s| shop_codes.include?(s.code) }.map(&:reserved).sum
+          raise 'invalid input!'
         end
       end
 
@@ -74,7 +86,25 @@ module Xsys
         stocks.find_all { |x| x.sellable }
       end
 
-      def price_date_for_list(price_list_id)
+      def sellable_stocks_quantity
+        sellable_stocks.map(&:quantity).sum
+      end
+
+      def sellable_stocks_reserved
+        sellable_stocks.map(&:reserved).sum
+      end
+
+      def sellable_stocks_available
+        sellable_stocks.map(&:available).sum
+      end
+
+      def price_list(price_list_id)
+        prices.find { |p|
+          p.price_list_id.to_i == price_list_id.to_i
+        }
+      end
+
+      def price_date_with_list(price_list_id)
         prices.find { |p|
           p.price_list_id.to_i == price_list_id.to_i
         }.try(:price_update_date)
@@ -86,7 +116,7 @@ module Xsys
         }.try(:markup) || BigDecimal.new('0.0')
       end
 
-      def price_in_list(price_list_id)
+      def total_price_with_list(price_list_id)
         prices.find { |p|
           p.price_list_id.to_i == price_list_id.to_i
         }.try(:total_price) || BigDecimal.new('0.0')

data/lib/xsys/version.rb

@@ -1,3 +1,3 @@
 module Xsys
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsys
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Matias Hick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler