xsys 0.10.4 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b835be389df6eb3b3ee42753f21b44ce28f48a11
-  data.tar.gz: 81e93306e973efa87286a5ee94c9860e49a67b17
+  metadata.gz: d78e68798930dc67a4590142a2e7f0f02cb8a3a9
+  data.tar.gz: 2fbdb77c23c7756b89d85cde9e3ad01b38c41335
 SHA512:
-  metadata.gz: 3976f2eb13c6beb07d2d9d753b99e9b5609fc5d154dff993ea680e40ae759b6c14ac498a3e33288c53d80d7f9af48cce1ed0335becd5628bd9e315082dbf2468
-  data.tar.gz: 07a895752d7c63ed49a6b732b70b8663c5532e3cddbdcdf0ea6c45bdd5b68ae82ea8e7e66b1bc726c056ea16aaa600b69ceca4037f006ac6e808d3afd7eec136
+  metadata.gz: cb8021a9bc5bb0c870287f3c1be956efd9dc7a17e192de9243e9e67766481a078ee6f6359f7b7bfb27696a9716ae7214de16a424d372de238b5fe5f0efd084d1
+  data.tar.gz: 91a8ef879e029b56100f03c0bec1e3feaeb1c08d25b0b93be12e71479ad023bdc00fbdefe1fe11d24393d2733b4d11e1769a14f16f476a22951a7820cb8283cb

data/CHANGELOG.md

@@ -301,3 +301,11 @@
 ## v0.10.4
 
 * Added has availability_date attribute to products
+
+## v0.11
+
+* Changed stock to show reserved, available quantity and removed shop fields
+
+## v0.11.1
+
+* Added shop_service

data/lib/xsys/model/product.rb

@@ -50,17 +50,7 @@ module Xsys
         result = 0
 
         sellable_stocks.each do |stock|
-          if options[:skip_exhibition]
-            if !stock.shop_has_exhibition
-              result += stock.quantity
-            elsif stock.quantity > 0
-              result += (stock.quantity - 1)
-            else
-              result += stock.quantity
-            end
-          else
-            result += stock.quantity
-          end
+          result += stock.quantity
         end
 
         result
@@ -91,17 +81,7 @@ module Xsys
           s.shop_code.to_s.upcase == shop_code.to_s.upcase
         }
 
-        if options[:skip_exhibition]
-          if !stock.shop_has_exhibition
-            stock.quantity
-          elsif stock.quantity > 0
-            (stock.quantity - 1)
-          else
-            stock.quantity
-          end
-        else
-          stock.quantity
-        end
+        stock.quantity
       end
 
       def price_date_for_list(price_list_id)

data/lib/xsys/model/stock.rb

@@ -2,14 +2,33 @@ module Xsys
   module Model
     class Stock
       def self.attr_list
-        [:shop_code, :quantity, :shop_has_exhibition, :shop_service]
+        [
+          :shop_code,
+          :quantity,
+          :available,
+          :reserved,
+          :quantity_update_time,
+          :quantity_update_date,
+          :reserved_update_time,
+          :reserved_update_date,
+          :shop_service
+        ]
       end
 
       attr_reader *attr_list
 
       def initialize(attributes={})
+        time_fields = ['quantity_update_time', 'reserved_update_time']
+        date_fields = ['quantity_update_date', 'reserved_update_date']
+
         attributes.each do |k, v|
-          self.send("#{k}=", v) if self.respond_to?(k)
+          if time_fields.include?(k.to_s)
+            self.send("#{k}=", Time.parse(v)) unless v.nil?
+          elsif date_fields.include?(k.to_s)
+            self.send("#{k}=", Date.parse(v)) unless v.nil?
+          else
+            self.send("#{k}=", v) if self.respond_to?(k)
+          end
         end
       end
 

data/lib/xsys/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsys
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.11.1
 platform: ruby
 authors:
 - Matias Hick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Get data from xsys api