office_clerk 0.5 → 0.6

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

@@ -8,16 +8,10 @@
         = t(:ordered_on) + " : " + date(@order.ordered_on)
     %p
       %b
-        = t(:total_price) + " : " +  euros(@order.basket.total_price)
-    %p
-      %b
-        = t(:total_tax) + " : " + euros(@order.basket.total_tax)
-    %p
-      %b
-        = t(:shipment_price) + " : " + euros(@order.shipment_price)
+        = t(:email) + " : " + @order.email.to_s
     %p
       %b
-        = t(:email) + " : " + @order.email.to_s
+        = t(:shipment_type) + " : " + @order.shipment_type.to_s
   .col-md-4
     %p
       %b
@@ -35,12 +29,30 @@
     %p
       %b
         = t(:canceled_on) + " : " + date(@order.canceled_on)
-    %p
-      %b
-        = t(:shipment_type) + " : " + @order.shipment_type.to_s
+-content_for :basket do
+  %tr
+    %td{:colspan => 2}
+    %td
+      %b= t(:total_tax) + " : "
+    %td
+      %b= euros(@order.total_tax)
+  %tr
+    %td{:colspan => 2}
+    %td
+      %b= t(:shipment_price) + " : "
+    %td
+      %b= euros(@order.shipment_price)
+  %tr
+    %td{:colspan => 2}
+    %td
+      %b= t(:total_price) + " : "
+    %td
+      %b= euros(@order.total_price)
+
 .row
   = render "baskets/small" , :basket => @order.basket
 .row
+  %br
   .col-md-2
     = link_to t(:back), orders_path, :class => "btn btn-warning"
   .col-md-10

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

@@ -1,5 +1,5 @@
-%h3= products.length.to_s + " " + t(:products)
 .row
+  %h3= products.length.to_s + " " + t(:products)
   %table.table.table-striped.table-bordered.table-condensed
     %tbody
       - products.in_groups_of(3).each do |array|
@@ -8,5 +8,5 @@
             -next unless product
             %td= image_tag product.main_picture.url(:thumb)
             %td
-              = link_to product_path(product), :title => t(:show) do
+              = link_to product_path(product), :title => t(:show) , :class => product.online && "online" do
                 = product.full_name

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

@@ -38,7 +38,7 @@
               %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) do
+                = link_to product_path(product), :title => t(:show) , :class => product.online && "online" do
                   =product.full_name
               %td.price=euros(product.price)
               %td.supplier
@@ -52,38 +52,56 @@
                 %td= link_to t(:edit) ,edit_product_path(product), :title => t(:edit)
     = paginate @products
   .col-md-3
-    = search_form_for @q, :url => search_products_path, :html => { :class => "well well-small" }, :method => :get do |f|
+    = search_form_for @q, :url => search_products_path, :html => { :class => "form-horizontal" }, :method => :get do |f|
       .form-group
-        - if params[:basket]
-          = hidden_field_tag :basket , params[:basket]
-          = f.text_field :name_or_product_name_cont, :class => "form-control" , :placeholder => t(:name)
-        -else
-          = f.text_field :name_cont, :class => "form-control" , :placeholder => t(:name)
+        .input-group
+          - if params[:basket]
+            = hidden_field_tag :basket , params[:basket]
+            = f.text_field :name_or_product_name_cont, :class => "form-control" , :placeholder => t(:name)
+          -else
+            = 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 , :class => "form-control" , :placeholder => t(:description)
+        .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
-        = f.text_field :ean_cont , :class => "form-control" , :placeholder => t(:ean)
+        .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
       .form-group
-        = f.text_field :scode_cont , :class => "form-control" , :placeholder => t(:scode)
-      .form-group.row
-        .col-md-3
+        .col-md-6
+          = f.text_field :ean_cont , :class => "form-control" , :placeholder => t(:ean)
+        .col-md-6
+          = f.text_field :scode_cont , :class => "form-control" , :placeholder => t(:scode)
+      .form-group
+        .col-md-4
           = f.label(:price)
         .col-md-4
           = f.text_field :price_gteq , :class => "form-control"
         .col-md-4
           = f.text_field :price_lteq , :class => "form-control"
-      .form-group.row
-        .col-md-3
+        .col-md-4
           = f.label(:inventory)
         .col-md-4
           = f.text_field :inventory_gteq , :class => "form-control"
         .col-md-4
           = f.text_field :inventory_lteq , :class => "form-control"
       .form-group
-        = f.label t(:supplier)
-        = f.collection_select :supplier_id_eq, Supplier.all, :id, :supplier_name, :include_blank => true
+        .col-md-4
+          = f.label t(:supplier)
+        .col-md-8
+          = f.collection_select :supplier_id_eq, Supplier.all, :id, :supplier_name, {:include_blank => true}, :class=>"form-control"
       .form-group
-        = f.label t(:category)
-        = f.collection_select :category_id_eq, Category.all, :id, :name, :include_blank => true
-      = f.submit t(:filter), :class => "btn btn-success"
+        .col-md-4
+          = f.label t(:category)
+        .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"

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

@@ -29,9 +29,9 @@
         .btn-group
           = paginate @purchases
   .col-md-3
-    = search_form_for @q, :url => search_purchases_path, :html => { :class => "well well-small" }, :method => :post do |f|
+    = search_form_for @q, :url => search_purchases_path, :html => { :class => "form-horizontal" }, :method => :post do |f|
       .form-group
-        = f.text_field :name_cont , :placeholder =>  t(:name)
+        = f.text_field :name_cont , :class => "form-control" , :placeholder =>  t(:name)
       .row
         .col-md-10
           = f.label(:ordered_on)
@@ -48,5 +48,6 @@
           = f.text_field :received_on_gt , :class => "form-control datepicker"
         .col-md-5
           = f.text_field :received_on_lt , :class => "form-control datepicker"
-      = f.submit t(:filter), :class => "btn btn-success"
+      %br
+      = f.submit t(:filter),  :id => :filter , :class => "btn btn-success"
       = link_to  t(:cancel), purchases_path, :class => "btn btn-warning"

data/app/views/shop/_product_box.haml

@@ -1,13 +1,13 @@
-=link_to shop_product_path(:link => product.link ) do
-  %h4.product-name
+%h4.product-name
+  =link_to shop_product_path(:link => product.link ) do
     = product.name
-  .row
-    .col-md-4
-      .square-image
-        =image_tag product.main_picture.url
-    .col-md-8.bottom
-      .product-fact
-        = link_to shop_product_path( :link => product.link ) , :class => :info do
-          %p= markdown product.summary
-          .price.selling
-            = euros product.price
+.row
+  .col-md-4
+    .square-image
+      =image_tag product.main_picture.url
+  .col-md-8.bottom
+    .product-fact
+      %p= markdown product.summary
+      = link_to shop_product_path( :link => product.link ) , :class => :info do
+        .price.selling
+          = euros product.price

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

@@ -23,18 +23,18 @@
         %tbody
           - @suppliers.each do |supplier|
             %tr{:class => "line-#{cycle("1","2")}"}
-              %td=supplier.supplier_name
+              %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)
     = paginate @suppliers
   .col-md-3
-    = search_form_for @q, :url => search_suppliers_path, :html => { :class => "well well-small" }, :method => :post do |f|
+    = search_form_for @q, :url => search_suppliers_path, :html => { :class => "form-horizontal" }, :method => :post do |f|
       .form-group
-        = f.text_field :supplier_name_cont , :placeholder =>  t(:name)
+        = f.text_field :supplier_name_cont , :class => "form-control", :placeholder =>  t(:name)
       .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), suppliers_path, :class => "btn btn-warning"
   

data/bin/rake

@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
-end
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

data/bin/rspec

@@ -1,7 +1,3 @@
 #!/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/config/locales/en.yml

@@ -17,6 +17,7 @@ en:
   basket_locked: Basket is locked, unlock to change
   baskets: Baskets
   between: ' between'
+  blanks: Blanks
   cancel: Cancel
   canceled_on: Canceled on
   cancel_order_button: Cancel email
@@ -48,6 +49,7 @@ en:
   extra_picture: Extra picture
   filter: Filter
   first_name: First Name
+  fix_errors: There are errors below
   history: Order history
   home: Home
   info: Info
@@ -121,6 +123,7 @@ en:
   shipped_on: Shipped on
   shipped_order_button: Ship Order Email
   shop: Shop
+  shop_link: In Shop
   show: Show
   sign_in: Log in
   sign_in_invalid: Invalid email or password
@@ -175,6 +178,7 @@ en:
         link: Link
         position: Position
         description: Description
+        summary: Summary
       order:
         email: Email
         ordered_on: Ordered on
@@ -184,6 +188,7 @@ en:
         received_on: Received on
       product:
         description: Description
+        summary: Summary
         ean: Ean
         inventory: Inventory
         name: Name

data/config/locales/fi.yml

@@ -15,6 +15,7 @@ fi:
   basket_locked: Ostoskoria ei voi muuttaa
   baskets: Ostoskorit
   between: haarukka
+  blanks: Tyhjät
   cancel: Peruuta
   cancel_order_button: Peruta s-post
   canceled_on: Peruutettu
@@ -47,6 +48,7 @@ fi:
   extra_picture: Toinen kuva
   filter: Hae
   first_name: Etunimi
+  fix_errors: Yhteystiedoistasi puuttuu tietoja
   history: Tilaushistoria
   home: Kotiin
   info: Info
@@ -121,6 +123,7 @@ fi:
   shipped_on: Lähetetty
   shipped_order_button: Lähetetty S-Posti
   shop: Kauppa
+  shop_link: Kauppassa
   show: Näytä
   sign_in: Kirjaudu sisään
   sign_in_invalid: Sposti tai salasana virheellinen
@@ -170,6 +173,7 @@ fi:
         street: Osoite
       category:
         name: Nimi
+        summary: Yhteenveto
         online: Netissä
         category: Pääryhmä
         link: Linkki
@@ -180,6 +184,7 @@ fi:
         ordered_on: Tilattu
       product:
         description: Kuvaus
+        summary: Yhteenveto
         ean: Ean
         inventory: Inventaario
         name: Nimi

data/config/spring.rb

@@ -0,0 +1 @@
+Spring.application_root = "./test_app"

data/lib/office_clerk.rb

@@ -4,7 +4,7 @@ require "haml"
 require "jquery-ui-rails"
 require "kramdown"
 require "will_paginate"
-
+require 'coffee_script'
 require 'will_paginate-bootstrap'
 require 'bootstrap-sass'
 require 'bootstrap_form'
@@ -13,6 +13,8 @@ require 'rails-i18n'
 require "jquery-rails"
 require "gon"
 require "bcrypt"
+require "valid_email"
+require "ransack"
 
 require "office_clerk/shipping_method"
 

data/lib/office_clerk/engine.rb

@@ -13,7 +13,11 @@ module OfficeClerk
     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
+
     config.paperclip_defaults =  {  :styles => {:thumb => '48x48>', :list => '150x150>', :product  => '600x600>' },
                                 :default_style => :list,
                                 :url => "/images/:id/:style/:basename.:extension",

data/lib/office_clerk/shipping_method.rb

@@ -6,7 +6,7 @@ module OfficeClerk
       @type = @data[:type]
       @description = @data[:description]
     end
-    attr_reader :data , :name , :type
+    attr_reader :data , :name , :type , :description
 
     def price_for(basket)
       raise "Not implemented in #{self}"

data/lib/office_clerk/version.rb

@@ -1,3 +1,3 @@
 module OfficeClerk
-  VERSION = "0.5"
+  VERSION = "0.6"
 end

data/office_clerk.gemspec

@@ -23,7 +23,9 @@ Gem::Specification.new do |s|
 
   s.has_rdoc = false
 
-  s.add_runtime_dependency 'rails', '~> 4.0', '>= 4.0.1'
+  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 'sass-rails' , '~> 4.0'
   s.add_runtime_dependency "haml" , '~> 4.0'
   s.add_runtime_dependency "jquery-rails" , '~> 3.1'

data/spec/features/categories_search_spec.rb

@@ -0,0 +1,47 @@
+#this file is included by category_spec, so the guard matchers work
+
+require 'spec_helper'
+
+describe "Category search" do
+  before :each do
+    sign_in
+   end
+   it "lists no categories" do
+     visit_path categories_path
+     expect(category_count).to be 0
+   end
+   it "lists correct number of unfiltered categories" do
+     category_ab :name => ["one","two", "more"]
+     expect(category_count).to be 3
+   end
+   it "filters by online" do
+     category_ab :online => [true, false]
+     choose("q[online_eq]")
+     expect(category_count).to be 1
+   end
+   it "filters by name" do
+     category_ab :name =>[ "i have a name", "nono"]
+     fill_in("q[name_cont]" , :with => "name")
+     expect(category_count).to be 1
+   end
+   it "filters by empty summary" do
+     category_ab :summary =>[ "i have a summary", ""]
+     choose("q[summary_blank]")
+     expect(category_count).to be 1
+   end
+   it "filters by summary" do
+     category_ab :summary =>[ "i have a summary", ""]
+     fill_in("q[summary_cont]" , :with => "have")
+     expect(category_count).to be 1
+   end
+   it "filters by description" do
+     category_ab :description =>[ "i have a name", "nono"]
+     fill_in("q[description_cont]" , :with => "name")
+     expect(category_count).to be 1
+   end
+   it "filters by empty description" do
+     category_ab :description =>[ "i have a description", ""]
+     choose("q[description_blank]")
+     expect(category_count).to be 1
+   end
+end

data/spec/features/products/index_spec.rb

@@ -4,13 +4,62 @@ describe "GET /products" do
   before :each do
     sign_in
    end
-  it "lists no products" do
-    visit_path products_path
-  end
-  it "filters by price" do
-    10.times { create :product }
-    visit products_path
-    fill_in "q[price_lteq]", :with => '10'
-    click_button( I18n.t(:filter))
-  end
+   it "lists no products" do
+     visit_path products_path
+     expect(product_count).to be 0
+   end
+   it "lists correct number of unfiltered products" do
+     product_ab :price => [8 ,12,14,16]
+     expect(product_count).to be 4
+   end
+   it "filters by name" do
+     product_ab :name =>[ "i have a name", "nono"]
+     fill_in("q[name_cont]" , :with => "name")
+     expect(product_count).to be 1
+   end
+   it "filters by online" do
+     product_ab :online => [true, false]
+     choose("q[online_eq]")
+     expect(product_count).to be 1
+   end
+   it "filters by empty summary" do
+     product_ab :summary =>[ "i have a summary", ""]
+     choose("q[summary_blank]")
+     expect(product_count).to be 1
+   end
+   it "filters by summary" do
+     product_ab :summary =>[ "i have a summary", ""]
+     fill_in("q[summary_cont]" , :with => "have")
+     expect(product_count).to be 1
+   end
+   it "filters by empty description" do
+     product_ab :description =>[ "i have a description", ""]
+     choose("q[description_blank]")
+     expect(product_count).to be 1
+   end
+   it "filters by description" do
+     product_ab :description =>[ "i have a name", "nono"]
+     fill_in("q[description_cont]" , :with => "name")
+     expect(product_count).to be 1
+   end
+   it "filters by price less" do
+     product_ab :price => [8 ,12]
+     fill_in "q[price_lteq]", :with => '10'
+     expect(product_count).to be 1
+   end
+   it "filters by price greater" do
+     product_ab :price => [8 ,12]
+     fill_in "q[price_gteq]", :with => '10'
+     expect(product_count).to be 1
+   end
+   it "filters by stock less" do
+     product_ab :inventory => [8 ,12]
+     fill_in "q[inventory_lteq]", :with => '10'
+     expect(product_count).to be 1
+   end
+   it "filters by inventory greater" do
+     product_ab :inventory => [8 ,12]
+     fill_in "q[inventory_gteq]", :with => '10'
+     expect(product_count).to be 1
+   end
 end