office_clerk 0.4 → 0.5

data/lib/office_clerk/version.rb

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

data/lib/templates/haml/scaffold/_form.html.haml

@@ -1,4 +1,4 @@
-<%= simple_form_for(@<%= singular_table_name %>) do |f| %>
+<%= bootstrap_form_for(@<%= singular_table_name %>) do |f| %>
 <%= f.error_notification %>
 .form-inputs
   - attributes.each do |attribute|

data/office_clerk.gemspec

@@ -7,13 +7,13 @@ Gem::Specification.new do |s|
   s.platform     = Gem::Platform::RUBY
   s.name         = 'office_clerk'
   s.version      = OfficeClerk::VERSION
-  s.summary      = 'Backend of rubyclerks'
-  s.description  = s.summary
+  s.summary      = 'Backend of rubyclerks, a simple way to manage a buisness'
+  s.description  = "Rubyclerks is a small buisness management solution, including an online presence (shop), but also POS, inventory and more."
   s.required_ruby_version = '>= 1.9.3'
 
   s.authors      = ['Torsten Rüger']
   s.email        = ['torsten@villataika.fi']
-  s.homepage     = 'https://github.com/ruby_clerks/office_clerk'
+  s.homepage     = 'https://github.com/rubyclerks/office_clerk'
   s.license      = 'MIT'
 
   s.files        = `git ls-files`.split("\n")
@@ -26,13 +26,12 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rails', '~> 4.0', '>= 4.0.1'
   s.add_runtime_dependency 'sass-rails' , '~> 4.0'
   s.add_runtime_dependency "haml" , '~> 4.0'
-  s.add_runtime_dependency "opal-rails" , '~> 0.6'
-  s.add_runtime_dependency 'opal-jquery' , '~> 0.2'
-
+  s.add_runtime_dependency "jquery-rails" , '~> 3.1'
+  s.add_runtime_dependency 'coffee-rails'
+  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 'simple_form' , '~> 3.0'
   s.add_runtime_dependency 'will_paginate-bootstrap' , '~> 1.0'
   s.add_runtime_dependency 'bootstrap-sass', '~> 3.1'
   s.add_runtime_dependency 'bootstrap_form' , '~> 2.2'
@@ -41,9 +40,4 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "bcrypt-ruby" , '~> 3.1'
 
-  #these will stil have to go to accountant
-  s.add_runtime_dependency "barby"
-  s.add_runtime_dependency "chunky_png"
-  s.add_runtime_dependency "prawn"
-
 end

data/spec/features/products/edit_spec.rb

@@ -25,8 +25,4 @@ feature "new product" do
     click_button( I18n.t(:product))
     ensure_path product_path(product)
   end
-  it "renders product barcode" do
-    product = create :product
-    visit_path barcode_product_path(product) 
-  end
 end

data/spec/mailers/order_mailer_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+RSpec.describe OrderMailer, :type => :mailer do
+  describe 'confirm' do
+    let(:order) { create :order }
+    let(:mail) { OrderMailer.confirm(order) }
+ 
+    it 'renders the subject' do
+      expect(mail.subject.to_s).to include('Order')
+    end
+ 
+    it 'renders the receiver email' do
+      expect(mail.to).to eql([order.email])
+    end
+ 
+    it 'renders the sender email' do
+      expect(mail.from).to eql(["me@here.now"])
+    end
+    
+    it "includes the total price" do
+      expect(mail.body).to include(order.total_price.to_s)
+    end
+  end
+end

data/spec/models/baskets/items_spec.rb

@@ -9,7 +9,7 @@ describe "Basket totals" 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.round(2)
+    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
@@ -17,7 +17,7 @@ describe "Basket totals" do
     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 eq total * items.first.tax / 100
+    expect(basket.total_tax.to_f).to eq total * items.first.tax / 100
   end
   it "updates total on destroy" do
     basket = create :basket_2_items
@@ -26,7 +26,7 @@ describe "Basket totals" do
     basket.items.delete basket.items.last
     basket.save!
     expect(basket.total_price).to eq total
-    expect(basket.total_tax).to eq tax.to_f
+    expect(basket.total_tax.to_f).to eq tax.to_f
   end
   it "destroys" do
     basket = create :basket_2_items

data/spec/models/locale_spec.rb

@@ -4,6 +4,7 @@ RSpec.describe 'locale:' do
 
   Dir.glob('config/locales/*.yml') do |locale_file|
     next if locale_file == "config/locales/config.yml"
+    next if locale_file.include? "extra"
     context locale_file do
       it { is_expected.to be_parseable }
       it { is_expected.to have_valid_pluralization_keys }
@@ -14,4 +15,7 @@ RSpec.describe 'locale:' do
       it { is_expected.to be_a_complete_translation_of 'config/locales/en.yml' }
     end
   end
+  context 'config/locales/en.yml' do
+    it { is_expected.to be_a_complete_translation_of 'config/locales/fi.yml' }
+  end
 end

data/test_app/db/migrate/20141114205527_categories.office.rb

@@ -1,11 +1,11 @@
-# This migration comes from office (originally 20131226143612)
 class Categories < ActiveRecord::Migration
   def change
     create_table :categories do |t|
       t.references  :category
       t.boolean     :online, :default => false
       t.string      :name
-      t.string      :description
+      t.text        :description , :default => ""
+      t.text        :summary      , :default => ""
       t.integer     :position , :default => 1
       t.string      :link
       t.attachment  :main_picture

data/test_app/db/migrate/20141114205532_products.office.rb

@@ -1,11 +1,11 @@
-# This migration comes from office (originally 20131226151332)
 class Products < ActiveRecord::Migration
   def change
     create_table :products do |t|
       t.float       :price      , :null => false
       t.string      :name       , :null => false
       t.string      :link        
-      t.text        :description
+      t.text        :description , :default => ""
+      t.text        :summary      , :default => ""
       t.attachment  :main_picture
       t.attachment  :extra_picture
       t.boolean     :online ,       :default => false

data/test_app/db/schema.rb

@@ -27,7 +27,8 @@ ActiveRecord::Schema.define(version: 20141114205532) do
     t.integer  "category_id"
     t.boolean  "online",                     default: false
     t.string   "name"
-    t.string   "description"
+    t.text     "description",                default: ""
+    t.text     "summary",                    default: ""
     t.integer  "position",                   default: 1
     t.string   "link"
     t.string   "main_picture_file_name"
@@ -89,7 +90,8 @@ ActiveRecord::Schema.define(version: 20141114205532) do
     t.float    "price",                                      null: false
     t.string   "name",                                       null: false
     t.string   "link"
-    t.text     "description"
+    t.text     "description",                default: ""
+    t.text     "summary",                    default: ""
     t.string   "main_picture_file_name"
     t.string   "main_picture_content_type"
     t.integer  "main_picture_file_size"

data/todo

@@ -2,7 +2,3 @@ old order prices are without alv
 sorting links dont work
 product search by supplier + category
 remove properties after import
-product "full_name" in views
-order vat
-remove vat from basket
-delete / add (ero värit)

metadata

@@ -1,271 +1,231 @@
 --- !ruby/object:Gem::Specification
 name: office_clerk
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Torsten Rüger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: opal-rails
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: opal-jquery
+  name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-ui-rails
+  name: gon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: kramdown
+  name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: simple_form
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: will_paginate-bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: barby
-  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: chunky_png
-  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: prawn
-  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'
-description: Backend of rubyclerks
+description: Rubyclerks is a small buisness management solution, including an online
+  presence (shop), but also POS, inventory and more.
 email:
 - torsten@villataika.fi
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .rubocop.yml
+- .travis.yml
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - app/assets/images/alpha.png
@@ -290,7 +250,7 @@ files:
 - app/assets/images/ui-anim_basic_16x16.gif
 - app/assets/images/up-icon.png
 - app/assets/javascripts/office_clerk.js
-- app/assets/stylesheets/office_clerk.scss
+- app/assets/stylesheets/office_clerk.css.scss
 - app/controllers/admin_controller.rb
 - app/controllers/baskets_controller.rb
 - app/controllers/categories_controller.rb
@@ -312,6 +272,7 @@ files:
 - app/helpers/purchases_helper.rb
 - app/helpers/shop_helper.rb
 - app/helpers/suppliers_helper.rb
+- app/mailers/order_mailer.rb
 - app/models/basket.rb
 - app/models/category.rb
 - app/models/clerk.rb
@@ -339,8 +300,13 @@ files:
 - app/views/layouts/_header_extra.haml
 - app/views/layouts/_messages.html.haml
 - 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/cancel.html.haml
+- app/views/order_mailer/confirm.html.haml
+- app/views/order_mailer/paid.html.haml
+- app/views/order_mailer/shipped.html.haml
 - app/views/orders/edit.html.haml
 - app/views/orders/index.html.haml
 - app/views/orders/ship.haml
@@ -357,6 +323,7 @@ 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
@@ -375,11 +342,8 @@ 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/simple_form.rb
-- config/initializers/simple_form_bootstrap.rb
 - config/initializers/wrap_parameters.rb
 - config/locales/config.yml
 - config/locales/en.yml
@@ -394,7 +358,6 @@ files:
 - db/migrate/20131226151151_purchases.rb
 - db/migrate/20131226151332_products.rb
 - db/schema.rb
-- db/seeds.rb
 - lib/office_clerk.rb
 - lib/office_clerk/engine.rb
 - lib/office_clerk/shipping_method.rb
@@ -440,6 +403,7 @@ files:
 - spec/features/purchases_spec.rb
 - spec/features/sessions_spec.rb
 - spec/features/suppliers_spec.rb
+- spec/mailers/order_mailer_spec.rb
 - spec/models/baskets/inventory_spec.rb
 - spec/models/baskets/items_spec.rb
 - spec/models/baskets/products_spec.rb
@@ -462,14 +426,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/factory_girl.rb
 - spec/support/request_helper.rb
-- test/fixtures/baskets.yml
-- test/fixtures/categories.yml
-- test/fixtures/clerks.yml
-- test/fixtures/items.yml
-- test/fixtures/orders.yml
-- test/fixtures/products.yml
-- test/fixtures/purchases.yml
-- test/fixtures/suppliers.yml
 - test_app/README.rdoc
 - test_app/app/assets/javascripts/application.js
 - test_app/app/assets/stylesheets/application.css
@@ -514,7 +470,7 @@ files:
 - test_app/spec/rails_helper.rb
 - test_app/spec/spec_helper.rb
 - todo
-homepage: https://github.com/ruby_clerks/office_clerk
+homepage: https://github.com/rubyclerks/office_clerk
 licenses:
 - MIT
 metadata: {}
@@ -524,21 +480,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Backend of rubyclerks
+summary: Backend of rubyclerks, a simple way to manage a buisness
 test_files:
 - spec/controllers/baskets_controller_spec.rb
 - spec/controllers/categories_controller_spec.rb
@@ -571,6 +527,7 @@ test_files:
 - spec/features/purchases_spec.rb
 - spec/features/sessions_spec.rb
 - spec/features/suppliers_spec.rb
+- spec/mailers/order_mailer_spec.rb
 - spec/models/baskets/inventory_spec.rb
 - spec/models/baskets/items_spec.rb
 - spec/models/baskets/products_spec.rb