office_clerk 0.0.1 → 0.1

data/app/controllers/products_controller.rb

@@ -27,7 +27,7 @@ class ProductsController < AdminController
   def new
     if params[:parent_id]
       parent = Product.find params[:parent_id]
-      @product = parent.new_line_item
+      @product = parent.new_product_item
     else
       @product = Product.new :tax => OfficeClerk.config("defaults.tax")
     end
@@ -38,47 +38,19 @@ class ProductsController < AdminController
   end
 
   def create
-    flash.notice = ""
     @product = Product.create(params_for_model)
-    #TODO maybe there is a better way, but this "validation" happens "after the fact", ie by adding
-    # an item to a parent the parent can become "invalid" even it is not what is being edited. hmmm
-    if @product.line_item? and not @product.product.ean.blank?
-      flash.notice += t(:product_line_has_ean) 
-      flash.notice += "<br/>"
-    end
-    if @product.line_item? and not @product.product.scode.blank?
-      flash.notice += t(:product_line_has_scode) 
-      flash.notice += "<br/>"
-    end
     if @product.save
-      flash.notice += t(:create_success, :model => "product")
-      redirect_to product_path(@product)
+      flash.notice = t(:create_success, :model => "product")
+      show = @product.product_item? ? @product.product : @product
+      redirect_to product_path(show)
     else
       render :action => :edit
     end
   end
 
   def update
-    flash.notice = ""
-    if ok = @product.update_attributes(params_for_model)
-      flash.notice += t(:update_success, :model => "product")
-      flash.notice += "<br/>"
-    end
-    if (@product.line_item? and not @product.link.blank?)
-      flash.notice += t(:product_item_has_link)
-      flash.notice += "<br/>"
-      ok = false
-    end
-    if (@product.line_item? and @product.product.ean) or (@product.line? and not @product.ean.blank?)
-      flash.notice += t(:product_line_has_ean) 
-      flash.notice += "<br/>"
-      ok = false
-    end
-    if (@product.line_item? and @product.product.scode) or (@product.line? and not @product.scode.blank?)
-      flash.notice += t(:product_line_has_scode) 
-      ok = false
-    end
-    if ok
+    if @product.update_attributes(params_for_model)
+      flash.notice = t(:update_success, :model => "product")
       redirect_to product_path(@product)
     else
       render :action => :edit
@@ -90,29 +62,37 @@ class ProductsController < AdminController
     if @product.save
       redirect_to products_url , :notice => t("deleted")
     else
-      redirect_to products_url , :notice => t("error")
+      redirect_to product_url , :notice => "#{t(:error)} : #{t(:inventory)}"
     end
   end
   
   # loads of ways to create barcodes nowadays, this is a bit older. 
   # Used to be html but moved to pdf for better layout control
   def barcode
-    pdf = Prawn::Document.new( :page_size => [ 54.mm , 25.mm ] , :margin => 2.mm )
-    pdf.text( @product.full_name  , :align => :left )
-    pdf.text( "#{@product.price} € "  , :align => :right , :padding => 5.mm)
-    code = @product.ean.blank? || ""
+    code = @product.ean
+    code = @product.name if code.blank?
     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
     pdf.image( StringIO.new( aBarcode.to_png(:xdim => 5)) , :width => 50.mm , 
             :height => 10.mm , :at => [ 0 , 10.mm])
     send_data pdf.render , :type => "application/pdf" , :filename => "#{@product.full_name}.pdf"
   end
   
   private
-  
+
+  def create_pdf
+    pdf = Prawn::Document.new( :page_size => [ 54.mm , 25.mm ] , :margin => 2.mm )
+    pdf.text( @product.full_name  , :align => :left )
+    pdf.text( "#{@product.price} € "  , :align => :right , :padding => 5.mm)
+    pdf
+  end
+
   def load_product
     @product = Product.find(params[:id])
   end

data/app/controllers/purchases_controller.rb

@@ -30,7 +30,8 @@ class PurchasesController < AdminController
   # receive the stuff (ie add to inventory)
   def inventory
     items = @purchase.inventory!
-    redirect_to purchase_path(@purchase), :notice => [t(:inventorized) ,items ,t(:items)].join(" ")
+    flash.notice = [t(:inventorized) ,items ,t(:items)].join(" ")
+    redirect_to purchase_path(@purchase)
   end
 
   def new

data/app/controllers/sessions_controller.rb

@@ -1,7 +1,7 @@
 class SessionsController < ApplicationController
   layout "shop"
 
-  def new
+  def sign_in
   end
 
   def create
@@ -11,36 +11,29 @@ class SessionsController < ApplicationController
       url = clerk.admin ?  baskets_url : root_url
       redirect_to url , :notice => I18n.t(:signed_in)
     else
-      render "new" , :notice => I18n.t(:sign_in_invalid)
+      redirect_to :sign_in , :notice => I18n.t(:sign_in_invalid)
     end
   end
 
-  def destroy
+  def sign_out
     session[:clerk_email] = nil
     redirect_to root_url, :notice => I18n.t(:signed_out)
   end
 
-  def new_clerk
-    @clerk = Clerk.new
-  end
-
-  def update_clerk
-    @clerk = current_clerk
-    if @clerk.update_attributes(params[:clerk])
-      redirect_to root_url, :notice => I18n.t(:updated)
+  def sign_up
+    if request.get?
+      @clerk = Clerk.new
     else
-      render :action => 'edit'
+      @clerk = Clerk.new(params_for_clerk)
+      if @clerk.save
+        session[:clerk_email] = @clerk.email
+        redirect_to root_url, :notice => "Signed up!"
+        return
+      end
     end
   end
-  
-  def create_clerk
-    @clerk = Clerk.new(params[:clerk])
-    if @clerk.save
-      session[:clerk_email] = @clerk.email
-      redirect_to root_url, :notice => "Signed up!"
-    else
-      render "new"
-    end
+  def params_for_clerk
+    params.require(:clerk).permit(:email,:password,:password_confirmation)
   end
-  
+
 end

data/app/helpers/admin_helper.rb

@@ -4,23 +4,21 @@ module AdminHelper
   def basket_edit_link basket , options = {}
     return "---" unless basket
     return "" unless request.url.include?("basket")
-    text = t(:edit) + " "
+    text = t(:edit) + " " 
     link = edit_basket_path(basket)
-    case basket.kori_type
-    when "Order"
+    case basket.kori
+    when Order
       text += I18n.t(:order)
       link = order_path(basket.kori) rescue ""
-    when "Purchase"
+    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 sorting_header(model_name, attribute_name, namespace)
-    attribute_name
-  end
-
   def sort_date key
     return "" unless params[:q]
     params[:q][key] || ""

data/app/helpers/orders_helper.rb

@@ -1,4 +1,10 @@
 # encoding : utf-8
 require "admin_helper"
 module OrdersHelper
+  def print_styles
+    OfficeClerk.config(:print_styles).split
+  end
+  def print_path style
+    eval("#{style}_order_path(@order)")
+  end
 end

data/app/models/basket.rb

@@ -80,8 +80,7 @@ class Basket < ActiveRecord::Base
   end
 
   def isa typ
-    return typ == :cart  if self.kori_type == nil
-    self.kori_type.downcase == typ.to_s.downcase
+    self.kori_type.to_s.downcase == typ.to_s.downcase && self.kori_id != nil
   end
 
   def suppliers

data/app/models/category.rb

@@ -7,6 +7,8 @@ class Category < ActiveRecord::Base
   belongs_to :category
   has_attached_file :main_picture
   has_attached_file :extra_picture
+  validates_attachment_content_type :main_picture, :content_type => /\Aimage\/.*\Z/
+  validates_attachment_content_type :extra_picture, :content_type => /\Aimage\/.*\Z/
 
   validates :name, :presence => true
   validates :link, presence: true, :if => :generate_url_if_needed

data/app/models/product.rb

@@ -21,6 +21,8 @@ class Product < ActiveRecord::Base
   belongs_to :supplier
   has_attached_file :main_picture
   has_attached_file :extra_picture
+  validates_attachment_content_type :main_picture, :content_type => /\Aimage\/.*\Z/
+  validates_attachment_content_type :extra_picture, :content_type => /\Aimage\/.*\Z/
 
   # default product scope only lists non-deleted products
   default_scope {where(:deleted_on => nil).order('created_at DESC') }
@@ -32,10 +34,12 @@ class Product < ActiveRecord::Base
   validates :price, :numericality => true
   validates :cost, :numericality => true
   validates :name, :presence => true
+  validates :deleted_on , :absence => true , :if => "inventory > 0"
 
-  before_save :generate_url
+  before_save :check_attributes
   before_save :adjust_cost
   after_save :update_line_inventory , :if => :product_id
+  after_save :check_parent_ean , :if => :product_id
 
   
   def update_line_inventory
@@ -46,13 +50,24 @@ class Product < ActiveRecord::Base
     parent.save! if inv != parent.inventory
   end
 
+  def check_parent_ean
+    parent = self.product
+    return unless parent
+    parent.check_attributes
+    parent.save! if parent.changed? 
+  end
+
   # if no url is set we generate one based on the name
-  # but line_items don't have urls, so not for them
-  def generate_url
-    if line_item? or deleted?
+  # but product_items don't have urls, so not for them
+  def check_attributes
+    if product_item?
       self.link = ""
     else
-      self.link = name.gsub(" " , "_").downcase if link.blank? && name != nil
+      self.link = self.name.gsub(" " , "_").downcase if self.link.blank? && self.name != nil
+    end
+    if line?
+      self.ean = "" unless self.ean.blank?
+      self.scode = "" unless self.scode.blank?
     end
   end
 
@@ -61,6 +76,7 @@ class Product < ActiveRecord::Base
       self.cost = self.price / 2
     end
   end
+
   def deleted?
     not deleted_on.blank?
   end
@@ -72,28 +88,38 @@ class Product < ActiveRecord::Base
     self
   end
 
-  #this product represents a product line (ie is not sellable in itself)
+  # the type is one of:
+  # - product
+  # -product_line
+  # -product_item
+  # mostly used for translation. Function below let you test for each of the possibilities
+  def type
+    return :product_item if product_item?
+    products.empty? ? :product : :product_line
+  end
+
+  # this product represents a product line (ie is not sellable in itself)
   def line?
-    !line_item? and !products.empty?
+    !product_item? and !products.empty?
+  end
+  # this product is an item of a product line (so is sellable)
+  def product_item?
+    self.product_id != nil
+  end
+  # only products and product items are sellable. in other words if it's not a line
+  def sellable?
+    !line?
   end
 
   def full_name
-    if line_item?
+    if product_item?
       product.name + " : " + self.name
     else
       self.name
     end
   end
-  #this product is an item of a product line (so is sellable)
-  def line_item?
-    self.product_id != nil
-  end
-
-  def sellable?
-    !line?
-  end
   
-  def new_line_item
+  def new_product_item
     Product.new :tax => self.tax , :weight => self.weight , :cost => self.cost ,  :product_id => self.id , 
         :supplier_id => self.supplier_id , :category_id => self.category_id , :price => self.price
   end

data/app/models/purchase.rb

@@ -9,18 +9,19 @@ class Purchase < ActiveRecord::Base
 
   def receive!
     items = basket.receive!
-    self.ordered_on = Date.today unless ordered_on
-    self.received_on = Date.today
-    self.save!
-    items
+    return stamp_today items
   end
 
   def inventory!
-    items = basket.receive!
+    items = basket.inventory!
+    return stamp_today items
+  end
+
+  private
+  def stamp_today items
     self.ordered_on = Date.today unless ordered_on
     self.received_on = Date.today
     self.save!
     items
   end
-
 end

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

@@ -51,13 +51,10 @@
     .row.form-actions
       .col-md-2
         = f.submit :class => "btn btn-success commit"
-      .col-md-2
-        = link_to t(:back), baskets_path, :class => "btn btn-warning"
-      .col-md-2
-        = link_to  t(:new) + ' ' + t(:basket) , new_basket_path , :class => "btn btn-primary"
-      - if @basket.isa(:cart) and not @basket.empty?
+      - if @basket.kori_type.blank? and not @basket.empty?
+        .col-md-1
+          = link_to t(:make_order), order_basket_path(@basket), :class => "btn btn-primary make_order"
         .col-md-2
-          - link_to t(:make_order), order_basket_path(@basket), :class => "btn btn-primary make_order"
           = link_to t(:make_purchase), purchase_basket_path(@basket), :class => "btn btn-primary make_purchase"
         .col-md-2{"data-no-turbolink" => true}
           = link_to t(:checkout), checkout_basket_path(@basket) , :target => "_blank" , :class => "btn btn-primary print_order"
@@ -69,6 +66,7 @@
       - elsif @basket.isa(:purchase)
         .col-md-2
           = link_to t(:to_purchase), purchase_path(@basket.kori), :class => "btn btn-primary to_purchase"
-
       .col-md-2
-        = 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(:destroy) , basket_path(@basket), :data => { :confirm => t(:are_you_sure )}, :method => :delete, :title => t(:destroy) , :class => "btn btn-danger" unless @basket.kori
+      .col-md-1
+        = link_to  t(:new) + ' ' + t(:basket) , new_basket_path , :class => "btn btn-primary"

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

@@ -15,4 +15,4 @@
 .col-md-12{"data-no-turbolink" => true}
   = 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), invoice_order_path(@basket.kori) , :target => "_blank" , :class => "btn btn-primary print_order" if @basket.isa(:order)
+  = 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/clerks/edit.html.haml

@@ -16,5 +16,5 @@
     = f.input :password
     = f.input :password_confirmation
   .form-actions
-    = f.submit :class => "btn btn-success"
+    = f.submit :class => "btn btn-success" , :id => "submit"
     = link_to t(:back), clerks_path, :class => "btn btn-warning"

data/app/views/layouts/_admin_menu.html.haml

@@ -12,3 +12,5 @@
   = link_to t(:suppliers), suppliers_path
 %li{:class => params[:controller] == "clerks" && "active" }
   = link_to t(:clerks), clerks_path
+%li{:class => params[:controller] == "manage" && "active" }
+  = link_to t(:manage), manage_all_path

data/app/views/layouts/admin.html.haml

@@ -20,23 +20,28 @@
           %li= link_to current_clerk.email , edit_clerk_path(current_clerk)
           %li= link_to t(:sign_out), sign_out_path
 
-      .row.content
-        - if not flash[:notice].blank? then
+      - if not flash[:notice].blank? then
+        .row.content
           .col-md-12.alert
             .alert-notice.row
               .col-md-3
                 .alert-heading= t(:info) + " :"
               .col-md-9
                 .alert-message!= flash[:notice]
-        - if not flash[:error].blank? then
+      - if not flash[:alert].blank? then
+        .row.content
           .col-md-12.alert
             .alert-error.row
               .col-md-3
                 .alert-heading= t(:info) + " :"
               .col-md-9
-                .alert-message!= flash[:notice]
+                .alert-message= flash[:alert]
         .large-12.column
           .row.space
             =image_tag "shop/spacer.gif"
 
       = yield
+
+    .row
+      .col-md-12
+        %br