office_clerk 0.7 → 0.8

data/spec/controllers/sessions_controller_spec.rb

@@ -13,7 +13,7 @@ describe SessionsController do
     clerk = create :clerk
     email = Clerk.where(:admin=>false).first.email
     post :create , :email => email
-    expect(response).to redirect_to(root_path)
+    expect(response).to redirect_to(Rails.application.routes.url_helpers.root_path)
     expect(session['clerk_email']).to eq email
   end
   it "create action should redirect to baskets for admin if authentication is valid" do

data/spec/features/orders_spec.rb

@@ -29,4 +29,9 @@ describe "Orders" do
     find(".ship_now").click
 #    expect(order.basket.items.first.product.inventory).to be order.basket.items.first.quantity
   end
+  it "filters by email" do
+    order_ab :email =>[ "torsten@villataika.fi", "raisa@villataika.fi"]
+    fill_in("q[email_cont]" , :with => "torsten")
+    expect(order_count).to eq 1
+  end
 end

data/spec/features/sessions_spec.rb

@@ -11,7 +11,7 @@ describe "Sessions" do
     fill_in(:email , :with => user.email)
     fill_in(:password , :with => "password")
     click_button( I18n.t(:sign_in))
-    ensure_path root_path
+    ensure_path Rails.application.routes.url_helpers.root_path
   end
   it "goes to baskets for admins" do
     user = create :admin
@@ -37,7 +37,7 @@ describe "Sessions" do
   it "signs out" do
     sign_in
     visit sign_out_path
-    ensure_path root_path
+    ensure_path Rails.application.routes.url_helpers.root_path
   end
   it "signs up needs confirmation" do
     visit_path sign_up_path
@@ -45,7 +45,6 @@ describe "Sessions" do
     fill_in(:clerk_password , :with => "password")
     find(".submit").click
     ensure_path sign_up_path
-    expect(page).to have_content("invalid")
   end
   it "signs up" do
     visit_path sign_up_path
@@ -53,6 +52,6 @@ describe "Sessions" do
     fill_in(:clerk_password , :with => "password")
     fill_in(:clerk_password_confirmation , :with => "password")
     find(".submit").click
-    ensure_path root_path
+    ensure_path main_app.root_path
   end
 end

data/spec/mailers/order_mailer_spec.rb

@@ -1,24 +1,67 @@
 require "spec_helper"
 
 RSpec.describe OrderMailer, :type => :mailer do
-  describe 'confirm' do
-    let(:order) { create :order }
+  let(:order) { create :order }
+
+  shared_examples_for "an order mail" do
+    describe "mail basics" do
+      it 'renders the subject' do
+        expect(mail.subject.to_s).to include( I18n.t(:order))
+        expect(mail.subject.to_s).to include( order.number)
+        expect(mail.subject.to_s).not_to include( "missing")
+      end
+      it 'renders the receiver email' do
+        expect(mail.to).to eq([order.email])
+      end
+    end
+    describe "order details" do
+      it "includes the total price" do
+        expect(mail.body).to include(order.total_price.to_s)
+      end
+      it "includes the product name" do
+        expect(mail.body).to include(order.basket.items.first.product.name)
+        expect(mail.body).not_to include( "missing")
+      end
+    end
+  end
+
+  describe 'confirm mail' do
     let(:mail) { OrderMailer.confirm(order) }
- 
-    it 'renders the subject' do
-      expect(mail.subject.to_s).to include('Order')
+    it_should_behave_like "an order mail" do
     end
- 
-    it 'renders the receiver email' do
-      expect(mail.to).to eql([order.email])
+    it "should include ordered" do
+      expect(mail.body).to include("vastaanotettu")
     end
- 
-    it 'renders the sender email' do
-      expect(mail.from).to eql(["me@here.now"])
+  end
+
+  describe 'cancel mail' do
+    let(:mail) { OrderMailer.cancel(order) }
+    it_should_behave_like "an order mail" do
     end
-    
-    it "includes the total price" do
-      expect(mail.body).to include(order.total_price.to_s)
+    it "should include cancled" do
+      expect(mail.body).to include("peruttu")
     end
   end
+
+  describe 'paid mail' do
+    let(:mail) { OrderMailer.paid(order) }
+    it_should_behave_like "an order mail" do
+    end
+    it "should include paid" do
+      expect(mail.body).to include("kirjattu maksetuksi")
+    end
+  end
+
+  describe 'shipped mail' do
+    let(:mail) do
+      order.pay_now!
+      OrderMailer.shipped(order)
+    end
+    it_should_behave_like "an order mail" do
+    end
+    it "should include paid" do
+      expect(mail.body).to include("postitettu")
+    end
+  end
+
 end

data/spec/models/clerk/email_spec.rb

@@ -62,8 +62,9 @@ describe Clerk do
   end
 
   # would be nice, just doesn't work yet
-#  it "should not allow odd characters in name" do
-#    create(:clerk, :name => 'odd ^&(@)').should have(1).error_on(:name)
-#  end
+  #it "should not allow odd characters in name" do
+   # clerk = create(:clerk, :name => 'odd ^&(@)')
+    #expect(clerk.errors[:name].size).to eq 1 
+    #end
 
 end

data/spec/models/clerk/misc_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Clerk do
+
+  it "should return last order address with empty for no order" do
+    clerk = create(:clerk)
+    expect(clerk.last_address).to be {}
+  end
+
+  it "should return last order address with last order address" do
+    order = create :order
+    order.name = "clerk name"
+    order.city = "my city"
+    order.save!
+    clerk = create(:clerk , :email => order.email)
+    expect(clerk.last_address).to eq order.address
+  end
+
+end

data/spec/support/product_helper.rb

@@ -17,7 +17,15 @@ module ProductHelper
     create_ab :category , hash
     visit categories_path
   end
+  def order_ab hash
+    create_ab :order , hash
+    visit orders_path
+  end
   alias :category_count :product_count
+  def order_count
+    click_button(:filter)
+    all(".number").count
+  end
 end
 
 RSpec.configure do |config|

data/test_app/config/environments/development.rb

@@ -28,5 +28,5 @@ TestApp::Application.configure do
   config.assets.debug = true
 
   # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
+  config.action_view.raise_on_missing_translations = true
 end

data/test_app/config/environments/test.rb

@@ -35,5 +35,5 @@ TestApp::Application.configure do
   config.active_support.deprecation = :stderr
 
   # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
+  config.action_view.raise_on_missing_translations = true
 end

data/test_app/config/locales/config.yml

@@ -0,0 +1,2 @@
+config:
+  mail_from: me@here.now

data/test_app/config/routes.rb

@@ -1,4 +1,7 @@
 TestApp::Application.routes.draw do
-  root :to => 'sessions#sign_in'
+
+  get '/group/:link' , :to => 'office#group', :as => :shop_group
   mount OfficeClerk::Engine => "/"
+  root :to => 'sessions#sign_in' , :as => :root
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: office_clerk
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - Torsten Rüger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,7 +17,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
@@ -27,13 +27,16 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
@@ -41,6 +44,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
@@ -48,16 +54,22 @@ dependencies:
   name: valid_email
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -104,30 +116,30 @@ dependencies:
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: gon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -160,14 +172,14 @@ dependencies:
   name: best_in_place
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -305,7 +317,6 @@ files:
 - app/controllers/products_controller.rb
 - app/controllers/purchases_controller.rb
 - app/controllers/sessions_controller.rb
-- app/controllers/shop_controller.rb
 - app/controllers/suppliers_controller.rb
 - app/helpers/admin_helper.rb
 - app/helpers/baskets_helper.rb
@@ -314,7 +325,6 @@ files:
 - app/helpers/orders_helper.rb
 - app/helpers/products_helper.rb
 - app/helpers/purchases_helper.rb
-- app/helpers/shop_helper.rb
 - app/helpers/suppliers_helper.rb
 - app/mailers/order_mailer.rb
 - app/models/basket.rb
@@ -340,14 +350,13 @@ files:
 - app/views/clerks/index.html.haml
 - app/views/clerks/show.html.haml
 - app/views/layouts/_admin_menu.html.haml
-- app/views/layouts/_google.haml
 - app/views/layouts/_header_extra.haml
 - app/views/layouts/_messages.html.haml
 - app/views/layouts/office_clerk.csv.erb
 - app/views/layouts/office_clerk.haml
-- app/views/layouts/sales_clerk.haml
 - app/views/manage/_hash.haml
 - app/views/manage/all.haml
+- app/views/order_mailer/_order.text.erb
 - app/views/order_mailer/cancel.text.erb
 - app/views/order_mailer/confirm.text.erb
 - app/views/order_mailer/paid.text.erb
@@ -360,6 +369,7 @@ files:
 - app/views/products/_head.haml
 - app/views/products/_line.html.haml
 - app/views/products/_online.html.haml
+- app/views/products/_preview_box.haml
 - app/views/products/_triple.html.haml
 - app/views/products/edit.html.haml
 - app/views/products/index.html.haml
@@ -369,7 +379,6 @@ files:
 - app/views/purchases/show.html.haml
 - app/views/sessions/sign_in.haml
 - app/views/sessions/sign_up.haml
-- app/views/shop/_product_box.haml
 - app/views/suppliers/edit.html.haml
 - app/views/suppliers/index.html.haml
 - app/views/suppliers/show.html.haml
@@ -458,6 +467,7 @@ files:
 - spec/models/baskets/taxes_spec.rb
 - spec/models/category_spec.rb
 - spec/models/clerk/email_spec.rb
+- spec/models/clerk/misc_spec.rb
 - spec/models/clerk/password_spec.rb
 - spec/models/item_spec.rb
 - spec/models/locale_spec.rb
@@ -505,6 +515,7 @@ files:
 - test_app/config/initializers/secret_token.rb
 - test_app/config/initializers/session_store.rb
 - test_app/config/initializers/wrap_parameters.rb
+- test_app/config/locales/config.yml
 - test_app/config/locales/en.yml
 - test_app/config/routes.rb
 - test_app/db/migrate/20141114205525_clerks.office.rb
@@ -588,6 +599,7 @@ test_files:
 - spec/models/baskets/taxes_spec.rb
 - spec/models/category_spec.rb
 - spec/models/clerk/email_spec.rb
+- spec/models/clerk/misc_spec.rb
 - spec/models/clerk/password_spec.rb
 - spec/models/item_spec.rb
 - spec/models/locale_spec.rb

data/app/controllers/shop_controller.rb

@@ -1,91 +0,0 @@
-class ShopController < OfficeController
-  before_action :load
-
-  layout "sales_clerk"
-
-  def welcome
-    @groups = Category.online.where( :category_id => nil )
-    render :layout => false
-  end
-
-  def product
-    @product = Product.shop_products.where(:link => params[:link]).first
-    unless @product
-      redirect_to :action => :group 
-      return
-    end
-    @group = @product.category
-    #error handling
-#    @group = Category.find(@product.category_id)
-  end
-
-  # the checkout page creates an order upon completion. So before a checkout the basket is attached to the session
-  # and by filling out all data an order is created with the basket and the session zeroed
-  def checkout
-    @order = Order.new :ordered_on => Date.today
-    @order.basket = current_basket
-    if(request.get?)
-      @order.email = current_clerk.email if current_clerk
-      @order.shipment_type = "pickup" # price is 0 automatically
-    else
-      order_ps = params.require(:order).permit( :email,:name , :street , :city , :phone , :shipment_type )
-      if @order.update_attributes(order_ps)
-        new_basket
-        OrderMailer.confirm(@order).deliver
-        redirect_to shop_order_path(@order), :notice => t(:thanks)
-        return
-      end
-    end
-  end
-
-  def order
-    if( params[:id])
-      @order = Order.find( params[:id] )
-    else
-      raise "last order of logged person"
-    end
-  end
-
-  def add
-    prod = Product.find( params[:id]) # no id will raise which in turn will show home page
-    current_basket.add_product(prod)
-    if request.get?
-      redirect_to shop_checkout_path
-    else
-      redirect_to shop_group_path(prod.category.link), :notice => "#{t(:product_added)}: #{prod.name}"
-    end
-  end
-  def remove
-    prod = Product.find( params[:id]) # no id will raise which in turn will show home page
-    current_basket.add_product(prod , -1)
-    redirect_to shop_checkout_path
-  end
-
-  def group
-    @group = Category.online.where(:link => params[:link]).first 
-    if @group
-      @products = @group.shop_products
-      template = "product_list"
-      @groups = @group.categories.online
-    else
-      @groups = Category.online.where( :category_id => nil )
-      template = "main_group"
-    end
-    render template
-  end
-
-  def page
-    @products = Product.shop_products.limit(50)
-    template = params[:id]
-    template = "tuotteista" if template.blank?
-    render template
-  end
-  private
-    def load
-      @menu =  {"/page/kotisivu" => "KOTISIVU" ,
-                "/group/start" => "VERKKOKAUPPA" ,
-                "/page/tuotteista" => "TUOTTEISTA",
-                "/page/toimitusehdot" => "TOIMITUSEHDOT" ,
-                "/page/liike" => "LIIKKEEMME" }
-    end
-end