bbmb 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41dc6c1f01a081082be4b1fd376e41b1faa8be13
-  data.tar.gz: f5398f218f446f20d18795888f830b0569db1460
+  metadata.gz: 539253d09b62765c28bc81f550e1831fd5d6fade
+  data.tar.gz: 54e3f3a803f0b54ec32c1fd2bc111f2f07ed5e63
 SHA512:
-  metadata.gz: c86e7a2e7dc6918767f3d8c2d7954b38b5e38b24a4d44efd9ed8cb5d894beb808d00cb922a3fca18e7c79b8ff7c0527e322a62a20b031eaf151a944caea7c709
-  data.tar.gz: 8386ea2ab6179c50f185d6ff9f6220af27edfa559de024bb9bca8c862d90106c9fcd257a090d7765333ed55284ba9c4c5e9d8a108c1170b58b2552cc45079ba9
+  metadata.gz: 5b56bf4ea3c9fc2f19eca1eeea3db51ca2faee383fe63f79fc0940c0e7531c8b090d7b7368be64d14b177fd3363c9868d9e3a6e4383b5700117de2374d5b6f6a
+  data.tar.gz: 2bc9a62ea60ec95ee4141921c4aeb75fae09fd12a275e453404471eac7b0a6d4a205ad2b2d49e42677cf3b4bbc892dd4c214614a8429bdf32ce2ee9911367147

data/History.txt

@@ -1,4 +1,11 @@
-=== 2.2.1 / upcoming
+=== 2.2.3 / 22.05.2017
+
+* Delete in Schnellbestellung all positions with an invalid product
+* Fixed nil access when displaying an order with invalid positions
+* Fixed login problem because of invalid current_order
+* Updated to sbsm 1.4.1 to be able to use the async method
+
+=== 2.2.2 / 17.05.2017
 
 * Remove bin/bbmbd. It is replaced by config.ru to start the rack process
 * Made bin/bbmb_admin work again

data/bbmb.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ydbd-pg", '>= 0.5.2'
   spec.add_dependency "ydbi",    '>= 0.5.3'
   spec.add_dependency "json"
-  spec.add_dependency "sbsm",    '>= 1.4.0'
+  spec.add_dependency "sbsm",    '>= 1.4.1'
   spec.add_dependency "htmlgrid"
   spec.add_dependency "ydim",    '>= 0.5.1'
   spec.add_dependency "syck"

data/lib/bbmb/html/state/favorites.rb

@@ -12,6 +12,8 @@ class Favorites < Global
   VIEW = View::Favorites
   def init
     @model = _customer.favorites
+    @model.positions.delete_if { |position| position.product.nil? }
+    @model
   end
 end
     end

data/lib/bbmb/model/order.rb

@@ -87,6 +87,7 @@ class Order
     info
   end
   def calculate_effective_prices
+    delete_invalid_positions
     @positions.each { |pos|
       pos.price_effective = price_effective(pos)
     }
@@ -121,6 +122,7 @@ class Order
     add(quantity, product)
   end
   def item_count
+    delete_invalid_positions
     @positions.inject(0) { |memo, pos| memo + pos.quantity }
   end
   def i2_body
@@ -204,15 +206,7 @@ class Order
     twin
   end
   def total
-    @positions.delete_if do |pos|
-      begin
-        pos.total
-        false
-      rescue => error
-        SBSM.info "Deleting an invalid position from order #{order_id}"
-        true
-      end
-    end
+    delete_invalid_positions
     @positions.inject(@shipping) { |memo, pos| pos.total + memo }
   end
   def total_incl_vat
@@ -259,6 +253,17 @@ class Order
   def _formatted_comment(replacement=';')
     @comment.to_s.gsub(/[\r\n]+/, replacement)[0,60] if @comment
   end
+  def delete_invalid_positions
+    @positions.delete_if do |pos|
+      begin
+        pos.total
+        false
+      rescue => error
+        SBSM.info "Deleting an invalid position from order #{order_id}"
+        true
+      end
+    end
+  end
 end
   end
 end

data/lib/bbmb/persistence/odba/model/customer.rb

@@ -18,6 +18,10 @@ module BBMB
           __old_current_order__
           odba_store
         end
+        if @current_order.is_a?(NilClass)
+          @current_order = BBMB::Model::Order.new(self)
+          odba_store
+        end
         @current_order
       end
       alias :__old_commit_order__ :commit_order!

data/lib/bbmb/version.rb

@@ -1,3 +1,3 @@
 module BBMB
-  VERSION = '2.2.2'
+  VERSION = '2.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbmb
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: htmlgrid
   requirement: !ruby/object:Gem::Requirement