office_clerk 0.8 → 0.9

data/app/views/products/_head.haml

@@ -5,10 +5,9 @@
   .col-md-6
     %h3
       - if @product.product_item?
-        = link_to @product.product.name , product_url(@product.product)
+        = link_to @product.product.name , office.product_url(@product.product)
       = @product.name
     %small
       = @product.online ? t(:online) : t(:not_online)
   .col-md-4
     %h2= t(:preview)
-  

data/app/views/products/_line.html.haml

@@ -5,7 +5,7 @@
       - @product.products.each do |product|
         %td
           = image_tag product.main_picture.url(:thumb)
-          =link_to product.name , product_path(product)
+          =link_to product.name , office.product_path(product)
     %tr.line-2
       %td=t(:price)
       - @product.products.each do |product|

data/app/views/products/_preview_box.haml

@@ -1,11 +1,15 @@
-%h4.product-name
-  =product.name
-.row
-  .col-md-4
-    .square-image
-      =image_tag product.main_picture.url
-  .col-md-8.bottom
-    .product-fact
-      %p= markdown product.summary
-      .price.selling
+.admin
+  .product-container
+    %h4.product-name
+      =product.name
+    .row
+      .col-md-4
+        .square-image
+          =image_tag product.main_picture.url
+      .col-md-8
+        .product-fact
+          %p= markdown product.summary
+    .row
+      .product-list-price
         = euros product.price
+    

data/app/views/products/_triple.html.haml

@@ -8,5 +8,5 @@
             -next unless product
             %td= image_tag product.main_picture.url(:thumb)
             %td
-              = link_to product_path(product), :title => t(:show) , :class => product.online && "online" do
+              = link_to office.product_path(product), :title => t(:show) , :class => product.online && "online" do
                 = product.full_name

data/app/views/products/edit.html.haml

@@ -1,6 +1,6 @@
 = render "head"
-
-= bootstrap_form_for(@product, :html => { :multipart => true , :role=>"form"} ) do |f|
+- url = @product.persisted? ? office.product_path(@product) : office.products_path
+= bootstrap_form_for(@product, :html => { :multipart => true , :role=>"form"} , :url => url) do |f|
   = f.hidden_field( :product_id) if @product.product_id
   .row
     .col-md-8
@@ -42,6 +42,6 @@
         .col-md-8
           = f.submit :class => "btn btn-success"
           -if @product.product_id
-            = link_to t(:cancel), product_path(@product.product), :class => "btn btn-warning"
+            = link_to t(:cancel), office.product_path(@product.product), :class => "btn btn-warning"
           -else
-            = link_to t(:cancel), products_path, :class => "btn btn-warning"
+            = link_to t(:cancel), office.products_path, :class => "btn btn-warning"

data/app/views/products/index.html.haml

@@ -12,22 +12,26 @@
             = t(:products)
           = paginate @products
       .col-md-2
-        = link_to  t(:new) + ' ' + t(:product) , new_product_path , :class => "btn btn-primary"
+        = link_to  t(:new) + ' ' + t(:product) , office.new_product_path , :class => "btn btn-primary"
   .col-md-3
     = image_tag "office_clerk/products.jpg" , :class => "img-responsive"
 
 .row
   .col-md-9
     %div
-      %table.table-striped.table-bordered.table-condensed
+      %table.table.table-condensed
         %thead
           %tr
             %th=t( "picture")
-            %th= sort_link @q, :ean
-            %th= sort_link @q, :name
-            %th= sort_link @q, :price
-            %th=t(:supplier) + " " + t(:category)
-            %th= sort_link @q, :inventory
+            %th= sort_link [:office,@q], :ean
+            %th= sort_link [:office,@q], :name
+            %th= sort_link [:office,@q], :price
+            %th= sort_link [:office,@q], :cost
+            %th
+              =t(:supplier)
+              %br
+              =t(:category)
+            %th= sort_link [:office,@q], :inventory
             %th
               %label.checkbox
                 = @product_scope.length.to_s + " " + t(:products)
@@ -38,21 +42,22 @@
               %td.image= image_tag product.main_picture.url(:thumb)
               %td.ean= product.line? ? "#{product.products.length} #{t(:items)}" : product.ean
               %td.name
-                = link_to product_path(product), :title => t(:show) , :class => product.online && "online" do
+                = link_to office.product_path(product), :title => t(:show) , :class => product.online && "online" do
                   =product.full_name
-              %td.price=euros(product.price)
+              %td.price.text-right=euros(product.price)
+              %td.price.text-right=euros(product.cost)
               %td.supplier
                 =product.supplier.supplier_name if product.supplier
                 %br
                 =product.category.name if product.category
               %td.inventory=product.inventory
               -if params[:basket]
-                %td= link_to t(:add_to_basket) , edit_basket_path(:id => params[:basket] , :add => product.id)
+                %td= link_to t(:add_to_basket) , office.edit_basket_path(:id => params[:basket] , :add => product.id)
               -else
-                %td= link_to t(:edit) ,edit_product_path(product), :title => t(:edit)
+                %td= link_to t(:edit) ,office.edit_product_path(product), :title => t(:edit)
     = paginate @products
   .col-md-3
-    = search_form_for @q, :url => search_products_path, :html => { :class => "form-horizontal" }, :method => :get do |f|
+    = search_form_for @q, :url => office.search_products_path, :html => { :class => "form-horizontal" }, :method => :get do |f|
       .form-group
         .input-group
           - if params[:basket]
@@ -87,6 +92,12 @@
           = f.text_field :price_gteq , :class => "form-control"
         .col-md-4
           = f.text_field :price_lteq , :class => "form-control"
+        .col-md-4
+          = f.label(:cost)
+        .col-md-4
+          = f.text_field :cost_gteq , :class => "form-control"
+        .col-md-4
+          = f.text_field :cost_lteq , :class => "form-control"
         .col-md-4
           = f.label(:inventory)
         .col-md-4
@@ -104,4 +115,4 @@
         .col-md-8
           = f.collection_select :category_id_eq, Category.all, :id, :name, {:include_blank => true}, :class=>"form-control"
       = f.submit t(:filter), :class => "btn btn-success" , :id => :filter
-      = link_to  t(:cancel), products_path, :class => "btn btn-warning"
+      = link_to  t(:cancel), office.products_path, :class => "btn btn-warning"

data/app/views/products/show.html.haml

@@ -21,52 +21,55 @@
       .col-md-6
         %p
           %b= t(:price) + " : "
-          = in_place @product , :price , :display_with => :euros
+          = in_place @product , :price , :display_with => :best_euros , :url => office.product_path(@product)
         %p
           %b= t(:cost) + " : "
-          = in_place @product , :cost , :display_with => :euros
+          = in_place @product , :cost , :display_with => :best_euros , :url => office.product_path(@product)
         %p
           %b= t(:category) + " : "
-          = link_to @product.category.name ,category_path(@product.category) if @product.category
+          = link_to @product.category.name , office.category_path(@product.category) if @product.category
         %p
           %b= t(:link) + " : "
           = @product.link
         %p
           %b= t(:ean) + " : "
-          = in_place @product , :ean
+          = in_place @product , :ean , :url => office.product_path(@product)
       .col-md-6
         %p
           %b= t(:weight) + " : "
-          = in_place @product , :weight
+          = in_place @product , :weight , :url => office.product_path(@product)
         %p
           %b= t(:inventory) + " : "
           = @product.inventory
+        %p
+          %b= t(:stock_level) + " : "
+          = in_place @product , :stock_level , :url => office.product_path(@product)
         %p
           %b= t(:supplier) + " : "
           = link_to @product.supplier.supplier_name ,supplier_path(@product.supplier) if @product.supplier
         %p
           %b= t(:scode) + " : "
-          = in_place @product , :scode
+          = in_place @product , :scode , :url => office.product_path(@product)
         %p
           %b= t(:tax_percent) + " : "
-          = in_place @product , :tax
+          = in_place @product , :tax , :url => office.product_path(@product)
   .col-md-4
     %p
       %b= t(:summary) + " : "
-      = in_place @product , :summary 
+      = in_place @product , :summary , :url => office.product_path(@product)
     %p
       %b= t(:description) + " : "
-      = in_place @product , :description , :as => :textarea
+      = in_place @product , :description , :as => :textarea , :url => office.product_path(@product)
   .col-md-4
     =render :partial => "products/preview_box" , :locals => {:product => @product}
     = markdown @product.description
 %br
 .row.product_show_row_buttons
   .col-md-2
-    = link_to t(:edit), edit_product_path(@product), :class => "btn btn-success"
+    = link_to t(:edit), office.edit_product_path(@product), :class => "btn btn-success"
   .col-md-2
-    = link_to t(:delete) , delete_product_path(@product), :class => "btn btn-danger"
+    = link_to t(:delete) , office.product_path(@product), :method => :delete , :class => "btn btn-danger", :data => {  :confirm => t(:are_you_sure )}
   -unless @product.product_item?
     .col-md-2
-      = link_to t(:new_item) , new_product_path( :parent_id => @product.id), :class => "btn btn-primary" 
+      = link_to t(:new_item) , office.new_product_path( :parent_id => @product.id), :class => "btn btn-primary"
   .col-md-6.product_show_row_end

data/app/views/purchases/index.html.haml

@@ -4,6 +4,8 @@
       .col-md-10
         %h2= t(:purchases)
         = paginate @purchases
+      .col-md-2
+        = link_to  t(:new) + ' ' + t(:purchase) , office.new_purchase_path , :class => "btn btn-primary new_purchase"
   .col-md-3
     = image_tag "office_clerk/purchases.jpg" , :class => "img-responsive"
 .row
@@ -12,24 +14,26 @@
       %table.table.table-striped.table-bordered.table-condensed
         %thead
           %tr
-            %th= sort_link @q, :ordered_on
-            %th= sort_link @q, :received_on
+            %th= t(:name)
+            %th= sort_link [:office,@q], :ordered_on
+            %th= sort_link [:office,@q], :received_on
             %th= t(:items)
-            %th= sort_link @q, :basket_total_price
+            %th= sort_link [:office,@q], :basket_total_price
             %th= @purchase_scope.length.to_s + " " +  t(:purchases)
         %tbody
           - @purchases.each do |purchase|
             %tr{:class => "line-#{cycle("1","2")}"}
+              %td= purchase.name
               %td= date(purchase.ordered_on)
               %td= date(purchase.received_on)
               %td= purchase.basket.items.length
-              %td= link_to euros(purchase.basket.total_price) , basket_path(purchase.basket)
-              %td= link_to t(:show) , purchase_path(purchase), :title => t(:show)
+              %td= link_to euros(purchase.basket.total_price) , office.basket_path(purchase.basket)
+              %td= link_to t(:show) , office.purchase_path(purchase), :title => t(:show)
       .btn-toolbar
         .btn-group
           = paginate @purchases
   .col-md-3
-    = search_form_for @q, :url => search_purchases_path, :html => { :class => "form-horizontal" }, :method => :post do |f|
+    = search_form_for @q, :url => office.search_purchases_path, :html => { :class => "form-horizontal" }, :method => :get do |f|
       .form-group
         = f.text_field :name_cont , :class => "form-control" , :placeholder =>  t(:name)
       .row
@@ -50,4 +54,4 @@
           = f.text_field :received_on_lt , :class => "form-control datepicker"
       %br
       = f.submit t(:filter),  :id => :filter , :class => "btn btn-success"
-      = link_to  t(:cancel), purchases_path, :class => "btn btn-warning"
+      = link_to  t(:cancel), office.purchases_path, :class => "btn btn-warning"

data/app/views/purchases/show.html.haml

@@ -1,32 +1,49 @@
-%h2
-  = t(:show)
-  = t(:purchase)
-%p
-  %b
-    = t(:name) + " : " + @purchase.name.to_s
-%p
-  %b
-    -if @purchase.ordered_on
-      = t(:ordered_on) + " : " + date(@purchase.ordered_on)
-    -else
-      = link_to t(:order) , order_purchase_path(@purchase) , :class => "btn btn-primary order_link"
-%p
-  %b
-    -if @purchase.received_on
-      = t(:received) + " : " + date(@purchase.received_on)
-    -else
-      = link_to t(:receive) , receive_purchase_path(@purchase) , :class => "btn btn-primary receive_link"
+.row
+  %h2
+    = t(:purchase)
+  %p
+    %b= t(:name)
+    = in_place @purchase , :name , :url => office.purchases_path(@purchase)
+.row
+  .col-md-3
+    %p
+      %b
+        = t(:ordered_on) + " : "
+        -if @purchase.ordered_on
+          = date(@purchase.ordered_on)
+        -else
+          = link_to t(:order) , office.order_purchase_path(@purchase) , :class => "btn btn-primary order_link"
+  .col-md-3
+    %p
+      %b
+        = t(:received_on) + " : "
+        -if @purchase.received_on
+          = date(@purchase.received_on)
+        -else
+          = link_to t(:receive) , office.receive_purchase_path(@purchase) , :class => "btn btn-primary receive_link"
+  .col-md-6
+    %p
+      %b
+        = t(:suppliers) + " : "
+      = raw @purchase.basket.suppliers.collect {|s| link_to( s.supplier_name , supplier_path(s)) }.join(",")
 
 = render "baskets/small" , :basket => @purchase.basket
 
-%p
-  %b
-    = t(:suppliers) + " : "
-  = @purchase.basket.suppliers.collect {|s| s.name }.join
-= link_to t(:back), purchases_path, :class => "btn btn-warning"
+.row
+  .col-md-5
+    %b= t(:order_actions)
+    %br
+    = link_to t(:edit), office.edit_basket_path(@purchase.basket), :class => "btn btn-info edit_basket" unless @purchase.basket.locked?
+    \ 
+    = link_to t(:back), office.purchases_path, :class => "btn btn-warning"
 
 -unless @purchase.received_on
   %h3{"style" => "color:red"}
     = t(:inventory)
-    = link_to t(:inventory) , inventory_purchase_path(@purchase) , :class => "btn btn-primary inventory_link", :data => { :confirm => t(:are_you_sure) }
- 
+    %br
+    = link_to t(:inventory) , office.inventory_purchase_path(@purchase) , :class => "btn btn-primary btn-danger inventory_link", :data => { :confirm => t(:are_you_sure) }
+
+.row
+  %br
+  .col-md-12
+    .purchase_show_last

data/app/views/sessions/sign_up.haml

@@ -1,10 +1,10 @@
-%h1= t(:sign_up)
-= bootstrap_form_for @clerk , :url => sign_up_path do |f|
-  .form_group
-    = f.text_field :email
-  .form_group
-    = f.password_field :password
-  .form_group
-    = f.password_field :password_confirmation
-  %p.button= f.submit :class => "btn btn-info submit"
-  
+.col-md-4
+  %h1= t(:sign_up)
+  = bootstrap_form_for @clerk , :url => office.sign_up_path do |f|
+    .form_group
+      = f.text_field :email
+    .form_group
+      = f.password_field :password
+    .form_group
+      = f.password_field :password_confirmation
+    %p.button= f.submit :class => "btn btn-info submit"

data/app/views/suppliers/edit.html.haml

@@ -1,10 +1,10 @@
 %h2
   = t params["action"]
   = t(:supplier)
-= bootstrap_form_for(@supplier) do |f|
+= bootstrap_form_for(@supplier, :url => office.suppliers_path) do |f|
   .row
     = f.text_field :supplier_name
     = render "addresses/form_fields" ,:f => f
   .form-actions
     = f.submit :class => "btn btn-success"
-    = link_to t(:back), suppliers_path, :class => "btn btn-warning"
+    = link_to t(:back), office.suppliers_path, :class => "btn btn-warning"

data/app/views/suppliers/index.html.haml

@@ -5,7 +5,7 @@
         %h2= t(:suppliers)
         = paginate @suppliers
       .col-md-2
-        = link_to  t(:new) + ' ' + t(:supplier) , new_supplier_path , :class => "btn btn-primary"
+        = link_to  t(:new) + ' ' + t(:supplier) , office.new_supplier_path , :class => "btn btn-primary"
   .col-md-3
     = image_tag "office_clerk/suppliers.jpg" , :class => "img-responsive"
 .row
@@ -14,7 +14,7 @@
       %table.table.table-striped.table-bordered.table-condensed
         %thead
           %tr
-            %th=sort_link @q,  :supplier_name
+            %th=sort_link [:office,@q],  :supplier_name
             %th=t :count
             %th=t :address
             %th{:colspan => "2"}
@@ -26,15 +26,14 @@
               %td.name=supplier.supplier_name
               %td=supplier.products.count
               %td=supplier.whole_address
-              %td= link_to t(:show) , supplier_path(supplier), :title => t(:show)
-              %td= link_to t(:edit) , edit_supplier_path(supplier), :title => t(:edit)
+              %td= link_to t(:show) , office.supplier_path(supplier), :title => t(:show)
+              %td= link_to t(:edit) , office.edit_supplier_path(supplier), :title => t(:edit)
     = paginate @suppliers
   .col-md-3
-    = search_form_for @q, :url => search_suppliers_path, :html => { :class => "form-horizontal" }, :method => :post do |f|
+    = search_form_for @q, :url => office.search_suppliers_path, :html => { :class => "form-horizontal" }, :method => :get do |f|
       .form-group
         = f.text_field :supplier_name_cont , :class => "form-control", :placeholder =>  t(:name)
       .form-group
         = f.text_field :address_cont , :class => "form-control", :placeholder =>  t(:address)
       = f.submit t(:filter), :id => :filter , :class => "btn btn-success"
-      = link_to  t(:cancel), suppliers_path, :class => "btn btn-warning"
-  
+      = link_to  t(:cancel), office.suppliers_path, :class => "btn btn-warning"

data/app/views/suppliers/show.html.haml

@@ -20,8 +20,7 @@
     %b
       = t(:country) + " : " + @supplier.country.to_s
 
-= link_to t(:edit), edit_supplier_path(@supplier), :class => "btn btn-success"
-= link_to t(:back), suppliers_path, :class => "btn btn-warning"
+= link_to t(:edit), office.edit_supplier_path(@supplier), :class => "btn btn-success"
+= link_to t(:back), office.suppliers_path, :class => "btn btn-warning"
 
 =render "products/triple" , :products => @supplier.products.no_items
-

data/config/i18n-tasks.yml

@@ -0,0 +1,97 @@
+# i18n-tasks finds and manages missing and unused translations https://github.com/glebm/i18n-tasks
+
+base_locale: en
+## i18n-tasks detects locales automatically from the existing locale files
+## uncomment to set locales explicitly
+locales: [en, fi]
+
+## i18n-tasks report locale, default: en, available: en, ru
+# internal_locale: ru
+
+# Read and write locale data
+data:
+  ## by default, translation data are read from the file system, or you can provide a custom data adapter
+  # adapter: I18n::Tasks::Data::FileSystem
+
+  # Locale files to read from
+  read:
+    - config/locales/%{locale}.yml
+    # - config/locales/*.%{locale}.yml
+    # - config/locales/**/*.%{locale}.yml
+
+  # key => file routes, matched top to bottom
+  write:
+    ## E.g., write devise and simple form keys to their respective files
+    - ['{config}.*', 'config/locales/\1.%{locale}.yml']
+    # Catch-all
+    - config/locales/%{locale}.yml
+    # `i18n-tasks normalize -p` will force move the keys according to these rules
+
+  # YAML / JSON serializer options, passed to load / dump / parse / serialize
+  yaml:
+    write:
+      # do not wrap lines at 80 characters
+      line_width: -1
+  json:
+    write:
+      # pretty print JSON
+      indent: '  '
+      space: ' '
+      object_nl: "\n"
+      array_nl: "\n"
+
+# Find translate calls
+search:
+  ## Default scanner finds t() and I18n.t() calls
+  # scanner: I18n::Tasks::Scanners::PatternWithScopeScanner
+
+  ## Paths to search in, passed to File.find
+  paths:
+    - app/
+
+  ## Root for resolving relative keys (default)
+  # relative_roots:
+  #   - app/views
+
+  ## File.fnmatch patterns to exclude from search (default)
+  # exclude: ["*.jpg", "*.png", "*.gif", "*.svg", "*.ico", "*.eot", "*.ttf", "*.woff", "*.pdf"]
+
+  ## Or, File.fnmatch patterns to include
+  # include: ["*.rb", "*.html.slim"]
+
+## Google Translate
+#   # Get an API key and set billing info at https://code.google.com/apis/console to use Google Translate
+translation:
+  api_key: "AIzaSyCRjToD-btZK_eaaLeqKNmoh1fPoqhbAtQ"
+
+## Consider these keys not missing
+ignore_missing:
+  - receipt.header
+  
+# - 'errors.messages.{accepted,blank,invalid,too_short,too_long}'
+# - '{devise,simple_form}.*'
+
+## Consider these keys used
+ignore_unused:
+  - 'activerecord.*'
+  - "will_paginate.*"
+  - "order_button.*"
+  - product_line
+  - product_item
+  - create
+  
+# - '{devise,kaminari,will_paginate}.*'
+# - 'simple_form.{yes,no}'
+# - 'simple_form.{placeholders,hints,labels}.*'
+# - 'simple_form.{error_notification,required}.:'
+
+## Exclude these keys from `i18n-tasks eq-base' report
+# ignore_eq_base:
+#   all:
+#     - common.ok
+#   fr,es:
+#     - common.brand
+
+## Exclude these keys from all of the reports
+#ignore:
+#  - kaminari.*