bbmb 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95bb9df5480ff6caed99262bd25c01f5294495fa
-  data.tar.gz: 1898c6f44136e99b25fda49015121c75e258536f
+  metadata.gz: 509fc49dd58770c80b653a8978b68fcc409c0805
+  data.tar.gz: 4b0a696b35073a886f6ce95306ccc06d26c2bb6f
 SHA512:
-  metadata.gz: d45c865e1cc9e052a55bd8904d1cfd7a371e231c8f6815b7cdd52230545b316e58f30b7bb93cb4d480ae70680c6df20fc4ec5778dcf3fe21af88ecc593aff202
-  data.tar.gz: d707982da74212b859464803df9f7a96140fa38d409f52a0aa3fd59e32a0c9f8cb5d9ac2007d1609c19c9938b0005e83ca9daca711f30386e7e809e738f43e01
+  metadata.gz: c0591becd04827df23cb0e7f0099db759d3ce8298b0aa9fa79811359f27fb88c5fe8b22d7693af6e1ca1311fcd2ed7b1db8d7d2d69f7971a6c5b1e6b0950b4c1
+  data.tar.gz: 121df3abf31245a43270eace8db52c00ea77a127c027e23b15692fa35ba8b2ab3d75a3f6582a3824cdd81bb194a9a7aeb80c3c2a120bbe13b43be63f4c14ed6e

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.3.1 / 12.06.2017
+
+* Fix inject_order for xmlconv
+* Fix starting bin/bbmb_admin
+* Load :postproc_dir and :plugin_dir if defined in config
+
 === 2.3.0 / 07.06.2017
 
 * Use by default only the etc/config.yml inside the current working directory

data/bin/bbmb_admin

@@ -3,7 +3,19 @@
 
 require 'drb'
 require 'bbmb'
-$: << File.expand_path('../lib', File.dirname(__FILE__))
+require 'bbmb/config'
+lib_dir = File.join(Dir.pwd, 'lib')
+$: << lib_dir
+[:postproc_dir, :plugin_dir].each do |add_to_required|
+  if BBMB.config.respond_to?(add_to_required)
+    dir = eval("BBMB.config.#{add_to_required}")
+    files = Dir.glob(File.join(dir, '*.rb'))
+    puts "Loading #{files}"
+    files.each do | file|
+      require file
+    end
+  end
+end
 require 'bbmb/util/app'
 require 'readline'
 include Readline

data/lib/bbmb/util/server.rb

@@ -43,7 +43,48 @@ module BBMB
         Mail.notify_error(e)
       end
       def inject_order(customer_id, products, infos, opts={})
-        @app.inject_order(customer_id, products, infos, opts)
+        customer = Model::Customer.find_by_customer_id(customer_id) \
+          || Model::Customer.find_by_ean13(customer_id)
+        needed_create = false
+        unless customer
+          if idtype = opts[:create_missing_customer] && !customer_id.empty?
+            customer = Model::Customer.new(customer_id)
+            if idtype.to_s == 'ean13'
+              customer.ean13 = customer_id
+            end
+            BBMB.persistence.save(customer)
+            needed_create = true
+          else
+            raise "Unknown Customer #{customer_id}"
+          end
+        end
+        order = Model::Order.new(customer)
+        products.each { |info|
+          if(product = Model::Product.find_by_pcode(info[:pcode]) \
+             || Model::Product.find_by_ean13(info[:ean13]) \
+             || Model::Product.find_by_article_number(info[:article_number]))
+            order.add(info[:quantity], product)
+            [:article_number, :backorder].each do |key|
+              info.store key, product.send(key)
+            end
+            info.store :description, product.description.de
+            info[:deliverable] = info[:quantity]
+          else
+            info[:deliverable] = 0
+          end
+        }
+        infos.each { |key, value|
+          order.send("#{key}=", value)
+        }
+        customer.inject_order(order)
+        if opts[:deliver]
+          @app.send_order order, customer
+        end
+        if needed_create
+          BBMB::Util::Mail.notify_inject_error(order, opts)
+        end
+        SBSM.info "inject_order #{order.order_id} for customer_id #{customer_id} done at #{Time.now}"
+        { :order_id => order.order_id, :products => products }
       end
       def rename_user(customer_id, old_name, new_name)
         return if old_name.eql?(new_name)

data/lib/bbmb/version.rb

@@ -1,3 +1,3 @@
 module BBMB
-  VERSION = '2.3.0'
+  VERSION = '2.3.1'
 end

metadata

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