office_clerk 0.1 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80c600db3f486aa78978af20f03c4db991244347
-  data.tar.gz: 44db9c4bae59fc5b10fdc97d13b9256ec78e53f0
+  metadata.gz: 5a2b4bc40578de23126465f66caf7875b16d756a
+  data.tar.gz: 0921190739bd31c9e5687fcdf9f2a3a82553d41b
 SHA512:
-  metadata.gz: 0f10654de1d7f3ab735d07d1f10491ec41f2482aaca8fe92933616f0974c9e9f530c38d0e3fc9074dc8a63a910e10c5187bcbf08666e4e43c3c5f4e47da8d9af
-  data.tar.gz: c8d865084809f8fdb68a70c497945bf0ba7d32faed891b103b48f2c4a88911a55ba3ebf22380af18b5a5d6e3b50022a964d5784e5a26fa4e1c6cd360a25e6b8d
+  metadata.gz: d2dd8a0e3fd11659919f9bdf9ef5e72428d285448d01ab8628d11af4cfbaa4ba0d0167c6c5dde2030dccb2f3f2426ed7da3b9bdd98a6ad762a0340daa475fc6c
+  data.tar.gz: c6c5bced0d3646e2b9e3810d84fef728c29340bd147c63fb6649b6e162b6208a25daaf2bbb06d29ea2db4b33f4fd7e94f378fbb1325792144b7c82335b0e7af1

data/.gitignore

@@ -4,11 +4,13 @@
 /vendor/ruby/
 
 # minimal Rails specific artifacts
-db/*.sqlite3
-/db/*.sqlite3-journal
+*.sqlite3
+*.sqlite3-journal
 /log/*
 /tmp/*
 .ruby-version
+test_app/tmp
+test_app/log
 
 # configuration file introduced in Rails 4.1
 /config/secrets.yml

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
-before_script:
-  - RAILS_ENV=test bundle exec rake db:schema:load
 script:
+  - RAILS_ENV=test bundle exec rake db:migrate
   - CODECLIMATE_REPO_TOKEN=3f97bb5305cd65f6683587a32b4b3eae42cfec26d3de56374b10b3efb78ccf6a bundle exec rspec
 rvm:
   - 1.9.3

data/Gemfile

@@ -1,21 +1,9 @@
 source 'https://rubygems.org'
 
-gemspec
+gem "office_clerk" , :path => "../"
 
-gem 'rails'
 gem 'sqlite3'
 
-# extensions, reporting, printing
-gem 'accountant_clerk' , github: "rubyclerks/accountant_clerk"
-#gem 'accountant_clerk' , path: "../accountant_clerk"
-
-gem 'print_clerk' , github: "rubyclerks/print_clerk"
-#gem 'print_clerk' , path: "../print_clerk"
-
-gem 'post_clerk' , github: "rubyclerks/post_clerk"
-#gem 'post_clerk' , path: "../post_clerk"
-
-
 # template
 gem "ransack", github: "activerecord-hackery/ransack", branch: "rails-4"
 
@@ -30,21 +18,13 @@ gem "rb-readline"
 gem 'uglifier', '>= 1.3.0'
 gem 'coffee-rails'
 
-#one wishes one would not need it. alas . . .
-gem 'rack-attack'
-
 group :development do
   gem 'better_errors' , :platforms=>[:mri_20, :mri_21, :rbx]
   gem 'binding_of_caller', :platforms=>[:mri_19, :mri_20, :mri_21,:rbx]
   gem "i18n-tasks"
   gem 'quiet_assets'
-  gem 'rails_layout'
 #  gem "jeweler", "> 1.6.4"
 end
-group :development, :test do
-  gem "spring"
-  gem "spring-commands-rspec"
-end
 group :test do
 #  gem "poltergeist"
 #  gem "phantomjs"
@@ -60,4 +40,3 @@ group :test do
   gem 'guard-rails'
   gem 'guard-rspec'
 end
-

data/Gemfile.lock

@@ -10,56 +10,33 @@ GIT
       i18n
       polyamorous (~> 1.1)
 
-GIT
-  remote: git://github.com/rubyclerks/accountant_clerk.git
-  revision: 180a37904680284caf2fe4d37c739f69fa76f621
-  specs:
-    accountant_clerk (0.2)
-      flot-rails (~> 0.0.6)
-      office_clerk (~> 0.1)
-
 GIT
   remote: git://github.com/rubyclerks/db_fixtures_dump.git
   revision: 2d00815c8cb4a9bf143564a8a1de082b6e30282c
   specs:
     db_fixtures_dump (0.0.9)
 
-GIT
-  remote: git://github.com/rubyclerks/post_clerk.git
-  revision: e8933edc2ecf62eed79417f7db92e5f5c1ace53e
-  specs:
-    post_clerk (0.4)
-      office_clerk (~> 0.1)
-
-GIT
-  remote: git://github.com/rubyclerks/print_clerk.git
-  revision: c73c5f7bcb7f0af73b37bc627fa2d0fa0faee6f0
-  specs:
-    print_clerk (0.2)
-      office_clerk (~> 0.1)
-
 PATH
-  remote: .
+  remote: ../
   specs:
-    office_clerk (0.1)
+    office_clerk (0.4)
       barby
-      bcrypt-ruby
-      bootstrap-sass (~> 3.1.0)
-      bootstrap_form
+      bcrypt-ruby (~> 3.1)
+      bootstrap-sass (~> 3.1)
+      bootstrap_form (~> 2.2)
       chunky_png
-      haml
-      jquery-rails
-      jquery-ui-rails
-      kramdown
-      paperclip
+      haml (~> 4.0)
+      jquery-ui-rails (~> 5.0)
+      kramdown (~> 1.5)
+      opal-jquery (~> 0.2)
+      opal-rails (~> 0.6)
+      paperclip (~> 4.1)
       prawn
-      rails (~> 4.0.1)
-      rails-i18n
-      sass-rails
-      simple_form
-      turbolinks
-      will_paginate
-      will_paginate-bootstrap
+      rails (~> 4.0, >= 4.0.1)
+      rails-i18n (~> 4.0)
+      sass-rails (~> 4.0)
+      simple_form (~> 3.0)
+      will_paginate-bootstrap (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -124,7 +101,7 @@ 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.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
     coffee-script (2.3.0)
@@ -151,10 +128,8 @@ GEM
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
     ffi (1.9.6)
-    flot-rails (0.0.6)
-      jquery-rails
     formatador (0.2.5)
-    guard (2.8.0)
+    guard (2.8.2)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
@@ -163,7 +138,7 @@ GEM
     guard-bundler (2.0.0)
       bundler (~> 1.0)
       guard (~> 2.2)
-    guard-rails (0.6.1)
+    guard-rails (0.7.0)
       guard (~> 2.0)
     guard-rspec (4.3.1)
       guard (~> 2.1)
@@ -197,7 +172,7 @@ GEM
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.3)
-    listen (2.7.11)
+    listen (2.7.12)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -206,11 +181,27 @@ GEM
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (2.4.3)
-    mini_portile (0.6.0)
+    mini_portile (0.6.1)
     minitest (4.7.5)
     multi_json (1.10.1)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
+    opal (0.6.2)
+      source_map
+      sprockets
+    opal-activesupport (0.0.5)
+      opal
+    opal-jquery (0.2.0)
+      opal (>= 0.5.0, < 1.0.0)
+    opal-rails (0.6.3)
+      jquery-rails
+      opal (~> 0.6.0)
+      opal-activesupport (>= 0.0.5)
+      opal-jquery (>= 0.1.0)
+      opal-rspec (~> 0.3.0.beta1)
+      rails (>= 3.2.13, < 5.0)
+    opal-rspec (0.3.0.beta3)
+      opal (>= 0.6.0, < 1.0.0)
     paperclip (4.2.0)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -229,8 +220,6 @@ GEM
     quiet_assets (1.0.3)
       railties (>= 3.1, < 5.0)
     rack (1.5.2)
-    rack-attack (4.2.0)
-      rack
     rack-test (0.6.2)
       rack (>= 1.0)
     rails (4.0.11)
@@ -244,7 +233,6 @@ GEM
     rails-i18n (4.0.3)
       i18n (~> 0.6)
       railties (~> 4.0)
-    rails_layout (1.0.23)
     railties (4.0.11)
       actionpack (= 4.0.11)
       activesupport (= 4.0.11)
@@ -291,9 +279,8 @@ GEM
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slop (3.6.0)
-    spring (1.1.3)
-    spring-commands-rspec (1.0.2)
-      spring (>= 0.9.1)
+    source_map (3.0.1)
+      json
     sprockets (2.11.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -318,8 +305,6 @@ GEM
       hitimes
     tins (1.3.3)
     ttfunk (1.4.0)
-    turbolinks (2.5.2)
-      coffee-rails
     tzinfo (0.3.42)
     uglifier (2.5.3)
       execjs (>= 0.3.0)
@@ -337,7 +322,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  accountant_clerk!
   better_errors
   binding_of_caller
   capybara
@@ -355,17 +339,10 @@ DEPENDENCIES
   i18n-tasks
   libv8 (= 3.16.14.3)
   office_clerk!
-  post_clerk!
-  print_clerk!
   quiet_assets
-  rack-attack
-  rails
-  rails_layout
   ransack!
   rb-readline
   rspec-rails
-  spring
-  spring-commands-rspec
   sqlite3
   therubyracer
   uglifier (>= 1.3.0)

data/Rakefile

@@ -1,6 +1,6 @@
 # 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 'i18n-spec/tasks'
-require File.expand_path('../config/application', __FILE__)
 
-OfficeClerk::Application.load_tasks
+require File.expand_path('../test_app/config/application', __FILE__)
+
+TestApp::Application.load_tasks

data/app/assets/javascripts/{admin.js → office_clerk.js}

@@ -1,8 +1,8 @@
 //= require jquery
 //= require jquery-ui
 //= require jquery-ui/datepicker-fi
-//= require jquery_ujs
-//= require turbolinks
+//= require opal
+//= require opal_ujs
 //= require bootstrap
 //= require_self
 

data/app/assets/stylesheets/{admin.css.scss → office_clerk.scss}

@@ -37,9 +37,7 @@ $tausta-bg: scale-color($primary-color, $lightness: 95%);
 a.online{
   color: green;
 }
-.navbar {
-  font-size: 1.7rem;
-};
+
 .alert-notice {
   background-color: #00FFEB;
   padding: 8px;
@@ -100,30 +98,30 @@ thead, tbody {  vertical-align: top;
 }
 
 .products{ 
-  background: image-url('admin/products-2.jpg') no-repeat;
+  background: image-url('office_clerk/products-2.jpg') no-repeat;
 }
 
 .baskets{ 
-  background: image-url('admin/baskets-2.jpg') no-repeat;
+  background: image-url('office_clerk/baskets-2.jpg') no-repeat;
 }
 
 .orders{ 
-  background: image-url('admin/orders-2.jpg') no-repeat;
+  background: image-url('office_clerk/orders-2.jpg') no-repeat;
 }
 
 .purchases{ 
-  background: image-url('admin/purchases-2.jpg') no-repeat;
+  background: image-url('office_clerk/purchases-2.jpg') no-repeat;
   height: 161px;
 }
 
 .categories{ 
-  background: image-url('admin/categories-2.jpg') no-repeat;
+  background: image-url('office_clerk/categories-2.jpg') no-repeat;
 }
 
 .suppliers{ 
-  background: image-url('admin/suppliers-2.jpg') no-repeat;
+  background: image-url('office_clerk/suppliers-2.jpg') no-repeat;
 }
 
 .clerks{ 
-  background: image-url('admin/clerks-2.jpg') no-repeat;
+  background: image-url('office_clerk/clerks-2.jpg') no-repeat;
 }

data/app/controllers/admin_controller.rb

@@ -1,7 +1,7 @@
 # encoding : utf-8
-class AdminController < ApplicationController
+class AdminController < OfficeController
 
-  layout "admin"
+  layout "office_clerk"
 
   before_filter :clean_search , :only => [:index , :search]
 

data/app/controllers/baskets_controller.rb

@@ -18,7 +18,12 @@ class BasketsController < AdminController
     order = @basket.kori || Order.new( :basket => @basket )
     order.pos_checkout( current_clerk.email )
     order.save!
-    redirect_to :action => :receipt , :controller => :orders , :id => order.id
+    styles = OfficeClerk.config(:print_styles)
+    if(styles && styles.split.include?("receipt"))
+      redirect_to receipt_order_path(order)
+    else
+      redirect_to order_path(order)
+    end
   end
 
   def show

data/app/controllers/{application_controller.rb → office_controller.rb}

@@ -1,8 +1,10 @@
-class ApplicationController < ActionController::Base
+class OfficeController < ApplicationController
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
   helper_method :current_clerk , :current_basket , :current_basket_or_nil
+  helper OfficeHelper
+  include OfficeClerk::Engine.routes.url_helpers
 
   # users are stored in the session by email
   # if user is not logged i , return nil

data/app/controllers/products_controller.rb

@@ -74,8 +74,6 @@ class ProductsController < AdminController
     if code.length == 12
       aBarcode =  ::Barby::EAN13.new( code )
     else
-      puts "product #{code}"
-      puts code.class
       aBarcode = ::Barby::Code128B.new( code  )
     end
     pdf = create_pdf

data/app/controllers/sessions_controller.rb

@@ -1,5 +1,5 @@
-class SessionsController < ApplicationController
-  layout "shop"
+class SessionsController < OfficeController
+  layout "sales_clerk"
 
   def sign_in
   end
@@ -8,7 +8,7 @@ class SessionsController < ApplicationController
     clerk = Clerk.where(:email => params[:email]).limit(1).first
     if clerk && clerk.valid_password?(params[:password])
       session[:clerk_email] = clerk.email
-      url = clerk.admin ?  baskets_url : root_url
+      url = clerk.admin ?  office.baskets_url : root_url
       redirect_to url , :notice => I18n.t(:signed_in)
     else
       redirect_to :sign_in , :notice => I18n.t(:sign_in_invalid)

data/app/controllers/shop_controller.rb

@@ -1,7 +1,7 @@
-class ShopController < ApplicationController
+class ShopController < OfficeController
   before_action :load
 
-  layout "shop"
+  layout "sales_clerk"
 
   def welcome
     @groups = Category.online.where( :category_id => nil )

data/app/helpers/{application_helper.rb → office_helper.rb}

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-module ApplicationHelper
+module OfficeHelper
   
   def markdown text
     return "" if text.blank?

data/app/helpers/orders_helper.rb

@@ -5,6 +5,6 @@ module OrdersHelper
     OfficeClerk.config(:print_styles).split
   end
   def print_path style
-    eval("#{style}_order_path(@order)")
+    eval("office.#{style}_order_path(@order)")
   end
 end

data/app/helpers/shop_helper.rb

@@ -1,6 +1,7 @@
 module ShopHelper
   def parents(group)
     parents = []
+    group = group.category
     while group
       parents << group
       group = group.category
@@ -14,4 +15,14 @@ module ShopHelper
     prods.delete(product)
     prods.sample(get)
   end
+
+  # a short version of a desciption text. now we use markdown and often have a bold "header"
+  # so if we find a bold we use just that, regardless of length given
+  # otherwise we try and find a space close to the given length, to avoid ugly half-words
+  def short text , len = 110
+    ind = text.index( "**" , 10)  || text.index( "**" , 10)
+    return text[0 .. ind + 1] if ind
+    ind = text.index(" " , len - 10)
+    ind ? text[0 .. ind + 1] : text[0 .. len +1]
+  end
 end

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

@@ -56,12 +56,12 @@
           = link_to t(:make_order), order_basket_path(@basket), :class => "btn btn-primary make_order"
         .col-md-2
           = link_to t(:make_purchase), purchase_basket_path(@basket), :class => "btn btn-primary make_purchase"
-        .col-md-2{"data-no-turbolink" => true}
+        .col-md-2
           = link_to t(:checkout), checkout_basket_path(@basket) , :target => "_blank" , :class => "btn btn-primary print_order"
       - elsif @basket.isa(:order)
         .col-md-2
           = link_to t(:to_order), order_path(@basket.kori), :class => "btn btn-primary to_order"
-        .col-md-2{"data-no-turbolink" => true}
+        .col-md-2
           = link_to t(:print_order), invoice_order_path(@basket.kori), :target => "_blank" , :class => "btn btn-primary print_order" , :target => "_blank"
       - elsif @basket.isa(:purchase)
         .col-md-2

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

@@ -5,9 +5,9 @@
         %h2= t(:baskets)
         = paginate @baskets
       .col-md-2
-        = link_to  t(:new) + ' ' + t(:basket) , new_basket_path , :class => "btn btn-primary"
+        = link_to  t(:new) + ' ' + t(:basket) , office.new_basket_path , :class => "btn btn-primary"
   .col-md-3
-    = image_tag "admin/baskets.jpg" , :class => "img-responsive"
+    = image_tag "office_clerk/baskets.jpg" , :class => "img-responsive"
 .row
   .col-md-9
     %div

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

@@ -12,7 +12,7 @@
 
 = render "small" , :basket => @basket
 
-.col-md-12{"data-no-turbolink" => true}
+.col-md-12
   = 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" unless @basket.kori_type
   = link_to t(:print_order), receipt_order_path(@basket.kori) , :target => "_blank" , :class => "btn btn-primary print_order" if @basket.isa(:order)

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

@@ -7,7 +7,7 @@
       .col-md-2
         = link_to  t(:new) + ' ' + t(:category) , new_category_path , :class => "btn btn-primary"
   .col-md-3
-    = image_tag "admin/categories.jpg" , :class => "img-responsive"
+    = image_tag "office_clerk/categories.jpg" , :class => "img-responsive"
 .row
   .col-md-9
     %div

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

@@ -7,7 +7,7 @@
       .col-md-2
         = link_to  t(:new) + ' ' + t(:clerk) , new_clerk_path , :class => "btn btn-primary"
   .col-md-3
-    = image_tag "admin/clerks.jpg" , :class => "img-responsive"
+    = image_tag "office_clerk/clerks.jpg" , :class => "img-responsive"
 .row
   .col-md-9
     %div

data/app/views/layouts/_header_extra.haml

@@ -0,0 +1,6 @@
+-# ::Rails::Engine.subclasses.map(&:instance) in 4.1
+-Rails::Application::Railties.engines.each do |e|
+  - name = e.engine_name.sub("clerk" , "office")
+  - next if name == e.engine_name
+  = stylesheet_link_tag name
+  = javascript_include_tag name

data/app/views/layouts/{admin.html.haml → office_clerk.haml}

@@ -4,8 +4,9 @@
     %meta{:charset => "utf-8"}/
     %title Office Clerk
     %meta{:content => "Office Clerk", :name => "description"}
-    = stylesheet_link_tag "admin"
-    = javascript_include_tag "admin"
+    = stylesheet_link_tag "office_clerk"
+    = javascript_include_tag "office_clerk"
+    = render "layouts/header_extra"
     = csrf_meta_tags
     = yield :head
   %body{:style => ""}

data/app/views/manage/_hash.haml

@@ -0,0 +1,7 @@
+- config.each do |key , value |
+  .col-md-2= key
+  .col-md-10
+    - if value.is_a? Hash
+      = render "hash" , :config => value
+    - else
+      = value

data/app/views/manage/all.haml

@@ -1,3 +1,8 @@
-Config
-
-link to report
+.row.manage_first
+.row.config
+  .col-md-12
+  %h3 Config
+  .row
+    - conf = I18n.backend.send(:translations)[:config]
+    = render "hash" , :config => conf if conf
+.row.manage_last

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

@@ -3,7 +3,7 @@
     %h2= t(:orders)
     = paginate @orders
   .col-md-3
-    = image_tag "admin/orders.jpg" , :class => "img-responsive"
+    = image_tag "office_clerk/orders.jpg" , :class => "img-responsive"
 .row
   .col-md-9
     %div

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

@@ -39,7 +39,7 @@
 
 = render "baskets/small" , :basket => @order.basket
 
-.col-md-12{"data-no-turbolink" => true}
+.col-md-12
   = link_to t(:back), orders_path, :class => "btn btn-warning"
   - print_styles.each do |style|
     = link_to t("print_" + style) , print_path(style), :class => "btn btn-primary" ,  :target => "_blank"

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

@@ -14,7 +14,7 @@
       .col-md-2
         = link_to  t(:new) + ' ' + t(:product) , new_product_path , :class => "btn btn-primary"
   .col-md-3
-    = image_tag "admin/products.jpg" , :class => "img-responsive"
+    = image_tag "office_clerk/products.jpg" , :class => "img-responsive"
 
 .row
   .col-md-9

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

@@ -5,7 +5,7 @@
         %h2= t(:purchases)
         = paginate @purchases
   .col-md-3
-    = image_tag "admin/purchases.jpg" , :class => "img-responsive"
+    = image_tag "office_clerk/purchases.jpg" , :class => "img-responsive"
 .row
   .col-md-9
     %div