xsys 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d78e68798930dc67a4590142a2e7f0f02cb8a3a9
-  data.tar.gz: 2fbdb77c23c7756b89d85cde9e3ad01b38c41335
+  metadata.gz: a827bdbae0d2ad9595a966e968404f083f61b5ab
+  data.tar.gz: 21f0a0a3917fcac505deaa3e44625842729d6bdd
 SHA512:
-  metadata.gz: cb8021a9bc5bb0c870287f3c1be956efd9dc7a17e192de9243e9e67766481a078ee6f6359f7b7bfb27696a9716ae7214de16a424d372de238b5fe5f0efd084d1
-  data.tar.gz: 91a8ef879e029b56100f03c0bec1e3feaeb1c08d25b0b93be12e71479ad023bdc00fbdefe1fe11d24393d2733b4d11e1769a14f16f476a22951a7820cb8283cb
+  metadata.gz: a1f6e51742a4d44094f8bf14d0332356e7a1afe7e3d9d21978c312644a5ea05cc45fcbacdcda8c411153fe940d30f51cd8d0f1c2f315bac64e41c118486ec2d2
+  data.tar.gz: bd9dc492e2315e52630e516275ac7146e5ffcb9a5aacdf692968b42bfbeba7502cb9124547f43979b20bf75ca70209b735b18d1912ede0087bebd02dacb09167

data/CHANGELOG.md

@@ -302,10 +302,14 @@
 
 * Added has availability_date attribute to products
 
-## v0.11
+## v0.11.0
 
 * Changed stock to show reserved, available quantity and removed shop fields
 
 ## v0.11.1
 
 * Added shop_service
+
+## v0.12.0
+
+* Fixes for products and stocks

data/lib/xsys/model/product.rb

@@ -2,15 +2,13 @@ module Xsys
   module Model
     class Product
       def self.attr_list
-        [:id, :name, :sellable, :product_category_id,
-         :product_provider_id, :vat_rate, :taxed_cost, :vat_cost, :total_cost,
-         :pending_ordered_quantity, :stocks, :prices, :category, :provider,
-         :last_total_cost, :last_taxed_cost, :cost_update_date, :cost_update_time,
-         :last_cost_update_date, :last_cost_update_time, :price_update_date, :price_update_time,
-         :online_stock, :product_size_code, :weight, :length, :width, :height, :packages_quantity,
-         :ean, :packages, :regular_price, :reduced_price, :credit_card_price, :brand, :model,
-         :has_stock_on_hold, :availability_date
-       ]
+        [:id, :name, :sellable, :product_category_id, :product_provider_id, :vat_rate,
+         :taxed_cost, :vat_cost, :total_cost, :pending_ordered_quantity, :stocks, :prices,
+         :category, :provider, :last_total_cost, :last_taxed_cost, :cost_update_date,
+         :cost_update_time, :last_cost_update_date, :last_cost_update_time, :price_update_date,
+         :price_update_time, :online_stock, :product_size_code, :weight, :length, :width,
+         :height, :packages_quantity, :ean, :packages, :regular_price, :reduced_price,
+         :credit_card_price, :brand, :model, :has_stock_on_hold, :availability_date]
       end
 
       attr_reader *attr_list
@@ -42,46 +40,38 @@ module Xsys
         end
       end
 
-      def sellable_stocks
-        stocks.find_all { |s| !s.shop_service }
-      end
-
-      def sellable_stocks_quantity(options={})
-        result = 0
-
-        sellable_stocks.each do |stock|
-          result += stock.quantity
+      def stock_quantity(shop_codes=[])
+        if shop_codes.empty?
+          stocks.map(&:quantity).sum
+        else
+          stocks.find_all { |s| shop_codes.include?(s.code) }.map(&:quantity).sum
         end
-
-        result
-      end
-
-      def service_stocks
-        stocks.find_all { |s| s.shop_service }
       end
 
-      def service_stocks_quantity
-        service_stocks.map(&:quantity).sum
-      end
-
-      def stocks_quantity
-        stocks.map(&:quantity).sum
+      def stock_available(shop_codes=[])
+        if shop_codes.empty?
+          stocks.map(&:available).sum
+        else
+          stocks.find_all { |s| shop_codes.include?(s.code) }.map(&:available).sum
+        end
       end
 
-      def stock_sum(shop_codes)
-        formatted_shop_codes = shop_codes.map(&:to_s).map(&:upcase)
-
-        stocks.find_all { |s|
-          formatted_shop_codes.include?(s.shop_code.to_s.upcase)
-        }.map(&:quantity).sum
+      def stock_reserved(shop_codes=[])
+        if shop_codes.empty?
+          stocks.map(&:reserved).sum
+        else
+          stocks.find_all { |s| shop_codes.include?(s.code) }.map(&:reserved).sum
+        end
       end
 
-      def stock_at(shop_code, options={})
-        stock = stocks.find { |s|
+      def stock_at(shop_code)
+        stocks.find { |s|
           s.shop_code.to_s.upcase == shop_code.to_s.upcase
         }
+      end
 
-        stock.quantity
+      def sellable_stocks
+        stocks.find_all { |x| x.sellable }
       end
 
       def price_date_for_list(price_list_id)

data/lib/xsys/model/shop.rb

@@ -2,10 +2,8 @@ module Xsys
   module Model
     class Shop
       def self.attr_list
-        [:id, :code, :name, :stock_description, :commercial,
-        :virtual, :stockable, :has_target, :service, :physical_shop_code,
-        :position, :has_stock_control, :has_exhibition, :stock_sellable,
-        :stock_sellable, :enabled, :physical_shop_id, :last_update]
+        [:id, :code, :name, :commercial, :virtual, :stockable, :has_target,
+         :position, :has_stock_control, :stock_sellable, :enabled, :kind]
       end
 
       attr_reader *attr_list
@@ -32,16 +30,12 @@ module Xsys
         stockable == true
       end
 
-      def service?
-        service == true
-      end
-
       def has_target?
         has_target == true
       end
 
-      def has_exhibition?
-        has_exhibition == true
+      def has_stock_control?
+        has_stock_control == true
       end
 
       def stock_sellable?

data/lib/xsys/model/stock.rb

@@ -11,7 +11,7 @@ module Xsys
           :quantity_update_date,
           :reserved_update_time,
           :reserved_update_date,
-          :shop_service
+          :sellable
         ]
       end
 

data/lib/xsys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xsys
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Matias Hick