office_clerk 0.8 → 0.9

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

@@ -2,7 +2,7 @@
   = t(:clerk) + " : " + @clerk.email
   -if @clerk.admin
     (
-    =t(:admin) 
+    =t(:admin)
     )
 %p
   %b= t(:address)
@@ -15,5 +15,5 @@
 %p
   %b= t(:phone) + " : " + @clerk.phone.to_s
 
-= link_to t(:edit), edit_clerk_path(@clerk), :class => "btn btn-success"
-= link_to t(:back), clerks_path, :class => "btn btn-warning"
+= link_to t(:edit), office.edit_clerk_path(@clerk), :class => "btn btn-success"
+= link_to t(:back), office.clerks_path, :class => "btn btn-warning"

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

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

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

@@ -1,5 +1,5 @@
 - flash.each do |name, msg|
   - if msg.is_a?(String)
-    %div{:class => "alert alert-#{name == :notice ? "success" : "danger"}"}
+    %div{:class => "alert alert-#{name}"}
       %button.close{"aria-hidden" => "true", "data-dismiss" => "alert", :type => "btn btn-primary"} ×
-      = content_tag :div, msg, :id => "flash_#{name}"
+      %div= msg

data/app/views/layouts/office_clerk.haml

@@ -2,12 +2,14 @@
 %html{:lang => (I18n.locale || I18n.default_locale)}
   %head
     %meta{:charset => "utf-8"}/
-    %title Office Clerk
-    %meta{:content => "Office Clerk", :name => "description"}
+    %title= content_for?(:title) ? content_for(:title) :  "Office Clerk"
+    = include_gon(:init => true)
     = stylesheet_link_tag "office_clerk" ,  :media => :all
+    -office_assets.each do |ass|
+      = stylesheet_link_tag ass , :media => :all
     = javascript_include_tag "office_clerk"
-    = include_gon(:init => true)
-    = render "layouts/header_extra"
+    -office_assets.each do |ass|
+      = javascript_include_tag ass
     = csrf_meta_tags
     = yield :head
   %body{:style => ""}
@@ -19,31 +21,12 @@
             %a{href: "/"}= t(:shop)
           = render :partial => "layouts/admin_menu"
         %ul.nav.navbar-nav.navbar-right
-          %li= link_to current_clerk.email , edit_clerk_path(current_clerk)
-          %li= link_to t(:sign_out), sign_out_path
-
-      - if not flash[:notice].blank? then
-        .row.content.hidden-print
-          .col-md-12.alert
-            .alert-notice.row
-              .col-md-3
-                .alert-heading= t(:info) + " :"
-              .col-md-9
-                .alert-message!= flash[:notice]
-      - if not flash[:alert].blank? then
-        .row.content.hidden-print
-          .col-md-12.alert
-            .alert-error.row
-              .col-md-3
-                .alert-heading= t(:info) + " :"
-              .col-md-9
-                .alert-message= flash[:alert]
-        .large-12.column
-          .row.space
-            =image_tag "shop/spacer.gif"
+          %li= link_to current_clerk.email , office.edit_clerk_path(current_clerk)
+          %li= link_to t(:sign_out), office.sign_out_path
+      = render "layouts/messages"
 
       = yield
 
       .row
         .col-md-12
-          %br
+          %br

data/app/views/order_mailer/confirm.text.erb

@@ -8,8 +8,7 @@ Tarkistathan että tiedot ovat oikein.
 Maksutapa: Ennakkomaksu
 
 Tilauksesi lähetetään, kun olet maksanut sen ja maksusi on kirjautunut tilillemme. 
-Tilinumero FI1017 4530 0013 2474, mainitse viestikentässä tilausnumerosi <%= @order.number %>
-tai käytä <%=viite%> 
+Tilinumero FI1017 4530 0013 2474, mainitse viestikentässä tilausnumerosi <%= @order.number %>.
  
 Kun maksusi on kirjautunut tilille, lähetämme tilaamasi tuotteet 1-3 arkipäivän kuluessa.
 

data/app/views/order_mailer/shipped.text.erb

@@ -1,6 +1,7 @@
 Hyvä asiakkaamme,
 
-Tilauksesi <%= @order.number %> on postitettu <%= date(@order.shipped_on) %>.
+Tilauksesi <%= @order.number %> on kuitattu maksetuksi ja 
+tilaus on postitettu <%= date(@order.shipped_on) %>.
 
 <% unless @order.shipment_info.blank? %>
 Postin seurantatunnus on <%=@order.shipment_info%>

data/app/views/orders/index.csv.erb

@@ -1,9 +1,9 @@
-<%= [:order_number , :ordered_on ,:total_price , :vat , :vat , :paid_on ].collect{|i| I18n.t(i)}.join(";") %>
-<% @orders.each do |order| %>
-<% values = [ order.number.to_s , date(order.ordered_on) ,  order.total_price.round(2)]  %>
+<%= [t(:order_number) , t(:ordered_on) , t(:total_price) , t(:vat) + " 14" , t(:vat) + " 24" , t(:paid_on) ].join(";") %>
+<% @order_scope.each do |order| %>
+<% values = [ order.number.to_s , date(order.ordered_on) ,  number_with_comma(order.total_price)]  %>
 <% taxes = order.taxes %>
-<% values << taxes[14.0].round(2) %>              
-<% values << taxes[24.0].round(2) %>
-<% values << date(order.paid_on) %>              
+<% values << number_with_comma(taxes[14.0]) %>
+<% values << number_with_comma(taxes[24.0]) %>
+<% values << date(order.paid_on) %>      
 <%= values.join(";")   %>              
 <%end%>

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

@@ -1,43 +1,48 @@
 .row
   .col-md-9.orders
-    %h2= t(:orders)
-    = paginate @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"
   .col-md-3
     = image_tag "office_clerk/orders.jpg" , :class => "img-responsive"
+
 .row
   .col-md-9
     %div
-      %table.table.table-striped.table-bordered.table-condensed
+      %table.table.table-hover.table-condensed
         %thead
           %tr
-            %th= sort_link @q, :number
-            %th= sort_link @q, :ordered_on
-            %th= t(:items)
-            %th= sort_link @q, :basket_total_price
-            %th= sort_link @q, :email
-            %th= sort_link @q, :paid_on
-            %th= sort_link @q, :shipped_on
+            %th= sort_link [:office,@q], :number
+            %th.text-right= sort_link [:office,@q], :ordered_on
+            %th.text-right= t(:items)
+            %th.text-right= sort_link [:office,@q], :basket_total_price
+            %th= sort_link [:office,@q], :email
+            %th.text-right= sort_link [:office,@q], :paid_on
+            %th.text-right= sort_link [:office,@q], :shipped_on
         %tbody
           - @orders.each do |order|
             %tr{:class => "line-#{cycle("1","2")}"}
               %td.number
-                = link_to order.number.to_s , order_path(order), :title => t(:show)
+                = link_to order.number.to_s , office.order_path(order), :title => t(:show)
                 -unless order.note.blank?
                   %span.glyphicon.glyphicon-flag
-              %td= date(order.ordered_on)
-              %td= order.basket.items.length
-              %td= link_to euros(order.total_price),  basket_path(order.basket)
+              %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.email= order.email
-              %td= date(order.paid_on)
-              %td= date(order.shipped_on)
+              %td.text-right= date(order.paid_on)
+              %td.text-right= date(order.shipped_on)
       .btn-toolbar
         .btn-group
           = paginate @orders
         .btn-group.pull-right
-          = link_to orders_path(:format => :csv), :class => "btn btn-primary" do
+          = link_to office.orders_path({:format => :csv}.merge( params)), {:class => "btn btn-primary"} do
             %i.icon-download CSV
   .col-md-3
-    = search_form_for @q, :url => search_orders_path, :html => { :class => "form-horizontal" , :role => "form"}, :method => :get do |f|
+    = search_form_for @q, :url => office.search_orders_path, :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)
@@ -67,7 +72,7 @@
           = f.radio_button :paid_on_blank , true
         .form-group.col-md-6
           = f.text_field :paid_on_gteq , :class => "form-control datepicker" , :value => sort_date(:paid_on_gteq)
-        .form-group.col-md-4
+        .form-group.col-md-3
           = f.text_field :paid_on_lteq , :class => "form-control datepicker", :value => sort_date(:paid_on_lteq)
       .form-group
         .col-md-3
@@ -88,4 +93,4 @@
         .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), orders_path, :class => "btn btn-warning"
+      = link_to  t(:cancel), office.orders_path, :class => "btn btn-warning"

data/app/views/orders/shipment.haml

@@ -0,0 +1,57 @@
+= bootstrap_form_for @order, :url => office.shipment_order_path do |f|
+  .row
+    = f.alert_message t(:fix_errors) , error_summary: false
+
+  .row
+    .col-md-8
+      .row
+        .col-md-9#address_form
+          %h4=t(:contact_details)
+          = f.text_field :name , :placeholder => t(:name)
+          = f.text_field :street , :placeholder => t(:street)
+          = f.text_field :city , :placeholder => t(:city)
+          = f.text_field :phone , :placeholder => t(:phone)
+          = f.email_field :email, :placeholder => t(:email)
+          %hr
+          %button.btn.btn-primary.btn-lg#make_order{:type => "submit"}
+            =t(:update)
+
+        .col-md-3
+    .col-md-4
+      %h4
+        =t(:choose_shipment)
+        = @order.shipment_type
+      - OfficeClerk::ShippingMethod.all.each_value do |s|
+        -next unless s.available?(@order.basket)
+        .radio
+          = radio_button_tag "order[shipment_type]" , s.type , s.type.to_s == @order.shipment_type , "data-price" => s.price_for(@order.basket).round(2)
+          %b
+            = s.name + ":  "
+          = s.price_for(@order.basket).round(2)
+          €
+
+      %br
+      %br
+      %br
+      %h4
+        = t(:order)
+        = @order.number
+
+      %table.table.table-condensed.basket-total
+        %thead
+          %tr
+            %th Tuotteet yhteensä
+            %td.text-right
+              %span#basket_total= @order.basket.total_price.round(2)
+              €
+        %tbody
+          %tr
+            %th Toimituskulut
+            %td.text-right
+              %span#shipping_cost= @order.shipment_price
+              €
+          %tr
+            %th Tilaus yhteensä
+            %th.text-right
+              %span#order_total= @order.total_price.round(2)
+              €

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

@@ -1,61 +1,104 @@
 .row
   %h2
     = t(:order) + " : " + @order.number.to_s
+    - unless @order.canceled_on.blank?
+      = t(:canceled_on) + " : " + date(@order.canceled_on)
+
 .row
+  .col-md-7
+    %table.table.table-condensed.no-bg.no-border
+      %tbody
+        %tr
+          %td
+            %b
+              = t(:ordered_on) + " : "
+            = date(@order.ordered_on)
+          %td
+        %tr
+          %td
+            %b
+              = t(:customer)
+            = @order.name
+            %br
+            = @order.street
+            = @order.city
+            %br
+            = link_to @order.email.to_s , office.search_orders_path( :"q[email_cont]" => @order.email )
+            %br
+            = @order.phone.to_s
+
+          %td
+            %b
+              = t(:shipment_type) + " : "
+            = @order.shipment_type
+            %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"
+
+          %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"
+
+        %tr
+          %td
+            \
+          %td
+            \
+
+
+  .col-md-1
   .col-md-4
     %p
-      %b
-        = t(:email) + " : " + @order.email.to_s
-    %p
-      %b
-        = t(:phone) + " : " +  @order.phone.to_s
-    %p
-      %b
-        = t(:ordered_on) + " : " + date(@order.ordered_on)
+      %b= t(:note)
+      = in_place @order , :note, :as => :textarea , :url => office.order_path(@order)
     %p
-      %b
-        = t(:canceled_on) + " : " + date(@order.canceled_on)
-  .col-md-4
+      %b= t(:shipment_info)
+      = in_place @order , :shipment_info , :url => office.order_path(@order)
     %p
-      %b
-        = t(:shipment_type) + " : " + @order.shipment_type.to_s
+      %b= t(:payment_info)
+      = in_place @order , :payment_info , :url => office.order_path(@order)
     %p
-      %b
-      -if @order.paid_on
-        %b= t(:paid_on) + " : " + date(@order.paid_on)
-      -else
-        = link_to t(:paid), pay_order_path(@order), :class => "btn btn-info pay_now"
+      %br
+      %br
+      %br
+      %b= t(:total_price) + " : " + euros(@order.total_price)
 
-    %p
-      -if @order.shipped_on
-        %b
-          = t(:shipped_on) + " : " + date(@order.shipped_on)
-      -else
-        = link_to t(:ship), ship_order_path(@order), :class => "btn btn-info ship_now"
-  .col-md-4
-    %p
-      %b= t(:note)
-    %p
-      = in_place @order , :note, :as => :textarea 
 
 -content_for :basket do
   %tr
-    %td= t(:name) 
-    %td=@order.name
+    %td
+    %td
     %td
       %b= t(:total_tax) + " : "
     %td
       %b= euros(@order.total_tax)
   %tr
-    %td= t(:street)
-    %td= @order.street
+    %td
+    %td
     %td
       %b= t(:shipment_price) + " : "
     %td
       %b= euros(@order.shipment_price)
   %tr
-    %td= t(:city)
-    %td=@order.city
+    %td
+    %td
     %td
       %b= t(:total_price) + " : "
     %td
@@ -63,11 +106,35 @@
 
 .row
   = render "baskets/small" , :basket => @order.basket
+
 .row
   %br
+
+  .col-md-5
+    %b= t(:order_actions)
+    %br
+
+    = link_to t(:back), office.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(:cancel), office.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?
+
   .col-md-2
-    = link_to t(:back), orders_path, :class => "btn btn-warning"
-  .col-md-10
+  .col-md-5
+    %b= t(:order_mail)
+    %br
     - mail_actions.each do |action|
-      = link_to t("#{action}_order_button") , mail_order_path( @order , :act => action) , :class => "btn btn-info"
-  .col-md-12.order_show_back
+      = link_to t("order_button.#{action}") , office.mail_order_path( @order , :act => action) , :class => "btn btn-info"
+      \ 
+
+
+.row
+  %br
+  .col-md-12
+    %b= t(:order_print)
+    .order_show_back
+  %br
+  %br