rawbotz 0.1.5 → 0.2.0

data/lib/rawbotz/views/layout.haml

@@ -38,7 +38,6 @@
               = msg.join(" | ")
           -# Consume the remainder
           - if flash.length > 0
-            = flash.inspect
             #flash.ui-state-highlight
               - flash.each do |f|
                 = error_icon

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

@@ -1,24 +1,69 @@
 %h2 General
-%dl
-  %dt
-    Supplier
-  %dd
-    = order.supplier.try(:name)
-  %dt
-    Created at
-  %dd
-    = order.created_at
-  %dt
-    Updated at
-  %dd
-    = order.updated_at
-  %dt
-    State
-  %dd
-    = order.state
+
+.pure-g
+  .pure-u-1-2
+    %dl
+      %dt
+        Supplier
+      %dd
+        = order.supplier.try(:name)
+      %dt
+        Created at
+      %dd
+        = order.created_at
+      %dt
+        Updated at
+      %dd
+        = order.updated_at
+  .pure-u-1-2
+    %dl
+      %dt
+        State
+      %dd
+        = order_state_icon order
+        = order.state
+      - if order.supplier.minimum_order_value.present?
+        %dt
+          Supplier minimum order value
+        %dd
+          %b
+            = order.supplier.minimum_order_value
+      - if order.supplier.order_info.present?
+        %dt
+          Supplier Order Info
+        %dd
+          %b
+            = order.supplier.order_info
+      - if order.supplier.delivery_time_days.present?
+        %dt
+          Supplier Delivery time (days)
+        %dd
+          %b
+            = order.supplier.delivery_time_days
+      - if order.remote_order_id.present?
+        %dt
+          Remote Order ID
+        %dd
+          = order.remote_order_id
+      - if order.remote_order_link
+        %dt
+          Remote Order Link
+        %dd
+          %a(href="#{order.remote_order_link}" target="remote_shop")
+            = external_link_icon
+            = order.remote_order_link
+          %br
+          %a(href="/remote_order/#{order.remote_order_link.split('/').last}")
+            in rawbotz
+- if order.internal_comment.present?
+  .internal_comment
+    %h3 Internal Comment
+    = order.internal_comment
+- if order.public_comment.present?
+  .public_comment
+    %h3 Public Comment
+    = order.public_comment
 
 %h2 Content
 = order.order_items.count
 Items.
-
-

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

@@ -1,16 +1,26 @@
+:javascript
+  $( function() {
+    $( document ).tooltip();
+  });
 
 %table.pure-table.pure-table-bordered
   %thead
     %tr
       %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: 10%;" title="Stock (at order- time!) / Minimum stock warning value")
+        = stock_icon
+        \/
+        = stock_full_icon
       %th(style="width: 20%;") Order
-      %th(style="width: 5%;")
+      %th(style="width: 5%;" title="Packsize")
         %i.fa.fa-cube
-      %th(style="width: 10%;") Stock/ Sales history
+      %th(style="width: 10%;" title="Stock and Sales history")
+        = sales_icon
+        %i.fa.fa-line-chart
   %tbody
     - order_items.each do |order_item|
+      -# purchase price, order info!
       %tr
         %td
           - if order_item.local_product
@@ -19,6 +29,12 @@
             No local product!
         %td
           = local_product_link order_item.local_product
+          - if order_item.local_product.order_info.present?
+            %br
+            #flash.ui-state-highlight
+              = info_icon
+              = order_item.local_product.order_info
+
         %td
           = order_item.current_stock
           \/

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

@@ -0,0 +1,26 @@
+%center
+  %h2 Actions
+  - if order.state == "new"
+    %button.pure-button.pure-button-secondary(name="action" value="save")
+      = save_icon
+      Save
+  - if order.state == "new"
+    %button.pure-button.pure-button-primary(name="action" value="order")
+      = order_icon
+      Order!
+  - if !["new", "deleted"].include? order.state
+    %a.pure-button(href="/order/#{order.id}/packlist")
+      = view_icon
+      = packlist_icon
+      Packlist
+    %a.pure-button(href="/order/#{order.id}/packlist/pdf")
+      %i.fa.fa-file-pdf-o
+      Download Packlist
+  - if !["stocked", "deleted", "new"].include? order.state
+    %a.pure-button(href="/order/#{order.id}/stock")
+      = stock_icon
+      Stock
+  - if order.state != "deleted"
+    %button.pure-button.pure-button-primary(name="action" value="delete")
+      = delete_icon
+      Delete

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

@@ -0,0 +1,30 @@
+= haml "orders/menu".to_sym
+
+%h1 Link order from #{@order.updated_at} to a remote order
+
+%center
+  %table.pure-table.pure-table-striped
+    %thead
+      %tr
+        %th Date
+        %th Volume
+        %th Order ID
+        %th State
+        %th Action
+    %tbody
+      - @last_orders.each do |remote_order|
+        %form.pure-form(method="post")
+          %input(type="hidden" name="remote_order_link" value="#{remote_order[2]}")
+          %input(type="hidden" name="remote_order_id"   value="#{remote_order[3]}")
+          %tr
+            %td=remote_order[0]
+            %td=remote_order[1]
+            %td=remote_order[3]
+            %td=remote_order[4]
+            %td
+              %a(href="#{remote_order[2]}" target="remote_shop")
+                Visit remote shop
+              %br
+              %button.pure-button.pure-button-primary(type="submit" href="/remote_order/#{remote_order[2][/\d+/]}")
+                = add_icon
+                Link to this order

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

@@ -1,30 +1,58 @@
 = haml "orders/menu".to_sym
 
+:javascript
+  $( function() {
+    $( document ).tooltip();
+  });
+
 %h1 Non-Remote Order for supplier #{@supplier.name}
 
 #modal-plot.modal-plot
 
-- if @mail_preview.to_s != ""
-  %h2 Mail preview
-  %pre~ @mail_preview
-  %a{:href => "mailto:#{@supplier.email}?Subject=Order&body=%s" % URI::escape(@mail_preview).gsub(/&/,'%26')} Open mail
-  %br
+#supplier_info
+  - if @supplier.order_info.present?
+    #flash.ui-state-highlight
+      = info_icon
+      %b Delivery info:
+      = @supplier.order_info
+  
+  - if @supplier.delivery_time_days
+    #flash.ui-state-highlight
+      = info_icon
+      %b Delivery Time (in days):
+      = @supplier.delivery_time_days
+  
+  - if @supplier.minimum_order_value
+    #flash.ui-state-highlight
+      = info_icon
+      %b Minimum Order Value
+      = @supplier.minimum_order_value
+      €
+  
+  - if @supplier.order_info.present? || @supplier.delivery_time_days || @supplier.minimum_order_value
+    %br
 
 %center
   %form#non_remote_order.pure-form(action="" method="post")
     %input(name="supplier_id" type="hidden" value="#{@supplier.id}")
-    %table.pure-table
+    %table.pure-table.pure-table-striped
       %thead
         %tr
           %th Name
           %th Qty
-          %th Packsize
-          %th Rough Avg. sales/ m
+          %th(title="Packsize")
+            = packsize_icon
+          %th Avg. sales / m
           %th Stock
+          %th Missing
+          %th Purchase Price
           %th Chart
       %tbody
-        - @products.find_each do |product|
-          %tr
+        - @order.order_items.find_each do |order_item|
+          - product = order_item.local_product
+          - product_monthly_sales = @monthly_sales && @monthly_sales[product.product_id]
+          - product_stock = @stock[product.product_id]
+          %tr(title="Complete sales info")
             %td
               = product_link product
               - if product.supplier_prod_name
@@ -32,29 +60,78 @@
                 %small
                   = product.supplier_sku
                   = product.supplier_prod_name
-            %td
-              = haml "widgets/_qty_wished_input".to_sym, locals: {product: product, input_id_num: product.id}
-            %td
+              - if product.order_info.present?
+                #flash.ui-state-highlight
+                  = error_icon
+                  = product.order_info
+            %td(title="Quantity to order")
+              - if @order.state == "new"
+                = haml "widgets/_qty_wished_input".to_sym, locals: {product: product, input_id_num: product.id, num_wished: order_item.num_wished}
+              - else
+                %input.qty{readonly: true, value: order_item.num_wished, size: 2}
+            %td(title="Packsize of product")
               - 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(title="Monthly sales of product")
+              = product_monthly_sales
+            %td(title="Product Stock")
+              = product_stock
+            %td(title="Predicted quantity missing to stock for 30 days")
+              - if product_stock && product_monthly_sales
+                -# red/yellow/green
+                -# if negative, put button
+                = product_stock - product_monthly_sales
+            %td(title="Purchase Price")
+              - if product.purchase_price
+                = product.purchase_price
+                €
             %td
               - stock_url = "/product/#{product.id}/stock_sales_plot"
               %a.stock_show_action{:href => "", :data => {url: stock_url, product: product.name}}
                 Stock/Sales
+    %br
+    %center
+      Total price (updates on 'Save' click):
+      %br
+      %b
+        = "%.2f" % @order.order_items.inject(0.0) {|acc, oi| acc += oi.num_wished.to_i * oi.local_product.purchase_price.to_f}
+        €
+        - if @order.order_items.detect{|oi| oi.num_wished.to_i > 0 && oi.local_product.purchase_price.present?}
+          \... plus products without purchase price
+      %br
 
+    .br
+    %table.pure-table.pure-table-bordered(width="100%")
+      %thead
+        %tr
+          %th
+            %label(for="internal_comment")
+              Internal Comment
+          %th
+            %label(for="public")
+              Public Comment
+      %tbody
+        %tr
+          %td
+            %textarea#internal_comment(name="internal_comment")~ @order.internal_comment
+          %td
+            %textarea#public_comment(name="public_comment")~ @order.public_comment
 
     %br
     %center
-      %button.pure-button.pure-button-primary
-        %i.fa.fa-envelope
-          Show me the mail!
+      %h2 Actions
+      - if @order.state != "deleted" && @order.state != "mailed"
+        %button.pure-button.pure-button-primary(name="action" value="save")
+          = save_icon
+          Save
+      - if @order.state != "deleted" && @order.state != "mailed"
+        %button.pure-button.pure-button-secondary(name="action" value="fix")
+          Save and fix, mark as mailed
+      - if @order.state != "deleted"
+        %button.pure-button.pure-button-primary(name="action" value="delete")
+          Delete
       -#%button#ajax_mailto.pure-button.pure-button-secondary
       -#  %i.fa.fa-envelope
       -#    Open mail
@@ -78,8 +155,25 @@
 -#Edit supplier ...
 
 %br
-%h2 Mail template
-%pre~ @supplier.order_template
-%a.pure-button(href="/supplier/#{@supplier.id}")
-  Edit template
-%br
+- if @mail_preview_text.to_s != ""
+  %table.pure-table
+    %tr
+      %td
+        %h2 Mail preview
+        %pre~ "SUBJECT: #{@mail_preview_subject}"
+        %pre~ "TO: #{@supplier.email}"
+        %pre~ @mail_preview_text
+        %a{:href => @mailto_url, :target => 'rawbotz_mail_order'}
+          Open mail
+      %td
+        %h2 Mail template
+        %pre~ @supplier.order_template
+        %a.pure-button(href="/supplier/#{@supplier.id}#tab_order_settings")
+          Edit template
+        %br
+- else
+  %h2 Mail template
+  %pre~ @supplier.order_template
+  %a.pure-button(href="/supplier/#{@supplier.id}#tab_order_settings")
+    Edit template
+  %br

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

@@ -1,14 +1,71 @@
-%h2 Order #{@order.supplier} from #{@order.created_at}
+= haml "orders/menu".to_sym
+
+%h2 Packlist for order #{@order.supplier.name} from #{@order.created_at}
+
+- if @order.supplier == settings.supplier && !@order.remote_order_link.present?
+  .ui-state-error
+    = error_icon
+    This order is not linked up to a remote order, thus no refunds or extra items are shown.
+    %a.button.pure-button(href="/order/#{@order.id}/link_to_remote")
+      Link to a remote order
+
+%center
+  Last changed #{@order.updated_at}
+
+= haml "order/_head".to_sym, locals: {order: @order}
+%br
 
 %table.pure-table.pure-table-striped
   %thead
     %tr
-      %th Product
-      %th Shelve
-      %th Quantity
+      %th
+        = products_icon
+        Product
+      %th
+        = shelve_icon
+        Shelve
+      %th
+        = order_icon
+        Quantity Ordered
+      - if !@refunds.empty? || !@orphans.empty?
+        %th
+          %i.fa.fa-times-circle-o
+          Refunded
+      %th
+        = stock_icon
+        Quantity Stocked
   %tbody
     - @order.order_items.where("num_ordered > 0").sort_by{|i| i.local_product.name}.each do |p|
       %tr
         %td=p.local_product.name
         %td=p.local_product.shelve_nr
-        %td=p.num_ordered
+        %td
+          = p.num_ordered
+          - if refund = @refunds[p.local_product.product_id]
+            (
+            = refund.qty_ordered
+            )
+        - if !@refunds.empty?
+          %td
+            - if remote_line = @refunds[p.local_product.product_id]
+              = @refunds[p.local_product.product_id].qty_refunded
+        %td=p.num_stocked
+    - if !@orphans.empty?
+      %tr
+        %td(colspan=4)
+          %center
+            %b
+              = error_icon
+              Orphans (not ordered via rawbotz):
+              = error_icon
+      - @orphans.each do |orphan|
+        %tr
+          %td
+            = orphan[0]
+          %td
+          %td(title="Quantity ordered")
+            = orphan[1]
+          %td(title="Quantity refunded")
+            = orphan[2]
+          %td
+%br