office_clerk 0.9 → 1.0.0

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

@@ -1,15 +1,14 @@
-%h2
+%h2.categories_edit_start
   = t params["action"]
   = t(:category)
 %ol.breadcrumb
   - parents(@category).each do | group|
     %li
       - if group.id
-        = link_to group.name , office.category_path(group)
+        = link_to group.name , category_path(group)
       - else
         = t(:new)
-- url = @category.persisted? ? office.category_path(@category) : office.categories_path
-= bootstrap_form_for(@category, :html => { :multipart => true } , :url => url) do |f|
+= bootstrap_form_for(@category, :html => { :multipart => true } ) do |f|
   .row.form-group
     .col-md-5
       = f.text_field :name
@@ -32,9 +31,10 @@
       = f.submit :class => "btn btn-success"
       %br
       %br
-      = link_to t(:back), office.categories_path, :class => "btn btn-warning"
+      = link_to t(:back), categories_path, :class => "btn btn-warning"
   .row
     .col-md-4
       = f.file_field :main_picture
     .col-md-4
       = f.file_field :extra_picture
+.categories_edit_end

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

@@ -1,11 +1,11 @@
-.row
+.row.categories_index_start
   .col-md-9.categories
     .row
       .col-md-10
         %h2= t(:categories)
         = paginate @categories
       .col-md-2
-        = link_to  t(:new) + ' ' + t(:category) , office.new_category_path , :class => "btn btn-primary"
+        = link_to  t(:new) + ' ' + t(:category) , new_category_path , :class => "btn btn-primary"
   .col-md-3
     = image_tag "office_clerk/categories.jpg" , :class => "img-responsive"
 .row
@@ -26,14 +26,14 @@
           - @categories.each do |category|
             %tr{:class => "line-#{cycle("1","2")}"}
               %td.image= image_tag category.main_picture.url(:thumb)
-              %td=link_to category.name, office.category_path(category), :title => t(:show) , :class => category.online && "online"
+              %td=link_to category.name, category_path(category), :title => t(:show) , :class => category.online && "online"
               %td=category.products.length.to_s
               %td=category.online ? t(:online) : t(:not_online)
-              %td=link_to category.category.name, office.category_path(category.category) , :class => category.category.online && "online" if category.category
-              %td= link_to t(:edit), office.edit_category_path(category), :title => t(:edit)
+              %td=link_to category.category.name, category_path(category.category) , :class => category.category.online && "online" if category.category
+              %td= link_to t(:edit), edit_category_path(category), :title => t(:edit)
     = paginate @categories
   .col-md-3
-    = search_form_for @q, :url => office.search_categories_path, :html => { :class => "form-horizontal" }, :method => :get do |f|
+    = search_form_for @q , :html => { :class => "form-horizontal" }, :method => :get do |f|
       .form-group
         .input-group
           = f.text_field :name_cont , :class => "form-control" , :placeholder =>  t(:name)
@@ -53,8 +53,9 @@
             =t(:blanks)
             = f.radio_button :description_blank , true
       = f.submit t(:filter), :id => :filter , :class => "btn btn-success"
-      = link_to  t(:cancel), office.categories_path, :class => "btn btn-warning"
+      = link_to  t(:cancel), categories_path, :class => "btn btn-warning"
     %hr
     - @roots.each do |group|
       %ul.cat
         = render "treeview" , :group => group
+.categories_index_end

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

@@ -1,4 +1,4 @@
-.row
+.row.categories_show_start
   .col-md-6
     %h2
       = t(:category)
@@ -25,10 +25,11 @@
         %p
           = image_tag @category.extra_picture.url
 
-  = link_to t(:edit), office.edit_category_path(@category), :class => "btn btn-primary"
-  = link_to t(:back), office.categories_path, :class => "btn btn-primary"
+  = link_to t(:edit), edit_category_path(@category), :class => "btn btn-primary"
+  = link_to t(:back), categories_path, :class => "btn btn-primary"
   %b= t(:shop_link) + " : "
-  = link_to @category.link , office.categories_path(@category.link)
+  = link_to @category.link , categories_path(@category.link)
 
 =render "triple" , :groups => @category.categories
 =render "products/triple" , :products => @category.products.no_items
+.categories_show_end

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

@@ -1,10 +1,9 @@
-%h2
+%h2.clerks_edit_start
   = t params["action"]
   = t(:clerk)
   -if @clerk.admin
     =t(:admin)
-- url = @clerk.persisted? ? office.clerk_path(@clerk) : office.clerks_path
-= bootstrap_form_for(@clerk, :url => url) do |f|
+= bootstrap_form_for(@clerk) do |f|
   .row
     = f.check_box :admin
     = f.email_field :email
@@ -15,4 +14,5 @@
     = f.password_field :password_confirmation
   .form-actions
     = f.submit :class => "btn btn-success" , :id => "submit"
-    = link_to t(:back), office.clerks_path, :class => "btn btn-warning"
+    = link_to t(:back), clerks_path, :class => "btn btn-warning"
+.clerks_edit_end

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

@@ -1,11 +1,11 @@
-.row
+.row.clerks_index_start
   .col-md-9.clerks
     .row
       .col-md-10
         %h2= t(:clerks)
         = paginate @clerks
       .col-md-2
-        = link_to  t(:new) + ' ' + t(:clerk) , office.new_clerk_path , :class => "btn btn-primary"
+        = link_to  t(:new) + ' ' + t(:clerk) , new_clerk_path , :class => "btn btn-primary"
   .col-md-3
     = image_tag "office_clerk/clerks.jpg" , :class => "img-responsive"
 .row
@@ -24,14 +24,15 @@
             %tr{:class => "line-#{cycle("1","2")}"}
               %td=clerk.email
               %td=clerk.whole_address
-              %td= link_to t(:show) , office.clerk_path(clerk), :title => t(:show)
-              %td= link_to t(:edit), office.edit_clerk_path(clerk), :title => t(:edit)
+              %td= link_to t(:show) , clerk_path(clerk), :title => t(:show)
+              %td= link_to t(:edit), edit_clerk_path(clerk), :title => t(:edit)
     = paginate @clerks
   .col-md-3
-    = search_form_for @q, :url => office.search_clerks_path, :html => { :class => "form-horizontal" }, :method => :get do |f|
+    = search_form_for @q, :html => { :class => "form-horizontal" }, :method => :get do |f|
       .form-group
         = f.text_field :email_cont , :class => "form-control" , :placeholder =>  t(:email)
       .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), office.clerks_path, :class => "btn btn-warning"
+      = link_to  t(:cancel), clerks_path, :class => "btn btn-warning"
+.clerks_index_end

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

@@ -1,4 +1,4 @@
-%h2
+%h2.clerks_show_start
   = t(:clerk) + " : " + @clerk.email
   -if @clerk.admin
     (
@@ -15,5 +15,6 @@
 %p
   %b= t(:phone) + " : " + @clerk.phone.to_s
 
-= link_to t(:edit), office.edit_clerk_path(@clerk), :class => "btn btn-success"
-= link_to t(:back), office.clerks_path, :class => "btn btn-warning"
+= link_to t(:edit), edit_clerk_path(@clerk), :class => "btn btn-success"
+= link_to t(:back), clerks_path, :class => "btn btn-warning"
+.clerks_show_end

data/app/views/layouts/_admin_menu.html.haml

@@ -1,16 +1,16 @@
 %li{:class => params[:controller] == "products" && "active" }
-  = link_to t(:products), office.products_path
+  = link_to t(:products), products_path
 %li{:class => params[:controller] == "baskets" && "active" }
-  = link_to t(:baskets), office.baskets_path
+  = link_to t(:baskets), baskets_path
 %li{:class => params[:controller] == "orders" && "active" }
-  = link_to t(:orders), office.orders_path
+  = link_to t(:orders), orders_path
 %li{:class => params[:controller] == "purchases" && "active" }
-  = link_to t(:purchases), office.purchases_path
+  = link_to t(:purchases), purchases_path
 %li{:class => params[:controller] == "categories" && "active" }
-  = link_to t(:categories), office.categories_path
+  = link_to t(:categories), categories_path
 %li{:class => params[:controller] == "suppliers" && "active" }
-  = link_to t(:suppliers), office.suppliers_path
+  = link_to t(:suppliers), suppliers_path
 %li{:class => params[:controller] == "clerks" && "active" }
-  = link_to t(:clerks), office.clerks_path
+  = link_to t(:clerks), clerks_path
 %li{:class => params[:controller] == "manage" && "active" }
-  = link_to t(:manage), office.manage_all_path
+  = link_to t(:manage), manage_all_path

data/app/views/layouts/office_clerk.haml

@@ -16,13 +16,13 @@
     .container-fluid
       %nav.navbar.navbar-default.navbar-fixed-top.navbar-inverse.hidden-print{role: "navigation"}
         .navbar-header
-        %ul.nav.navbar-nav
+        %ul.nav.navbar-nav.menu
           %li
             %a{href: "/"}= t(:shop)
           = render :partial => "layouts/admin_menu"
         %ul.nav.navbar-nav.navbar-right
-          %li= link_to current_clerk.email , office.edit_clerk_path(current_clerk)
-          %li= link_to t(:sign_out), office.sign_out_path
+          %li= link_to current_clerk.email , edit_clerk_path(current_clerk)
+          %li= link_to t(:sign_out), sign_out_path
       = render "layouts/messages"
 
       = yield

data/app/views/manage/all.haml

@@ -1,8 +1,8 @@
-.row.manage_first
+.row.manage_start
 .row.config
   .col-md-12
   %h3 Config
   .row
     - conf = I18n.backend.send(:translations)[:config]
     = render "hash" , :config => conf if conf
-.row.manage_last
+.row.manage_end

data/app/views/orders/_payment.html.haml

@@ -0,0 +1,11 @@
+%td
+  %b= t(:payment_info)
+  = in_place @order , :payment_info
+%td
+  -unless @order.paid_on.blank?
+    %b
+      = t(:paid_on) + ":"
+    \
+    = date(@order.paid_on)
+  -else
+    = link_to t(:pay), pay_order_path(@order), :class => "btn btn-info pay_now"

data/app/views/orders/_shipment.html.haml

@@ -0,0 +1,10 @@
+%td
+  %b= t(:shipment_info)
+  = in_place @order , :shipment_info
+%td
+  -unless(@order.shipped_on.blank?)
+    %b
+      = t(:shipped_on) + " : "
+    =date(@order.shipped_on)
+  -else
+    = link_to t(:ship), ship_order_path(@order), :class => "btn btn-info ship_now"

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

@@ -1,18 +1,18 @@
-.row
+.row.order_index_start
   .col-md-9.orders
     .row
       .col-md-10
         %h2= t(:orders)
         = paginate @orders
       .col-md-2
-        = link_to  t(:new) + ' ' + t(:order) , office.new_order_path , :class => "btn btn-primary new_order"
+        = link_to  t(:new) + ' ' + t(:order) , new_order_path , :class => "btn btn-primary new_order"
   .col-md-3
     = image_tag "office_clerk/orders.jpg" , :class => "img-responsive"
 
 .row
   .col-md-9
     %div
-      %table.table.table-hover.table-condensed
+      %table.table.table-striped.table-condensed
         %thead
           %tr
             %th= sort_link [:office,@q], :number
@@ -26,12 +26,12 @@
           - @orders.each do |order|
             %tr{:class => "line-#{cycle("1","2")}"}
               %td.number
-                = link_to order.number.to_s , office.order_path(order), :title => t(:show)
+                = link_to order.number.to_s , order_path(order), :title => t(:show)
                 -unless order.note.blank?
                   %span.glyphicon.glyphicon-flag
               %td.text-right= date(order.ordered_on)
               %td.text-right= order.basket.items.length rescue "basket #{order.id}"
-              %td.text-right= link_to euros(order.total_price),  office.basket_path(order.basket)
+              %td.text-right= link_to euros(order.total_price),  basket_path(order.basket)
               %td.email= order.email
               %td.text-right= date(order.paid_on)
               %td.text-right= date(order.shipped_on)
@@ -39,10 +39,10 @@
         .btn-group
           = paginate @orders
         .btn-group.pull-right
-          = link_to office.orders_path({:format => :csv}.merge( params)), {:class => "btn btn-primary"} do
+          = link_to orders_path({:format => :csv}.merge( params)), {:class => "btn btn-primary"} do
             %i.icon-download CSV
   .col-md-3
-    = search_form_for @q, :url => office.search_orders_path, :html => { :class => "form-horizontal" , :role => "form"}, :method => :get do |f|
+    = search_form_for @q, :html => { :class => "form-horizontal" , :role => "form"}, :method => :get do |f|
       .form-group
         .input-group
           = f.text_field :number_cont ,:class => "form-control" , :placeholder =>  t(:order_number)
@@ -93,4 +93,5 @@
         .form-group.col-md-4
           = f.text_field :canceled_on_lteq , :class => "form-control datepicker",:value => sort_date(:canceled_on_lteq)
       = f.submit t(:filter), :id => :filter , :class => "btn btn-success"
-      = link_to  t(:cancel), office.orders_path, :class => "btn btn-warning"
+      = link_to  t(:cancel), orders_path, :class => "btn btn-warning"
+.order_index_end

data/app/views/orders/shipment.haml

@@ -1,4 +1,5 @@
-= bootstrap_form_for @order, :url => office.shipment_order_path do |f|
+.sipment_start
+= bootstrap_form_for @order do |f|
   .row
     = f.alert_message t(:fix_errors) , error_summary: false
 
@@ -55,3 +56,4 @@
             %th.text-right
               %span#order_total= @order.total_price.round(2)
               €
+.sipment_end

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

@@ -1,8 +1,12 @@
-.row
-  %h2
-    = t(:order) + " : " + @order.number.to_s
-    - unless @order.canceled_on.blank?
-      = t(:canceled_on) + " : " + date(@order.canceled_on)
+.row.order_show_start
+  .col-md-7
+    %h2
+      = t(:order) + " : " + @order.number.to_s
+      - unless @order.canceled_on.blank?
+        = t(:canceled_on) + " : " + date(@order.canceled_on)
+  .col-md-3
+    %br
+      %b= t(:total_price) + " : " + euros(@order.total_price)
 
 .row
   .col-md-7
@@ -23,7 +27,7 @@
             = @order.street
             = @order.city
             %br
-            = link_to @order.email.to_s , office.search_orders_path( :"q[email_cont]" => @order.email )
+            = link_to @order.email.to_s , search_orders_path( :"q[email_cont]" => @order.email )
             %br
             = @order.phone.to_s
 
@@ -34,27 +38,9 @@
             %br
             %br
 
-            = link_to t(:edit) , office.shipment_order_path(@order) , :class => "btn btn-info shipment_type"
-
-            = link_to t(:new) + ' ' + t(:order) , office.new_order_path( :address => @order.id) , :class => "btn btn-primary copy_order"
-
-        %tr
-          %td
-            %b
-              = t(:paid_on) + ":"
-            \
-            -if @order.paid_on
-              = date(@order.paid_on)
-            -else
-              = link_to t(:paid), office.pay_order_path(@order), :class => "btn btn-info pay_now"
+            = link_to t(:edit) , shipment_order_path(@order) , :class => "btn btn-info shipment_type"
 
-          %td
-            %b
-              = t(:shipped_on) + " : "
-            -unless(@order.shipped_on.blank?)
-              =date(@order.shipped_on)
-            -else
-              = link_to t(:ship), office.ship_order_path(@order), :class => "btn btn-info ship_now"
+            = link_to t(:new) + ' ' + t(:order) , new_order_path( :address => @order.id) , :class => "btn btn-primary copy_order"
 
         %tr
           %td
@@ -63,22 +49,17 @@
             \
 
 
-  .col-md-1
-  .col-md-4
-    %p
-      %b= t(:note)
-      = in_place @order , :note, :as => :textarea , :url => office.order_path(@order)
-    %p
-      %b= t(:shipment_info)
-      = in_place @order , :shipment_info , :url => office.order_path(@order)
-    %p
-      %b= t(:payment_info)
-      = in_place @order , :payment_info , :url => office.order_path(@order)
-    %p
-      %br
-      %br
-      %br
-      %b= t(:total_price) + " : " + euros(@order.total_price)
+  .col-md-5
+    %table.table.table-condensed.no-bg.no-border
+      %tbody
+        %tr
+          %td{ colspan: 2}
+            %b= t(:note)
+            = in_place @order , :note, :as => :textarea
+        %tr
+          =render "shipment"
+      %tr
+        = render "payment"
 
 
 -content_for :basket do
@@ -114,20 +95,20 @@
     %b= t(:order_actions)
     %br
 
-    = link_to t(:back), office.orders_path, :class => "btn btn-warning"
+    = link_to t(:back), orders_path, :class => "btn btn-warning"
     \ 
-    = link_to t(:edit), office.edit_basket_path(@order.basket), :class => "btn btn-info edit_basket" unless @order.basket.locked?
+    = link_to t(:edit), edit_basket_path(@order.basket), :class => "btn btn-info edit_basket" unless @order.basket.locked?
     \ 
-    = link_to t(:cancel), office.cancel_order_path(@order), :data =>{:confirm => t(:cancel_confirmation )} , :class => "btn btn-danger cancel_order" if @order.basket.locked?
+    = link_to t(:cancel), cancel_order_path(@order), :data =>{:confirm => t(:cancel_confirmation )} , :class => "btn btn-danger cancel_order" if @order.basket.locked?
     \ 
-    = link_to t(:destroy) , office.order_path(@order), :data => {:confirm => t(:are_you_sure )}, :method => :delete, :title => t(:destroy) , :class => "btn btn-danger" if @order.shipped_on.nil? and @order.paid_on.nil?
+    = link_to t(:destroy) , order_path(@order), :data => {:confirm => t(:are_you_sure )}, :method => :delete, :title => t(:destroy) , :class => "btn btn-danger" if @order.shipped_on.nil? and @order.paid_on.nil?
 
   .col-md-2
   .col-md-5
     %b= t(:order_mail)
     %br
     - mail_actions.each do |action|
-      = link_to t("order_button.#{action}") , office.mail_order_path( @order , :act => action) , :class => "btn btn-info"
+      = link_to t("order_button.#{action}") , mail_order_path( @order , :act => action) , :class => "btn btn-info"
       \ 
 
 
@@ -138,3 +119,4 @@
     .order_show_back
   %br
   %br
+.order_show_end

data/app/views/products/_head.haml

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

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 , office.product_path(product)
+          =link_to product.name , product_path(product)
     %tr.line-2
       %td=t(:price)
       - @product.products.each do |product|