rawbotz 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 788bb5000f74251dc1c2aadd371f6260ea4ff84f
-  data.tar.gz: bd7d6705020f6fedeccdda86e96d798fb6f7be98
+  metadata.gz: d73846461722f121dd6dd7a7e237dc6a385c7e50
+  data.tar.gz: d48bbb7113198c076bf2b5508eebfc3fb1e542e8
 SHA512:
-  metadata.gz: 35d61d51553864fe25bd25896e04372a9603578e111562e8dcb0447b7f3c10af8818862b970d946bfebf59904b18c1cf145859b062f3e63c5201e77fc2cc40d0
-  data.tar.gz: 2f9bebba8f40938e0433c3a94323a001ef2af91467698201f368b934d277ba929b51280734b61cf209a38822eabdee0db1cd89b1af124e5952d2b873a3f0369f
+  metadata.gz: f5a7decce42fd359fa610217cd1a7cea7d87d6e6d7584b79fe665037219a57771d5e6b6c570c81b0c96c47c9648e97e0e0b870f2fabf7d45df886cbb9c28ca23
+  data.tar.gz: e5a20092222188225fe5c78b1bef1069bb5b3bd9f909e280dfa8604deffc0aa27107a59de7801ab2a96cb929589279d1839b85b12299bfc1ce602c2a7adde3a4

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Changelog
+
+Changelog, History of changes for Rawbotz
+
+## 0.1.5 (released 2016-07-12)
+  - Add new attributes to ease non remote orders.
+
+## glass ball future version 0.2
+  - create first-class orders for non-remote-magento orders
+  - check for refunds in remote orders
+  - add 'stockings' to link local orders with remote orders and put the
+    delivered qty of products into the magento database.

data/README.md

@@ -29,6 +29,8 @@ Anyway, the application is so specific to RawLiving Germanys needs that you prob
 - supplier attribute
 - shelve attribute
 - packsize attribute
+- supplier_sku attribute
+- supplier_prod_name attribute
 - Ubuntu 14.04 installation, using rvm in an unprivileged users home.
 
 ## Usage
@@ -70,6 +72,8 @@ Create a `rawbotz.conf` YAML-file with the unified keys needed.  Note that you c
       supplier_name: 666
       shelve_nr: 42
       packsize: 1337
+      supplier_sku: 1222
+      supplier_prod_name: 1921
     
     # Remote Magento Web Interface (for our mech)
     remote_shop:

data/exe/rawbotz_update_local_products

@@ -26,7 +26,8 @@ begin
   products = RawgentoDB::Query.products
 rescue
   logger.error "Could not connect to MySQL database or other error"
-  #logger.error "$!.inspect" $@ -> backtrace
+  logger.error $!.inspect
+  # $@ -> backtrace would be available, too
   exit 1
 end
 

data/lib/rawbotz/app.rb

@@ -55,7 +55,7 @@ class RawbotzApp < Sinatra::Base
   # post '/product/:id/unhide'
   # get  '/remote_products'
   # post '/remote_products/search'
-  # get  '/remote_product/id'
+  # get  '/remote_product/:id'
   register Rawbotz::RawbotzApp::Routing::Products
 
   # get  '/products/links'

data/lib/rawbotz/cli/order_result_table.rb

@@ -47,9 +47,12 @@ module Rawbotz::CLI
       end
 
       if !diffs[:extra].empty?
+        extra_items = diffs[:extra].map do |n,q|
+          [n[0..35], q]
+        end
         out << Terminal::Table.new(title: "Extra (not in rawbotz)",
           headings: ['Product', 'In Cart'],
-          rows:     diffs[:extra],
+          rows:     extra_items,
           style:    {width:60}).to_s
       end
     end

data/lib/rawbotz/datapolate.rb

@@ -16,12 +16,14 @@ module Rawbotz
     end
 
     def self.explode_days min_date, max_date
+      return [] if min_date.nil? || max_date.nil?
       (min_date.to_date..max_date.to_date).to_a
     end
 
     def self.create_data sales, stock
       # from [date, sales] and [date, stock] create realistic list
       from_date, to_date = date_minmax sales, stock
+      return {} if from_date.nil? || to_date.nil?
       days = explode_days from_date, to_date
 
       stock_data = Hash.new(nil)

data/lib/rawbotz/mail_template.rb

@@ -11,7 +11,7 @@ module Rawbotz
       order_lines = order[:order_items].map do |oi|
         next if product_line.nil?
         order_item_line = product_line[2..-1]
-        order_item_line.gsub!(/PRODUCTCODE/, '')
+        order_item_line.gsub!(/SUPPLIERSKU/, oi[:local_product][:supplier_sku].to_s)
         order_item_line.gsub!(/QTY/, oi[:num_wished].to_s)
         if oi[:local_product][:packsize].to_s != ""
           order_item_line.gsub!(/NUM_PACKS/, (oi[:num_wished] / oi[:local_product][:packsize].to_f).to_s)
@@ -19,7 +19,7 @@ module Rawbotz
           order_item_line.gsub!(/NUM_PACKS/, '')
         end
         order_item_line.gsub!(/PACKSIZE/, oi[:local_product][:packsize].to_s)
-        order_item_line.gsub!(/PRODUCTNAME/, oi[:local_product][:name].to_s)
+        order_item_line.gsub!(/PRODUCTNAME/, oi[:local_product][:supplier_prod_name] || oi[:local_product][:name].to_s)
         order_item_line
       end
       lines[lines.find_index(product_line)] = order_lines if product_line

data/lib/rawbotz/product_updater.rb

@@ -3,7 +3,8 @@ module Rawbotz
     attr_accessor :local_products
     attr_accessor :logger
     attr_accessor :name_attribute_id, :supplier_attribute_id,
-      :shelve_attribute_id, :packsize_attribute_id
+      :shelve_attribute_id, :packsize_attribute_id,
+      :supplier_sku_attribute_id, :supplier_prod_name_attribute_id
 
     def initialize logger
       @local_products = {}
@@ -13,10 +14,14 @@ module Rawbotz
       @supplier_attribute_id = Rawbotz.attribute_ids["supplier_name"]
       @shelve_attribute_id   = Rawbotz.attribute_ids["shelve_nr"]
       @packsize_attribute_id = Rawbotz.attribute_ids["packsize"]
+      @supplier_sku_attribute_id = Rawbotz.attribute_ids["supplier_sku"]
+      @supplier_prod_name_attribute_id = Rawbotz.attribute_ids["supplier_prod_name"]
       @logger.debug "Attribute-ids: Name: #{@name_attribute_id}, "\
         "Supplier: #{@supplier_attribute_id}, "\
         "Shelve-Nr: #{@shelve_attribute_id}, "\
-        "Packsize: #{@packsize_attribute_id}"
+        "Packsize: #{@packsize_attribute_id}"\
+        "Supplier-SKU: #{@supplier_sku_attribute_id}"\
+        "Supplier-Prod-Name: #{@supplier_prod_name_attribute_id}"
     end
 
     def sync
@@ -31,6 +36,10 @@ module Rawbotz
       update_attribute(@shelve_attribute_id, :shelve_nr)
       # Packsize
       update_attribute(@packsize_attribute_id, :packsize, :integer)
+      # Supplier SKU
+      update_attribute(@supplier_sku_attribute_id, :supplier_sku)
+      # Supplier Product name
+      update_attribute(@supplier_prod_name_attribute_id, :supplier_prod_name)
 
       log_changes
 

data/lib/rawbotz/public/rawbotz.js

@@ -31,7 +31,7 @@ $(document).ready(function() {
   };
 
   // For Non-Remote Order Forms: add a pack
-  $("button.plus-pack").click(function(e) {
+  $("a.plus-pack").click(function(e) {
     e.preventDefault();
 
     input_id = $(this).data("reference_input_id");
@@ -50,7 +50,7 @@ $(document).ready(function() {
   });
 
   // For Non-Remote Order Forms: subtract a pack
-  $("button.minus-pack").click(function(e) {
+  $("a.minus-pack").click(function(e) {
     e.preventDefault();
 
     input_id = $(this).data("reference_input_id");

data/lib/rawbotz/routes/non_remote_orders.rb

@@ -17,6 +17,21 @@ module Rawbotz::RawbotzApp::Routing::NonRemoteOrders
         redirect "/supplier/#{@supplier.id}"
       else
         @products = LocalProduct.supplied_by(@supplier)
+
+        begin
+          db = RawgentoDB::Query
+          @monthly_sales = @products.map{|p| [p.product_id,
+                                             db.sales_monthly_between(p.product_id,
+                                             Date.today,
+                                             Date.today - 31 * 4)]}.to_h
+          @monthly_sales.each{|k,v| @monthly_sales[k] = v.inject(0){|a,s| a + s[1].to_i}/v.length rescue 0}
+          @stock = {}
+          db.stock.each {|s| @stock[s.product_id] = s.qty}
+        rescue Exception => e
+          @monthly_sales = {}
+          @stock = {}
+          add_flash :error, "Cannot connect to MySQL database (#{e.message})"
+        end
         haml "order/non_remote".to_sym
       end
     end
@@ -26,6 +41,20 @@ module Rawbotz::RawbotzApp::Routing::NonRemoteOrders
       @supplier = Supplier.find(params[:supplier_id])
       @products = @supplier.local_products
 
+      begin
+        db = RawgentoDB::Query
+        @monthly_sales = @products.map{|p| [p.product_id,
+                                           db.sales_monthly_between(p.product_id,
+                                           Date.today,
+                                           Date.today - 31 * 4)]}.to_h
+        # this is not avg
+        @monthly_sales.each{|k,v| @monthly_sales[k] = v.inject(0){|a,s| a + s[1].to_i}/v.length rescue 0}
+        @stock = {}
+        db.stock.each {|s| @stock[s.product_id] = s.qty}
+      rescue Exception => e
+        @stock = {}
+      end
+
       order = {supplier: @supplier, order_items: []}
       params.select{|p| p.start_with?("item_")}.each do |p, val|
         if val && val.to_i > 0

data/lib/rawbotz/routes/products.rb

@@ -89,7 +89,7 @@ module Rawbotz::RawbotzApp::Routing::Products
       @products.map{|p| {name: p[0], product_id: p[1]}}.to_json
     end
 
-    # app.get  '/remote_product/id',  &show_remote_product
+    # app.get  '/remote_product/:id',  &show_remote_product
     show_remote_product = lambda do
       @product = RawgentoModels::RemoteProduct.find(params[:id])
       haml "remote_product/view".to_sym
@@ -104,6 +104,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/version.rb

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

data/lib/rawbotz/views/index.haml

@@ -7,7 +7,8 @@
     %br
     %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: [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|
         %tr
           %td
             %a(href="/order/#{order.id}")

data/lib/rawbotz/views/layout.haml

@@ -52,4 +52,4 @@
             %center
               %ul.pure-menu-list
                 %li.pure-menu-item
-                  Rawbotz 2016 (c) Felix Wolfsteller
+                  Rawbotz #{Rawbotz::VERSION} 2016 (c) Felix Wolfsteller

data/lib/rawbotz/views/order/_item_table.haml

@@ -34,7 +34,7 @@
               = last_order_item.num_ordered
         %td
           - if order_item.remote_product_id.present?
-            = haml "widgets/_qty_wished_input".to_sym, locals: {product: order_item.local_product}
+            = haml "widgets/_qty_wished_input".to_sym, locals: {product: order_item.local_product, input_id_num: order_item.id, num_wished: order_item.num_wished}
           - else
             No remote product
         %td= order_item.local_product.packsize

data/lib/rawbotz/views/order/non_remote.haml

@@ -8,6 +8,7 @@
   %h2 Mail preview
   %pre~ @mail_preview
   %a{:href => "mailto:#{@supplier.email}?Subject=Order&body=%s" % URI::escape(@mail_preview).gsub(/&/,'%26')} Open mail
+  %br
 
 %center
   %form#non_remote_order.pure-form(action="" method="post")
@@ -18,19 +19,31 @@
           %th Name
           %th Qty
           %th Packsize
-          %th Stock/ Sales
+          %th Rough Avg. sales/ m
+          %th Stock
+          %th Chart
       %tbody
         - @products.find_each do |product|
           %tr
             %td
               = product_link product
+              - if product.supplier_prod_name
+                %br
+                %small
+                  = product.supplier_sku
+                  = product.supplier_prod_name
             %td
-              = haml "widgets/_qty_wished_input".to_sym, locals: {product: product}
+              = haml "widgets/_qty_wished_input".to_sym, locals: {product: product, input_id_num: product.id}
             %td
               - if product.packsize.present?
                 = product.packsize
               - else
                 %i.fa.fa-ban
+            %td
+              - if @monthly_sales
+                = @monthly_sales[product.product_id]
+            %td
+              = @stock[product.product_id]
             %td
               - stock_url = "/product/#{product.id}/stock_sales_plot"
               %a.stock_show_action{:href => "", :data => {url: stock_url, product: product.name}}
@@ -41,7 +54,7 @@
     %center
       %button.pure-button.pure-button-primary
         %i.fa.fa-envelope
-          Send me the mail!
+          Show me the mail!
       -#%button#ajax_mailto.pure-button.pure-button-secondary
       -#  %i.fa.fa-envelope
       -#    Open mail

data/lib/rawbotz/views/order/view.haml

@@ -44,7 +44,7 @@
     %br
     %h2 Action
     %center
-      (Find remote order? Delete?)
+      -#(Find remote order? Delete?)
       %button.pure-button.pure-button-secondary(name="action" value="save")
         Save
       %button.pure-button.pure-button-primary(name="action" value="order")
@@ -74,6 +74,6 @@
             =item.num_ordered
           %td
             =item.current_stock
-  %h2 Action
-  (Find remote order? Delete?)
+-#  %h2 Action
+-#  (Find remote order? Delete?)
 

data/lib/rawbotz/views/product/view.haml

@@ -33,6 +33,14 @@
     .pure-control-group
       %label(for="shelve") Shelve
       = @product.shelve_nr
+    - if @product.supplier_sku != ""
+      .pure-control-group
+        %label(for="supplier_sku") Supplier SKU
+        = @product.supplier_sku
+    - if @product.supplier_prod_name != ""
+      .pure-control-group
+        %label(for="supplier_prod_name") Supplier Product Name
+        = @product.supplier_prod_name
 
 %h2 Actions
 - if !@product.remote_product.present?

data/lib/rawbotz/views/supplier/view.haml

@@ -31,6 +31,12 @@
     %h2 Orders of #{@supplier.name}
     - @supplier.orders.find_each do |order|
       = order.id
+    - if @supplier != settings.supplier
+      - if @supplier.order_template.present?
+        %a(href="/order/non_remote/#{@supplier.id}")
+          Create mail order
+      - else
+        Please specify mail order template (in Settings tab) before continuing.
   #tab_order_settings
     %h2 Settings for #{@supplier.name}
 
@@ -64,7 +70,7 @@
     
               We will order
     
-              * PRODUCTCODE QTY (NUM_PACKS of PACKSIZE) PRODUCTNAME
+              * SUPPLIERSKU QTY (NUM_PACKS of PACKSIZE) PRODUCTNAME
     
               Thank you,
     
@@ -79,8 +85,6 @@
             %dd will be replaced by this suppliers name
             %dt *
             %dd the line starting with a star will be iterated over with every product
-            %dt PRODUCTCODE
-            %dd the product code as stored in magento
             %dt QTY
             %dd quantity ordered
             %dt NUM_PACKS
@@ -88,5 +92,7 @@
             %dt PACKSIZE
             %dd packsize as stored in magento
             %dt PRODUCTNAME
-            %dd the products name
+            %dd the products name, (prefers supplier_prod_name property of product)
+            %dt SUPPLIERSKU
+            %dd 'remote' SKU of the product
           %br

data/lib/rawbotz/views/thin_layout.haml

@@ -1,32 +1,17 @@
-!!! 5
-%html
-  %head
-    %title Rawbotz
-    %meta(name="viewport" content="width=device-width, initial-scale=1")
-    %meta(charset="utf-8")
-    %link(rel="stylesheet" txpe="text/css" href="/pure-min.css")
-    %link(rel="stylesheet" txpe="text/css" href="/font-awesome-4.5.0/css/font-awesome.min.css")
-    %link(rel="stylesheet" txpe="text/css" href="/rawbotz.css")
-    %script{:type => 'text/javascript', :src => "/Chart.min.js"}
-    %script{:type => 'text/javascript', :src => "/jquery-2.2.0.min.js"}
-    %script{:type => 'text/javascript', :src => "/jui/jquery-ui.min.js"}
-    %link(rel="stylesheet" type='text/css' href="/jui/jquery-ui.min.css")
-    %script{:type => 'text/javascript', :src => "/rawbotz.js"}
-  %body
-    .pure-g
-      .pure-u-1#main
-        - if flash
-          - if msg = flash.delete(:error)
-            #flash.ui-state-error
-              = msg.join(" | ")
-          - if msg = flash.delete(:success)
-            #flash.ui-state-highlight
-              = msg.join(" | ")
-          - if msg = flash.delete(:failure)
-            #flash.ui-state-highlight
-              = msg.join(" | ")
-          - if msg = flash.delete(:info)
-            #flash.ui-state-highlight
-              = msg.join(" | ")
+.pure-g
+  .pure-u-1#main
+    - if flash
+      - if msg = flash.delete(:error)
+        #flash.ui-state-error
+          = msg.join(" | ")
+      - if msg = flash.delete(:success)
+        #flash.ui-state-highlight
+          = msg.join(" | ")
+      - if msg = flash.delete(:failure)
+        #flash.ui-state-highlight
+          = msg.join(" | ")
+      - if msg = flash.delete(:info)
+        #flash.ui-state-highlight
+          = msg.join(" | ")
 
-        =yield
+    =yield

data/lib/rawbotz/views/widgets/_qty_wished_input.haml

@@ -1,13 +1,14 @@
 .wished_qty_input
-  - input_id = "item_#{product.id}"
-  %input.qty(id=input_id name=input_id size="2")
+  - input_id = "item_#{input_id_num}"
+  - num_wished ||= nil
+  %input.qty(id=input_id name=input_id size="2" value=num_wished)
   - packsize = product.packsize
   - if packsize.present?
     .packsize-buttons
-      %button.pure-button.plus-pack(data-packsize=packsize data-reference_input_id=input_id)
+      %a.pure-button.plus-pack(data-packsize=packsize data-reference_input_id=input_id)
         %i.fa.fa-plus-square
         %i.fa.fa-cube
-      %button.pure-button.minus-pack(data-packsize=packsize data-reference_input_id=input_id)
+      %a.pure-button.minus-pack(data-packsize=packsize data-reference_input_id=input_id)
         %i.fa.fa-minus-square
         %i.fa.fa-cube
   %button.pure-button.order-none

data/rawbotz.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sinatra", '~> 1.4'
   spec.add_dependency 'pony', '~> 1.11'
   spec.add_dependency 'haml', '~> 4.0'
-  spec.add_dependency "rawgento_models", '~> 0.2.3'
+  spec.add_dependency "rawgento_models", '~> 0.2.4'
   spec.add_dependency "rawgento_db", "~> 0.1.1"
   spec.add_dependency "magento_remote"
   spec.add_dependency "terminal-table", '~> 1.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rawbotz
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Felix Wolfsteller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: rawgento_db
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +167,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.md