office_clerk 0.9 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5a250e67581a19d766fe34f4a709767f98009a9
-  data.tar.gz: e3e194b64e268b120c6c2fa8d7717f994e829f29
+  metadata.gz: cf0d4457645c4d6b2b0b86b7fd46a8fdcf853a81
+  data.tar.gz: e8da9e8951cbdf8e609c4ccd3631b6aed885a478
 SHA512:
-  metadata.gz: fbab3c7fc0c5bdf018d17ed4175503457ce388c28d6237a51f589dc0639d3db1e57c794af46bb61d6b6ae0a9e548a425d15f055f4b9dff897717adb51683d5e8
-  data.tar.gz: 0ed90018649cf76d4eda077d5bc142526fdce061ada06423c7d5e08d49997036e16b7dad61b071b968709e0732445456cd7e1960ebc10238e41185519a841304
+  metadata.gz: 8eb6449dfcac5d356bb83d374e240bd52a5b3771860d18b60bddf5a7c750dfa7aba8d50829cb9aed0e0c5d7aeb4131d03fc251ddb552fa2a468b0a848d9b1968
+  data.tar.gz: 639b75f7698851d0907f37eb8a2e684f60852010585eb51506d53f07c30559cf98bbafa5eda6bd1e6b323d24f2706d5998f83a5733f89f4e92c6bd26f74d0f4d

data/.travis.yml

@@ -8,3 +8,5 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.4
+  - 2.2.3
+  

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    office_clerk (0.9)
+    office_clerk (1.0.0)
       bcrypt-ruby (~> 3.1)
       best_in_place (~> 3.0)
       bootstrap-sass (~> 3.1)
@@ -99,9 +99,9 @@ GEM
     codeclimate-test-reporter (0.4.1)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
-    coffee-rails (4.1.0)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.1.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -234,7 +234,7 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    rails-i18n (4.0.7)
+    rails-i18n (4.0.8)
       i18n (~> 0.7)
       railties (~> 4.0)
     railties (4.2.5)
@@ -254,7 +254,7 @@ GEM
       ffi (>= 0.5.0)
     rb-readline (0.5.1)
     ref (1.0.5)
-    request_store (1.2.1)
+    request_store (1.3.0)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -292,10 +292,10 @@ GEM
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets-rails (3.0.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.3.10)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
@@ -306,7 +306,7 @@ GEM
     thor (0.19.1)
     thread (0.1.4)
     thread_safe (0.3.5)
-    tilt (2.0.1)
+    tilt (2.0.2)
     timers (4.0.4)
       hitimes
     tins (1.3.3)
@@ -318,7 +318,7 @@ GEM
     valid_email (0.0.11)
       activemodel
       mail (~> 2.6.1)
-    will_paginate (3.0.7)
+    will_paginate (3.1.0)
     will_paginate-bootstrap (1.0.1)
       will_paginate (>= 3.0.3)
     xpath (2.0.0)

data/README.md

@@ -10,20 +10,25 @@ Office Clerk is the back office helper, your accountant, storage manager, secret
 
 ####  Status
 
-In production for 2 sites. Work continues on refinements. That could qualify for 1.0 but i'll wait a few months. 
+Version 1.0.0 (beginning 2016) In production for 2 years on sites with less than 10000 orders a year.
 
 ### Other clerks
 
-The original plan (as per web-site) is being implemented: several extension "clerk" will be optional. Some are ready (one not)
+The original plan has been implemented: several extension "clerk" will be optional.
+Below a list of what is available, and off course you should write your own.
 
 ### AccountantClerk
 
-This currenly does graphical sales reports. Purchase order creation is planned.
+This currently does graphical sales reports. Purchase order creation is planned.
 
 ### Print Clerk
 
 A invoice generator. Also barcode generation and receipt printing (for POS use).
 
+### Stripe Clerk
+
+Stripe Payment engine. (Only for client, ie shop)
+
 ### Sales Clerk
 
 We have a shop [online](http://auringostaitaan.fi/), the best way to get started is to clone [it](https://github.com/rubyclerks/sales_clerk).
@@ -34,7 +39,7 @@ The easy way (tryout or new project):
 
 - clone sales_clerk
 - bundle and migrate it
-- change the git/config 
+- change the git/config
 - start editing
 
 The longer route, adding to existing project
@@ -45,17 +50,30 @@ The longer route, adding to existing project
 
 ### Further
 
-If you got this far and still have question , mail me, or mail the [list](https://groups.google.com/forum/#!forum/rubyclerks)
-
-Check the [User Guide](http://rubyclerks.org/user_guide/01_index.html), 
+Check the [User Guide](http://rubyclerks.org/user_guide/01_index.html),
 then the [Developer Guide](http://rubyclerks.org/developer_guide/01_index.html).
 
+If you got this far and still have question , mail me, or mail the [list](https://groups.google.com/forum/#!forum/rubyclerks)
+
 Fill issues if you find, or discuss with me for ideas.
 
+### Release strategy
+
+One of the things that got me started on this project was the effort i spent to keep up with
+releases. I think for a working system one should not have to spend great effort just to keep it
+working. In other words, i will try and resist change on the core.
+
+1. patch releases will require no changes, should be safe to upgrade any time
+2. minor releases may include html changes and possibly migrations that add things.
+3. Only mayor releases would need actual non trivial work to upgrade. I am not looking for one of
+  those in the foreseeable future, stability is key.   
+
+That may sound a bit pragmatic and it is. But it applies to the core only. I do encourage you to
+write extensions and am happy to add decent extensions to the organisation.
+
 ### Similar Projects
 
  * "Spree":http:spreecommerce.com , the grandfather of the rails ecommerce has grown big and mighty
  * "Ror-e":http://ror-e.com/ has some nice purchase features, and did great work to standardise rails usage
  * "MarketStreet":https://github.com/alex-nexus/market_street/ has taken the ball from ror-e and is running strong with an impressive list of goals
  * "TryShoppe":http://tryshoppe.com/ is new and lightweight. Very nice looking interface.
- 

data/Rakefile

@@ -1,9 +1,9 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../test_app/config/application', __FILE__)
+Bundler::GemHelper.install_tasks
 
-require 'bundler/gem_tasks'
+require File.expand_path('../test_app/config/application', __FILE__)
 
 TestApp::Application.load_tasks
 

data/app/controllers/admin_controller.rb

@@ -6,15 +6,11 @@ class AdminController < OfficeController
   before_filter :clean_search , :only => [:index , :search]
 
   before_filter :require_admin
-  
+
   def require_admin
     clerk = current_clerk
     return if clerk and clerk.admin
-    redirect_to sign_in
-  end
-
-  def sign_in
-    has_ssl? ? sign_in_path(:protocol => :https) : sign_in_url
+    redirect_to sign_in_url
   end
 
   def clean_search

data/app/controllers/baskets_controller.rb

@@ -98,7 +98,7 @@ class BasketsController < AdminController
         return
       end
     end
-    redirect_to office.basket_path(@basket)
+    redirect_to office.edit_basket_path(@basket)
   end
 
   def edit
@@ -146,7 +146,7 @@ class BasketsController < AdminController
   def redirect_if_locked
     if @basket.locked?
       flash.notice = t('basket_locked')
-      redirect_to :action => :show
+      redirect_to basket_path(@basket)
       return true
     end
     return false

data/app/controllers/office_controller.rb

@@ -3,6 +3,7 @@ class OfficeController < ApplicationController
   helper OfficeHelper
   include OfficeHelper
 
+  helper  OfficeClerk::Engine.routes.url_helpers
   include OfficeClerk::Engine.routes.url_helpers
 
   def error

data/app/controllers/orders_controller.rb

@@ -31,7 +31,7 @@ class OrdersController < AdminController
     mail = eval("OrderMailer.#{action}(@order)")
     mail.deliver
     flash.notice = "Sent #{action}"
-    redirect_to :action => :show
+    redirect_to order_path(@order)
   end
   def pay
     @order.pay_now

data/app/controllers/sessions_controller.rb

@@ -10,12 +10,12 @@ class SessionsController < OfficeController
     if clerk && clerk.valid_password?(params[:password])
       session[:clerk_email] = clerk.email
       if clerk.admin
-         redirect_to baskets_url , :notice => I18n.t(:signed_in)
-       else
-         redirect_after_sign_up
-       end
+        redirect_to baskets_url , :notice => I18n.t(:signed_in)
+      else
+        redirect_after_sign_up
+      end
     else
-      redirect_to :sign_in , :notice => I18n.t(:sign_in_invalid)
+      redirect_to sign_in_url , :notice => I18n.t(:sign_in_invalid)
     end
   end
 

data/app/helpers/office_helper.rb

@@ -70,26 +70,7 @@ module OfficeHelper
   def paginate(collection , options = {})
     #options = options.merge defaults
     options[:renderer] = BootstrapPagination::Rails
-    options[:params] = { :url_scope => :office }
     will_paginate collection, options
   end
 
 end
-
-require "bootstrap_pagination/version"
-
-BootstrapPagination::Rails.class_eval do
-  def url(page)
-    @base_url_params ||= begin
-      url_params = merge_get_params(default_url_params)
-      url_params[:only_path] = true
-      merge_optional_params(url_params)
-    end
-
-    url_params = @base_url_params.dup
-    add_current_page_param(url_params, page)
-
-    OfficeClerk::Engine.routes.url_for(url_params)
-  end
-
-end

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

@@ -19,5 +19,5 @@
 %p
   %b
     = t(:country) + " : " + @address.country
-= link_to t(:edit), office.edit_address_path(@address), :class => "btn btn-success"
-= link_to t(:back), office.addresses_path, :class => "btn btn-warning"
+= link_to t(:edit), edit_address_path(@address), :class => "btn btn-success"
+= link_to t(:back), addresses_path, :class => "btn btn-warning"

data/app/views/baskets/_small.html.haml

@@ -10,7 +10,7 @@
       - basket.items.each do |item|
         %tr{:class => "line-#{cycle("1","2")}"}
           %td= image_tag item.product.main_picture.url(:thumb) if item.product
-          %td.name= link_to_if item.product, item.name , office.product_path(item.product)
+          %td.name= link_to_if item.product, item.name , product_path(item.product)
           %td= item.quantity
           %td= euros item.price
       %tr

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

@@ -1,4 +1,4 @@
-.row
+.row.basket_edit_start
   .col-md-12
     -if @basket.kori_type
       %h2
@@ -6,15 +6,15 @@
 .row
   .col-md-8.ean_form
     = label_tag :ean
-    = form_tag office.ean_basket_path(@basket)  do |f|
+    = form_tag ean_basket_path(@basket)  do |f|
       = text_field_tag :ean , "" , :autofocus => true , :class => "ean_field" , :size => 45
       = submit_tag t(:search) ,  :class => "btn btn-xs ean_submit"
   .col-md-3
     = t(:discount )
-    = form_tag office.edit_basket_path(@basket) , :method => :get do
-      = select_tag("discount" , options_for_select( ["",0,5,10,15,20,25,30,35,40,50,60,70] ), :onchange => "window.location.href='#{office.discount_basket_path(@basket)}?discount=' + this.value")
+    = form_tag edit_basket_path(@basket) , :method => :get do
+      = select_tag("discount" , options_for_select( ["",0,5,10,15,20,25,30,35,40,50,60,70] ), :onchange => "window.location.href='#{discount_basket_path(@basket)}?discount=' + this.value")
 .row
-  = form_for(@basket , :url => office.basket_path(@basket) ) do |f|
+  = form_for(@basket) do |f|
     %table.table.table-hover.table-condensed
       %thead
         %tr
@@ -33,10 +33,10 @@
               %td= iform.text_field :quantity , :label => false
               %td= iform.text_field :price , :label => false
             %td
-              = select_tag("discount" , options_for_select( [item.discount,0,5,10,15,20,25,30,35,40,50,60,70] ), :onchange => "window.location.href='#{office.discount_basket_path(@basket)}?item=#{item.id}&discount=' + this.value"  )
+              = select_tag("discount" , options_for_select( [item.discount,0,5,10,15,20,25,30,35,40,50,60,70] ), :onchange => "window.location.href='#{discount_basket_path(@basket)}?item=#{item.id}&discount=' + this.value"  )
             %td
-              = link_to t(:delete) , office.edit_basket_path(:delete => item.product.id)
-              = link_to t(:add) , office.edit_basket_path(:add => item.product.id)
+              = link_to t(:delete) , edit_basket_path(:delete => item.product.id)
+              = link_to t(:add) , edit_basket_path(:add => item.product.id)
 
         %tr
           %td{:colspan => 4}
@@ -53,23 +53,24 @@
         = f.submit :class => "btn btn-success commit"
       - if @basket.kori_type.blank? and not @basket.empty?
         .col-md-1
-          = link_to t(:make_order), office.order_basket_path(@basket), :class => "btn btn-primary make_order"
+          = link_to t(:make_order), order_basket_path(@basket), :class => "btn btn-primary make_order"
         .col-md-2
-          = link_to t(:make_purchase), office.purchase_basket_path(@basket), :class => "btn btn-primary make_purchase"
+          = link_to t(:make_purchase), purchase_basket_path(@basket), :class => "btn btn-primary make_purchase"
         .col-md-2
-          = link_to t(:checkout), office.checkout_basket_path(@basket) , :class => "btn btn-primary print_order"
+          = link_to t(:checkout), checkout_basket_path(@basket) , :class => "btn btn-primary print_order"
       - elsif @basket.isa(:order)
         .col-md-2
-          = link_to t(:to_order), office.order_path(@basket.kori), :class => "btn btn-primary to_order"
+          = link_to t(:to_order), order_path(@basket.kori), :class => "btn btn-primary to_order"
         .col-md-2
           - if has_receipt?
-            = link_to t("receipt.header"), office.receipt_order_path(@basket.kori), :class => "btn btn-primary print_order"
+            = link_to t("receipt.header"), receipt_order_path(@basket.kori), :class => "btn btn-primary print_order"
       - elsif @basket.isa(:purchase)
         .col-md-2
-          = link_to t(:to_purchase), office.purchase_path(@basket.kori), :class => "btn btn-primary to_purchase"
+          = link_to t(:to_purchase), purchase_path(@basket.kori), :class => "btn btn-primary to_purchase"
       .col-md-2
-        = link_to t(:destroy) , office.basket_path(@basket), :confirm => t(:are_you_sure ), :method => :delete, :title => t(:destroy) , :class => "btn btn-danger" unless @basket.locked? or @basket.kori
+        = link_to t(:destroy) , basket_path(@basket), :confirm => t(:are_you_sure ), :method => :delete, :title => t(:destroy) , :class => "btn btn-danger" unless @basket.locked? or @basket.kori
       .col-md-2
-        = link_to t(:nolla) , office.zero_basket_path(@basket), :class => "btn btn-danger" unless @basket.locked?
+        = link_to t(:nolla) , zero_basket_path(@basket), :class => "btn btn-danger" unless @basket.locked?
       .col-md-1
-        = link_to  t(:new) + ' ' + t(:basket) , office.new_basket_path , :class => "btn btn-primary"
+        = link_to  t(:new) + ' ' + t(:basket) , new_basket_path , :class => "btn btn-primary"
+.basket_edit_end

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

@@ -1,11 +1,11 @@
-.row
+.row.basket_index_start
   .col-md-9.baskets
     .row
       .col-md-10
         %h2= t(:baskets)
         = paginate @baskets
       .col-md-2
-        = link_to  t(:new) + ' ' + t(:basket) , office.new_basket_path , :class => "btn btn-primary"
+        = link_to  t(:new) + ' ' + t(:basket) , new_basket_path , :class => "btn btn-primary"
   .col-md-3
     = image_tag "office_clerk/baskets.jpg" , :class => "img-responsive"
 .row
@@ -22,28 +22,29 @@
                 = @basket_scope.length.to_s + " " + t("baskets")
         %tbody
           - @baskets.each do |basket|
-            %tr{:class => "line-#{cycle("1","2")}"}
-              %td
-                = date(basket.created_at.to_date)
-              %td
-                = euros basket.total_price
-              %td
-                - basket.items.each do |item| #should break at 5 and do the rest as tooltip
-                  = item.quantity
-                  x
-                  = item.name
-                  %br
-              %td= basket_edit_link(basket)
+            - cache(basket) do
+              %tr{:class => "line-#{cycle("1","2")}"}
+                %td
+                  = date(basket.created_at.to_date)
+                %td
+                  = euros basket.total_price
+                %td
+                  - basket.items.each do |item| #should break at 5 and do the rest as tooltip
+                    = item.quantity
+                    x
+                    = item.name
+                    %br
+                %td= basket_edit_link(basket)
     = paginate @baskets
   .col-md-3
-    = search_form_for @q, :url => office.search_baskets_path, :html => { :class => "form-horizontal" }, :method => :get do |f|
+    = search_form_for @q , :html => { :class => "form-horizontal" }, :method => :get do |f|
       .form-group.row
         .col-md-3
           = f.label(:type)
         .col-md-9
           = f.select :kori_type_eq, [["",""] , [t(:order) , "Order"] , [t(:purchase),"Purchase"]] , {},  :class => "form-control"
       .form-group
-        = f.text_field :items_product_name_or_items_product_product_name_cont , :class => "form-control" , :placeholder => t(:product) + " " +t(:name_contains)
+        = f.text_field :items_name_cont , :class => "form-control" , :placeholder => t(:product) + " " +t(:name_contains)
       .form-group.row
         .col-md-4
           = f.label(:total_price)
@@ -60,4 +61,5 @@
         .form-group.col-md-4
           = f.search_field :created_at_lteq , :class => "form-control datepicker" , :value => sort_date(:created_at_lteq)
       = f.submit t(:filter), :class => "btn btn-success"
-      = link_to  t(:cancel), office.baskets_path, :class => "btn btn-warning"
+      = link_to  t(:cancel), baskets_path, :class => "btn btn-warning"
+.basket_index_end

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

@@ -1,4 +1,4 @@
-%h2
+%h2.basket_show_start
   = t(:basket) + " : "
   = t(:order) + " " + @basket.kori.number.to_s if @basket.isa(:order)
 .col-md-4
@@ -13,5 +13,5 @@
 = render "small" , :basket => @basket
 
 .col-md-12.basket_show_end
-  = link_to t(:back), office.orders_path, :class => "btn btn-warning"
-  = link_to t(:destroy) , office.basket_path(@basket), :data => { :confirm => t(:are_you_sure) }, :method => :delete, :title => t(:destroy) , :class => "btn btn-danger" if @basket.locked.blank?
+  = link_to t(:back), orders_path, :class => "btn btn-warning"
+  = link_to t(:destroy) , basket_path(@basket), :data => { :confirm => t(:are_you_sure) }, :method => :delete, :title => t(:destroy) , :class => "btn btn-danger" if @basket.locked.blank?

data/app/views/categories/_treeview.html.haml

@@ -1,5 +1,5 @@
 %li
-  = link_to "#{group.name} (#{group.products.length})" , office.category_path(group), :title => t(:edit) , :class => group.online && "online"
+  = link_to "#{group.name} (#{group.products.length})" , category_path(group), :title => t(:edit) , :class => group.online && "online"
   - ar = group.categories
   -if ar.length > 0
     %ul.subcat