office_clerk 0.7 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c64817a8d69623b98ac71359f18f3b2d47683bd2
-  data.tar.gz: dcfe694a0ed59c10487658e77090d224676c4d39
+  metadata.gz: 8f6cbbcac08eb644af00cbaa6ca5748abd294f8b
+  data.tar.gz: e97b58ec03899ad284661fb57cb0f8b3cb3a19aa
 SHA512:
-  metadata.gz: b9f11aa0e76f6d1683da1e324cf8a8b65bba947adaa6455ec97d5049c2494376cca854a8654b046653a89b20101837e041ea9d5a4629816d3c222d150673023d
-  data.tar.gz: 0bc48769c8e8d8492e1a9914e92d3c2df7b4fd37f4b8402c0167fadf1507071eb84369bef281c1eff540c247a308a1a4e979f14b7a06cf11db69a8c4d68308c2
+  metadata.gz: 45e2d64b1a17763ff6297c4bd3dfa34e4e0b88ece8f36ae6cf97e263ae339270d6e8f15576b4bbe532ffb032ac2f60a9921b173898327f27e3e4363497b97113
+  data.tar.gz: 3d430db74a07576e61ad526aeef76d086a4068540640ada2db42dbcd52306d5666c9430c24a5c5a1676fed259ac07b6e41f57d15d3b8be401a98d166a628ac83

data/ChangeLog.md

@@ -1,3 +1,14 @@
+### 0.8
+
+- fix order search
+- improve sign_in and up behaviour
+- move sales layout there
+- remove analytics (is an app function)
+- fix emails
+- manage printing inline (inside the layout), improves navigation
+- using best in place to edit new order note and simple product features
+- pin to rails under 4.2
+
 ### 0.7
 
 - Order search improvements, added a private Note too

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: ../
   specs:
-    office_clerk (0.6)
+    office_clerk (0.8)
       bcrypt-ruby (~> 3.1)
       best_in_place
       bootstrap-sass (~> 3.1)
       bootstrap_form (~> 2.2)
-      coffee-rails
+      coffee-rails (~> 4.0)
       gon
       haml (~> 4.0)
       jquery-rails (~> 3.1)
       jquery-ui-rails (~> 5.0)
       kramdown (~> 1.5)
       paperclip (~> 4.1)
-      rails (~> 4.1, <= 4.2)
+      rails (~> 4.1, < 4.2)
       rails-i18n (~> 4.0)
-      ransack (>= 1.5.1)
+      ransack (~> 1.5, >= 1.5.1)
       sass-rails (~> 4.0)
-      valid_email
+      valid_email (~> 0.0.10)
       will_paginate-bootstrap (~> 1.0)
 
 GEM
@@ -54,7 +54,7 @@ GEM
     bcrypt (3.1.9)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
-    best_in_place (3.0.0)
+    best_in_place (3.0.2)
       actionpack (>= 3.2)
       railties (>= 3.2)
     better_errors (2.0.0)
@@ -81,7 +81,7 @@ GEM
       timers (~> 4.0.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.4)
+    cocaine (0.5.5)
       climate_control (>= 0.0.3, < 1.0)
     codeclimate-test-reporter (0.4.1)
       simplecov (>= 0.7.1, < 1.0.0)
@@ -159,7 +159,7 @@ GEM
     multi_json (1.10.1)
     nokogiri (1.6.4.1)
       mini_portile (~> 0.6.0)
-    paperclip (4.2.0)
+    paperclip (4.2.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)

data/Guardfile

@@ -3,6 +3,7 @@ begin
   require "rubygems"
   require "spring/version" #safe to try
   command = "spring rspec"
+  puts "Using Spring loaded rspec"
 rescue LoadError
 end
 guard :rspec , :cmd => command do

data/README.md

@@ -4,7 +4,7 @@
 [![Code Climate](https://codeclimate.com/github/rubyclerks/office_clerk/badges/gpa.svg)](https://codeclimate.com/github/rubyclerks/office_clerk)
 [![Test Coverage](https://codeclimate.com/github/rubyclerks/office_clerk/badges/coverage.svg)](https://codeclimate.com/github/rubyclerks/office_clerk)
 
-Office Clerk is the back office helper, your accountant, storage manager, secretary and more. It is the heart of the "RubyClerks team":http://rubyclerks.org , the manager as it were.
+Office Clerk is the back office helper, your accountant, storage manager, secretary and more. It is the heart of the [RubyClerks team](http://rubyclerks.org) , the manager as it were.
 
 ####  Status
 
@@ -39,7 +39,7 @@ 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
+- possibly copy ShopController from sales_clerk as a starting point
 
 ### Further
 

data/app/controllers/baskets_controller.rb

@@ -103,7 +103,7 @@ class BasketsController < AdminController
     if p_id = (params[:add] || params[:delete])
       add = params[:add].blank? ? -1 : 1
       @basket.add_product Product.find(p_id) , add
-      flash.notice = params[:add] ? t('product_added') : t('item_removed')
+      flash.now.notice = params[:add] ? t('product_added') : t('item_removed')
     end
     @basket.save!
   end

data/app/controllers/office_controller.rb

@@ -1,54 +1,14 @@
 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
+  include OfficeHelper
 
-  # users are stored in the session by email
-  # if user is not logged i , return nil
-  def current_clerk
-    return @current_clerk if @current_clerk
-    return nil unless session[:clerk_email]
-    @current_clerk = Clerk.where( :email => session[:clerk_email] ).limit(1).first 
-  end
+  include OfficeClerk::Engine.routes.url_helpers
 
   def error
     logger.info "Error" + request.url
     redirect_to "/"
   end
 
-  def current_basket_or_nil
-    return @current_basket unless @current_basket.nil?
-    if session[:current_basket]
-      Basket.where( :id => session[:current_basket] ).limit(1).first 
-    else
-      nil
-    end
-  end
-  # the current user has a shopping basket which is also stored in the session
-  # we *always* return a basket, even if we have to create one (and then store in the session)
-  # this is not associated with the user until an order is finalized at which point the order gets the users email (not id)
-  # that way people don't have to log in to order, but if they are we can retrieve their orders by email
-  def current_basket
-    @current_basket = current_basket_or_nil
-    if @current_basket.nil?
-      @current_basket = Basket.new(:kori_type => "Order")
-      @current_basket.save!
-      session[:current_basket] = @current_basket.id
-    end
-    @current_basket
-  end
 
-  private
-  def has_ssl?
-    return false unless Rails.env.production?
-    OfficeClerk.config(:has_ssl) == true
-  end
-  
-  # when the order is made and the basket locked, it's time to make a new one
-  def new_basket
-    session[:current_basket] = nil
-  end
 end

data/app/controllers/orders_controller.rb

@@ -3,9 +3,6 @@ class OrdersController < AdminController
 
   before_filter :load_order, :only => [:show, :edit, :update , :pay , :ship , :mail]
 
-  # Uncomment for check abilities with CanCan
-  #authorize_resource
-
   def index
     @q = Order.search(params[:q])
     @order_scope = @q.result( :distinct => true)
@@ -31,8 +28,7 @@ class OrdersController < AdminController
     redirect_to :action => :show
   end
   def pay
-    @order.paid_on = Date.today
-    @order.save!
+    @order.pay_now!
     render :show
   end
   def ship

data/app/controllers/sessions_controller.rb

@@ -1,7 +1,6 @@
 class SessionsController < OfficeController
-  layout "sales_clerk"
 
-  force_ssl :if => :has_ssl?
+  force_ssl :if => :has_ssl? , :except => :sign_out
 
   def sign_in
   end
@@ -10,8 +9,11 @@ class SessionsController < OfficeController
     clerk = Clerk.where(:email => params[:email]).limit(1).first
     if clerk && clerk.valid_password?(params[:password])
       session[:clerk_email] = clerk.email
-      url = clerk.admin ?  office.baskets_url : root_url
-      redirect_to url , :notice => I18n.t(:signed_in)
+      if clerk.admin
+         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)
     end
@@ -19,7 +21,7 @@ class SessionsController < OfficeController
 
   def sign_out
     session[:clerk_email] = nil
-    redirect_to root_url, :notice => I18n.t(:signed_out)
+    redirect_to Rails.application.routes.url_helpers.root_path , :notice => I18n.t(:signed_out)
   end
 
   def sign_up
@@ -29,14 +31,19 @@ class SessionsController < OfficeController
       @clerk = Clerk.new(params_for_clerk)
       if @clerk.save
         session[:clerk_email] = @clerk.email
-        redirect_to root_url, :notice => "Signed up!"
-        return
+        return redirect_after_sign_up
       end
     end
   end
 
   private
 
+  def redirect_after_sign_up
+    redirect_to main_app.root_url, :notice => t(:signed_up)
+  end
+  def redirect_after_sign_in
+    redirect_to main_app.root_url, :notice => t(:signed_in)
+  end
   def params_for_clerk
     params.require(:clerk).permit(:email,:password,:password_confirmation)
   end

data/app/helpers/admin_helper.rb

@@ -36,5 +36,4 @@ module AdminHelper
     attributes.reverse_merge! defaults 
     best_in_place(object , field , attributes)
   end
-  BestInPlace::ViewHelpers.extend OfficeHelper
 end

data/app/helpers/categories_helper.rb

@@ -1,4 +1,15 @@
 # encoding : utf-8
 require "admin_helper"
 module CategoriesHelper
+
+  def parents(group)
+    parents = []
+    group = group.category
+    while group
+      parents << group
+      group = group.category
+    end
+    parents.reverse
+  end
+
 end

data/app/helpers/office_helper.rb

@@ -1,6 +1,49 @@
 # -*- coding: utf-8 -*-
 module OfficeHelper
   
+  # users are stored in the session by email
+  # if user is not logged i , return nil
+  def current_clerk
+    return @current_clerk if @current_clerk
+    return nil unless session[:clerk_email]
+    @current_clerk = Clerk.where( :email => session[:clerk_email] ).limit(1).first 
+  end
+  def current_basket_or_nil
+    return @current_basket unless @current_basket.nil?
+    if session[:current_basket]
+      Basket.where( :id => session[:current_basket] ).limit(1).first 
+    else
+      nil
+    end
+  end
+  # the current user has a shopping basket which is also stored in the session
+  # we *always* return a basket, even if we have to create one (and then store in the session)
+  # this is not associated with the user until an order is finalized at which point the order gets the users email (not id)
+  # that way people don't have to log in to order, but if they are we can retrieve their orders by email
+  def current_basket
+    @current_basket = current_basket_or_nil
+    if @current_basket.nil?
+      @current_basket = Basket.new(:kori_type => "Order")
+      @current_basket.save!
+      session[:current_basket] = @current_basket.id
+    end
+    @current_basket
+  end
+  
+  def has_ssl?
+    return false unless Rails.env.production?
+    OfficeClerk.config(:has_ssl) == true
+  end
+  
+  # when the order is made and the basket locked, it's time to make a new one
+  def new_basket
+    session[:current_basket] = nil
+  end
+  
+  def shipping_method name
+    OfficeClerk::ShippingMethod.method(name)
+  end
+  
   def markdown text
     return "" if text.blank?
     return sanitize Kramdown::Document.new(text).to_html

data/app/helpers/orders_helper.rb

@@ -8,4 +8,8 @@ module OrdersHelper
   def mail_path action
     
   end
+  def viite
+    base = @order.number[1 .. -1]
+    viite = open("http://www1.nordea.fi/P636V/H636VTXT.asp?action=tekstiLista&lkm=1&alkuViite=#{base}&L=1").read[/\d+ \d+/]
+  end
 end

data/app/mailers/order_mailer.rb

@@ -1,19 +1,29 @@
+# Mails may be sent from the admin interface for below actions.
+
+# The SalesClerk sends a confirm when the order is received (they are unpaid at that time)
+
+# Default from (possibly bcc) and mail delivery method must be set up in production.rb (see rails docs)
+
 class OrderMailer < ActionMailer::Base
 
+  add_template_helper(OfficeHelper)
+  add_template_helper(OrdersHelper)
+
   def confirm(order)
     @order = order
-    mail(to: @order.email, from: "me@here.now" ,  subject: "Order #{@order.number}")
+    mail(to: @order.email, subject: "#{I18n.t(:order)} #{@order.number}")
   end
   def cancel(order)
     @order = order
-    mail(to: @order.email, from: "me@here.now" ,  subject: "Order #{@order.number}")
+    mail(to: @order.email, subject: "#{I18n.t(:order)} #{@order.number}")
   end
   def paid(order)
     @order = order
-    mail(to: @order.email, from: "me@here.now" ,  subject: "Order #{@order.number}")
+    mail(to: @order.email, subject: "#{I18n.t(:order)} #{@order.number}")
   end
   def shipped(order)
     @order = order
-    mail(to: @order.email, from: "me@here.now" ,  subject: "Order #{@order.number}")
+    mail(to: @order.email, subject: "#{I18n.t(:order)} #{@order.number}")
   end
+  
 end

data/app/models/clerk.rb

@@ -10,8 +10,11 @@ class Clerk < ActiveRecord::Base
   validates_presence_of :encrypted_password
 
   validates_uniqueness_of :email
-  validates :email, :presence => true, :email => {:ban_disposable_email => true, :mx_with_fallback => true }
-
+  if Rails.env.test?
+    validates :email, :presence => true , :email => true
+  else
+    validates :email, :presence => true, :email => {:ban_disposable_email => true, :mx_with_fallback => true }
+  end
   store :address, accessors: [ :name , :street , :city , :phone ] #, coder: JSON
 
   def whole_address
@@ -28,6 +31,10 @@ class Clerk < ActiveRecord::Base
     res == 0
   end
 
+  def last_address
+    order = Order.where(:email => self.email).first
+    order ? order.address : {}
+  end
   private
 
   def prepare_password

data/app/models/order.rb

@@ -44,6 +44,10 @@ class Order < ActiveRecord::Base
     cart
   end
   
+  def pay_now!
+    self.paid_on = Date.today
+    self.save!    
+  end
   #quick checkout, ie ship (hand over) and pay (externally)
   def pos_checkout email
     self.ordered_on    = Date.today unless self.ordered_on

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

@@ -57,12 +57,12 @@
         .col-md-2
           = link_to t(:make_purchase), purchase_basket_path(@basket), :class => "btn btn-primary make_purchase"
         .col-md-2
-          = link_to t(:checkout), checkout_basket_path(@basket) , :target => "_blank" , :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), order_path(@basket.kori), :class => "btn btn-primary to_order"
         .col-md-2
-          = link_to t(:print_order), invoice_order_path(@basket.kori), :target => "_blank" , :class => "btn btn-primary print_order" , :target => "_blank"
+          = link_to t(:print_order), invoice_order_path(@basket.kori), :class => "btn btn-primary print_order"
       - elsif @basket.isa(:purchase)
         .col-md-2
           = link_to t(:to_purchase), purchase_path(@basket.kori), :class => "btn btn-primary to_purchase"

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

@@ -28,7 +28,7 @@
   = link_to t(:edit), edit_category_path(@category), :class => "btn btn-primary"
   = link_to t(:back), categories_path, :class => "btn btn-primary"
   %b= t(:shop_link) + " : "
-  = link_to @category.link , shop_group_path(@category.link)
+  = link_to @category.link , main_app.shop_group_path(@category.link)
 
 =render "triple" , :groups => @category.categories
 =render "products/triple" , :products => @category.products.no_items

data/app/views/layouts/_header_extra.haml

@@ -1,5 +1,6 @@
--Rails::Engine.subclasses.map(&:instance).each do |e|
-  - name = e.engine_name.sub("clerk" , "office")
-  - next if name == e.engine_name
-  = stylesheet_link_tag name
-  = javascript_include_tag name
+- ( Rails::Engine.subclasses.map(&:instance) << Rails.application).each do |e|
+  - next unless e.respond_to? :office_assets
+  - asset = e.office_assets
+  - next if asset.blank?
+  = stylesheet_link_tag asset , :media => :all
+  = javascript_include_tag asset