bbmb 2.2.8 → 2.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fad1f8b5aca9d7f1c1b904f0079b7ff0ef3d9016
-  data.tar.gz: 57549268ac39f0626347809270c0afe2658ba4e1
+  metadata.gz: a2d183b03706d8559019ff4dc090b85e23a9b2a8
+  data.tar.gz: 077a75bd3d642ece584a5e422b570ad6c296b466
 SHA512:
-  metadata.gz: 47f3672ce1568dce96c3adc9cd7b98605df10c66c542afbbe0fa55fe0811e9131be54851824300aec1737a06c40c53533897f9c754858c76e131f236aa98bec9
-  data.tar.gz: 65848a84b803cd7d7f836c8060b31f2643eea4d36458265d9b73d877f6cf8c88ba7bf9a6b8a247ae644e20e73630ac5de9014f6d5843adaa810a74c152ad726a
+  metadata.gz: 97c91fb51fbabebd497ea2504831c913103dc84c122962ebea6b4549c8cc33f6670ed98b2be15fb071355b19698e976190cea871801b58f589eed11ec74d0e85
+  data.tar.gz: 68a820b5779f418636da8384352c5b0a9dabe96512544568a71063bf1db99995e04078c84be6b5e0171c938aa51f2b032ebeffea35f2190c7cf83933bc006694

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.2.9 / 01.06.2017
+
+* Work around order without customer and no positions
+
 === 2.2.8 / 30.05.2017
 
 * Add Customer set_email_without_yus for importer

data/lib/bbmb/model/order.rb

@@ -172,7 +172,7 @@ class Order
       "521:PCE", "540:2", "541:%s" % @commit_time.strftime('%Y%m%d')]
   end
   def order_id
-    sprintf "%s-%s", @customer.customer_id, @commit_id
+    sprintf "%s-%s" ,@customer ? @customer.customer_id : 'no_customer', @commit_id
   end
   def position(product)
     @positions.find { |pos| pos.product == product }
@@ -207,7 +207,8 @@ class Order
   end
   def total
     delete_invalid_positions
-    @positions.inject(@shipping) { |memo, pos| pos.total + memo }
+    res = @positions.inject(@shipping) { |memo, pos| pos.total + memo }
+    res || Util::Money.new(0)
   end
   def total_incl_vat
     if rate = BBMB.config.vat_rate

data/lib/bbmb/util/server.rb

@@ -64,6 +64,7 @@ module BBMB
         raise Yus::YusError
       end
       def run_invoicer
+        run_only_once_at_startup = false
         @invoicer ||= Thread.new {
           Thread.current.abort_on_exception = true
           loop {
@@ -73,10 +74,11 @@ module BBMB
             now = Time.now
             at = Time.local(day.year, day.month)
             secs = at - now
-            msg = "run_invoicer sleeping %.2f seconds (or more than %d days)" % [ secs, secs/3600/24 ]
-            SBSM.debug(msg)
-            sleep(secs)
+            SBSM.debug("run_invoicer sleeping %.2f seconds. run_only_once_at_startup #{run_only_once_at_startup}" % secs)
+            if run_only_once_at_startup then puts "Skipped sleeping #{secs}" else sleep(secs) end
+            SBSM.debug("invoice starting")
             invoice(start...at)
+            SBSM.debug("invoice finished")
           }
         }
       end

data/lib/bbmb/version.rb

@@ -1,3 +1,3 @@
 module BBMB
-  VERSION = '2.2.8'
+  VERSION = '2.2.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbmb
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.2.9
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba