office_clerk 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ddc45855a851af3f02607825a7d2fd94ed802c9
-  data.tar.gz: ddfab4362620b9043574d8eb7d97793b8a49132b
+  metadata.gz: c64817a8d69623b98ac71359f18f3b2d47683bd2
+  data.tar.gz: dcfe694a0ed59c10487658e77090d224676c4d39
 SHA512:
-  metadata.gz: 51b6b48dfcabe21eef92716f31fe282d571b440ce453ebd73a77e7995c8e15c7b2bdfdad080d0497b6df434fcd70efe5604a90df40897dda1b994cbdb9fe55a2
-  data.tar.gz: bdf6744c2b0c661b66ce56d04e6f1f4dc2ff3109d7dafc1fc1f4d71c3f76c4900628ec5e66da41828501cc63d72328611952feee2e93b06ece5765ee09d1236b
+  metadata.gz: b9f11aa0e76f6d1683da1e324cf8a8b65bba947adaa6455ec97d5049c2494376cca854a8654b046653a89b20101837e041ea9d5a4629816d3c222d150673023d
+  data.tar.gz: 0bc48769c8e8d8492e1a9914e92d3c2df7b4fd37f4b8402c0167fadf1507071eb84369bef281c1eff540c247a308a1a4e979f14b7a06cf11db69a8c4d68308c2

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+sudo: false
+cache: bundler
 script:
   - RAILS_ENV=test bundle exec rake db:migrate
   - CODECLIMATE_REPO_TOKEN=3f97bb5305cd65f6683587a32b4b3eae42cfec26d3de56374b10b3efb78ccf6a bundle exec rspec

data/ChangeLog.md

@@ -1,3 +1,9 @@
+### 0.7
+
+- Order search improvements, added a private Note too
+- Tax improvements: lots of tests to eradicate the bug our accountant found
+- in place editing, for the note and some product features
+
 ### 0.6
 
 - Remove simpleform
@@ -11,5 +17,5 @@
 
 ### prior 0.5
 
-Basic core has been stable and in produciton for 9 months.
+Basic core has been stable and in production for 9 months.
 Since no gem realease were done before production versions go quite quickly towards 1

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: ../
   specs:
-    office_clerk (0.5)
+    office_clerk (0.6)
       bcrypt-ruby (~> 3.1)
+      best_in_place
       bootstrap-sass (~> 3.1)
       bootstrap_form (~> 2.2)
       coffee-rails
@@ -53,6 +54,9 @@ GEM
     bcrypt (3.1.9)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
+    best_in_place (3.0.0)
+      actionpack (>= 3.2)
+      railties (>= 3.2)
     better_errors (2.0.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -122,7 +126,7 @@ GEM
     guard-rspec (4.3.1)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
-    haml (4.0.5)
+    haml (4.0.6)
       tilt
     hike (1.2.3)
     hitimes (1.2.2)
@@ -134,7 +138,7 @@ GEM
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.2)
+    jquery-ui-rails (5.0.3)
       railties (>= 3.2.16)
     json (1.8.1)
     kramdown (1.5.0)
@@ -223,10 +227,10 @@ GEM
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
     sass (3.2.19)
-    sass-rails (4.0.4)
+    sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.2.2)
-      sprockets (~> 2.8, < 2.12)
+      sprockets (~> 2.8, < 3.0)
       sprockets-rails (~> 2.0)
     simplecov (0.9.1)
       docile (~> 1.1.0)
@@ -234,12 +238,12 @@ GEM
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slop (3.6.0)
-    sprockets (2.11.3)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.1)
+    sprockets-rails (2.2.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)

data/README.md

@@ -8,11 +8,7 @@ Office Clerk is the back office helper, your accountant, storage manager, secret
 
 ####  Status
 
-The clerks are under heavy development in public beta one could say.
-
-A first push of development resulted in a system that has been used for backend office work since 2/2014
-
-Currenly refinements and front end work is underway and scheduled for x-mas.
+In production for 2 sites. Work continues on refinements. That could qualify for 1.0 but i'll wait a few months. 
 
 ### Other clerks
 
@@ -24,17 +20,32 @@ This currenly does graphical sales reports. Purchase order creation is planned.
 
 ### Print Clerk
 
-A invoice generator
+A invoice generator. Also barcode generation and receipt printing (for POS use).
 
 ### Sales Clerk
 
-Work is underway to make the front end work. ie your standard e-commerce front end.
+We have a shop [online](http://auringostaitaan.fi/), the best way to get started is to clone [it](https://github.com/rubyclerks/sales_clerk).
 
 ### Getting Started
 
-Clone the office clerk, migrate, and click around. Fork and help.
+The easy way (tryout or new project):
+
+- clone sales_clerk
+- bundle and migrate it
+- change the git/config 
+- start editing
+
+The longer route, adding to existing project
+
+- add office_clerk  to Gemfile (gem or git)
+- build your public pages
+- may use ShopController which is included in office
+
+### Further
+
+If you got this far and still have question , mail me, or mail the [list](https://groups.google.com/forum/#!forum/rubyclerks)
 
-THe final version wil work by cloning the sales clerk, OR adding the officeclerk engine into your existing app. Docs follow.
+I will start writing User/Developer guides soon, your question will help. Off course your help will help even more :-)
 
 ### Similar Projects
 

data/app/assets/javascripts/office_clerk.js

@@ -1,6 +1,10 @@
 //= require jquery
+//= require best_in_place
+
 //= require jquery-ui
 //= require jquery-ui/datepicker-fi
+//= require best_in_place.jquery-ui
+
 //= require bootstrap
 //= require_self
 
@@ -19,4 +23,9 @@ function initPage(){
 
 $(window).bind('page:change', function() {
     initPage();
-});
+});
+
+$(document).ready(function() {
+  /* Activating Best In Place */
+  jQuery(".best_in_place").best_in_place();
+});

data/app/assets/stylesheets/office_clerk.css.scss

@@ -27,7 +27,7 @@ $table-border-color: scale-color($primary-color, $lightness: 85%);
 
 $tausta-bg: scale-color($primary-color, $lightness: 95%);
 
-
+@import "bootstrap-sprockets";
 @import "bootstrap";
 
 .container-fluid{

data/app/controllers/orders_controller.rb

@@ -49,7 +49,7 @@ class OrdersController < AdminController
   end
 
   def create
-    @order = Order.create(params_for_model)
+    @order = Order.create(params_for_order)
     @order.build_basket() unless @order.basket
     if @order.save
       redirect_to order_path(@order), :notice => t(:create_success, :model => "order")
@@ -60,10 +60,14 @@ class OrdersController < AdminController
 
   def update
     @order.build_basket unless @order.basket
-    if @order.update_attributes(params_for_model)
-      redirect_to order_path(@order), :notice => t(:update_success, :model => "order")
-    else
-      render :action => :edit
+    respond_to do |format|
+      if @order.update_attributes(params_for_order)
+        format.html { redirect_to(@order, :notice => t(:update_success, :model => "order")) }
+        format.json { respond_with_bip(@order) }
+      else
+        format.html { render :action => :edit }
+        format.json { respond_with_bip(@order) }
+      end
     end
   end
 
@@ -73,8 +77,8 @@ class OrdersController < AdminController
     @order = Order.find(params[:id])
   end
 
-  def params_for_model
-    params.require(:order).permit(:ordered_on,:shipment_price,:shipment_tax,:basket_id,:email,:paid_on,:shipped_on,:paid_on,:canceled_on,:shipment_type)
+  def params_for_order
+    params.require(:order).permit(:shipment_price,:shipment_tax,:shipment_type, :note)
   end
 end
 

data/app/controllers/products_controller.rb

@@ -44,11 +44,14 @@ class ProductsController < AdminController
   end
 
   def update
-    if @product.update_attributes(params_for_model)
-      flash.notice = t(:update_success, :model => "product")
-      redirect_to product_path(@product)
-    else
-      render :action => :edit
+    respond_to do |format|
+      if @product.update_attributes(params_for_model)
+        format.html { redirect_to(@product, :notice => t(:update_success, :model => "product")) }
+        format.json { respond_with_bip(@product) }
+      else
+        format.html { render :action => :edit }
+        format.json { respond_with_bip(@product) }
+      end
     end
   end
 

data/app/helpers/admin_helper.rb

@@ -1,6 +1,6 @@
 # encoding : utf-8
 module AdminHelper
-
+    
   def basket_edit_link basket , options = {}
     return "---" unless basket
     return "" unless request.url.include?("basket")
@@ -23,4 +23,18 @@ module AdminHelper
     return "" unless params[:q]
     params[:q][key] || ""
   end
+
+  # define a bunch of defaults for the best_in_place call
+  # save and cancel buttons with internationlized texts
+  # bootstrap form class
+  # a default note
+  # same signature as best_in_place, ie object, field symbol , hash
+  def in_place object , field , attributes ={}
+    defaults = { :ok_button => I18n.t(:edit), :ok_button_class => "btn btn-success" , 
+                 :cancel_button => I18n.t(:cancel) , :cancel_button_class => "btn btn-warning",
+                 :place_holder => I18n.t(:edit)  , :inner_class => "form-control" }
+    attributes.reverse_merge! defaults 
+    best_in_place(object , field , attributes)
+  end
+  BestInPlace::ViewHelpers.extend OfficeHelper
 end

data/app/models/item.rb

@@ -15,7 +15,7 @@ class Item < ActiveRecord::Base
 
   # tax included in the total
   def tax_amount
-    ((self.total * self.tax ) / 100.0).round(2)
+    self.quantity * single_item_tax
   end
 
   #relation of price to product price down from 100 %
@@ -23,4 +23,8 @@ class Item < ActiveRecord::Base
     return 0 unless product.price and product.price != 0
     (100 - (price/product.price)*100).round(0)
   end
+
+  def single_item_tax
+    (self.price * self.tax / ( 100.0 + self.tax)).round(4)
+  end
 end

data/app/models/order.rb

@@ -32,16 +32,15 @@ class Order < ActiveRecord::Base
   # 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 / 100.0).round(2) 
+    basket.total_tax + shipment_tax_value
   end
 
   # return a hash of rate => amount , because products may have different taxes, 
   # the items in an order may have a collection of tax rates.
   def taxes
     cart = basket.taxes
-    s_tax = self.shipment_price * shipment_tax
     #relies on basket creating a default value of 0
-    cart[self.shipment_tax] += s_tax if self.shipment_tax and self.shipment_tax != 0
+    cart[self.shipment_tax] += shipment_tax_value if self.shipment_tax and self.shipment_tax != 0
     cart
   end
   
@@ -69,4 +68,7 @@ class Order < ActiveRecord::Base
     return false unless shipment_type
     return shipment_type != "pickup"
   end
+  def shipment_tax_value
+    (self.shipment_tax * self.shipment_price / ( 100.0 + self.shipment_tax)).round(4)
+  end
 end

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

@@ -1,5 +1,9 @@
-<% [:number , :ordered_on ,:total_price , :tax , :paid_on ].collect{|i| I18n.t(i)}.join("") %>
+<%= [:order_number , :ordered_on ,:total_price , :vat , :vat , :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%>
+<% values = [ order.number.to_s , date(order.ordered_on) ,  order.total_price.round(2)]  %>
+<% taxes = order.taxes %>
+<% values << taxes[14.0].round(2) %>              
+<% values << taxes[24.0].round(2) %>
+<% values << date(order.paid_on) %>              
+<%= values.join(";")   %>              
+<%end%>

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

@@ -13,15 +13,17 @@
             %th= sort_link @q, :number
             %th= sort_link @q, :ordered_on
             %th= t(:items)
-            %th= sort_link @q, :total_price
+            %th= sort_link @q, :basket_total_price
             %th= sort_link @q, :email
-            %th= t(:paid_on)
-            %th= t(:shipped_on)
+            %th= sort_link @q, :paid_on
+            %th= sort_link @q, :shipped_on
         %tbody
           - @orders.each do |order|
             %tr{:class => "line-#{cycle("1","2")}"}
               %td
                 = 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)
@@ -37,7 +39,10 @@
   .col-md-3
     = 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 ,:class => "form-control" , :placeholder =>  t(:order_number)
+        .input-group
+          = f.text_field :number_cont ,:class => "form-control" , :placeholder =>  t(:order_number)
+          %span.input-group-addon
+            = f.radio_button :note_present , true
       .form-group
         = f.text_field(:email , :class => "form-control" , :placeholder => t(:email))
       .form-group
@@ -51,7 +56,6 @@
         .col-md-3
           = f.label(:ordered_on)
         .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)
         .form-group.col-md-4

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

@@ -3,16 +3,22 @@
     = t(:order) + " : " + @order.number.to_s
 .row
   .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)
     %p
       %b
-        = t(:email) + " : " + @order.email.to_s
+        = t(:canceled_on) + " : " + date(@order.canceled_on)
+  .col-md-4
     %p
       %b
         = t(:shipment_type) + " : " + @order.shipment_type.to_s
-  .col-md-4
     %p
       %b
       -if @order.paid_on
@@ -26,24 +32,30 @@
           = 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(:canceled_on) + " : " + date(@order.canceled_on)
+      %b= t(:note)
+    %p
+      = in_place @order , :note, :as => :textarea 
+
 -content_for :basket do
   %tr
-    %td{:colspan => 2}
+    %td= t(:name) 
+    %td=@order.name
     %td
       %b= t(:total_tax) + " : "
     %td
       %b= euros(@order.total_tax)
   %tr
-    %td{:colspan => 2}
+    %td= t(:street)
+    %td= @order.street
     %td
       %b= t(:shipment_price) + " : "
     %td
       %b= euros(@order.shipment_price)
   %tr
-    %td{:colspan => 2}
+    %td= t(:city)
+    %td=@order.city
     %td
       %b= t(:total_price) + " : "
     %td

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

@@ -21,10 +21,10 @@
       .col-md-6
         %p
           %b= t(:price) + " : "
-          = euros(@product.price)
+          = in_place @product , :price , :display_with => :euros
         %p
           %b= t(:cost) + " : "
-          = euros(@product.cost)
+          = in_place @product , :cost , :display_with => :euros
         %p
           %b= t(:category) + " : "
           = link_to @product.category.name ,category_path(@product.category) if @product.category
@@ -33,11 +33,11 @@
           = @product.link
         %p
           %b= t(:ean) + " : "
-          = @product.ean
+          = in_place @product , :ean
       .col-md-6
         %p
           %b= t(:weight) + " : "
-          = @product.weight
+          = in_place @product , :weight
         %p
           %b= t(:inventory) + " : "
           = @product.inventory
@@ -46,19 +46,20 @@
           = link_to @product.supplier.supplier_name ,supplier_path(@product.supplier) if @product.supplier
         %p
           %b= t(:scode) + " : "
-          = @product.scode
+          = in_place @product , :scode
         %p
           %b= t(:tax_percent) + " : "
-          = @product.tax
+          = in_place @product , :tax
   .col-md-4
     %p
       %b= t(:summary) + " : "
-      = markdown @product.summary
+      = in_place @product , :summary 
     %p
       %b= t(:description) + " : "
-      = markdown @product.description
+      = in_place @product , :description , :as => :textarea
   .col-md-4
     =render :partial => "shop/product_box" , :locals => {:product => @product}
+    = markdown @product.description
 %br
 .row.product_show_row_buttons
   .col-md-2

data/config/initializers/migrate.rb

@@ -0,0 +1,8 @@
+# poor mans migration. 
+# Trying to keep the schema clean until version 1
+
+unless Rails.env.test?
+  unless Order.columns_hash["note"]
+    ActiveRecord::Base.connection.add_column :orders, :note, :string , :default => ""
+  end
+end

data/config/locales/en.yml

@@ -73,6 +73,7 @@ en:
   new_item: New product item
   next: Next
   not_online: not online
+  note: Note
   notice: Notice
   online: Online
   order: Order
@@ -161,6 +162,7 @@ en:
   activerecord:
     attributes:
       basket:
+        type: Type
         created_at: Created
         total_price: Price
       clerk:
@@ -180,6 +182,11 @@ en:
         description: Description
         summary: Summary
       order:
+        total: Total
+        paid_on: Paid on
+        shipped_on: Shipped on
+        canceled_on: Canceled on
+        note: Note
         email: Email
         ordered_on: Ordered on
       purchase:

data/config/locales/fi.yml

@@ -73,6 +73,7 @@ fi:
   next: seuraava
   notice: Huom
   not_online: ei netissä
+  note: Muistiinpano
   online: Netissä
   online_eq: Online?
   order: Tilaus
@@ -161,6 +162,7 @@ fi:
   activerecord:
     attributes:
       basket:
+        type: Laji
         created_at: Luotu
         total_price: Hinta
       clerk:
@@ -180,6 +182,11 @@ fi:
         position: Järjetysnummero
         description: Kuvaus
       order:
+        total: Yhteensä
+        paid_on: Maksettu
+        shipped_on: Lähetetty
+        canceled_on: Peruttu
+        note: Muisti
         email: S-posti
         ordered_on: Tilattu
       product:

data/db/migrate/20131226144134_orders.rb

@@ -2,6 +2,7 @@ class Orders < ActiveRecord::Migration
   def change
     create_table :orders do |t|
       t.string      :number
+      t.string      :note,     :default => ""
       t.string      :email
       t.date        :ordered_on
       t.date        :paid_on

data/lib/office_clerk.rb

@@ -14,6 +14,7 @@ require "jquery-rails"
 require "gon"
 require "bcrypt"
 require "valid_email"
+require "best_in_place"
 require "ransack"
 
 require "office_clerk/shipping_method"

data/lib/office_clerk/version.rb

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

data/office_clerk.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'gon'
   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 'will_paginate-bootstrap' , '~> 1.0'
   s.add_runtime_dependency 'bootstrap-sass', '~> 3.1'

data/spec/controllers/orders_controller_spec.rb

@@ -47,24 +47,6 @@ describe OrdersController do
   end
 
   describe "POST create" do
-    describe "with valid params" do
-      it "creates a new Order" do
-        expect {
-          post :create, {:order => attributes_for(:order)}, valid_session
-        }.to change(Order, :count).by(1)
-      end
-
-      it "assigns a newly created order as @order" do
-        post :create, {:order => attributes_for(:order)}, valid_session
-        expect(assigns(:order)).to be_kind_of(Order)
-        expect(assigns(:order)).to be_persisted
-      end
-
-      it "redirects to the created order" do
-        post :create, {:order => attributes_for(:order)}, valid_session
-        expect(response).to redirect_to(Order.first)
-      end
-    end
 
     describe "with invalid params" do
       it "assigns a newly created but unsaved order as @order" do

data/spec/factories/addresses.rb

@@ -2,10 +2,10 @@
 
 FactoryGirl.define do
   factory :address do
-    first_name "Torsten"
-    last_name "Ruger"
-    street1 "Fiskarsintie 513"
+    name "Torsten Ruger"
+    street "Fiskarsintie 513"
     city "10480 antskog"
     country "Suomi"
+    phone "0407308052"
   end
 end

data/spec/factories/items.rb

@@ -5,7 +5,7 @@ FactoryGirl.define do
     product
     quantity 1
     price {product.price}
-    tax 10
+    tax { product.tax }
     sequence( :name) { |n| "product #{n}" }
     factory :item_quantity do
       quantity 1 

data/spec/factories/orders.rb

@@ -10,6 +10,11 @@ FactoryGirl.define do
       factory :order_paid do
         paid_on "2013-12-26"
       end
+      factory :order_shippped do
+        shipped_on "2013-12-26"
+        shipment_price 10.0
+        shipment_tax 20.0
+      end
     end
   end
 end

data/spec/factories/products.rb

@@ -4,7 +4,8 @@ FactoryGirl.define do
   #minimal product
   factory :product do
     sequence( :name) { |n| "product #{n}" }
-    sequence :price , 10
+    price 10
+    tax 10.0
     inventory 5
     factory :shop_product do
       online true

data/spec/models/baskets/items_spec.rb

@@ -1,35 +1,26 @@
 require 'spec_helper'
 
 describe "Basket totals" do
+  let(:basket) { create :basket_2_items }
+  
   it "creates proper quantities" do
     basket = create :basket_3_items
   end
-
-  it "calculates tax for 2" do
-    basket = create :basket_2_items
-    expect(basket.items.length).to be 2
-    taxes = basket.taxes
-    expect(taxes.values.first.round(2)).to eq  basket.total_tax.to_f.round(2)
-  end
   it "updates total on add" do
-    basket = create :basket_2_items
     items = basket.items
     total = items.first.price * items.first.quantity + items.last.price * items.last.quantity
     expect(basket.total_price).to eq total
     # assume the same tax (as per factory)
-    expect(basket.total_tax.to_f).to eq total * items.first.tax / 100
+    tax =  (total * basket.items.first.tax / ( 100.0 + basket.items.first.tax)).round(2)
+    expect(basket.total_tax.to_f).to eq tax
   end
   it "updates total on destroy" do
-    basket = create :basket_2_items
     total = basket.items.first.price
-    tax = total * basket.items.first.tax / 100
     basket.items.delete basket.items.last
     basket.save!
     expect(basket.total_price).to eq total
-    expect(basket.total_tax.to_f).to eq tax.to_f
   end
   it "destroys" do
-    basket = create :basket_2_items
     basket.items.delete basket.items.last
     basket.save!
     expect(basket.items.length).to be  1

data/spec/models/baskets/taxes_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe "Basket totals" do
+  let(:basket) { create :basket_2_items }
+  
+  it "calculates tax for 2" do
+    expect(basket.items.length).to be 2
+    taxes = basket.taxes
+    expect(taxes.values.first.round(2)).to eq  basket.total_tax.to_f.round(2)
+    expect(taxes.values.length).to eq  1
+  end
+  it "calculates total tax right" do
+    expect(basket.items.first.product.price).to eq 10.0
+    expect(basket.items.first.product.tax).to eq 10.0
+    expect(basket.total_tax).to eq 2.73
+  end
+  it "calculates tax hash" do
+    expect(basket.taxes.length).to eq 1
+    expect(basket.taxes.keys.first).to eq 10.0
+    expect(basket.taxes.values.first).to eq 2.7273
+  end
+end

data/spec/models/item_spec.rb

@@ -14,8 +14,11 @@ describe Item do
   end
 
   it "calcualtes taxes" do
+    expect(create(:item).price).to eq 10.0
+    expect(create(:item).tax).to eq 10.0
+    expect(create(:item).tax_amount).to eq 0.9091
     [create(:item) , create(:item2) , create(:item22)].each do |c|
-      expect(c.tax_amount).to eq ((c.tax * c.price*c.quantity) / 100.0).round(2)
+      expect(c.tax_amount).to eq ((c.price * c.tax / (100 + c.tax ) ) ).round(4) * c.quantity
     end
   end
   it "calcualtes total" do

data/spec/models/order_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Order do
+  let(:order) { create :order }
+  let(:shipped_order) { create :order_shippped }
+
   it "factory is ok" do
     o = build :order
     ok = o.save
@@ -14,6 +17,26 @@ describe Order do
   end
 
   it "creates ok" do
-    o1 = create :order
+    order
+  end
+
+  it "calculates total tax" do
+    expect(order.basket.items.length).to eq 1
+    expect(order.total_tax).to eq 0.91
+  end
+
+  it "calculates tax per rate" do
+    expect(order.taxes.length).to eq 1
+    expect(order.taxes.first).to eq [10.0 , 0.9091]
+  end
+
+  it "adds shipping tax to taxes" do
+    expect(shipped_order.taxes.length).to eq 2
+    expect(shipped_order.taxes.first).to eq [10.0 , 0.9091]
+    expect(shipped_order.taxes[20.0]).to eq 1.6667
+  end
+
+  it "calculates total tax with shipping" do
+    expect(shipped_order.total_tax).to eq 2.5767
   end
 end

data/test_app/db/migrate/20141114205529_orders.office.rb

@@ -3,6 +3,7 @@ class Orders < ActiveRecord::Migration
   def change
     create_table :orders do |t|
       t.string      :number
+      t.string      :note,     :default => ""
       t.string      :email
       t.date        :ordered_on
       t.date        :paid_on

data/test_app/db/schema.rb

@@ -70,6 +70,7 @@ ActiveRecord::Schema.define(version: 20141114205532) do
 
   create_table "orders", force: true do |t|
     t.string   "number"
+    t.string   "note",           default: ""
     t.string   "email"
     t.date     "ordered_on"
     t.date     "paid_on"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: office_clerk
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Torsten Rüger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -156,6 +156,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  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
   name: will_paginate-bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -373,6 +387,7 @@ files:
 - config/initializers/backtrace_silencers.rb
 - config/initializers/filter_parameter_logging.rb
 - config/initializers/inflections.rb
+- config/initializers/migrate.rb
 - config/initializers/mime_types.rb
 - config/initializers/session_store.rb
 - config/initializers/wrap_parameters.rb
@@ -440,6 +455,7 @@ files:
 - spec/models/baskets/inventory_spec.rb
 - spec/models/baskets/items_spec.rb
 - spec/models/baskets/products_spec.rb
+- spec/models/baskets/taxes_spec.rb
 - spec/models/category_spec.rb
 - spec/models/clerk/email_spec.rb
 - spec/models/clerk/password_spec.rb
@@ -569,6 +585,7 @@ test_files:
 - spec/models/baskets/inventory_spec.rb
 - spec/models/baskets/items_spec.rb
 - spec/models/baskets/products_spec.rb
+- spec/models/baskets/taxes_spec.rb
 - spec/models/category_spec.rb
 - spec/models/clerk/email_spec.rb
 - spec/models/clerk/password_spec.rb