office_clerk 0.7 → 0.8

data/app/views/layouts/office_clerk.haml

@@ -4,15 +4,15 @@
     %meta{:charset => "utf-8"}/
     %title Office Clerk
     %meta{:content => "Office Clerk", :name => "description"}
-    = stylesheet_link_tag "office_clerk"
-    = include_gon(:init => true)
+    = stylesheet_link_tag "office_clerk" ,  :media => :all
     = javascript_include_tag "office_clerk"
+    = include_gon(:init => true)
     = render "layouts/header_extra"
     = csrf_meta_tags
     = yield :head
   %body{:style => ""}
     .container-fluid
-      %nav.navbar.navbar-default.navbar-fixed-top.navbar-inverse{role: "navigation"}
+      %nav.navbar.navbar-default.navbar-fixed-top.navbar-inverse.hidden-print{role: "navigation"}
         .navbar-header
         %ul.nav.navbar-nav
           %li
@@ -23,7 +23,7 @@
           %li= link_to t(:sign_out), sign_out_path
 
       - if not flash[:notice].blank? then
-        .row.content
+        .row.content.hidden-print
           .col-md-12.alert
             .alert-notice.row
               .col-md-3
@@ -31,7 +31,7 @@
               .col-md-9
                 .alert-message!= flash[:notice]
       - if not flash[:alert].blank? then
-        .row.content
+        .row.content.hidden-print
           .col-md-12.alert
             .alert-error.row
               .col-md-3
@@ -44,6 +44,6 @@
 
       = yield
 
-    .row
-      .col-md-12
-        %br
+      .row
+        .col-md-12
+          %br

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

@@ -0,0 +1,24 @@
+...............................................................................
+Tilauksen tiedot
+...............................................................................
+
+<% @order.basket.items.each do |item|%>
+<%= item.quantity%> x <%=item.product.full_name%> á <%= euros(item.price) %> = <%= euros(item.total)%> 
+<%end%>
+
+...............................................................................
+
+Välisumma: <%= euros(@order.basket.total_price) %>
+Toimituskulut: <%= euros(@order.shipment_price)%>
+<%@order.taxes.each do |tax , value| %>
+<%=t(:vat) %><%=tax%>%: <%=euros(value)%>
+<%end%>
+
+Tilauksen loppusumma: <%= euros(@order.total_price)%>
+
+...............................................................................
+Toimitusosoite: 
+<%=@order.name%>
+<%=@order.street%>
+<%=@order.city%>
+...............................................................................

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

@@ -1,24 +1,10 @@
 Hei,
 
-Tilauksesi R11111111 on peruttu NN.NN.2014.
+Tilauksesi <%= @order.number %> on peruttu <%= date(@order.canceled_on) %>.
 
-....................................................................
-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
-....................................................................
+<%=render :partial => "order_mailer/order"%>
 
+Ystävällisin terveisin 
 
-Kiitos tilauksestasi!
-Ystävällisin terveisin Auringosta Itään, Kuusta länteen
+Auringosta Itään, Kuusta länteen
 

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

@@ -1,29 +1,16 @@
 Hei,
 
-Tilauksesi R11111111 on vastaanotettu NN.NN.2014.
+Tilauksesi <%= @order.number %> on vastaanotettu <%= date(@order.ordered_on) %>.
 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
-....................................................................
+<%=render :partial => "order_mailer/order"%>
+
 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. 
+Tilinumero FI1017 4530 0013 2474, mainitse viestikentässä tilausnumerosi <%= @order.number %>
+tai käytä <%=viite%> 
+ 
 Kun maksusi on kirjautunut tilille, lähetämme tilaamasi tuotteet 1-3 arkipäivän kuluessa.
 
 Kiitos tilauksestasi!

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

@@ -1,23 +1,10 @@
 Hei,
 
-Tilauksesi R11111111 on kirjattu maksetuksi NN.NN.2014.
+Tilauksesi <%= @order.number %> on kirjattu maksetuksi <%= date(@order.paid_on) %>.
+
 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
-....................................................................
+<%=render :partial => "order_mailer/order"%>
 
 Kiitos tilauksestasi!
 

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

@@ -1,21 +1,15 @@
 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
-....................................................................
+Tilauksesi <%= @order.number %> on postitettu <%= date(@order.shipped_on) %>.
 
+<% unless @order.shipment_info.blank? %>
+Postin seurantatunnus on <%=@order.shipment_info%>
+<%end%>
+  
+<%=render :partial => "order_mailer/order"%>
 
 Kiitos tilauksestasi!
+
 Ystävällisin terveisin Auringosta Itään, Kuusta länteen
 
 

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

@@ -20,14 +20,14 @@
         %tbody
           - @orders.each do |order|
             %tr{:class => "line-#{cycle("1","2")}"}
-              %td
+              %td.number
                 = link_to order.number.to_s , 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= order.email
+              %td.email= order.email
               %td= date(order.paid_on)
               %td= date(order.shipped_on)
       .btn-toolbar
@@ -44,7 +44,7 @@
           %span.input-group-addon
             = f.radio_button :note_present , true
       .form-group
-        = f.text_field(:email , :class => "form-control" , :placeholder => t(:email))
+        = f.text_field(:email_cont , :class => "form-control" , :placeholder => t(:email))
       .form-group
         .col-md-4
           = f.label(:total)

data/app/views/products/_preview_box.haml

@@ -0,0 +1,11 @@
+%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
+        = euros product.price

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

@@ -58,7 +58,7 @@
       %b= t(:description) + " : "
       = in_place @product , :description , :as => :textarea
   .col-md-4
-    =render :partial => "shop/product_box" , :locals => {:product => @product}
+    =render :partial => "products/preview_box" , :locals => {:product => @product}
     = markdown @product.description
 %br
 .row.product_show_row_buttons

data/app/views/sessions/sign_in.haml

@@ -1,10 +1,10 @@
-%h1= t(:sign_in)
-= form_tag office.create_session_path do
-  %p
-    = label_tag :email , t(:email) 
-    %br= text_field_tag :email, params[:email]
-  %p
-    = label_tag :password , t(:password)
-    %br= password_field_tag :password
-  %p.btn= submit_tag t(:sign_in)
+.col-md-4
+  %h1= t(:sign_in)
+  = bootstrap_form_tag :url => office.create_session_path do |f|
+    .form_group
+      = f.text_field :email, value: params[:email] , :label => t(:email)
+    .form_group
+      = f.password_field :password , value: params[:password] , :label => t(:password)
+    .form_group
+      = f.submit  t(:sign_in) , :class => "btn btn-info submit"
   

data/app/views/sessions/sign_up.haml

@@ -1,22 +1,10 @@
-%h1 Sign Up
+%h1= t(:sign_up)
 = bootstrap_form_for @clerk , :url => sign_up_path do |f|
-  - if @clerk.errors.any?
-    .error_messages
-      %h2 Form is invalid
-      %ul
-        - for message in @clerk.errors.full_messages
-          %li= message
-  %p
-    = f.label :email
-    %br/
+  .form_group
     = f.text_field :email
-  %p
-    = f.label :password
-    %br/
+  .form_group
     = f.password_field :password
-  %p
-    = f.label :password_confirmation
-    %br/
+  .form_group
     = f.password_field :password_confirmation
   %p.button= f.submit :class => "btn btn-info submit"
   

data/bin/rspec

@@ -1,3 +1,7 @@
 #!/usr/bin/env ruby
+begin
+  load File.expand_path("../spring", __FILE__)
+rescue LoadError
+end
 require 'bundler/setup'
 load Gem.bin_path('rspec-core', 'rspec')

data/bin/spring

@@ -7,7 +7,7 @@ unless defined?(Spring)
   require "rubygems"
   require "bundler"
 
-  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    spring \((.*?)\)$.*?^$/m)
+  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m)
     ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
     ENV["GEM_HOME"] = ""
     Gem.paths = ENV

data/config/locales/en.yml

@@ -131,6 +131,7 @@ en:
   sign_out: Log out
   sign_up: Sign up
   signed_in: Logged in
+  signed_up: Signed up
   signed_out: Logged out
   state: State
   street: Street
@@ -189,6 +190,8 @@ en:
         note: Note
         email: Email
         ordered_on: Ordered on
+        password: Passord
+        password_confirmation: Password confirmation
       purchase:
         name: Name
         ordered_on: Ordered on

data/config/locales/fi.yml

@@ -131,6 +131,7 @@ fi:
   sign_out: Kirjaudu ulos
   sign_up: Luo tili
   signed_in: Sisäänkirjautunut
+  signed_up: Tili luottu
   signed_out: Uloskirjautunut
   state: Tila
   street: Osoite
@@ -188,6 +189,8 @@ fi:
         canceled_on: Peruttu
         note: Muisti
         email: S-posti
+        password: Salasana
+        password_confirmation: Vahvista salasana
         ordered_on: Tilattu
       product:
         description: Kuvaus

data/config/routes.rb

@@ -1,7 +1,5 @@
 OfficeClerk::Engine.routes.draw do
 
-  root :to => 'shop#group'
-
   get "sign_out" => "sessions#sign_out"
   get "sign_in"  => "sessions#sign_in"
   post "create_session"  => "sessions#create" 
@@ -91,17 +89,5 @@ OfficeClerk::Engine.routes.draw do
   end
 
   match "manage/all" => "manage#all", :via => [:get, :post]
-  
-  #shop
-  get 'group/:link' => 'shop#group', :as => :shop_group
-  get 'prod/:link' => 'shop#product', :as => :shop_product
-  get 'page/:id' => 'shop#page', :as => :shop_page
-  match 'cart/add/:id' => 'shop#add', :as => :cart_add , :via => [:get,:post]
-  get 'cart/remove/:id' => 'shop#remove', :as => :cart_remove
-  get 'welcome' => 'shop#welcome', :as => :shop_welcome
-  get 'cart/order/:id' => 'shop#order', :as => :shop_order
-  match 'cart/checkout' => 'shop#checkout', :as => :shop_checkout , :via => [:get,:post]
-  
-  get "/404", :to => "application#error"
-  
+    
 end

data/lib/office_clerk/engine.rb

@@ -1,3 +1,5 @@
+require "best_in_place"
+
 module OfficeClerk
   class Engine < ::Rails::Engine
     engine_name "office"
@@ -11,12 +13,16 @@ module OfficeClerk
 
     I18n.enforce_available_locales = false
     I18n.default_locale = :fi
-    config.after_initialize do
-    end
     # for testing this makes engine factories available
     initializer "model_core.factories", :after => "factory_girl.set_factory_paths" do
-       FactoryGirl.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryGirl)
-     end
+      FactoryGirl.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryGirl)
+    end
+
+    # have to init the BestInPlace first to be able to include helpers
+    config.railties_order = [BestInPlace::Railtie , OfficeClerk::Engine  , :all  ] 
+    config.after_initialize do
+      BestInPlace::ViewHelpers.extend OfficeHelper
+    end
 
     config.paperclip_defaults =  {  :styles => {:thumb => '48x48>', :list => '150x150>', :product  => '600x600>' },
                                 :default_style => :list,

data/lib/office_clerk/shipping_method.rb

@@ -27,6 +27,11 @@ module OfficeClerk
       end
       @@methods
     end
+    def self.method(name)
+      return self.all.values.first if name.nil?
+      m = self.all[name.to_sym]
+      m.blank? ?  self.all.values.first : m
+    end
   end
   class Pickup < ShippingMethod
     def initialize data

data/lib/office_clerk/version.rb

@@ -1,3 +1,3 @@
 module OfficeClerk
-  VERSION = "0.7"
+  VERSION = "0.8"
 end

data/office_clerk.gemspec

@@ -23,17 +23,17 @@ Gem::Specification.new do |s|
 
   s.has_rdoc = false
 
-  s.add_runtime_dependency 'rails', '~> 4.1', '<= 4.2'
-  s.add_runtime_dependency "ransack" , '>= 1.5.1'
-  s.add_runtime_dependency "valid_email" 
+  s.add_runtime_dependency 'rails', '~> 4.1', '< 4.2'
+  s.add_runtime_dependency 'ransack', '~> 1.5', '>= 1.5.1'
+  s.add_runtime_dependency "valid_email" ,  '~> 0.0', '>= 0.0.10'
   s.add_runtime_dependency 'sass-rails' , '~> 4.0'
   s.add_runtime_dependency "haml" , '~> 4.0'
   s.add_runtime_dependency "jquery-rails" , '~> 3.1'
-  s.add_runtime_dependency 'coffee-rails'
-  s.add_runtime_dependency 'gon'
+  s.add_runtime_dependency 'coffee-rails' , '~> 4.0'
+  s.add_runtime_dependency 'gon' , '~> 5.2'
   s.add_runtime_dependency 'jquery-ui-rails' , '~> 5.0'
   s.add_runtime_dependency "kramdown" , '~> 1.5'
-  s.add_runtime_dependency "best_in_place"
+  s.add_runtime_dependency "best_in_place" , '~> 0'
 
   s.add_runtime_dependency 'will_paginate-bootstrap' , '~> 1.0'
   s.add_runtime_dependency 'bootstrap-sass', '~> 3.1'