xsys 0.10.4 → 0.11.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +8 -0
- data/lib/xsys/model/product.rb +2 -22
- data/lib/xsys/model/stock.rb +21 -2
- data/lib/xsys/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d78e68798930dc67a4590142a2e7f0f02cb8a3a9
|
4
|
+
data.tar.gz: 2fbdb77c23c7756b89d85cde9e3ad01b38c41335
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: cb8021a9bc5bb0c870287f3c1be956efd9dc7a17e192de9243e9e67766481a078ee6f6359f7b7bfb27696a9716ae7214de16a424d372de238b5fe5f0efd084d1
|
7
|
+
data.tar.gz: 91a8ef879e029b56100f03c0bec1e3feaeb1c08d25b0b93be12e71479ad023bdc00fbdefe1fe11d24393d2733b4d11e1769a14f16f476a22951a7820cb8283cb
|
data/CHANGELOG.md
CHANGED
data/lib/xsys/model/product.rb
CHANGED
@@ -50,17 +50,7 @@ module Xsys
|
|
50
50
|
result = 0
|
51
51
|
|
52
52
|
sellable_stocks.each do |stock|
|
53
|
-
|
54
|
-
if !stock.shop_has_exhibition
|
55
|
-
result += stock.quantity
|
56
|
-
elsif stock.quantity > 0
|
57
|
-
result += (stock.quantity - 1)
|
58
|
-
else
|
59
|
-
result += stock.quantity
|
60
|
-
end
|
61
|
-
else
|
62
|
-
result += stock.quantity
|
63
|
-
end
|
53
|
+
result += stock.quantity
|
64
54
|
end
|
65
55
|
|
66
56
|
result
|
@@ -91,17 +81,7 @@ module Xsys
|
|
91
81
|
s.shop_code.to_s.upcase == shop_code.to_s.upcase
|
92
82
|
}
|
93
83
|
|
94
|
-
|
95
|
-
if !stock.shop_has_exhibition
|
96
|
-
stock.quantity
|
97
|
-
elsif stock.quantity > 0
|
98
|
-
(stock.quantity - 1)
|
99
|
-
else
|
100
|
-
stock.quantity
|
101
|
-
end
|
102
|
-
else
|
103
|
-
stock.quantity
|
104
|
-
end
|
84
|
+
stock.quantity
|
105
85
|
end
|
106
86
|
|
107
87
|
def price_date_for_list(price_list_id)
|
data/lib/xsys/model/stock.rb
CHANGED
@@ -2,14 +2,33 @@ module Xsys
|
|
2
2
|
module Model
|
3
3
|
class Stock
|
4
4
|
def self.attr_list
|
5
|
-
[
|
5
|
+
[
|
6
|
+
:shop_code,
|
7
|
+
:quantity,
|
8
|
+
:available,
|
9
|
+
:reserved,
|
10
|
+
:quantity_update_time,
|
11
|
+
:quantity_update_date,
|
12
|
+
:reserved_update_time,
|
13
|
+
:reserved_update_date,
|
14
|
+
:shop_service
|
15
|
+
]
|
6
16
|
end
|
7
17
|
|
8
18
|
attr_reader *attr_list
|
9
19
|
|
10
20
|
def initialize(attributes={})
|
21
|
+
time_fields = ['quantity_update_time', 'reserved_update_time']
|
22
|
+
date_fields = ['quantity_update_date', 'reserved_update_date']
|
23
|
+
|
11
24
|
attributes.each do |k, v|
|
12
|
-
|
25
|
+
if time_fields.include?(k.to_s)
|
26
|
+
self.send("#{k}=", Time.parse(v)) unless v.nil?
|
27
|
+
elsif date_fields.include?(k.to_s)
|
28
|
+
self.send("#{k}=", Date.parse(v)) unless v.nil?
|
29
|
+
else
|
30
|
+
self.send("#{k}=", v) if self.respond_to?(k)
|
31
|
+
end
|
13
32
|
end
|
14
33
|
end
|
15
34
|
|
data/lib/xsys/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: xsys
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.11.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Matias Hick
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2017-02-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
98
98
|
version: '0'
|
99
99
|
requirements: []
|
100
100
|
rubyforge_project:
|
101
|
-
rubygems_version: 2.4.5.
|
101
|
+
rubygems_version: 2.4.5.2
|
102
102
|
signing_key:
|
103
103
|
specification_version: 4
|
104
104
|
summary: Get data from xsys api
|