office_clerk 0.5 → 0.6

data/app/models/basket.rb

@@ -18,8 +18,8 @@ class Basket < ActiveRecord::Base
   end
 
   def cache_total
-    self.total_price = items.to_a.sum{ |i| i.total }
-    self.total_tax =  items.to_a.sum{ |i| i.tax_amount}
+    self.total_price = (items.to_a.sum{ |i| i.total }).round(2)
+    self.total_tax =  (items.to_a.sum{ |i| i.tax_amount}).round(2)
   end
   
   def touch

data/app/models/clerk.rb

@@ -1,5 +1,3 @@
- require 'bcrypt'
- 
 class Clerk < ActiveRecord::Base
   PEPPER = "0bfa9e2cb4a5efd0d976518a3d82e345060547913d2fd1dd2f32b0c8dbbbb5d3dc20b86d0fed31aca9513bccdf51643700ea277d9c64d9ce8ef886bf39293453"
   has_many :basket
@@ -12,7 +10,7 @@ class Clerk < ActiveRecord::Base
   validates_presence_of :encrypted_password
 
   validates_uniqueness_of :email
-  validates :email, :presence => true, :email => true  # extra gem to check email validity
+  validates :email, :presence => true, :email => {:ban_disposable_email => true, :mx_with_fallback => true }
 
   store :address, accessors: [ :name , :street , :city , :phone ] #, coder: JSON
 

data/app/models/order.rb

@@ -9,7 +9,7 @@ class Order < ActiveRecord::Base
   validates :street,:presence => true , :if => :needs_address?
   validates :city,  :presence => true , :if => :needs_address?
   validates :phone, :presence => true , :if => :needs_address?
-  validates :email, :presence => true , :email => true  # extra gem to check email validity
+  validates :email, :presence => true , :email => {:ban_disposable_email => true, :mx_with_fallback => true }
   
   default_scope { order('created_at DESC')}
 
@@ -26,13 +26,13 @@ class Order < ActiveRecord::Base
   end
 
   def total_price
-    basket.total_price + shipment_price
+    basket.total_price + shipment_price.round(2)
   end
 
   # total tax is for when the rates don't matter, usually to cutomers.
   # only on bills or invoices do we need the detailed list you get from the taxes function
   def total_tax
-    basket.total_tax + shipment_tax*shipment_price
+    basket.total_tax + (shipment_tax*shipment_price / 100.0).round(2) 
   end
 
   # return a hash of rate => amount , because products may have different taxes, 

data/app/views/baskets/_small.html.haml

@@ -23,3 +23,4 @@
         %td
           = t(:total)
           = euros basket.total_price
+      = yield :basket

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

@@ -36,16 +36,16 @@
               %td= basket_edit_link(basket)
     = paginate @baskets
   .col-md-3
-    = search_form_for @q, :url => search_baskets_path, :html => { :class => "well well-large" }, :method => :post do |f|
+    = search_form_for @q, :url => search_baskets_path, :html => { :class => "form-horizontal" }, :method => :post do |f|
       .form-group.row
         .col-md-3
-          = t(:type)
+          = f.label(:type)
         .col-md-9
           = f.select :kori_type_eq, [["",""] , [t(:order) , "Order"] , [t(:purchase),"Purchase"]] , {},  :class => "form-control"
       .form-group
         = f.text_field :items_product_name_cont , :class => "form-control" , :placeholder => t(:name_contains)
       .form-group.row
-        .col-md-3
+        .col-md-4
           = f.label(:total_price)
         .col-md-4
           = f.text_field :total_price_gt , :class => "form-control"

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

@@ -12,7 +12,6 @@
 
 = render "small" , :basket => @basket
 
-.col-md-12
+.col-md-12.basket_show_end
   = link_to t(:back), orders_path, :class => "btn btn-warning"
   = link_to t(:destroy) , basket_path(@basket), :data => { :confirm => t(:are_you_sure) }, :method => :delete, :title => t(:destroy) , :class => "btn btn-danger" unless @basket.kori_type
-  = link_to t(:print_order), receipt_order_path(@basket.kori) , :target => "_blank" , :class => "btn btn-primary print_order" if @basket.isa(:order)

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

@@ -21,7 +21,8 @@
       = f.select :category_id , Category.all.order(:name).map { |c| [c.name, c.id ] }, :prompt => t(:select) , :include_blank => true
       = f.text_field :position
     .col-md-7
-      = f.text_area :description , :rows => 12
+      = f.text_area :summary , :rows => 2
+      = f.text_area :description , :rows => 10
   .row
     .col-md-4
       = image_tag @category.main_picture.url

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

@@ -25,7 +25,7 @@
         %tbody
           - @categories.each do |category|
             %tr{:class => "line-#{cycle("1","2")}"}
-              %td= image_tag category.main_picture.url(:thumb)
+              %td.image= image_tag category.main_picture.url(:thumb)
               %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)
@@ -33,15 +33,26 @@
               %td= link_to t(:edit), edit_category_path(category), :title => t(:edit)
     = paginate @categories
   .col-md-3
-    = search_form_for @q, :url => search_categories_path, :html => { :class => "well well-small" }, :method => :post do |f|
+    = search_form_for @q, :url => search_categories_path, :html => { :class => "form-horizontal" }, :method => :post do |f|
       .form-group
-        = f.text_field :name_cont , :placeholder =>  t(:name)
+        .input-group
+          = f.text_field :name_cont , :class => "form-control" , :placeholder =>  t(:name)
+          %span.input-group-addon
+            =t(:online)
+            = f.radio_button :online_eq , true
       .form-group
-        = f.text_field :description_cont , :placeholder =>  t(:description)
-      .search_heading
-        = t(:online)
-        = f.check_box :online_eq
-      = f.submit t(:filter), :class => "btn btn-success"
+        .input-group
+          = f.text_field :summary_cont , :class => "form-control" , :placeholder => t(:summary)
+          %span.input-group-addon
+            =t(:blanks)
+            = f.radio_button :summary_blank , true
+      .form-group
+        .input-group
+          = f.text_field :description_cont , :class => "form-control" , :placeholder =>  t(:description)
+          %span.input-group-addon
+            =t(:blanks)
+            = f.radio_button :description_blank , true
+      = f.submit t(:filter), :id => :filter , :class => "btn btn-success"
       = link_to  t(:cancel), categories_path, :class => "btn btn-warning"
     %hr
     - @roots.each do |group|

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

@@ -1,30 +1,35 @@
-.col-md-6
-  %h2
-    = t(:category)
-    = @category.name
-    = render "products/online" , :object => @category
+.row
+  .col-md-6
+    %h2
+      = t(:category)
+      = @category.name
+      = render "products/online" , :object => @category
+    %p
+      %b
+        = t(:summary) + " : "
+      = markdown @category.summary
+      %br
+      %b
+        = t(:description) + " : "
+      = markdown @category.description
+  .col-md-6
+    %ol.breadcrumb
+      - parents(@category).each do | group|
+        %li
+          = link_to group.name , category_path(group)
+    .row
+      .col-md-6
+        %p
+          = image_tag @category.main_picture.url
+      .col-md-6
+        %p
+          = image_tag @category.extra_picture.url
 
-  %ol.breadcrumb
-    - parents(@category).each do | group|
-      %li
-        = link_to group.name , category_path(group)
-  %p
-    %b
-      = t(:description) + " : "
-    = markdown @category.description
-.col-md-6
-  %p
-    %b
-      = t(:link) + " : "
-    = @category.link
-  %p
-    %b
-      = t(:picture) + " : "
-    = image_tag @category.main_picture.url
+  = 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 , shop_group_path(@category.link)
 
-= link_to t(:edit), edit_category_path(@category), :class => "btn btn-primary"
-= link_to t(:back), categories_path, :class => "btn btn-primary"
-
-=render "products/triple" , :products => @category.products.no_items
 =render "triple" , :groups => @category.categories
+=render "products/triple" , :products => @category.products.no_items
 

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

@@ -28,10 +28,10 @@
               %td= link_to t(:edit), edit_clerk_path(clerk), :title => t(:edit)
     = paginate @clerks
   .col-md-3
-    = search_form_for @q, :url => search_clerks_path, :html => { :class => "well well-small" }, :method => :post do |f|
+    = search_form_for @q, :url => search_clerks_path, :html => { :class => "form-horizontal" }, :method => :post do |f|
       .form-group
-        = f.text_field :email_cont , :placeholder =>  t(:email)
+        = f.text_field :email_cont , :class => "form-control" , :placeholder =>  t(:email)
       .form-group
-        = f.text_field :address_cont , :placeholder =>  t(:address)
-      = f.submit t(:filter), :class => "btn btn-success"
+        = 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), clerks_path, :class => "btn btn-warning"

data/app/views/layouts/_header_extra.haml

@@ -1,5 +1,4 @@
--# ::Rails::Engine.subclasses.map(&:instance) in 4.1
--Rails::Application::Railties.engines.each do |e|
+-Rails::Engine.subclasses.map(&:instance).each do |e|
   - name = e.engine_name.sub("clerk" , "office")
   - next if name == e.engine_name
   = stylesheet_link_tag name

data/app/views/layouts/office_clerk.csv.erb

@@ -0,0 +1 @@
+<%= yield %>

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

@@ -0,0 +1,24 @@
+Hei,
+
+Tilauksesi R11111111 on peruttu NN.NN.2014.
+
+....................................................................
+Tilauksen tiedot
+....................................................................
+Tasapainottava – Neem-Rhassoul shampoo  1 kpl á 13,20 € = 13,20 €
+Villiruusu Hiustenhoitoaine  1  kpl á  18,20 € = 18,20 €
+Päivittäin – Granaattiomenashampoo  2  kpl á  13,20 € = 26,40 €
+Intense Frangipani Deo Roll-on  1  kpl á  14,30 € = 14,30 €
+....................................................................
+Välisumma: 72,10 €
+Toimituskulut: 7,30 €
+Tilauksen loppusumma: 79,40 €
+Alv 24% NN,NN €
+....................................................................
+Toimitusosoite: Tiina Tilaaja, Kotikatu 3, 10470 Fiskars
+....................................................................
+
+
+Kiitos tilauksestasi!
+Ystävällisin terveisin Auringosta Itään, Kuusta länteen
+

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

@@ -0,0 +1,36 @@
+Hei,
+
+Tilauksesi R11111111 on vastaanotettu NN.NN.2014.
+Tarkistathan että tiedot ovat oikein. 
+
+....................................................................
+Tilauksen tiedot
+....................................................................
+<% @order.basket.items.each do |item|%>
+<%= item.product.full_name%>
+<%end%>
+Tasapainottava – Neem-Rhassoul shampoo  1 kpl á 13,20 € = 13,20 €
+Villiruusu Hiustenhoitoaine  1  kpl á  18,20 € = 18,20 €
+Päivittäin – Granaattiomenashampoo  2  kpl á  13,20 € = 26,40 €
+Intense Frangipani Deo Roll-on  1  kpl á  14,30 € = 14,30 €
+....................................................................
+Välisumma: 72,10 €
+Toimituskulut: 7,30 €
+Tilauksen loppusumma: <%= @order.total_price%> €
+Alv 24% NN,NN €
+....................................................................
+Toimitusosoite: Tiina Tilaaja, Kotikatu 3, 10470 Fiskars
+....................................................................
+Maksutapa: Ennakkomaksu
+Tilauksesi lähetetään, kun olet maksanut sen ja maksusi on kirjautunut tilillemme. 
+Tilinumero FI1017 4530 0013 2474, mainitse viestikentässä tilausnumerosi R111222333. 
+Kun maksusi on kirjautunut tilille, lähetämme tilaamasi tuotteet 1-3 arkipäivän kuluessa.
+
+Kiitos tilauksestasi!
+
+Ystävällisin terveisin 
+
+Auringosta Itään, Kuusta länteen
+info@auringostaitaan.fi
+Fredrikinkatu 19 (Viiskulma), 00120 Helsinki 
+

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

@@ -0,0 +1,28 @@
+Hei,
+
+Tilauksesi R11111111 on kirjattu maksetuksi NN.NN.2014.
+Tilaus postitetaan 1-3 arkipäivän kuluessa.
+
+....................................................................
+Tilauksen tiedot
+....................................................................
+Tasapainottava – Neem-Rhassoul shampoo  1 kpl 
+Villiruusu Hiustenhoitoaine  1  kpl 
+Päivittäin – Granaattiomenashampoo  2  
+Intense Frangipani Deo Roll-on  1  kpl 
+....................................................................
+Välisumma: 72,10 €
+Toimituskulut: 7,30 €
+Tilauksen loppusumma: 79,40 €
+Alv 24% NN,NN €
+....................................................................
+Toimitusosoite: Tiina Tilaaja, Kotikatu 3, 10470 Fiskars
+....................................................................
+
+Kiitos tilauksestasi!
+
+Ystävällisin terveisin 
+
+Auringosta Itään, Kuusta länteen
+info@auringostaitaan.fi
+Fredrikinkatu 19 (Viiskulma), 00120 Helsinki 

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

@@ -0,0 +1,24 @@
+Hyvä asiakkaamme,
+
+Tilauksesi R11111111 on postitettu NN.NN.2014.
+Postin seurantatunnus on JJFI000111222333444
+
+....................................................................
+Tilauksen tiedot
+....................................................................
+Tasapainottava – Neem-Rhassoul shampoo  1 kpl 
+Villiruusu Hiustenhoitoaine  1  kpl 
+Päivittäin – Granaattiomenashampoo  2  
+Intense Frangipani Deo Roll-on  1  kpl 
+....................................................................
+Toimitusosoite: Tiina Tilaaja, Kotikatu 3, 10470 Fiskars
+....................................................................
+
+
+Kiitos tilauksestasi!
+Ystävällisin terveisin Auringosta Itään, Kuusta länteen
+
+
+
+
+

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

@@ -0,0 +1,5 @@
+<% [:number , :ordered_on ,:total_price , :tax , :paid_on ].collect{|i| I18n.t(i)}.join("") %>
+<% @orders.each do |order| %>
+<%=[ order.number.to_s , date(order.ordered_on) ,  order.total_price.round(2),  
+    order.total_tax.round(2) , date(order.paid_on) ].join(",")   %>              
+<%end%>

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

@@ -13,7 +13,7 @@
             %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, :total_price
             %th= sort_link @q, :email
             %th= t(:paid_on)
             %th= t(:shipped_on)
@@ -24,7 +24,7 @@
                 = link_to order.number.to_s , order_path(order), :title => t(:show)
               %td= date(order.ordered_on)
               %td= order.basket.items.length
-              %td= link_to euros(order.basket.total_price),  basket_path(order.basket)
+              %td= link_to euros(order.total_price),  basket_path(order.basket)
               %td= order.email
               %td= date(order.paid_on)
               %td= date(order.shipped_on)
@@ -34,60 +34,54 @@
         .btn-group.pull-right
           = link_to orders_path(:format => :csv), :class => "btn btn-primary" do
             %i.icon-download CSV
-          = link_to orders_path(:format => :json), :class => "btn btn-primary" do
-            %i.icon-download JSON
   .col-md-3
-    = search_form_for @q, :url => search_orders_path, :html => { :class => "well well-small" }, :method => :post do |f|
+    = search_form_for @q, :url => search_orders_path, :html => { :class => "form-horizontal" , :role => "form"}, :method => :get do |f|
       .form-group
-        = f.text_field :number_cont , :placeholder =>  t(:order_number)
+        = f.text_field :number_cont ,:class => "form-control" , :placeholder =>  t(:order_number)
       .form-group
-        = f.text_field(:email , :placeholder => t(:email))
-      .form-group.row
-        .col-md-3
+        = f.text_field(:email , :class => "form-control" , :placeholder => t(:email))
+      .form-group
+        .col-md-4
           = f.label(:total)
         .col-md-4
           = f.text_field :basket_total_price_gteq , :class => "form-control"
         .col-md-4
           = f.text_field :basket_total_price_lteq , :class => "form-control"
-      .row
-        .col-md-10
+      .form-group
+        .col-md-3
           = f.label(:ordered_on)
-      .row
-        .col-md-5
+        .col-sm-1.radio
+          = f.radio_button :ordered_on_blank , true
+        .form-group.col-md-6
           = f.search_field :ordered_on_gteq , :class => "form-control datepicker" , :value => sort_date(:ordered_on_gteq)
-        .col-md-5
-          = f.search_field :ordered_on_lteq , :class => "form-control datepicker"
-      .row
-        .col-md-10
+        .form-group.col-md-4
+          = f.search_field :ordered_on_lteq , :class => "form-control datepicker" , :value => sort_date(:ordered_on_lteq)
+      .form-group
+        .col-md-3
           = f.label(:paid_on)
-      .row
-        .col-md-5
-          = f.text_field :paid_on_gteq , :class => "form-control datepicker"
-        .col-md-5
-          = f.text_field :paid_on_lteq , :class => "form-control datepicker"
-      .row
-        .col-md-10
-          = f.label(:shipped_on)
-      .row
-        .col-md-5
-          = f.text_field :shipped_on_gteq , :class => "form-control datepicker"
-        .col-md-5
-          = f.text_field :shipped_on_lteq , :class => "form-control datepicker"
-      .row
-        .col-md-10
+        .col-sm-1.radio
+          = 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
+          = f.text_field :paid_on_lteq , :class => "form-control datepicker", :value => sort_date(:paid_on_lteq)
+      .form-group
+        .col-md-3
           = f.label(:shipped_on)
-      .row
-        .col-md-5
-          = f.text_field :shipped_on_gteq , :class => "form-control datepicker"
-        .col-md-5
-          = f.text_field :shipped_on_lteq , :class => "form-control datepicker"
-      .row
-        .col-md-10
+        .col-sm-1.radio
+          = f.radio_button :shipped_on_blank , true
+        .form-group.col-md-6
+          = f.text_field :shipped_on_gteq , :class => "form-control datepicker" , :value => sort_date(:shipped_on_gteq)
+        .form-group.col-md-4
+          = f.text_field :shipped_on_lteq , :class => "form-control datepicker" , :value => sort_date(:shipped_on_lteq)
+      .form-group
+        .col-md-3
           = f.label(:canceled_on)
-      .row
-        .col-md-5
-          = f.text_field :canceled_on_gteq , :class => "form-control datepicker"
-        .col-md-5
-          = f.text_field :canceled_on_lteq , :class => "form-control datepicker"
-      = f.submit t(:filter), :class => "btn btn-success"
+        .col-sm-1.radio
+          = f.radio_button :canceled_on_blank , true
+        .form-group.col-md-6
+          = f.text_field :canceled_on_gteq , :class => "form-control datepicker",:value => sort_date(:canceled_on_gteq)
+        .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"