rawbotz 0.1.5 → 0.2.0

data/lib/rawbotz/routes/orders.rb

@@ -1,4 +1,5 @@
 require 'rawbotz/routes'
+require 'pdfkit'
 
 module Rawbotz::RawbotzApp::Routing::Orders
   include RawgentoModels
@@ -6,19 +7,21 @@ module Rawbotz::RawbotzApp::Routing::Orders
   def self.registered(app)
     # app.get '/orders',             &show_orders
     show_orders = lambda do
-      @orders = Order.where("supplier_id IS NULL OR supplier_id = %d" % settings.supplier.id).order(created_at: :desc)
+      @orders = Order.order(created_at: :desc).all
       haml "orders/index".to_sym
     end
 
     # app.get '/order/new',          &create_order
     create_order = lambda do
-      if Order.current.present?
+      if settings.supplier.orders.where(state: 'new').present?
         add_flash :message, "Already one Order in progress"
-        @order = Order.current
+        @order = settings.supplier.orders.where(state: 'new').first
       else
         @order = Order.create(state: :new)
-        @order.supplier = settings.supplier
+        @order.supplier     = settings.supplier
+        @order.order_method = :magento
 
+        # There is hell a lot of products missing if with remote order
         RawgentoDB::Query.understocked.each do |product_id, name, min_qty, stock|
           local_product = LocalProduct.find_by(product_id: product_id)
           if local_product.present? && local_product.supplier == settings.supplier
@@ -37,6 +40,12 @@ module Rawbotz::RawbotzApp::Routing::Orders
     # app.get '/order/:id',          &show_order
     show_order = lambda do
       @order = Order.find(params[:id])
+      @stock = {}
+      begin
+        RawgentoDB::Query.stock.each {|s| @stock[s.product_id] = s.qty}
+      rescue Exception => e
+        add_flash :error, "Cannot connect to MySQL database (#{e.message})"
+      end
       haml 'order/view'.to_sym
     end
 
@@ -48,6 +57,8 @@ module Rawbotz::RawbotzApp::Routing::Orders
           OrderItem.find(k[5..-1]).update(num_wished: v.to_i)
         end
       end
+      @order.internal_comment = params[:internal_comment]
+      @order.save
       if params['action'] == 'order'
         @order.update(state: :queued)
         add_flash :success, 'Order queued'
@@ -57,6 +68,12 @@ module Rawbotz::RawbotzApp::Routing::Orders
         add_flash :success, 'Order marked deleted'
         redirect '/orders'
       else
+        @stock = {}
+        begin
+          RawgentoDB::Query.stock.each {|s| @stock[s.product_id] = s.qty}
+        rescue Exception => e
+          add_flash :error, "Cannot connect to MySQL database (#{e.message})"
+        end
         haml "order/view".to_sym
       end
     end
@@ -64,13 +81,47 @@ module Rawbotz::RawbotzApp::Routing::Orders
     # app.get '/order/:id/packlist', &show_order_packlist
     show_order_packlist = lambda do
       @order = Order.find(params[:id])
+      @orphans = []
+      @refunds = {}
+      if @order.supplier == settings.supplier && @order.remote_order_link.present?
+        order_linker = Rawbotz::OrderLinker.new @order
+        order_linker.link!
+        @orphans = order_linker.orphans
+        @refunds = order_linker.refunds
+      end
       haml "order/packlist".to_sym
     end
 
+    # app.get  '/order/:id/packlist/pdf', &show_pdf_packlist
+    show_pdf_packlist = lambda do
+      attachment "packlist_order.pdf"
+      @order = Order.find(params[:id])
+      html = haml "order/packlist.pdf".to_sym, layout: :pdf_layout
+      PDFKit.configure do |config|
+        config.verbose = false
+        config.default_options[:quiet] = true
+      end
+
+      kit = PDFKit.new(html)
+
+      kit.stylesheets << File.join(settings.root, "public",
+                                   "pure-min.css")
+      kit.stylesheets << File.join(settings.root, "public",
+                                   "rawbotz.css")
+      # This would need more resources (base64 encoded woff?)
+      #kit.stylesheets << File.join(settings.root, "public",
+      #                             "font-awesome-4.5.0/css/font-awesome.min.css")
+      kit.stylesheets << File.join(settings.root, "public",
+                                   "jui/jquery-ui.min.css")
+      kit.to_pdf
+    end
+
+    # routes
     app.get  '/orders',             &show_orders
     app.get  '/order/new',          &create_order
     app.get  '/order/:id',          &show_order
     app.post '/order/:id',          &act_on_order
     app.get  '/order/:id/packlist', &show_order_packlist
+    app.get  '/order/:id/packlist/pdf', &show_pdf_packlist
   end
 end

data/lib/rawbotz/routes/orders/stock.rb

@@ -0,0 +1,75 @@
+require 'rawbotz/routes'
+
+module Rawbotz::RawbotzApp::Routing::Orders::Stock
+  include RawgentoModels
+
+  def self.registered(app)
+
+    # app.get  '/order/:id/stock',    &show_stock_order
+    show_stock_order = lambda do
+      @order = Order.find(params[:id])
+      @refunds = {}
+      if @order.supplier == settings.supplier && @order.remote_order_link.blank?
+        add_flash :message, "You need to select a remote order"
+        redirect "/order/#{@order.id}/link_to_remote"
+      else
+        if @order.supplier == settings.supplier
+          order_linker = Rawbotz::OrderLinker.new @order
+          order_linker.link!
+          @orphans = order_linker.orphans
+          @refunds = order_linker.refunds
+        end
+        haml "order/stock".to_sym
+      end
+    end
+
+    # app.post '/order/:id/stock',    &stock_order
+    stock_order = lambda do
+      @order = Order.find(params[:id])
+
+      @order.remote_order_id   = params[:remote_order_id]
+      @order.remote_order_link = params[:remote_order_link]
+
+      stock_processor = Rawbotz::StockProcessor.new @order, params
+      errors = stock_processor.process!
+
+      if errors.empty?
+        add_flash :success, "Stocked this order"
+      else
+        errors.each{|e| add_flash :error, e}
+      end
+
+      @refunds = {}
+      if @order.supplier == settings.supplier
+        order_linker = Rawbotz::OrderLinker.new @order
+        order_linker.link!
+        @orphans = order_linker.orphans
+        @refunds = order_linker.refunds
+      end
+
+      haml "order/stock".to_sym
+    end
+
+    # app.get  '/order/:id/link_to_remote',   &show_link_to_remote_order
+    show_link_to_remote_order = lambda do
+      @order = Order.find(params[:id])
+      @last_orders = Rawbotz.mech.last_orders
+      haml "order/link_to_remote".to_sym
+    end
+
+    # app.post '/order/:id/link_to_remote', &link_to_remote_order
+    link_to_remote_order = lambda do
+      @order = Order.find(params[:id])
+      @order.remote_order_id   = params[:remote_order_id]
+      @order.remote_order_link = params[:remote_order_link]
+      @order.save
+      redirect "/order/#{@order.id}/stock"
+    end
+
+    # routes
+    app.get  '/order/:id/stock',    &show_stock_order
+    app.post '/order/:id/stock',    &stock_order
+    app.get  '/order/:id/link_to_remote', &show_link_to_remote_order
+    app.post '/order/:id/link_to_remote', &link_to_remote_order
+  end
+end

data/lib/rawbotz/routes/product_links.rb

@@ -22,7 +22,7 @@ module Rawbotz::RawbotzApp::Routing::ProductLinks
 
     # app.get  '/products/link_wizard/:idx', &show_link_wizard_id
     show_link_wizard_id = lambda do
-      @unlinked_count = LocalProduct.unlinked.count
+      @unlinked_count = LocalProduct.supplied_by(settings.supplier).unlinked.count
       @local_product = LocalProduct.supplied_by(settings.supplier).unlinked.at(params[:idx].to_i || 0)
       haml "products/link_wizard".to_sym
     end

data/lib/rawbotz/routes/products.rb

@@ -1,13 +1,14 @@
 require 'rawbotz/routes'
 
 module Rawbotz::RawbotzApp::Routing::Products
+  include Rawbotz
   include RawgentoModels
 
   def self.registered(app)
     # app.get  '/products',           &show_products
     show_products = lambda do
-      @products = LocalProduct
-      @suppliers = Supplier.all
+      @products = LocalProduct.includes(:supplier, :remote_product)
+      @suppliers = Supplier.includes(:local_products).order(:name).all
       haml "products/index".to_sym
     end
 
@@ -21,20 +22,17 @@ module Rawbotz::RawbotzApp::Routing::Products
     # app.get  '/product/:id',        &show_product
     show_product = lambda do
       settings = RawgentoDB.settings(Rawbotz.conf_file_path)
-      @product = LocalProduct.unscoped.find(params[:id])
+      @product = LocalProduct.unscoped.includes(:supplier).find(params[:id])
       begin
-        @sales = RawgentoDB::Query.sales_daily_between(@product.product_id,
-                                                       Date.today,
-                                                       Date.today - 30,
-                                                       settings)
-        @sales_monthly = RawgentoDB::Query.sales_monthly_between(@product.product_id,
-                                                         Date.today,
-                                                         Date.today - (12 * 30),
-                                                         settings).uniq
-      rescue
+        product_id = @product.product_id
+        @sales = Models::Sales.daily_since product_id
+        @sales_monthly = Models::Sales.monthly_since product_id
+      rescue Exception => e
+        STDERR.puts e.message
+        STDERR.puts e.backtrace
         @sales = []
         @sales_monthly = []
-        add_flash :error, 'Cannot connect to MySQL database'
+        add_flash :error, "Cannot connect to MySQL database/ #{e.message}"
       end
       @plot_data = Rawbotz::Datapolate.create_data @sales, @product.stock_items.where(created_at: (Date.today - 30)..Date.today)
       haml "product/view".to_sym
@@ -44,10 +42,7 @@ module Rawbotz::RawbotzApp::Routing::Products
     show_product_stock_sales_plot = lambda do
       @product = LocalProduct.unscoped.find(params[:id])
       begin
-        @sales = RawgentoDB::Query.sales_daily_between(@product.product_id,
-                                                       Date.today,
-                                                       Date.today - 30,
-                                                       RawgentoDB.settings(Rawbotz.conf_file_path))
+        @sales = Models::Sales.daily_since(@product.product_id)
       rescue
         @sales = []
         add_flash :error, 'Cannot connect to MySQL database'
@@ -59,7 +54,7 @@ module Rawbotz::RawbotzApp::Routing::Products
     # app.post '/product/:id/hide',   &hide_product
     hide_product = lambda do
       @product = RawgentoModels::LocalProduct.find(params[:id])
-      @product.active = false
+      @product.hidden = true
       @product.save
 
       add_flash :success, "Product '#{@product.name}' is now hidden"
@@ -69,7 +64,7 @@ module Rawbotz::RawbotzApp::Routing::Products
     # app.post '/product/:id/unhide', &unhide_product
     unhide_product = lambda do
       @product = RawgentoModels::LocalProduct.unscoped.find(params[:id])
-      @product.active = true
+      @product.hidden = false
       @product.save
 
       add_flash :success, "Product '#{@product.name}' is now not hidden anymore"
@@ -85,8 +80,10 @@ module Rawbotz::RawbotzApp::Routing::Products
     # app.post '/remote_products/search', &search_remote_products
     search_remote_products = lambda do
       @products = RemoteProduct.supplied_by(settings.supplier)
-        .where('lower(name) LIKE ?', "%#{params[:term].downcase}%").limit(20).pluck(:name, :id)
-      @products.map{|p| {name: p[0], product_id: p[1]}}.to_json
+        .ilike(params[:term]).limit(20).pluck(:name, :id)
+      @products.map do |p|
+        {name: p[0], product_id: p[1]}
+      end.to_json
     end
 
     # app.get  '/remote_product/:id',  &show_remote_product
@@ -104,6 +101,6 @@ module Rawbotz::RawbotzApp::Routing::Products
 
     app.get  '/remote_products',        &show_remote_products
     app.post '/remote_products/search', &search_remote_products
-    app.get  '/remote_product/:id',      &show_remote_product
+    app.get  '/remote_product/:id',     &show_remote_product
   end
 end

data/lib/rawbotz/routes/remote_shop.rb

@@ -24,7 +24,7 @@ module Rawbotz::RawbotzApp::Routing::RemoteShop
       @remote_order_id = params[:id]
       @remote_order_items = Rawbotz.mech.products_from_order params[:id]
       @remote_products_qty = @remote_order_items.map do |remote_product|
-        [RemoteProduct.find_by(name: remote_product[0]) || OpenStruct.new(name: remote_product[0]), remote_product[2]]
+        [RemoteProduct.find_by(name: remote_product[0]) || OpenStruct.new(name: remote_product[0]), remote_product[2], remote_product[3]]
       end
       # TODO catch problem if one is missing ...
       haml "remote_order/view".to_sym

data/lib/rawbotz/routes/stock.rb

@@ -0,0 +1,58 @@
+require 'rawbotz/routes'
+
+module Rawbotz::RawbotzApp::Routing::Stock
+  include RawgentoModels
+
+  def self.registered(app)
+
+    # app.get  '/stock',        &show_stock
+    show_stock = lambda do
+      @suppliers  = Supplier.where.not(id: settings.supplier.id).order(:name).all
+      begin
+        @stock_products = Rawbotz::Models::StockProductFactory.create @suppliers
+      rescue Exception => e
+        @stock_products = []
+        add_flash :error, "Error: #{e.message}"
+      end
+
+      haml "stock/index".to_sym
+    end
+
+    # app.get  '/stock/alerts', &show_stock_alerts
+    show_stock_alerts = lambda do
+      @suppliers  = Supplier.where.not(id: settings.supplier.id).order(:name).all
+      begin
+        @stock_products = Rawbotz::Models::StockProductFactory.create @suppliers
+      rescue Exception => e
+        @stock_products = []
+        add_flash :error, "Error: #{e.message}"
+      end
+
+      mis_stocked_product_ids = RawgentoDB::Query.wrongly_not_in_stock
+      @wrongly_out_of_stocks  = LocalProduct.where(product_id: mis_stocked_product_ids)
+
+      haml "stock/index".to_sym
+    end
+
+    # app.get  '/stock/warnings', &show_stock_warnings
+    show_stock_warnings = lambda do
+      @suppliers  = Supplier.where.not(id: settings.supplier.id).order(:name).all
+      begin
+        @stock_products = Rawbotz::Models::StockProductFactory.create @suppliers
+      rescue Exception => e
+        @stock_products = []
+        add_flash :error, "Error: #{e.message}"
+      end
+
+      @stock_products.delete_if {|s| s.expected_stock_lifetime > 10 }
+
+      haml "stock/index".to_sym
+    end
+
+
+    # routes
+    app.get  '/stock',          &show_stock
+    app.get  '/stock/alerts',   &show_stock_alerts
+    app.get  '/stock/warnings', &show_stock_warnings
+  end
+end

data/lib/rawbotz/routes/suppliers.rb

@@ -6,7 +6,7 @@ module Rawbotz::RawbotzApp::Routing::Suppliers
   def self.registered(app)
     # app.get  '/suppliers', &show_suppliers
     show_suppliers = lambda do
-      @suppliers = Supplier.all
+      @suppliers = Supplier.order(:name).all
       haml "suppliers/index".to_sym
     end
 
@@ -19,16 +19,21 @@ module Rawbotz::RawbotzApp::Routing::Suppliers
     # app.post '/supplier/:id', &update_supplier
     update_supplier = lambda do
       @supplier = Supplier.find(params[:id])
-      @supplier.email = params[:email]
-      @supplier.order_template = params[:order_template]
+      @supplier.email               = params[:email]
+      @supplier.order_info          = params[:order_info]
+      @supplier.order_template      = params[:order_template]
+      @supplier.delivery_time_days  = params[:delivery_time_days]
+      @supplier.minimum_order_value = params[:minimum_order_value]
       if @supplier.save
         add_flash :success, "Supplier updated"
       else
         add_flash :error, "Supplier could not be saved"
       end
-      haml "supplier/view".to_sym
+      # This should redirect to the correct tab!
+      redirect "/supplier/#{@supplier.id}#tab_order_settings".to_sym
     end
 
+    # routes
     app.get  '/suppliers',    &show_suppliers
     app.get  '/supplier/:id', &show_supplier
     app.post '/supplier/:id', &update_supplier

data/lib/rawbotz/sales_data.rb

@@ -0,0 +1,13 @@
+module Rawbotz
+  module SalesData
+    def self.sales_since day, products
+      db = RawgentoDB::Query
+      monthly_sales = products.map{|p| [p.product_id,
+                                        db.sales_monthly_between(p.product_id,
+                                        Date.today,
+                                        day)]}.to_h
+      # This is NOT the average!
+      monthly_sales.each{|k,v| monthly_sales[k] = v.inject(0){|a,s| a + s[1].to_i}/v.length rescue 0}
+    end
+  end
+end

data/lib/rawbotz/version.rb

@@ -1,3 +1,3 @@
 module Rawbotz
-  VERSION = "0.1.5".freeze
+  VERSION = "0.2.0".freeze
 end

data/lib/rawbotz/views/_hide_unhide_button.haml

@@ -1,4 +1,4 @@
-- if product.active?
+- if !product.hidden?
   %form.pure-form.pure-form-aligned(action="/product/#{product.id}/hide" method="post")
     %button.pure-button.pure-button-primary(type="submit")
       %i.fa.fa-ban

data/lib/rawbotz/views/_menu.haml

@@ -13,6 +13,15 @@
         %a.pure-menu-link(href="/products")
           = products_icon
           Products
+      %li.pure-menu-item
+        %a.pure-menu-link(href="/suppliers")
+          = supplier_icon
+          Suppliers
+      %li.pure-menu-item
+        %a.pure-menu-link(href="/stock")
+          = stock_icon
+          = sales_icon
+          Stock/Sales
       %li.pure-menu-item
         %a.pure-menu-link(href="/remote_cart")
           %i(class="fa fa-cart-arrow-down")

data/lib/rawbotz/views/index.haml

@@ -8,7 +8,7 @@
     %h3 Last 3 Orders
     %table.pure-table-horizontal.pure-table
       -# Order.where(state: [Order::STATES.new, Order::STATES.processing, Order::STATES.queued, Order::STATES.ordered]).order("updated_at DESC").first(3).each do |order|
-      - Order.where(state: ["new", "processing", "ordered"]).order("updated_at DESC").first(3).each do |order|
+      - Order.where(state: ["new", "processing", "ordered", "mailed"]).order("updated_at DESC").first(3).each do |order|
         %tr
           %td
             %a(href="/order/#{order.id}")