rawbotz 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81bcca5d73862da12d5eb4ed197377f0866bae8c
-  data.tar.gz: 903e12e32aade0a32acc87310d820b574e6edf0e
+  metadata.gz: 402f796c506cac2364cab880d48e8181c69cf8d0
+  data.tar.gz: c2b42f12e6c8eea8f23e5e7037f53fb15136130c
 SHA512:
-  metadata.gz: 081bc679e520975b5df4541200295bf9925798cacbad4246582b998c539a3bb1a3cc8a561bd6d36ce8b6e58955405094eb613fb82492de5229313fd4077888a7
-  data.tar.gz: c20fd92925a37221f111e5156ef9f9db0da466e4469f0002869a1422e8eed9924bfbe4dd23cc5d06f9052f7716e2cddc7264ce537ecf8652087499a8ee3dab7a
+  metadata.gz: 453857bee3be25903bf77b984cf137b2e28ff59539478b9773ba077bcfaac4b3f08f15d68ae2fa2b5081a3b65cc9b54d3086cf030fe09afc659c76ce1e9d97e5
+  data.tar.gz: 60662be5fae280a77f09ac2ee953cfb9d3b4a72bfe97864c437024077533d7c2f054d6bc58dc502eebea18a19bd79b3889280ab96ef318ff661774126a003541

data/lib/rawbotz/public/rawbotz.css

@@ -57,4 +57,37 @@ th {
 .float_ul li a {
   width: 10em;
   float: left;
+  }
+.center {
+  text-align: center;
+}
+.huge-icon {
+  font-size: 500%;
+  color: #444;
+}
+.huge-icon:hover {
+  color: #246;
+}
+.wished_qty_input {
+  display: table-row;
+}
+.wished_qty_input input.qty {
+  width: 3em;
+  display: table-cell;
+}
+.wished_qty_input .packsize-buttons {
+  display: table-cell;
+  /*font-size: 50%;*/
+  padding-left: 0px;
+  padding-top: 0px;
+  padding-bottom: 0px;
+  padding-right: 5px;
+  vertical-align: middle;
+}
+.wished_qty_input .minus-pack, .wished_qty_input .plus-pack {
+  font-size: 50%;
+  display: block;
+}
+.wished_qty_input .order-none {
+  display: table-cell;
 }

data/lib/rawbotz/public/rawbotz.js

@@ -33,7 +33,10 @@ $(document).ready(function() {
   // For Non-Remote Order Forms: add a pack
   $("button.plus-pack").click(function(e) {
     e.preventDefault();
-    inputField = $(this).siblings("input");
+
+    input_id = $(this).data("reference_input_id");
+    inputField = $('#' + input_id);
+
     current = parseInt(inputField.val());
     if (isNaN(current)) {
       current = 0;
@@ -49,7 +52,9 @@ $(document).ready(function() {
   // For Non-Remote Order Forms: subtract a pack
   $("button.minus-pack").click(function(e) {
     e.preventDefault();
-    inputField = $(this).siblings("input");
+
+    input_id = $(this).data("reference_input_id");
+    inputField = $("#" + input_id);
     current = parseInt(inputField.val());
     if (isNaN(current)) {
       current = 0;
@@ -92,5 +97,14 @@ $(document).ready(function() {
     $('#modal-plot').load(url);
     $('#modal-plot').dialog("open");
   });
+
+  // Fill order item input with last value
+  $("button.reorder").click(function(e) {
+    e.preventDefault();
+    var order_item_id = $(e.target).data('order_item_id');
+    var num_wished = $(e.target).data('num_wished');
+    $("#item_" + order_item_id).val(num_wished);
+  });
+
 });
 

data/lib/rawbotz/version.rb

@@ -1,3 +1,3 @@
 module Rawbotz
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.3".freeze
 end

data/lib/rawbotz/views/index.haml

@@ -1 +1,15 @@
 %h1 Welcome at Rawbotz
+
+#main-threes.pure-g
+  .pure-u-1-3.center
+    %i.fa.fa-shopping-cart.huge-icon
+    %br
+    Order
+  .pure-u-1-3.center
+    %i.fa.fa-cubes.huge-icon
+    %br
+    Products
+  .pure-u-1-3.center
+    %i.fa.fa-truck.huge-icon
+    %br
+    Supplier

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

@@ -2,13 +2,13 @@
 %table.pure-table.pure-table-bordered
   %thead
     %tr
-      %th Product ID
-      %th Product Name
-      %th Stock (at time of Order)
-      %th Min Stock
-      %th Order
-      %th Packsize
-      %th Stock/Sales history
+      %th(style="width: 5%;") Product ID
+      %th(style="width: 50%;") Product Name
+      %th(style="width: 10%;") Stock (at order- time) / min stock
+      %th(style="width: 20%;") Order
+      %th(style="width: 5%;")
+        %i.fa.fa-cube
+      %th(style="width: 10%;") Stock/ Sales history
   %tbody
     - order_items.each do |order_item|
       %tr
@@ -19,26 +19,26 @@
             No local product!
         %td
           = local_product_link order_item.local_product
-        %td= order_item.current_stock
-        %td= order_item.min_stock
+        %td
+          = order_item.current_stock
+          \/
+          = order_item.min_stock
+          - last_order_item = order_item.order_item_same_product(order_item.updated_at).first
+          - if last_order_item.present? && last_order_item.num_wished
+            %br
+            %button.pure-button.reorder(data-order_item_id="#{order_item.id}" data-num_wished="#{last_order_item.num_wished}")
+              = last_order_item.order.updated_at.strftime("%Y-%m-%d")
+              %br
+              = last_order_item.num_wished
+              \/
+              = last_order_item.num_ordered
         %td
           - if order_item.remote_product_id.present?
-            %input.qty(name="item_#{order_item.id}" size="1" value="#{order_item.num_wished}")
-            %button.pure-button.order-none
-              %i.fa.fa-remove
-            - packsize = order_item.local_product.packsize
-            - if packsize
-              %button.pure-button.plus-pack(data-packsize="#{packsize}")
-                %i.fa.fa-plus-square
-                %i.fa.fa-cube
-              %button.pure-button.minus-pack(data-packsize="#{packsize}")
-                %i.fa.fa-minus-square
-                %i.fa.fa-cube
-            -#(last time X)
+            = haml "widgets/_qty_wished_input".to_sym, locals: {product: order_item.local_product}
           - else
             No remote product
         %td= order_item.local_product.packsize
         %td
           - stock_url = "/product/#{order_item.local_product.id}/stock_sales_plot"
           %a.stock_show_action{:href => "", :data => {url: stock_url, product: order_item.local_product.name}}
-            Show Stock/Sale data
+            Stock/Sales

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

@@ -2,6 +2,8 @@
 
 %h1 Non-Remote Order for supplier #{@supplier.name}
 
+#modal-plot.modal-plot
+
 %center
   %form.pure-form(action="" method="post")
     %input(name="supplier_id" type="hidden" value="#{@supplier.id}")
@@ -11,28 +13,23 @@
           %th Name
           %th Qty
           %th Packsize
-          -#%th Stock and Sales
+          %th Stock/ Sales
       %tbody
         - @products.find_each do |product|
           %tr
             %td
               = product_link product
             %td
-              %input.qty(name="item_#{product.id}" size="2")
-              - if product.packsize.present?
-                %button.pure-button.plus-pack(data-packsize="#{product.packsize}")
-                  %i.fa.fa-plus-square
-                  %i.fa.fa-cube
-                %button.pure-button.minus-pack(data-packsize="#{product.packsize}")
-                  %i.fa.fa-minus-square
-                  %i.fa.fa-cube
-                %button.pure-button.order-none
-                  %i.fa.fa-remove
+              = haml "widgets/_qty_wished_input".to_sym, locals: {product: product}
             %td
               - if product.packsize.present?
                 = product.packsize
               - else
                 %i.fa.fa-ban
+            %td
+              - stock_url = "/product/#{product.id}/stock_sales_plot"
+              %a.stock_show_action{:href => "", :data => {url: stock_url, product: product.name}}
+                Stock/Sales
 
 
     %br

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

@@ -20,7 +20,7 @@
         = backend_url
     .pure-control-group
       %label(for="supplier") Supplier
-      = @product.supplier.try(:name)
+      = supplier_link @product.supplier
     .pure-control-group
       %label(for="supplier") Remote Product
       - if @product.remote_product.nil?

data/lib/rawbotz/views/products/index.haml

@@ -2,6 +2,8 @@
 
 %h1 Products by Supplier
 
+#modal-plot.modal-plot
+
 :javascript
   $(function() {
     $( "#tabs" ).tabs();

data/lib/rawbotz/views/products/table.haml

@@ -7,14 +7,19 @@
         Product ID
       %th
         Supplier
-      -#%th
-      -#  Last Stock
+      %th
+        Stock/ Sales
   %tbody
     - products.each do |product|
       %tr
         %td
           = product_link product
-        %td= product.product_id
-        %td= product.supplier.try(:name)
-        -#%td
-        -#  %a(href="") Show modal
+        %td
+          = product.product_id
+        %td
+          = supplier_link product.supplier
+        %td
+          = haml "widgets/_stock_sales".to_sym, locals: {product: product}
+          - stock_url = "/product/#{product.id}/stock_sales_plot"
+          %a.stock_show_action{:href => "", :data => {url: stock_url, product: product.name}}
+            Stock/Sales

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

@@ -5,59 +5,88 @@
 
 %h2 Supplier #{@supplier.name}
 
-%form.pure-form.pure-form-aligned(action="" method="post")
-  %input(type="hidden" name="_method" value="put")
-  %fieldset
-    .pure-control-group
-      %label(for="email") E-Mail address
-      %input#email(name="email" type="email" value="#{@supplier.email}")
+:javascript
+  $(function() {
+    $( "#tabs" ).tabs();
+  });
 
-    .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
+#tabs
+  %ul
+    %li
+      %a(href="#tab_products")
+        = products_icon
+        Products
+    %li
+      %a(href="#tab_orders")
+        = order_icon
+        Orders
+    %li
+      %a(href="#tab_order_settings")
+        = settings_icon
+        Order Settings
+  #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
+  #tab_order_settings
+    %h2 Settings for #{@supplier.name}
 
-    .pure-control-group
-      %button.pure-button.pure-button-primary
-        %i.fa.fa-save
-        Save
-    %h3 Help
-    .pure-control-group
-      %em
-        How to fill out templates:
-    .pure-control-group
-      See the example template in the following textarea.  The line starting with a star (*) will be repeated.  A list of supported symbols can be found below.
-      %br
-      %textarea#example_order_template(name="example_order_template" readonly rows="10" cols="80")
-        :preserve
-          SUBJECT=Order NAME
-
-          Dear NAME,
-
-          We will order
-
-          * PRODUCTCODE QTY (QTY_PACKS of PACKSIZE) PRODUCTNAME
-
-          Thank you,
-
-          us.
-      %br
-      Following symbols are supported:
-      %br
-      %dl
-        %dt SUBJECT=
-        %dd will be subject of the mail (and NOT included in mail itself)
-        %dt NAME
-        %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 QTY_PACKS
-        %dd quantity ordered (in packs of PACKSIZE)
-        %dt PACKSIZE
-        %dd packsize as stored in magento
-        %dt PRODUCTNAME
-        %dd the products name
-      %br
+    %form.pure-form.pure-form-aligned(action="" method="post")
+      %input(type="hidden" name="_method" value="put")
+      %fieldset
+        .pure-control-group
+          %label(for="email") E-Mail address
+          %input#email(name="email" type="email" value="#{@supplier.email}")
+    
+        .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
+          %button.pure-button.pure-button-primary
+            %i.fa.fa-save
+            Save
+        %h3 Help
+        .pure-control-group
+          %em
+            How to fill out templates:
+        .pure-control-group
+          See the example template in the following textarea.  The line starting with a star (*) will be repeated.  A list of supported symbols can be found below.
+          %br
+          %textarea#example_order_template(name="example_order_template" readonly rows="10" cols="80")
+            :preserve
+              SUBJECT=Order NAME
+    
+              Dear NAME,
+    
+              We will order
+    
+              * PRODUCTCODE QTY (NUM_PACKS of PACKSIZE) PRODUCTNAME
+    
+              Thank you,
+    
+              us.
+          %br
+          Following symbols are supported:
+          %br
+          %dl
+            %dt SUBJECT=
+            %dd will be subject of the mail (and NOT included in mail itself)
+            %dt NAME
+            %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
+            %dd quantity ordered (in packs of PACKSIZE)
+            %dt PACKSIZE
+            %dd packsize as stored in magento
+            %dt PRODUCTNAME
+            %dd the products name
+          %br

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

@@ -0,0 +1,14 @@
+.wished_qty_input
+  - input_id = "item_#{product.id}"
+  %input.qty(id=input_id name=input_id size="2")
+  - packsize = product.packsize
+  - if packsize.present?
+    .packsize-buttons
+      %button.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)
+        %i.fa.fa-minus-square
+        %i.fa.fa-cube
+  %button.pure-button.order-none
+    %i.fa.fa-remove

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

@@ -0,0 +1,4 @@
+- stock_url = "/product/#{product.id}/stock_sales_plot"
+%a.stock_show_action{:href => "", :data => {url: stock_url,
+                                            product: product.name}}
+

data/lib/rawbotz.rb

@@ -4,12 +4,13 @@ require "rawbotz/local_shop"
 require "rawbotz/order_processor"
 require "rawbotz/datapolate"
 require "rawbotz/product_updater"
-require "rawbotz/routes"
 require "rawbotz/mail_template"
 
 require 'rawgento_models'
 require 'rawgento_db'
 
+require "rawbotz/routes"
+
 require 'ostruct'
 require 'yaml'
 require 'pony'

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.2'
+  spec.add_dependency "rawgento_models", '~> 0.2.3'
   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.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Felix Wolfsteller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-14 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.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: rawgento_db
   requirement: !ruby/object:Gem::Requirement
@@ -298,6 +298,8 @@ files:
 - lib/rawbotz/views/widgets/_ajax_link.haml
 - lib/rawbotz/views/widgets/_link.haml
 - lib/rawbotz/views/widgets/_link_line.haml
+- lib/rawbotz/views/widgets/_qty_wished_input.haml
+- lib/rawbotz/views/widgets/_stock_sales.haml
 - rawbotz.gemspec
 homepage: https://rawliving-germany.github.io/rawbotz/
 licenses: