office_clerk 0.9 → 1.0.0

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

@@ -8,5 +8,5 @@
             -next unless product
             %td= image_tag product.main_picture.url(:thumb)
             %td
-              = link_to office.product_path(product), :title => t(:show) , :class => product.online && "online" do
+              = link_to product_path(product), :title => t(:show) , :class => product.online && "online" do
                 = product.full_name

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

@@ -1,6 +1,7 @@
+.product_edit_start
 = render "head"
-- url = @product.persisted? ? office.product_path(@product) : office.products_path
-= bootstrap_form_for(@product, :html => { :multipart => true , :role=>"form"} , :url => url) do |f|
+- url = @product.persisted? ? product_path(@product) : products_path
+= bootstrap_form_for(@product, :html => { :multipart => true , :role=>"form"} ) do |f|
   = f.hidden_field( :product_id) if @product.product_id
   .row
     .col-md-8
@@ -42,6 +43,7 @@
         .col-md-8
           = f.submit :class => "btn btn-success"
           -if @product.product_id
-            = link_to t(:cancel), office.product_path(@product.product), :class => "btn btn-warning"
+            = link_to t(:cancel), product_path(@product.product), :class => "btn btn-warning"
           -else
-            = link_to t(:cancel), office.products_path, :class => "btn btn-warning"
+            = link_to t(:cancel), products_path, :class => "btn btn-warning"
+.product_edit_end

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

@@ -1,4 +1,4 @@
-.row
+.row.product_index_start
   .col-md-9.products
     .row
       .col-md-10
@@ -12,7 +12,7 @@
             = t(:products)
           = paginate @products
       .col-md-2
-        = link_to  t(:new) + ' ' + t(:product) , office.new_product_path , :class => "btn btn-primary"
+        = link_to  t(:new) + ' ' + t(:product) , new_product_path , :class => "btn btn-primary"
   .col-md-3
     = image_tag "office_clerk/products.jpg" , :class => "img-responsive"
 
@@ -37,27 +37,28 @@
                 = @product_scope.length.to_s + " " + t(:products)
         %tbody
           - @products.each do |product|
-          -next if params[:basket] and product.line?
-            %tr{:class => "line-#{cycle("1","2")}"}
-              %td.image= image_tag product.main_picture.url(:thumb)
-              %td.ean= product.line? ? "#{product.products.length} #{t(:items)}" : product.ean
-              %td.name
-                = link_to office.product_path(product), :title => t(:show) , :class => product.online && "online" do
-                  =product.full_name
-              %td.price.text-right=euros(product.price)
-              %td.price.text-right=euros(product.cost)
-              %td.supplier
-                =product.supplier.supplier_name if product.supplier
-                %br
-                =product.category.name if product.category
-              %td.inventory=product.inventory
-              -if params[:basket]
-                %td= link_to t(:add_to_basket) , office.edit_basket_path(:id => params[:basket] , :add => product.id)
-              -else
-                %td= link_to t(:edit) ,office.edit_product_path(product), :title => t(:edit)
+            -next if params[:basket] and product.line?
+            - cache(product.cache_key + ":" + params[:basket].to_s) do
+              %tr{:class => "line-#{cycle("1","2")}"}
+                %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) , :class => product.online && "online" do
+                    =product.full_name
+                %td.price.text-right=euros(product.price)
+                %td.price.text-right=euros(product.cost)
+                %td.supplier
+                  =product.supplier.supplier_name if product.supplier
+                  %br
+                  =product.category.name if product.category
+                %td.inventory=product.inventory
+                -if params[:basket]
+                  %td= link_to t(:add_to_basket) , edit_basket_path(:id => params[:basket] , :add => product.id)
+                -else
+                  %td= link_to t(:edit) ,edit_product_path(product), :title => t(:edit)
     = paginate @products
   .col-md-3
-    = search_form_for @q, :url => office.search_products_path, :html => { :class => "form-horizontal" }, :method => :get do |f|
+    = search_form_for @q, :html => { :class => "form-horizontal" }, :method => :get do |f|
       .form-group
         .input-group
           - if params[:basket]
@@ -115,4 +116,5 @@
         .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), office.products_path, :class => "btn btn-warning"
+      = link_to  t(:cancel), products_path, :class => "btn btn-warning"
+.product_index_end

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

@@ -1,3 +1,4 @@
+.product_show_start
 = render "head"
 
 -if @product.line?
@@ -21,55 +22,56 @@
       .col-md-6
         %p
           %b= t(:price) + " : "
-          = in_place @product , :price , :display_with => :best_euros , :url => office.product_path(@product)
+          = in_place @product , :price , :display_with => :best_euros
         %p
           %b= t(:cost) + " : "
-          = in_place @product , :cost , :display_with => :best_euros , :url => office.product_path(@product)
+          = in_place @product , :cost , :display_with => :best_euros
         %p
           %b= t(:category) + " : "
-          = link_to @product.category.name , office.category_path(@product.category) if @product.category
+          = link_to @product.category.name , category_path(@product.category) if @product.category
         %p
           %b= t(:link) + " : "
           = @product.link
         %p
           %b= t(:ean) + " : "
-          = in_place @product , :ean , :url => office.product_path(@product)
+          = in_place @product , :ean
       .col-md-6
         %p
           %b= t(:weight) + " : "
-          = in_place @product , :weight , :url => office.product_path(@product)
+          = in_place @product , :weight
         %p
           %b= t(:inventory) + " : "
           = @product.inventory
         %p
           %b= t(:stock_level) + " : "
-          = in_place @product , :stock_level , :url => office.product_path(@product)
+          = in_place @product , :stock_level
         %p
           %b= t(:supplier) + " : "
           = link_to @product.supplier.supplier_name ,supplier_path(@product.supplier) if @product.supplier
         %p
           %b= t(:scode) + " : "
-          = in_place @product , :scode , :url => office.product_path(@product)
+          = in_place @product , :scode
         %p
           %b= t(:tax_percent) + " : "
-          = in_place @product , :tax , :url => office.product_path(@product)
+          = in_place @product , :tax
   .col-md-4
     %p
       %b= t(:summary) + " : "
-      = in_place @product , :summary , :url => office.product_path(@product)
+      = in_place @product , :summary
     %p
       %b= t(:description) + " : "
-      = in_place @product , :description , :as => :textarea , :url => office.product_path(@product)
+      = in_place @product , :description , :as => :textarea
   .col-md-4
     =render :partial => "products/preview_box" , :locals => {:product => @product}
     = markdown @product.description
 %br
 .row.product_show_row_buttons
   .col-md-2
-    = link_to t(:edit), office.edit_product_path(@product), :class => "btn btn-success"
+    = link_to t(:edit), edit_product_path(@product), :class => "btn btn-success"
   .col-md-2
-    = link_to t(:delete) , office.product_path(@product), :method => :delete , :class => "btn btn-danger", :data => {  :confirm => t(:are_you_sure )}
+    = link_to t(:delete) , product_path(@product), :method => :delete , :class => "btn btn-danger", :data => {  :confirm => t(:are_you_sure )}
   -unless @product.product_item?
     .col-md-2
-      = link_to t(:new_item) , office.new_product_path( :parent_id => @product.id), :class => "btn btn-primary"
+      = link_to t(:new_item) , new_product_path( :parent_id => @product.id), :class => "btn btn-primary"
   .col-md-6.product_show_row_end
+.product_show_end

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

@@ -1,11 +1,11 @@
-.row
+.row.purchase_index_start
   .col-md-9.purchases
     .row
       .col-md-10
         %h2= t(:purchases)
         = paginate @purchases
       .col-md-2
-        = link_to  t(:new) + ' ' + t(:purchase) , office.new_purchase_path , :class => "btn btn-primary new_purchase"
+        = link_to  t(:new) + ' ' + t(:purchase) , new_purchase_path , :class => "btn btn-primary new_purchase"
   .col-md-3
     = image_tag "office_clerk/purchases.jpg" , :class => "img-responsive"
 .row
@@ -27,13 +27,13 @@
               %td= date(purchase.ordered_on)
               %td= date(purchase.received_on)
               %td= purchase.basket.items.length
-              %td= link_to euros(purchase.basket.total_price) , office.basket_path(purchase.basket)
-              %td= link_to t(:show) , office.purchase_path(purchase), :title => t(:show)
+              %td= link_to euros(purchase.basket.total_price) , basket_path(purchase.basket)
+              %td= link_to t(:show) , purchase_path(purchase), :title => t(:show)
       .btn-toolbar
         .btn-group
           = paginate @purchases
   .col-md-3
-    = search_form_for @q, :url => office.search_purchases_path, :html => { :class => "form-horizontal" }, :method => :get do |f|
+    = search_form_for @q, :html => { :class => "form-horizontal" }, :method => :get do |f|
       .form-group
         = f.text_field :name_cont , :class => "form-control" , :placeholder =>  t(:name)
       .row
@@ -54,4 +54,5 @@
           = f.text_field :received_on_lt , :class => "form-control datepicker"
       %br
       = f.submit t(:filter),  :id => :filter , :class => "btn btn-success"
-      = link_to  t(:cancel), office.purchases_path, :class => "btn btn-warning"
+      = link_to  t(:cancel), purchases_path, :class => "btn btn-warning"
+.purchase_index_end

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

@@ -1,9 +1,9 @@
-.row
+.row.purchase_show_start
   %h2
     = t(:purchase)
   %p
     %b= t(:name)
-    = in_place @purchase , :name , :url => office.purchases_path(@purchase)
+    = in_place @purchase , :name
 .row
   .col-md-3
     %p
@@ -12,7 +12,7 @@
         -if @purchase.ordered_on
           = date(@purchase.ordered_on)
         -else
-          = link_to t(:order) , office.order_purchase_path(@purchase) , :class => "btn btn-primary order_link"
+          = link_to t(:order) , order_purchase_path(@purchase) , :class => "btn btn-primary order_link"
   .col-md-3
     %p
       %b
@@ -20,7 +20,7 @@
         -if @purchase.received_on
           = date(@purchase.received_on)
         -else
-          = link_to t(:receive) , office.receive_purchase_path(@purchase) , :class => "btn btn-primary receive_link"
+          = link_to t(:receive) , receive_purchase_path(@purchase) , :class => "btn btn-primary receive_link"
   .col-md-6
     %p
       %b
@@ -33,17 +33,18 @@
   .col-md-5
     %b= t(:order_actions)
     %br
-    = link_to t(:edit), office.edit_basket_path(@purchase.basket), :class => "btn btn-info edit_basket" unless @purchase.basket.locked?
+    = link_to t(:edit), edit_basket_path(@purchase.basket), :class => "btn btn-info edit_basket" unless @purchase.basket.locked?
     \ 
-    = link_to t(:back), office.purchases_path, :class => "btn btn-warning"
+    = link_to t(:back), purchases_path, :class => "btn btn-warning"
 
 -unless @purchase.received_on
   %h3{"style" => "color:red"}
     = t(:inventory)
     %br
-    = link_to t(:inventory) , office.inventory_purchase_path(@purchase) , :class => "btn btn-primary btn-danger inventory_link", :data => { :confirm => t(:are_you_sure) }
+    = link_to t(:inventory) , inventory_purchase_path(@purchase) , :class => "btn btn-primary btn-danger inventory_link", :data => { :confirm => t(:are_you_sure) }
 
 .row
   %br
   .col-md-12
     .purchase_show_last
+.purchase_show_end

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

@@ -1,10 +1,11 @@
-%h2
+%h2.suppliers_edit_start
   = t params["action"]
   = t(:supplier)
-= bootstrap_form_for(@supplier, :url => office.suppliers_path) do |f|
+= bootstrap_form_for(@supplier) do |f|
   .row
     = f.text_field :supplier_name
     = render "addresses/form_fields" ,:f => f
   .form-actions
     = f.submit :class => "btn btn-success"
-    = link_to t(:back), office.suppliers_path, :class => "btn btn-warning"
+    = link_to t(:back), suppliers_path, :class => "btn btn-warning"
+.suppliers_edit_end

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

@@ -1,11 +1,11 @@
-.row
+.row.suppliers_index_start
   .col-md-9.suppliers
     .row
       .col-md-10
         %h2= t(:suppliers)
         = paginate @suppliers
       .col-md-2
-        = link_to  t(:new) + ' ' + t(:supplier) , office.new_supplier_path , :class => "btn btn-primary"
+        = link_to  t(:new) + ' ' + t(:supplier) , new_supplier_path , :class => "btn btn-primary"
   .col-md-3
     = image_tag "office_clerk/suppliers.jpg" , :class => "img-responsive"
 .row
@@ -26,14 +26,15 @@
               %td.name=supplier.supplier_name
               %td=supplier.products.count
               %td=supplier.whole_address
-              %td= link_to t(:show) , office.supplier_path(supplier), :title => t(:show)
-              %td= link_to t(:edit) , office.edit_supplier_path(supplier), :title => t(:edit)
+              %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 => office.search_suppliers_path, :html => { :class => "form-horizontal" }, :method => :get do |f|
+    = search_form_for @q, :html => { :class => "form-horizontal" }, :method => :get do |f|
       .form-group
         = f.text_field :supplier_name_cont , :class => "form-control", :placeholder =>  t(:name)
       .form-group
         = 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), office.suppliers_path, :class => "btn btn-warning"
+      = link_to  t(:cancel), suppliers_path, :class => "btn btn-warning"
+.suppliers_index_end

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

@@ -1,4 +1,4 @@
-%h2
+%h2.suppliers_show_start
   = t(:supplier) + " : " +  @supplier.supplier_name
 
 .col-md-6
@@ -20,7 +20,8 @@
     %b
       = t(:country) + " : " + @supplier.country.to_s
 
-= link_to t(:edit), office.edit_supplier_path(@supplier), :class => "btn btn-success"
-= link_to t(:back), office.suppliers_path, :class => "btn btn-warning"
+= link_to t(:edit), edit_supplier_path(@supplier), :class => "btn btn-success"
+= link_to t(:back), suppliers_path, :class => "btn btn-warning"
 
 =render "products/triple" , :products => @supplier.products.no_items
+.suppliers_show_end

data/bin/rails

@@ -1,4 +1,12 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../test_app/config/application',  __FILE__)
-require_relative '../test_app/config/boot'
-require 'rails/commands'
+# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/office_clerk/engine', __FILE__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/config/locales/en.yml

@@ -149,7 +149,7 @@ en:
   ordered: Ordered
   ordered_on: Ordered On
   orders: Orders
-  paid: Paid
+  pay: Pay
   paid_on: Paid on
   password: Password
   payment_info: Payment info

data/config/locales/fi.yml

@@ -149,7 +149,7 @@ fi:
   ordered: Tilattu
   ordered_on: Tilauspäivä
   orders: Tilaukset
-  paid: Maksa
+  pay: Maksa
   paid_on: Maksettu
   password: Salasana
   payment_info: Maksukoodi

data/db/migrate/20131226144316_baskets.rb

@@ -3,8 +3,8 @@ class Baskets < ActiveRecord::Migration
     create_table :baskets do |t|
       t.integer     :kori_id
       t.string      :kori_type
-      t.decimal     :total_price , :default => 0.0
-      t.decimal     :total_tax ,   :default => 0.0
+      t.decimal     :total_price , :default => 0.0, precision: 10, scale: 4
+      t.decimal     :total_tax ,   :default => 0.0, precision: 10, scale: 4
       t.date        :locked
       t.timestamps
     end

data/db/schema.rb

@@ -16,8 +16,8 @@ ActiveRecord::Schema.define(version: 20131226151332) do
   create_table "baskets", force: true do |t|
     t.integer  "kori_id"
     t.string   "kori_type"
-    t.decimal  "total_price", default: 0.0
-    t.decimal  "total_tax",   default: 0.0
+    t.decimal  "total_price", default: 0.0, precision: 10, scale: 4
+    t.decimal  "total_tax",   default: 0.0, precision: 10, scale: 4
     t.date     "locked"
     t.datetime "created_at"
     t.datetime "updated_at"

data/lib/office_clerk/engine.rb

@@ -7,9 +7,6 @@ module OfficeClerk
     config.autoload_paths += %W(#{config.root}/lib)
 #    config.assets.paths +=
     config.exceptions_app = self.routes
-    initializer "office_clerk.assets.precompile" do |app|
-      app.config.assets.precompile += %w(office_clerk.css office_clerk.js)
-    end
 
     config.i18n.enforce_available_locales = false
     config.i18n.available_locales = [:fi , :en , :config]
@@ -18,6 +15,9 @@ module OfficeClerk
     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.assets.precompile += %w( office_clerk.css office_clerk.js  )
+    config.assets.precompile += %w( office_clerk/*.jpg  up-icon.png down-icon.png )
+    config.assets.precompile += ["missing_thumb.png", "missing.png", "missing_list.png", "missing_product.png"]
 
     # have to init the BestInPlace first to be able to include helpers
     config.railties_order = [BestInPlace::Railtie , OfficeClerk::Engine  , :all  ]

data/lib/office_clerk/version.rb

@@ -1,3 +1,3 @@
 module OfficeClerk
-  VERSION = "0.9"
+  VERSION = "1.0.0"
 end

data/test_app/app/controllers/application_controller.rb

@@ -1,5 +1,5 @@
 class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
+  protect_from_forgery with: :reset_session
 end

data/test_app/config/application.rb

@@ -27,5 +27,8 @@ module TestApp
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
     config.active_record.raise_in_transactional_callbacks = true
+
+    # apperently disk just keeps growing, this clears out :-)
+    config.cache_store = :memory_store
   end
 end

data/test_app/config/initializers/assets.rb

@@ -8,4 +8,6 @@ Rails.application.config.assets.version = '1.0'
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )
+Rails.application.config.assets.precompile += %w( office_clerk.css office_clerk.js  )
+Rails.application.config.assets.precompile += %w( office_clerk/*.jpg  up-icon.png down-icon.png )
+Rails.application.config.assets.precompile += ["missing_thumb.png", "missing.png", "missing_list.png", "missing_product.png"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: office_clerk
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: 1.0.0
 platform: ruby
 authors:
 - Torsten Rüger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -358,6 +358,8 @@ files:
 - app/views/order_mailer/confirm.text.erb
 - app/views/order_mailer/paid.text.erb
 - app/views/order_mailer/shipped.text.erb
+- app/views/orders/_payment.html.haml
+- app/views/orders/_shipment.html.haml
 - app/views/orders/index.csv.erb
 - app/views/orders/index.html.haml
 - app/views/orders/shipment.haml
@@ -389,14 +391,7 @@ files:
 - config/environments/production.rb
 - config/environments/test.rb
 - config/i18n-tasks.yml
-- 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/paperclip.rb
-- config/initializers/session_store.rb
-- config/initializers/wrap_parameters.rb
 - config/locales/config.yml
 - config/locales/en.yml
 - config/locales/fi.yml