bbmb 2.2.5 → 2.2.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9c5793216ed5dcafa2aa43eb9a9a19e2b4b98f1a
4
- data.tar.gz: 65c7898f71d0383f766b22538a87102d3552affe
3
+ metadata.gz: c187dfbe07349ed86a9b331cdec0b3ef6d462479
4
+ data.tar.gz: 8261d5645db57269d3cb1267e5a41caefa6329df
5
5
  SHA512:
6
- metadata.gz: f96dbf0eb7ff92a5e5976b904a4efed7c3e47ab57bd8721fdc7ec29726a53b0c79d65050adeb6176c392c161acfe73f78a3e69d3dd68c9c041a4b2334e06a6d9
7
- data.tar.gz: 504b09e106f02f33ec5b2bd449191b14891a01d9a232ce38e49cb6c8f6c1130905966b19617ca516c09621447fe63620ba9abd19e60e83969db8015f659b6961
6
+ metadata.gz: 7733439b00fc17cbdf0581da992e6414dea09b960592c1fc87c55d5bcc31dec992a8c4e42bf043fd218932b97fe2fad8515e13d8f7b3f49e4db1f0f8088d27ec
7
+ data.tar.gz: 378cb61da81959c656b716fe838508e12ad7e007ad12d881706058ae0820ce4c131c855a0342ee7cc7813a268d9531b011c780239e35bd2049c7bbeee74725da
@@ -1,3 +1,8 @@
1
+ === 2.2.6 / 23.05.2017
2
+
3
+ * Use SBSM 1.4.2 for clients needing HTTPS
4
+ * Fix adding a file to an order
5
+
1
6
  === 2.2.5 / 23.05.2017
2
7
 
3
8
  * Don't require persistence/odba if config.persitence == none
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
21
21
  spec.add_dependency "ydbd-pg", '>= 0.5.2'
22
22
  spec.add_dependency "ydbi", '>= 0.5.3'
23
23
  spec.add_dependency "json"
24
- spec.add_dependency "sbsm", '>= 1.4.1'
24
+ spec.add_dependency "sbsm", '>= 1.4.2'
25
25
  spec.add_dependency "htmlgrid"
26
26
  spec.add_dependency "ydim", '>= 0.5.1'
27
27
  spec.add_dependency "syck"
@@ -40,8 +40,9 @@ module Customer
40
40
  end
41
41
  end
42
42
  def _transfer(order)
43
- if(io = user_input(:file_chooser))
44
- BBMB::Util::TransferDat.parse(io) { |info|
43
+ if(io = user_input(:file_chooser) && (file = user_input(:file_chooser)[:tempfile]))
44
+ file = user_input(:file_chooser)[:tempfile]
45
+ BBMB::Util::TransferDat.parse( open(file.path)) { |info|
45
46
  if(product = Model::Product.find_by_pcode(info.pcode) \
46
47
  || Model::Product.find_by_ean13(info.ean13))
47
48
  order.increment(info.quantity, product)
@@ -1,3 +1,3 @@
1
1
  module BBMB
2
- VERSION = '2.2.5'
2
+ VERSION = '2.2.6'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bbmb
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.5
4
+ version: 2.2.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
@@ -72,14 +72,14 @@ dependencies:
72
72
  requirements:
73
73
  - - ">="
74
74
  - !ruby/object:Gem::Version
75
- version: 1.4.1
75
+ version: 1.4.2
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - ">="
81
81
  - !ruby/object:Gem::Version
82
- version: 1.4.1
82
+ version: 1.4.2
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: htmlgrid
85
85
  requirement: !ruby/object:Gem::Requirement