bbmb 2.1.3 → 2.1.4

data/lib/bbmb/html/util/validator.rb

@@ -6,7 +6,7 @@ require 'sbsm/validator'
 module BBMB
   module Html
     module Util
-class Validator < SBSM::Validator
+class Validator < ::SBSM::Validator
   BOOLEAN = [ :accept_terms, :order_confirmation ]
   ENUMS = {
     :canton				=>	[
@@ -32,17 +32,17 @@ class Validator < SBSM::Validator
     return nil if(value.empty?)
     match = /\d{13}/.match(value.to_s)
     unless match
-      raise SBSM::InvalidDataError.new(:e_invalid_ean13, :ean13, value) 
+      raise SBSM::InvalidDataError.new(:e_invalid_ean13, :ean13, value)
     end
     values = match[0].split("")
     check = values.pop
     sum = 0
-    values.each_with_index { |val, index| 
-      modulus = ((index%2)*2)+1	
+    values.each_with_index { |val, index|
+      modulus = ((index%2)*2)+1
       sum += (modulus*val.to_i)
     }
     unless (check.to_i == (10-(sum%10))%10)
-      raise SBSM::InvalidDataError.new(:e_invalid_ean13, :ean13, value) 
+      raise SBSM::InvalidDataError.new(:e_invalid_ean13, :ean13, value)
     end
     match[0]
   end

data/lib/bbmb/html/view/customers.rb

@@ -64,49 +64,34 @@ class CustomersList < HtmlGrid::List
   def customer_id(model)
     link = HtmlGrid::Link.new(:customer_id, model, @session, self)
     link.value = model.customer_id
-    link.href = @lookandfeel._event_url(:customer, 
+    link.href = @lookandfeel._event_url(:customer,
                                         {:customer_id => model.customer_id})
     link
   end
   def organisation(model)
     link = HtmlGrid::Link.new(:organisation, model, @session, self)
     link.value = model.organisation
-    link.href = @lookandfeel._event_url(:customer, 
+    link.href = @lookandfeel._event_url(:customer,
                                         {:customer_id => model.customer_id})
     link
   end
-=begin
-  def email(model)
-    if(mail = model.email)
-      link = HtmlGrid::Link.new(:email, model, @session, self)
-      link.value = mail
-      link.href = sprintf("mailto:%s", mail)
-      link
-    end
-  end
-  def email(model)
-    EmailValue.new(model, @session, self)
-  end
-  def last_login(model)
-    DateTimeView.new(:last_login, model, @session, self)
-  end
-  def active(model)
-    model.value(:active)
-  end
-=end 
   def last_login(model)
     if model.respond_to?(:last_login)
       model.last_login
     else
-      @session.user.last_login(model.email)
+      @session.auth_session.last_login(model.email)
     end
   end
   def valid(model)
     if model.respond_to?(:valid)
       @lookandfeel.lookup(model.valid)
+    elsif @session.auth_session && defined?(@session.auth_session.entity_valid?)
+      @session.auth_session.entity_valid?(model.email)
     else
       @lookandfeel.lookup(@session.user.entity_valid?(model.email).to_s)
     end
+  rescue => error
+    puts error
   end
   private
   def sort_link(header_key, matrix, component)

data/lib/bbmb/html/view/head.rb

@@ -16,7 +16,7 @@ class Head < HtmlGrid::DivComposite
   CSS_ID_MAP = {2 => 'welcome', 1 => 'logged-in-as'}
   def logged_in_as(model)
     if(@session.logged_in?)
-      @lookandfeel.lookup(:logged_in_as, @session.user.name)
+      @lookandfeel.lookup(:logged_in_as, @session.auth_session.name)
     end
   end
   def logo(model)

data/lib/bbmb/html/view/navigation.rb

@@ -6,6 +6,7 @@ module BBMB
     module View
 class NavigationLink < HtmlGrid::Link
   def init
+    puts "NavigationLink unless #{@session.event} == #{@name}"
     unless(@session.event == @name)
       self.href = @lookandfeel._event_url(@name)
     end

data/lib/bbmb/model/customer.rb

@@ -6,8 +6,9 @@ require 'bbmb/model/order'
 
 module BBMB
   module Model
-    MUTEX ||= Mutex.new
 class Customer
+  MUTEX = Mutex.new
+
   attr_reader :customer_id, :email, :archive, :quotas
   attr_accessor :address1, :address2, :address3, :canton, :city,
     :drtitle, :ean13, :fax, :firstname, :language, :lastname,
@@ -22,6 +23,11 @@ class Customer
     @quotas = []
   end
   def add_quota(quota)
+    unless @quotas.is_a?(Array)
+      puts "customer #{customer_id}: Fixing quotas #{@quotas} -> []"
+      @quotas = []
+      odba_store;
+    end
     @quotas.push(quota).uniq!
     quota
   end
@@ -36,7 +42,7 @@ class Customer
     ].compact
   end
   def commit_order!(commit_time = Time.now)
-    BBMB::Model::MUTEX.synchronize {
+    MUTEX.synchronize {
       id = @archive.keys.max.to_i.next
       order = current_order
       order.commit!(id, commit_time)
@@ -56,7 +62,6 @@ class Customer
     end
   end
   def quota(article_id)
-    
     @quotas.compact.find { |quota| quota.article_number == article_id }
   end
   def email=(email)
@@ -69,11 +74,11 @@ class Customer
       @email = email
     end
   end
-  def favorites 
+  def favorites
     @favorites ||= Order.new(self)
   end
   def inject_order(order, commit_time = Time.now)
-    BBMB::Model::MUTEX.synchronize {
+    MUTEX.synchronize {
       id = @archive.keys.max.to_i.next
       order.commit!(id, commit_time)
       @archive.store(id, order)
@@ -93,7 +98,15 @@ class Customer
     @protected.fetch(key, false)
   end
   def turnover
-    orders.inject(0) { |memo, order| order.total + memo }
+    orders.inject(0) do
+      |memo, order|
+      begin
+        order.total + memo
+      rescue => error
+        SBSM.info "turnover error for #{order.order_id} returning memo"
+        memo
+      end
+    end
   end
 end
   end

data/lib/bbmb/model/order.rb

@@ -87,7 +87,7 @@ class Order
     info
   end
   def calculate_effective_prices
-    @positions.each { |pos| 
+    @positions.each { |pos|
       pos.price_effective = price_effective(pos)
     }
   end
@@ -98,7 +98,7 @@ class Order
   def commit!(commit_id, commit_time)
     raise "can't commit empty order" if(empty?)
     calculate_effective_prices
-    @positions.each { |pos| 
+    @positions.each { |pos|
       pos.commit!
     }
     @unavailable.clear
@@ -157,8 +157,8 @@ class Order
     if(@priority)
       lines.push "238:%i" % @priority
     end
-    lines.push "250:ADE", 
-                sprintf("251:%i%05i", @customer.customer_id, @commit_id), 
+    lines.push "250:ADE",
+                sprintf("251:%i%05i", @customer.customer_id, @commit_id),
                 "300:4", "301:%s" % @commit_time.strftime('%Y%m%d')
     lines.join("\n")
   end
@@ -205,6 +205,9 @@ class Order
   end
   def total
     @positions.inject(@shipping) { |memo, pos| pos.total + memo }
+  rescue
+    SBSM.info "total: rescuing by adding 0 to memo #{memo} as total for #{order_id}"
+    return memo
   end
   def total_incl_vat
     if rate = BBMB.config.vat_rate
@@ -222,7 +225,7 @@ class Order
           @customer.customer_id,
           @customer.ean13,
           @commit_time.strftime('%d%m%Y'),
-          @commit_id, 
+          @commit_id,
           position.pcode,
           position.ean13,
           position.article_number,

data/lib/bbmb/model/product.rb

@@ -62,47 +62,11 @@ class ProductInfo < Subject
       instance_variable_get("@l#{level}_qty")
     end
   end
-
-  def ==(other)
-    other.is_a?(ProductInfo) && @article_number == other.article_number
-  end
-
   def to_info
-    self
-  end
-
-  def to_product
-    convert_to(Product)
+		self
   end
-
-  private
-
-  # Converts as new instance
-  #
-  # @param [Class] klass New class {Product|ProductInfo}
-  # @return [Array(Product,ProductInfo)] new instance
-  def convert_to(klass)
-    base_keys = %i{
-      backorder_date catalogue1 catalogue2 catalogue3
-      description ean13 expiry_date partner_index pcode status
-    }
-    keys = case klass.to_s
-           when 'BBMB::Model::Product'
-             base_keys
-           when 'BBMB::Model::ProductInfo'
-             base_keys += %i{
-               vat price
-               l1_qty l2_qty l3_qty l4_qty l5_qty l6_qty
-               l1_price l2_price l3_price l4_price l5_price l6_price
-             }
-           else
-             raise "Unknown class #{klass}"
-           end
-    obj = klass.new(@article_number)
-    keys.each { |key| obj.send("#{key}=", self.send(key)) }
-    obj.promotion = @promotion.dup if (@promotion && @promotion.current?)
-    obj.sale      = @sale.dup      if (@sale && @sale.current?)
-    obj
+  def ==(other)
+    other.is_a?(ProductInfo) && @article_number == other.article_number
   end
 end
 class Product < ProductInfo
@@ -117,13 +81,18 @@ class Product < ProductInfo
   def current_promo
     [@sale, @promotion].find { |promo| promo && promo.current? }
   end
-
-  def to_product
-    self
-  end
-
   def to_info
-    convert_to(ProductInfo)
+    info = ProductInfo.new(@article_number)
+    [ :backorder_date, :catalogue1, :catalogue2, :catalogue3,
+      :description, :ean13, :expiry_date, :partner_index, :pcode,
+      :status, :l1_qty, :l2_qty, :l3_qty, :l4_qty, :l5_qty, :l6_qty, :vat,
+      :price, :l1_price, :l2_price, :l3_price, :l4_price, :l5_price, :l6_price
+    ].each { |key|
+      info.send("#{key}=", self.send(key))
+    }
+    info.promotion = @promotion.dup if(@promotion && @promotion.current?)
+    info.sale = @sale.dup if(@sale && @sale.current?)
+    info
   end
 end
   end

data/lib/bbmb/persistence/odba.rb

@@ -24,12 +24,12 @@ module BBMB
         objs.each { |obj| obj.odba_delete }
       end
       def ODBA.migrate_to_subject
-        all(Model::Product) { |product| 
-          product.migrate_to_subject && product.odba_store 
+        all(Model::Product) { |product|
+          product.migrate_to_subject && product.odba_store
         }
         all(Model::Order) { |order|
-          order.each { |position| 
-            position.migrate_to_subject && position.odba_store 
+          order.each { |position|
+            position.migrate_to_subject && position.odba_store
           }
         }
         ::ODBA.cache.create_deferred_indices(true)

data/lib/bbmb/util/invoicer.rb

@@ -3,6 +3,7 @@
 
 require 'ydim/config'
 require 'ydim/client'
+require 'bbmb/util/mail'
 require 'openssl'
 
 module BBMB

data/lib/bbmb/util/mail.rb

@@ -101,8 +101,7 @@ module Mail
     parts = []
     config.mail_confirm_lines.collect do |line|
       content = order.collect do |pos|
-        sprintf(line, pos.quantity.to_i,
-                pos.description, pos.price_qty.to_f, pos.total.to_f)
+        sprintf line, pos.quantity, pos.description, pos.price_qty, pos.total
       end
       parts.push date, content.join("\n"), order.total
       if vtotal = order.total_incl_vat

data/lib/bbmb/util/polling_manager.rb

@@ -16,12 +16,15 @@ class FileMission
   attr_accessor :backup_dir, :delete, :directory, :glob_pattern
   def file_paths
     path = File.expand_path(@glob_pattern || '*', @directory)
-    Dir.glob(path).collect { |entry|
+    res = Dir.glob(path).collect { |entry|
       File.expand_path(entry, @directory)
     }.compact
+    puts res
+    res
   end
   def poll(&block)
-    @directory = File.expand_path(@directory, BBMB.config.bbmb_dir)
+    @directory = File.expand_path(@directory, BBMB.config.bbmb_dir) unless File.directory?(@directory) &&
+        File.absolute_path(@directory) == @directory
     file_paths.each { |path|
       poll_path(path, &block)
     }
@@ -34,7 +37,11 @@ class FileMission
     BBMB::Util::Mail.notify_error(err)
   ensure
     if(@backup_dir)
-      dir = File.expand_path(@backup_dir, BBMB.config.bbmb_dir)
+      if File.absolute_path(@backup_dir) == @backup_dir
+        dir = @backup_dir
+      else
+        dir = File.expand_path(@backup_dir, BBMB.config.bbmb_dir)
+      end
       FileUtils.mkdir_p(dir)
       FileUtils.cp(path, dir)
     end
@@ -43,12 +50,10 @@ class FileMission
     end
   end
 end
-class PopMission 
+class PopMission
   attr_accessor :host, :port, :user, :pass, :content_type
   def poll(&block)
     # puts "PopMission starts polling host #{@host}:#{@port} u: #{@user} pw: #{@pass}"
-    @backup_dir ||= Dir.tmpdir
-
     options = {
                       :address    => @host,
                       :port       => @port,

data/lib/bbmb/util/server.rb

@@ -6,20 +6,116 @@ require 'bbmb/html/util/known_user'
 require 'bbmb/html/util/session'
 require 'bbmb/html/util/validator'
 require 'bbmb/util/invoicer'
+require 'bbmb/util/invoicer'
 require 'bbmb/util/mail'
 require 'bbmb/util/updater'
 require 'bbmb/model/order' # needed to be enable to invoice later
 require 'bbmb/model/customer'
 require 'date'
-require 'sbsm/drbserver'
+require 'sbsm/app'
+require 'bbmb/persistence/odba'
+require 'bbmb/model/customer'
+require 'bbmb/model/quota'
+require 'bbmb/model/product'
+require 'bbmb/model/promotion'
 
 module BBMB
+  def self.persistence
+    @@persistence ||= BBMB::Persistence::ODBA
+  end
   module Util
-    class Server < SBSM::DRbServer
+    class Server
+      def initialize(persistence, app)
+        puts "Self #{self.class} initialize"
+        @persistence = persistence
+        @app = app
+      end
+      def invoice(range)
+        Invoicer.run(range)
+      rescue Exception => e
+        Mail.notify_error(e)
+      end
+      def update
+        Updater.run
+      rescue Exception => e
+        Mail.notify_error(e)
+      end
+      def inject_order(customer_id, products, infos, opts={})
+        @app.inject_order(customer_id, products, infos, opts)
+      end
+      def rename_user(old_name, new_name)
+        @app.rename_user(old_name, new_name)
+      end
+      def run_invoicer
+        SBSM.debug("run_invoicer starting")
+        @invoicer ||= Thread.new {
+          Thread.current.abort_on_exception = true
+          loop {
+            today = Date.today
+            day = today >> 1
+            start = Time.local(today.year, today.month)
+            now = Time.now
+            at = Time.local(day.year, day.month)
+            secs = at - now
+            SBSM.debug("invoicer") {
+              "sleeping %.2f seconds" % secs
+            }
+            sleep(secs)
+            SBSM.debug("invoice starting")
+            invoice(start...at)
+            SBSM.debug("invoice finished")
+          }
+        }
+      end
+      def run_updater
+        run_only_once_at_startup = false
+        SBSM.debug("updater") { "run_updater run_only_once_at_startup? #{run_only_once_at_startup} " }
+        @updater ||= Thread.new {
+          loop {
+            day = Date.today
+            now = Time.now
+            if(now.hour >= BBMB.config.update_hour)
+              day += 1
+            end
+            at = Time.local(day.year, day.month, day.day, BBMB.config.update_hour)
+            secs = at - now
+            SBSM.debug("updater") { "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("update starting")
+            update
+            SBSM.debug("update finished")
+            Thread.abort if run_only_once_at_startup
+          }
+        }
+      end
+    end
+    class RackInterface < SBSM::RackInterface
       ENABLE_ADMIN = true
-	    SESSION = Html::Util::Session
-	    VALIDATOR = Html::Util::Validator
-      attr_reader :updater
+      SESSION = Html::Util::Session
+      VALIDATOR = Html::Util::Validator
+      attr_reader :updater, :auth
+      def initialize(app: BBMB::Util::App.new,
+                     auth: nil,
+                     validator: BBMB::Html::Util::Validator)
+        [ File.join(Dir.pwd, 'etc', 'config.yml'),
+        ].each do |config_file|
+          if File.exist?(config_file)
+            puts "BBMB.config.load from #{config_file}"
+            BBMB.config.load (config_file)
+            break
+          end
+        end
+        @auth = DRb::DRbObject.new(nil, BBMB.config.auth_url)
+        puts "@auth is #{@auth} from #{self.class}"
+        @app = app
+        super(app: app,
+              session_class: BBMB::Html::Util::Session,
+              unknown_user: Html::Util::KnownUser,
+              validator: validator,
+              cookie_name: 'virbac.bbmb'
+              )
+      end
       def inject_order(customer_id, products, infos, opts={})
         customer = Model::Customer.find_by_customer_id(customer_id) \
           || Model::Customer.find_by_ean13(customer_id)
@@ -39,8 +135,8 @@ module BBMB
         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]))
+              || 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)
@@ -65,19 +161,14 @@ module BBMB
         end
         { :order_id => order.order_id, :products => products }
       end
-      def invoice(range)
-        Invoicer.run(range)
-      rescue Exception => e
-        Mail.notify_error(e)
-      end
       def login(email, pass)
-        session = BBMB.auth.login(email, pass, BBMB.config.auth_domain)
-        Html::Util::KnownUser.new(session)
-      end
-      def logout(session)
-        BBMB.auth.logout(session)
-      rescue DRb::DRbError, RangeError, NameError
-      end
+          session = BBMB.auth.login(email, pass, BBMB.config.auth_domain)
+          Html::Util::KnownUser.new(session)
+        end
+        def logout(session)
+          BBMB.auth.logout(session)
+        rescue DRb::DRbError, RangeError, NameError
+        end
       def rename_user(old_name, new_name)
         return if old_name.eql?(new_name)
         BBMB.auth.autosession(BBMB.config.auth_domain) do |session|
@@ -88,49 +179,6 @@ module BBMB
           end
         end
       end
-      def run_invoicer
-        BBMB.logger.debug("run_invoicer starting")
-        @invoicer ||= Thread.new {
-          Thread.current.abort_on_exception = true
-          loop {
-            today = Date.today
-            day = today >> 1
-            start = Time.local(today.year, today.month)
-            now = Time.now
-            at = Time.local(day.year, day.month)
-            secs = at - now
-            BBMB.logger.debug("invoicer") {
-              "sleeping %.2f seconds" % secs
-            }
-            sleep(secs)
-            BBMB.logger.debug("invoice starting")
-            invoice(start...at)
-            BBMB.logger.debug("invoice finished")
-          }
-        }
-      end
-      def run_updater
-        run_only_once_at_startup = false
-        BBMB.logger.debug("updater") { "run_updater run_only_once_at_startup? #{run_only_once_at_startup} " }
-        @updater ||= Thread.new {
-          loop {
-            day = Date.today
-            now = Time.now
-            if(now.hour >= BBMB.config.update_hour)
-              day += 1
-            end
-            at = Time.local(day.year, day.month, day.day, BBMB.config.update_hour)
-            secs = at - now
-            BBMB.logger.debug("updater") { "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
-
-            BBMB.logger.debug("update starting")
-            update
-            BBMB.logger.debug("update finished")
-            Thread.abort if run_only_once_at_startup
-          }
-        }
-      end
       def send_order order, customer
         begin
           Timeout.timeout(300) {
@@ -157,11 +205,17 @@ module BBMB
           BBMB::Util::Mail.notify_error(err)
         end
       end
-      def update
-        Updater.run
-      rescue Exception => e
-        Mail.notify_error(e)
+    end
+    class App < SBSM::App
+      def login(email, pass)
+        session = BBMB.auth.login(email, pass, BBMB.config.auth_domain)
+        Html::Util::KnownUser.new(session)
+      end
+      def logout(session)
+        # Here we start when logging in from the home page
+        BBMB.auth.logout(session)
+      rescue DRb::DRbError, RangeError, NameError
       end
     end
-  end
-end
+      end
+      end