office_clerk 0.8 → 0.9

data/app/controllers/products_controller.rb

@@ -2,7 +2,7 @@
 
 class ProductsController < AdminController
 
-  before_filter :load_product, :only => [:show, :edit, :update, :delete ]
+  before_filter :load_product, :only => [:show, :edit, :update, :destroy ]
 
   # Uncomment for check abilities with CanCan
   #authorize_resource
@@ -39,6 +39,7 @@ class ProductsController < AdminController
       show = @product.product_item? ? @product.product : @product
       redirect_to product_path(show)
     else
+      flash.alert = t(:fix_errors, :model => "product")
       render :action => :edit
     end
   end
@@ -55,12 +56,12 @@ class ProductsController < AdminController
     end
   end
 
-  def delete
+  def destroy
     @product.delete
     if @product.save
-      redirect_to products_url , :notice => t("deleted")
+      redirect_to products_url , :notice => t("deleted") + ": " + @product.full_name
     else
-      redirect_to product_url , :notice => "#{t(:error)} : #{t(:inventory)}"
+      redirect_to product_url(@product) , :notice => "#{t(:error)} : #{t(:product_has_inventory)}"
     end
   end
 
@@ -69,9 +70,8 @@ class ProductsController < AdminController
   end
 
   def params_for_model
-    params.require(:product).permit(:price,:cost,:weight,:name,:description, :online, :summary,
+    params.require(:product).permit(:price,:cost,:weight,:name,:description, :online, :summary,:stock_level,
       :link,:ean,:tax,:properties,:scode,:product_id,:category_id,:supplier_id, :main_picture,:extra_picture
 )
   end
 end
-

data/app/controllers/purchases_controller.rb

@@ -13,6 +13,7 @@ class PurchasesController < AdminController
   end
 
   def show
+    gon.purchase_id = @purchase.id
   end
 
   # order this from supplier
@@ -35,8 +36,11 @@ class PurchasesController < AdminController
   end
 
   def new
-    @purchase = Purchase.new
-    render :edit
+    today = Date.today
+    basket = Basket.create!
+    @purchase = Purchase.new :name => "#{I18n.t(:purchase)} #{I18n.l(today)}" , :basket => basket 
+    @purchase.save!
+    redirect_to edit_basket_path basket
   end
 
   def edit
@@ -48,24 +52,30 @@ class PurchasesController < AdminController
     if @purchase.save
       redirect_to purchase_path(@purchase), :notice => t(:create_success, :model => "purchase")
     else
-      render :edit
+      render :show
     end
   end
 
   def update
-    if @purchase.update_attributes(params_for_model)
-      redirect_to purchase_path(@purchase), :notice => t(:update_success, :model => "purchase")
-    else
-      render :action => :edit
+    respond_to do |format|
+      if @purchase.update_attributes(params_for_model)
+        format.html { redirect_to purchase_path(@purchase), :notice => t(:update_success, :model => "purchase") }
+        format.json { respond_with_bip(@purchase) }
+      else
+        format.html { render :action => :show }
+        format.json { respond_with_bip(@purchase) }
+      end
     end
   end
 
-  private
+  protected
 
   def load_purchase
     @purchase = Purchase.where( :id => params[:id]).includes( :basket => {:items => {:product => :supplier}} ).first
   end
 
+  private
+
   def params_for_model
     params.require(:purchase).permit(:name,:ordered_on,:received_on,:basket_id)
   end

data/app/helpers/admin_helper.rb

@@ -1,24 +1,6 @@
 # encoding : utf-8
 module AdminHelper
-    
-  def basket_edit_link basket , options = {}
-    return "---" unless basket
-    return "" unless request.url.include?("basket")
-    text = t(:edit) + " " 
-    link = edit_basket_path(basket)
-    case basket.kori
-    when Order
-      text += I18n.t(:order)
-      link = order_path(basket.kori) rescue ""
-    when Purchase
-      text += I18n.t(:purchase)
-      link = purchase_path(basket.kori) rescue ""
-    else
-      text += t(:basket)
-    end
-    return link_to text , link , options 
-  end
-  
+
   def sort_date key
     return "" unless params[:q]
     params[:q][key] || ""
@@ -30,10 +12,23 @@ module AdminHelper
   # a default note
   # same signature as best_in_place, ie object, field symbol , hash
   def in_place object , field , attributes ={}
-    defaults = { :ok_button => I18n.t(:edit), :ok_button_class => "btn btn-success" , 
+    defaults = { :ok_button => I18n.t(:edit), :ok_button_class => "btn btn-success" ,
                  :cancel_button => I18n.t(:cancel) , :cancel_button_class => "btn btn-warning",
                  :place_holder => I18n.t(:edit)  , :inner_class => "form-control" }
-    attributes.reverse_merge! defaults 
+    attributes.reverse_merge! defaults
     best_in_place(object , field , attributes)
   end
+
+  def office_assets
+    engines = Rails::Engine.subclasses.map(&:instance)
+    engines << Rails.application
+    engines.delete_if {|e| ! e.respond_to?(:office_assets) }
+    assets = engines.collect{ |e| e.office_assets }
+    assets.compact
+  end
+
+  # helper so one doesn't hav to write the funny content_for in templates
+  def title(page_title)
+    content_for(:title) { page_title }
+  end
 end

data/app/helpers/baskets_helper.rb

@@ -1,4 +1,35 @@
 # encoding : utf-8
 require "admin_helper"
 module BasketsHelper
+  def has_receipt?
+    styles = OfficeClerk.config(:print_styles)
+    return false if styles.nil?
+    return styles.split.include?("receipt")
+  end
+  def basket_edit_link basket , options = {}
+    return "---" unless basket
+    return "" unless request.url.include?("basket")
+    if basket.locked?
+      text =  I18n.t(:locked) + ": "
+      case basket.kori
+      when Order
+        text += I18n.t(:order)
+        link = office.order_path(basket.kori)
+      when Purchase
+        text += I18n.t(:purchase)
+        link = office.purchase_path(basket.kori)
+      else
+        raise "System Error: Locked basket without order #{basket.id}"
+      end
+    else
+      if basket.kori
+        key = basket.kori.class.name.downcase
+        text = I18n.t(key)
+      else
+        text = t(:basket)
+      end
+      link = office.edit_basket_path(basket)
+    end
+    return link_to text , link , options
+  end
 end

data/app/helpers/categories_helper.rb

@@ -11,5 +11,8 @@ module CategoriesHelper
     end
     parents.reverse
   end
+  def group_path group
+    category_path(group)
+  end
 
 end

data/app/helpers/office_helper.rb

@@ -1,17 +1,17 @@
 # -*- 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 
+    @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 
+      Basket.where( :id => session[:current_basket] ).limit(1).first
     else
       nil
     end
@@ -29,30 +29,38 @@ module OfficeHelper
     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
   end
 
+  # euros displays the prices in ... da da .. . euros.
+  # This could of course be configurable, but since taxes and possibly shipping don't work in us, i wait for the pull
   def euros price
     price ? number_to_currency(price , :precision => 2 , :unit => "€") : 0.0
   end
 
+  # this is the helper that best in place uses to display euros.
+  # it is different so it can be overriden
+  def best_euros p
+    euros(p)
+  end
+
   def date d
     return "" unless d
     I18n.l d
@@ -62,7 +70,26 @@ 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/helpers/orders_helper.rb

@@ -8,8 +8,7 @@ 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+/]
+  def number_with_comma n
+    number_with_precision(n , :precision => 2 , :separator => "," , :strip_insignificant_zeros => false)
   end
 end

data/app/models/basket.rb

@@ -4,7 +4,8 @@ class Basket < ActiveRecord::Base
 
   belongs_to :kori, polymorphic: true  #kori is basket in finnish
 
-  has_many :items, autosave: true
+  has_many :items, autosave: true , :dependent => :destroy
+
   before_save :cache_total
 
   accepts_nested_attributes_for :items
@@ -17,11 +18,15 @@ class Basket < ActiveRecord::Base
     self.items.empty?
   end
 
+  def locked?
+    not self.locked.blank?
+  end
+
   def cache_total
     self.total_price = (items.to_a.sum{ |i| i.total }).round(2)
     self.total_tax =  (items.to_a.sum{ |i| i.tax_amount}).round(2)
   end
-  
+
   def touch
     cache_total
     super
@@ -39,27 +44,19 @@ class Basket < ActiveRecord::Base
 
   # receiving the goods means that the item quantity is added to the stock (product.inventory)
   # also we change the price to the products cost price
-  # locks the basket so receiving or deductiing becomes an error.
+  # locks the basket so receiving or deducting becomes an error.
   def receive!
-    raise "Locked since #{self.locked}" if self.locked
-    sum = 0
-    self.items.each do |item|
-      prod = item.product
-      prod.inventory = prod.inventory + item.quantity
-      prod.save!
-      sum += item.quantity
-      item.price = item.product.cost
-#      item.save!
-    end
+    raise "Locked since #{self.locked}" if locked?
+    sum = do_receive(true) # change the prices
     self.locked = Date.today
     self.save!
     sum
   end
 
+  # deduct the items from inventory, change affects immediately in the products
   # locks the basket so receiving or deducting becomes an error.
-  # deduct the items from inventory, change affects immediately in the products 
   def deduct!
-    raise "Locked since #{self.locked}" if self.locked
+    raise "Locked since #{self.locked}" if locked?
     sum = 0
     self.items.each do |item|
       prod = item.product
@@ -72,13 +69,30 @@ class Basket < ActiveRecord::Base
     sum
   end
 
-  #inventoying the basket means setting the item quantity as the stock
-  #we actually change the basket for it to be a relative change (so as to look like a receive)
+  # return inventory and cancel basket
+  # very similar to receive, just we don't change prices (and don't lock)
+  def cancel_order!
+    self.locked = nil
+    do_receive(false) #don't change prices
+    self.save!
+  end
+
+  # inventorying the basket means setting the item quantity as the stock
+  # we actually change the basket for it to be a relative change (so as to look like a receive)
   def inventory!
     self.items.each { |item| item.quantity -= item.product.inventory  }
     self.receive!
   end
 
+  # set all items prices to zero
+  def zero_prices!
+    raise "Locked since #{self.locked}" if locked?
+    self.items.each do |item|
+      item.price = 0.0
+    end
+    self.save!
+  end
+
   def isa typ
     self.kori_type.to_s.downcase == typ.to_s.downcase && self.kori_id != nil
   end
@@ -89,17 +103,17 @@ class Basket < ActiveRecord::Base
     ss.delete(nil)
     ss
   end
-  
+
   #when adding a product (with quantity) we ensure there is only one item for each product
   def add_product prod , quant = 1
     return unless prod
     return unless quant != 0
-    raise "Locked since #{self.locked}" if self.locked
+    raise "Locked since #{self.locked}" if locked?
     exists = items.where(:product_id => prod.id ).limit(1).first
     if exists
       exists.quantity += quant
     else
-      exists = items.new :quantity => quant , :product => prod , :price => prod.price , 
+      exists = items.new :quantity => quant , :product => prod , :price => prod.price ,
                          :tax => prod.tax , :name => prod.full_name
     end
     if( exists.quantity == 0)
@@ -110,4 +124,16 @@ class Basket < ActiveRecord::Base
     end
     reload
   end
+  private
+  def do_receive change_prices
+    sum = 0
+    self.items.each do |item|
+      prod = item.product
+      prod.inventory = prod.inventory + item.quantity
+      prod.save!
+      sum += item.quantity
+      item.price = item.product.cost if change_prices
+    end
+    sum
+  end
 end

data/app/models/clerk.rb

@@ -31,8 +31,13 @@ class Clerk < ActiveRecord::Base
     res == 0
   end
 
+  # just an ar association with order of the same email
+  def orders
+    Order.where(:email => self.email)
+  end
+
   def last_address
-    order = Order.where(:email => self.email).first
+    order = orders.last 
     order ? order.address : {}
   end
   private