rawbotz 0.1.5 → 0.2.0

data/lib/rawbotz/views/supplier/orders/table.haml

@@ -0,0 +1,26 @@
+%table.pure-table
+  %thead
+    %tr
+      %th Product
+      %th qty stocked
+      %th Stock date
+      %th order date
+      %th order number
+      %th supplier
+  %tbody
+    - Supplier.find_each do |supplier|
+      - supplier.orders.find_each do |order|
+        - if order.order_items.where("num_stocked > 0").present?
+          %tr
+            %td(colspan=6)
+              %center
+                %em
+                  Order #{order.remote_order_id} from #{order.supplier.name}
+          - order.order_items.where("num_stocked > 0").each do |item|
+            %tr
+              %td= product_link item.local_product
+              %td= item.num_stocked
+              %td= order.stocked_at
+              %td= order.ordered_at
+              %td= order.remote_order_id
+              %td= order.supplier.name

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

@@ -3,11 +3,19 @@
 
 = haml "maintenance/menu".to_sym
 
+#modal-plot.modal-plot
+
 %h2 Supplier #{@supplier.name}
 
 :javascript
   $(function() {
-    $( "#tabs" ).tabs();
+    $( "#tabs" ).tabs({
+      beforeLoad: function( event, ui ) {
+        ui.jqXHR.fail(function() {
+          ui.panel.html("Couldn't load this tab, there was an error.");
+        });
+      }
+     });
   });
 
 #tabs
@@ -24,32 +32,66 @@
       %a(href="#tab_order_settings")
         = settings_icon
         Order Settings
+    %li
+      %a(href="/stockexplorer/#{@supplier.id}")
+        Stock explorer Pack icons
   #tab_products
     %h2 Products of #{@supplier.name}
     = haml "products/table".to_sym, locals: {products: @supplier.local_products.all}
   #tab_orders
     %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.
+    - if @supplier != settings.supplier && !@supplier.order_template.present?
+      %center
+        .ui-state-error
+          Please specify mail order template (in Settings tab) before continuing.
+      %br
+    = haml "orders/_order_table".to_sym, locals: {orders: @supplier.orders.order(updated_at: :desc), supplier: @supplier}
   #tab_order_settings
     %h2 Settings for #{@supplier.name}
 
     %form.pure-form.pure-form-aligned(action="" method="post")
       %input(type="hidden" name="_method" value="put")
       %fieldset
+        .pure-control-group
+          %label
+            Order method
+          %input(readonly value="#{@supplier.order_method || 'mail'}")
+
         .pure-control-group
           %label(for="email") E-Mail address
-          %input#email(name="email" type="email" value="#{@supplier.email}")
+          %input#email(name="email" value="#{@supplier.email}")
+        .pure-control-group
+          %label.pseudo
+          .hint
+            Multiple adresses separated by whitespace, first addresss will be used as 'To:', following as 'CC:'.
     
         .pure-control-group
           %label(for="order_template") Order Template
           %textarea#order_template(name="order_template" value="#{@supplier.order_template}" rows="10" cols="80")~ @supplier.order_template
+        .pure-control-group
+          %label.pseudo
+          .hint
+            See example below.
+
+        .pure-control-group
+          %label(for="order_info") Order Info
+          %textarea#order_info(name="order_info" value="#{@supplier.order_info}" rows="10" cols="80")~ @supplier.order_info
+
+        .pure-control-group
+          %label(for="delivery_time_days") Delivery Time
+          %input#delivery_time_days(name="delivery_time_days" value="#{@supplier.delivery_time_days}")
+        .pure-control-group
+          %label.pseudo
+          .hint
+            In days.
+
+        .pure-control-group
+          %label(for="minimum_order_value") Minimum Order Value
+          %input#minimum_order_value(name="minimum_order_value" value="#{@supplier.minimum_order_value}")
+        .pure-control-group
+          %label.pseudo
+          .hint
+            In €, british notation (100.87 not 100,87).
     
         .pure-control-group
           %button.pure-button.pure-button-primary
@@ -71,6 +113,8 @@
               We will order
     
               * SUPPLIERSKU QTY (NUM_PACKS of PACKSIZE) PRODUCTNAME
+
+              PUBLIC_COMMENT
     
               Thank you,
     
@@ -95,4 +139,6 @@
             %dd the products name, (prefers supplier_prod_name property of product)
             %dt SUPPLIERSKU
             %dd 'remote' SKU of the product
+            %dt PUBLIC_COMMENT
+            %dd Public comment given in the order
           %br

data/rawbotz.gemspec

@@ -12,22 +12,26 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{web-interface and other tools to manage a magento shop}
   spec.description   = %q{provides a (sinatra) web interface to order from another shop, view stock history ...}
   spec.homepage      = %q{https://rawliving-germany.github.io/rawbotz/}
-  spec.licenses      = ['AGPLv3+']
+  spec.licenses      = ['AGPL-3.0+']
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/[^/]*$}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = '~> 2.3'
 
-  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.4'
-  spec.add_dependency "rawgento_db", "~> 0.1.1"
-  spec.add_dependency "magento_remote"
-  spec.add_dependency "terminal-table", '~> 1.5'
+  spec.add_dependency "sinatra",         '~> 1.4'
+  spec.add_dependency 'pony',            '~> 1.11'
+  spec.add_dependency 'haml',            '~> 4.0'
+  spec.add_dependency 'pdfkit',          '~> 0.8'
+  spec.add_dependency "rawgento_models", '~> 0.5'
+  spec.add_dependency "rawgento_db",     '~> 0.3.1'
+  spec.add_dependency "magento_remote",  '~> 0.4.1'
+  spec.add_dependency "terminal-table",  '~> 1.5'
+  spec.add_dependency "bcrypt",          '~> 3.1.11'
 
   spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake",    "~> 10.0"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "rerun"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rawbotz
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Felix Wolfsteller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -52,48 +52,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: pdfkit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rawgento_models
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rawgento_db
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: magento_remote
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.11
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -150,12 +178,28 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rerun
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: provides a (sinatra) web interface to order from another shop, view stock
   history ...
 email:
 - felix.wolfsteller@gmail.com
 executables:
+- bcrypt_pw
 - rawbotz
+- rawbotz_abort_orders
 - rawbotz_import_links
 - rawbotz_maintenance.sh
 - rawbotz_process_order
@@ -172,11 +216,14 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- agpl-3.0.txt
 - bin/console
 - bin/setup
 - config.ru
+- exe/bcrypt_pw
 - exe/debug/test_mail
 - exe/rawbotz
+- exe/rawbotz_abort_orders
 - exe/rawbotz_import_links
 - exe/rawbotz_maintenance.sh
 - exe/rawbotz_process_order
@@ -190,13 +237,22 @@ files:
 - lib/rawbotz/cli/order_result_table.rb
 - lib/rawbotz/datapolate.rb
 - lib/rawbotz/helpers/flash_helper.rb
+- lib/rawbotz/helpers/format_helper.rb
 - lib/rawbotz/helpers/icon_helper.rb
+- lib/rawbotz/helpers/order_item_color_helper.rb
 - lib/rawbotz/helpers/resource_link_helper.rb
 - lib/rawbotz/local_shop.rb
 - lib/rawbotz/mail_template.rb
+- lib/rawbotz/models/sales.rb
+- lib/rawbotz/models/stock.rb
+- lib/rawbotz/models/stock_product.rb
+- lib/rawbotz/models/stock_product_factory.rb
 - lib/rawbotz/option_parser.rb
-- lib/rawbotz/order_processor.rb
-- lib/rawbotz/product_updater.rb
+- lib/rawbotz/processors/order_linker.rb
+- lib/rawbotz/processors/order_processor.rb
+- lib/rawbotz/processors/organic_product_deliveries_csv.rb
+- lib/rawbotz/processors/product_updater.rb
+- lib/rawbotz/processors/stock_processor.rb
 - lib/rawbotz/public/Chart.min.js
 - lib/rawbotz/public/font-awesome-4.5.0/HELP-US-OUT.txt
 - lib/rawbotz/public/font-awesome-4.5.0/css/font-awesome.css
@@ -258,10 +314,13 @@ files:
 - lib/rawbotz/routes.rb
 - lib/rawbotz/routes/non_remote_orders.rb
 - lib/rawbotz/routes/orders.rb
+- lib/rawbotz/routes/orders/stock.rb
 - lib/rawbotz/routes/product_links.rb
 - lib/rawbotz/routes/products.rb
 - lib/rawbotz/routes/remote_shop.rb
+- lib/rawbotz/routes/stock.rb
 - lib/rawbotz/routes/suppliers.rb
+- lib/rawbotz/sales_data.rb
 - lib/rawbotz/version.rb
 - lib/rawbotz/views/_hide_unhide_button.haml
 - lib/rawbotz/views/_menu.haml
@@ -271,13 +330,18 @@ files:
 - lib/rawbotz/views/maintenance/menu.haml
 - lib/rawbotz/views/order/_head.haml
 - lib/rawbotz/views/order/_item_table.haml
-- lib/rawbotz/views/order/new.haml
+- lib/rawbotz/views/order/_order_actions.haml
+- lib/rawbotz/views/order/link_to_remote.haml
 - lib/rawbotz/views/order/non_remote.haml
 - lib/rawbotz/views/order/packlist.haml
+- lib/rawbotz/views/order/packlist.pdf.haml
+- lib/rawbotz/views/order/stock.haml
 - lib/rawbotz/views/order/view.haml
+- lib/rawbotz/views/orders/_order_table.haml
 - lib/rawbotz/views/orders/index.haml
 - lib/rawbotz/views/orders/menu.haml
 - lib/rawbotz/views/orders/non_remotes.haml
+- lib/rawbotz/views/pdf_layout.haml
 - lib/rawbotz/views/product/_stock_sales_plot.haml
 - lib/rawbotz/views/product/link_to.haml
 - lib/rawbotz/views/product/view.haml
@@ -294,6 +358,12 @@ files:
 - lib/rawbotz/views/remote_product/view.haml
 - lib/rawbotz/views/remote_products/_table.haml
 - lib/rawbotz/views/remote_products/index.haml
+- lib/rawbotz/views/stock/index.haml
+- lib/rawbotz/views/stock/menu.haml
+- lib/rawbotz/views/stock_product/_value_table_line.haml
+- lib/rawbotz/views/stock_product/value_table.haml
+- lib/rawbotz/views/stockexplorer/stockexplorer.haml
+- lib/rawbotz/views/supplier/orders/table.haml
 - lib/rawbotz/views/supplier/view.haml
 - lib/rawbotz/views/suppliers/index.haml
 - lib/rawbotz/views/thin_layout.haml
@@ -305,7 +375,7 @@ files:
 - rawbotz.gemspec
 homepage: https://rawliving-germany.github.io/rawbotz/
 licenses:
-- AGPLv3+
+- AGPL-3.0+
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -313,9 +383,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -328,4 +398,3 @@ signing_key:
 specification_version: 4
 summary: web-interface and other tools to manage a magento shop
 test_files: []
-has_rdoc: 

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

@@ -1,22 +0,0 @@
-%h1 New Order
-
-%form.pure-form.pure-form-aligned(action="" method="post")
-  %input(type="hidden" name="_method" value="put")
-
-  :javascript
-    $(function() {
-      $( "#tabs" ).tabs();
-    });
-
-  #tabs
-    %ul
-      %li
-        %a(href="#under_min")Under min
-      %li
-        %a(href="#tabs-2")all
-      %li
-        %a(href="#tabs-2")ordered
-      %li
-        %a(href="#tabs-3")ignored
-    #under_min
-      = haml "order/_item_table".to_sym, locals: { order: @order}