office_clerk 0.8 → 0.9

data/app/models/item.rb

@@ -18,6 +18,13 @@ class Item < ActiveRecord::Base
     self.quantity * single_item_tax
   end
 
+  # profit is off course the sale price minus the cost
+  # but . .. while the sale price is copied to the item and thus remains correct
+  # when the cost changes over time, so does this "profit".
+  def profit
+    (self.price - self.product.cost) * self.quantity
+  end
+
   #relation of price to product price down from 100 %
   def discount
     return 0 unless product.price and product.price != 0

data/app/models/order.rb

@@ -1,16 +1,17 @@
 class Order < ActiveRecord::Base
-  has_one :basket , :as => :kori , :autosave => true
+  has_one :basket , :as => :kori , :autosave => true , :dependent => :destroy
 
   store :address, accessors: [ :name , :street , :city , :phone ] #, coder: JSON
 
   after_validation :generate_order_number, :on => :create
+  validates :ordered_on,  :presence => true
 
   validates :name,  :presence => true , :if => :needs_address?
   validates :street,:presence => true , :if => :needs_address?
   validates :city,  :presence => true , :if => :needs_address?
   validates :phone, :presence => true , :if => :needs_address?
   validates :email, :presence => true , :email => {:ban_disposable_email => true, :mx_with_fallback => true }
-  
+
   default_scope { order('created_at DESC')}
 
   # many a european goverment requires buisnesses to have running order/transaction numbers.
@@ -35,7 +36,7 @@ class Order < ActiveRecord::Base
     basket.total_tax + shipment_tax_value
   end
 
-  # return a hash of rate => amount , because products may have different taxes, 
+  # return a hash of rate => amount , because products may have different taxes,
   # the items in an order may have a collection of tax rates.
   def taxes
     cart = basket.taxes
@@ -43,11 +44,21 @@ class Order < ActiveRecord::Base
     cart[self.shipment_tax] += shipment_tax_value if self.shipment_tax and self.shipment_tax != 0
     cart
   end
-  
-  def pay_now!
+
+  def pay_now
     self.paid_on = Date.today
-    self.save!    
   end
+  def ship_now
+    self.shipped_on = Date.today
+  end
+
+  # go back to edit mode, but return inventiry and zero shipped
+  def cancel!
+    self.shipped_on = nil
+    self.basket.cancel_order!
+    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
@@ -64,6 +75,7 @@ class Order < ActiveRecord::Base
     calc = OfficeClerk::ShippingMethod.all[typ.to_sym]
     cost = calc.price_for(self.basket)
     self.shipment_price = cost
+    self.shipment_tax = OfficeClerk.config("defaults.tax").to_f rescue 0
   end
 
   private

data/app/models/product.rb

@@ -15,6 +15,7 @@
 
 class Product < ActiveRecord::Base
   has_many :products
+  has_many :items
   store :properties, accessors: [ :color, :size , :model_number ] #, coder: JSON
   belongs_to :product
   belongs_to :category
@@ -29,15 +30,17 @@ class Product < ActiveRecord::Base
   scope :online, -> { where(:online => true) }
   scope :no_items, -> { where(:product_id => nil) }
   scope :with_inventory, -> { where("inventory > 0") }
-  scope :shop_products , -> { online.no_items.with_inventory }
+  # some shops may wish to add .with_inventory to the scope, but that means users can't see the page
+  # and for products you carry regularly that is not desirable. The Product page checks, and the controller
+  scope :shop_products , -> { online.no_items }
 
   validates :price, :numericality => true
   validates :cost, :numericality => true
   validates :name, :presence => true
-  validates :deleted_on , :absence => true , :if => "inventory > 0"
+  validates :deleted_on , :absence => true , :if => :has_inventory?
 
   before_save :check_attributes
-  before_save :adjust_cost
+  before_save :fix_cost
   after_save :update_line_inventory , :if => :product_id
   after_save :check_parent_ean , :if => :product_id
 
@@ -71,16 +74,17 @@ class Product < ActiveRecord::Base
     end
   end
 
-  def adjust_cost
-    if self.cost == 0.0
-      self.cost = self.price / 2
-    end
+  def has_inventory?
+    self.inventory > 0
   end
-
+  # has the product been deleted (marked as deleted)
   def deleted?
     not deleted_on.blank?
   end
 
+  # deleting sets the deleted_on flag to today
+  # Products can not be deleted because of the risk of invalidating old orders
+  # to actually remove a product from the db, use the console
   def delete
     self.deleted_on = Date.today
     self.link = ""
@@ -102,15 +106,19 @@ class Product < ActiveRecord::Base
   def line?
     !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
 
+  # full name, or display name, is the name for a product, 
+  # and the concatination of the parents name and the name, for product items
   def full_name
     if product_item?
       product.name + " : " + self.name
@@ -123,4 +131,11 @@ class Product < ActiveRecord::Base
     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
+
+  private
+  def fix_cost
+    if self.cost == 0.0
+      self.cost = self.price / 2
+    end
+  end
 end

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

@@ -19,5 +19,5 @@
 %p
   %b
     = t(:country) + " : " + @address.country
-= link_to t(:edit), edit_address_path(@address), :class => "btn btn-success"
-= link_to t(:back), addresses_path, :class => "btn btn-warning"
+= link_to t(:edit), office.edit_address_path(@address), :class => "btn btn-success"
+= link_to t(:back), office.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=link_to_if item.product, item.name , product_path(item.product)
+          %td.name= link_to_if item.product, item.name , office.product_path(item.product)
           %td= item.quantity
           %td= euros item.price
       %tr
@@ -23,4 +23,4 @@
         %td
           = t(:total)
           = euros basket.total_price
-      = yield :basket
+      = yield :basket

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

@@ -6,16 +6,16 @@
 .row
   .col-md-8.ean_form
     = label_tag :ean
-    = form_tag ean_basket_path(@basket)  do |f|
+    = form_tag office.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 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")
+    = 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")
 .row
-  = form_for(@basket) do |f|
-    %table.table.table-striped.table-bordered.table-condensed
+  = form_for(@basket , :url => office.basket_path(@basket) ) do |f|
+    %table.table.table-hover.table-condensed
       %thead
         %tr
           %th= t(:picture)
@@ -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='#{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='#{office.discount_basket_path(@basket)}?item=#{item.id}&discount=' + this.value"  )
             %td
-              = link_to t(:delete) , edit_basket_path(:delete => item.product.id)
-              = link_to t(:add) , edit_basket_path(:add => item.product.id)
+              = link_to t(:delete) , office.edit_basket_path(:delete => item.product.id)
+              = link_to t(:add) , office.edit_basket_path(:add => item.product.id)
 
         %tr
           %td{:colspan => 4}
@@ -53,20 +53,23 @@
         = f.submit :class => "btn btn-success commit"
       - 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"
+          = link_to t(:make_order), office.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"
+          = link_to t(:make_purchase), office.purchase_basket_path(@basket), :class => "btn btn-primary make_purchase"
         .col-md-2
-          = link_to t(:checkout), checkout_basket_path(@basket) , :class => "btn btn-primary print_order"
+          = link_to t(:checkout), office.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"
+          = link_to t(:to_order), office.order_path(@basket.kori), :class => "btn btn-primary to_order"
         .col-md-2
-          = link_to t(:print_order), invoice_order_path(@basket.kori), :class => "btn btn-primary print_order"
+          - if has_receipt?
+            = link_to t("receipt.header"), office.receipt_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"
+          = link_to t(:to_purchase), office.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
+        = 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
+      .col-md-2
+        = link_to t(:nolla) , office.zero_basket_path(@basket), :class => "btn btn-danger" unless @basket.locked?
       .col-md-1
-        = 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"

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

@@ -14,8 +14,8 @@
       %table.table.table-striped.table-bordered.table-condensed
         %thead
           %tr
-            %th= sort_link @q, :created_at
-            %th= sort_link @q, :total_price
+            %th= sort_link [:office,@q], :created_at
+            %th= sort_link [:office,@q], :total_price
             %th= t(:items)
             %th
               %label.checkbox
@@ -36,14 +36,14 @@
               %td= basket_edit_link(basket)
     = paginate @baskets
   .col-md-3
-    = search_form_for @q, :url => search_baskets_path, :html => { :class => "form-horizontal" }, :method => :post do |f|
+    = search_form_for @q, :url => office.search_baskets_path, :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_cont , :class => "form-control" , :placeholder => t(:name_contains)
+        = f.text_field :items_product_name_or_items_product_product_name_cont , :class => "form-control" , :placeholder => t(:product) + " " +t(:name_contains)
       .form-group.row
         .col-md-4
           = f.label(:total_price)
@@ -51,5 +51,13 @@
           = f.text_field :total_price_gt , :class => "form-control"
         .col-md-4
           = f.text_field :total_price_lt , :class => "form-control"
+      .form-group
+        .col-md-3
+          = f.label(:created_at)
+        .col-sm-1.radio
+        .form-group.col-md-6
+          = f.search_field :created_at_gteq , :class => "form-control datepicker" , :value => sort_date(:created_at_gteq)
+        .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), baskets_path, :class => "btn btn-warning"
+      = link_to  t(:cancel), office.baskets_path, :class => "btn btn-warning"

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

@@ -1,5 +1,5 @@
 %h2
-  = t(:basket) + " : " 
+  = t(:basket) + " : "
   = t(:order) + " " + @basket.kori.number.to_s if @basket.isa(:order)
 .col-md-4
   %p
@@ -13,5 +13,5 @@
 = render "small" , :basket => @basket
 
 .col-md-12.basket_show_end
-  = 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(: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?

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

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

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

@@ -5,11 +5,11 @@
   - parents(@category).each do | group|
     %li
       - if group.id
-        = link_to group.name , category_path(group)
+        = link_to group.name , office.category_path(group)
       - else
         = t(:new)
-        
-= bootstrap_form_for(@category, :html => { :multipart => true }) do |f|
+- url = @category.persisted? ? office.category_path(@category) : office.categories_path
+= bootstrap_form_for(@category, :html => { :multipart => true } , :url => url) do |f|
   .row.form-group
     .col-md-5
       = f.text_field :name
@@ -32,10 +32,9 @@
       = f.submit :class => "btn btn-success"
       %br
       %br
-      = link_to t(:back), categories_path, :class => "btn btn-warning"
+      = link_to t(:back), office.categories_path, :class => "btn btn-warning"
   .row
     .col-md-4
       = f.file_field :main_picture
     .col-md-4
       = f.file_field :extra_picture
-        

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

@@ -5,7 +5,7 @@
         %h2= t(:categories)
         = paginate @categories
       .col-md-2
-        = link_to  t(:new) + ' ' + t(:category) , new_category_path , :class => "btn btn-primary"
+        = link_to  t(:new) + ' ' + t(:category) , office.new_category_path , :class => "btn btn-primary"
   .col-md-3
     = image_tag "office_clerk/categories.jpg" , :class => "img-responsive"
 .row
@@ -15,7 +15,7 @@
         %thead
           %tr
             %th=t( "picture")
-            %th= sort_link @q, :name
+            %th= sort_link [:office,@q], :name
             %th= t(:count)
             %th= t(:online)
             %th=t( "activerecord.attributes.category.category")
@@ -26,14 +26,14 @@
           - @categories.each do |category|
             %tr{:class => "line-#{cycle("1","2")}"}
               %td.image= image_tag category.main_picture.url(:thumb)
-              %td=link_to category.name, category_path(category), :title => t(:show) , :class => category.online && "online"
+              %td=link_to category.name, office.category_path(category), :title => t(:show) , :class => category.online && "online"
               %td=category.products.length.to_s
               %td=category.online ? t(:online) : t(:not_online)
-              %td=link_to category.category.name, category_path(category.category) , :class => category.category.online && "online" if category.category
-              %td= link_to t(:edit), edit_category_path(category), :title => t(:edit)
+              %td=link_to category.category.name, office.category_path(category.category) , :class => category.category.online && "online" if category.category
+              %td= link_to t(:edit), office.edit_category_path(category), :title => t(:edit)
     = paginate @categories
   .col-md-3
-    = search_form_for @q, :url => search_categories_path, :html => { :class => "form-horizontal" }, :method => :post do |f|
+    = search_form_for @q, :url => office.search_categories_path, :html => { :class => "form-horizontal" }, :method => :get do |f|
       .form-group
         .input-group
           = f.text_field :name_cont , :class => "form-control" , :placeholder =>  t(:name)
@@ -53,7 +53,7 @@
             =t(:blanks)
             = f.radio_button :description_blank , true
       = f.submit t(:filter), :id => :filter , :class => "btn btn-success"
-      = link_to  t(:cancel), categories_path, :class => "btn btn-warning"
+      = link_to  t(:cancel), office.categories_path, :class => "btn btn-warning"
     %hr
     - @roots.each do |group|
       %ul.cat

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

@@ -25,11 +25,10 @@
         %p
           = image_tag @category.extra_picture.url
 
-  = link_to t(:edit), edit_category_path(@category), :class => "btn btn-primary"
-  = link_to t(:back), categories_path, :class => "btn btn-primary"
+  = link_to t(:edit), office.edit_category_path(@category), :class => "btn btn-primary"
+  = link_to t(:back), office.categories_path, :class => "btn btn-primary"
   %b= t(:shop_link) + " : "
-  = link_to @category.link , main_app.shop_group_path(@category.link)
+  = link_to @category.link , office.categories_path(@category.link)
 
 =render "triple" , :groups => @category.categories
 =render "products/triple" , :products => @category.products.no_items
-

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

@@ -2,8 +2,9 @@
   = t params["action"]
   = t(:clerk)
   -if @clerk.admin
-    =t(:admin) 
-= bootstrap_form_for(@clerk) do |f|
+    =t(:admin)
+- url = @clerk.persisted? ? office.clerk_path(@clerk) : office.clerks_path
+= bootstrap_form_for(@clerk, :url => url) do |f|
   .row
     = f.check_box :admin
     = f.email_field :email
@@ -14,4 +15,4 @@
     = f.password_field :password_confirmation
   .form-actions
     = f.submit :class => "btn btn-success" , :id => "submit"
-    = link_to t(:back), clerks_path, :class => "btn btn-warning"
+    = link_to t(:back), office.clerks_path, :class => "btn btn-warning"

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

@@ -5,7 +5,7 @@
         %h2= t(:clerks)
         = paginate @clerks
       .col-md-2
-        = link_to  t(:new) + ' ' + t(:clerk) , new_clerk_path , :class => "btn btn-primary"
+        = link_to  t(:new) + ' ' + t(:clerk) , office.new_clerk_path , :class => "btn btn-primary"
   .col-md-3
     = image_tag "office_clerk/clerks.jpg" , :class => "img-responsive"
 .row
@@ -14,7 +14,7 @@
       %table.table.table-striped.table-bordered.table-condensed
         %thead
           %tr
-            %th=sort_link @q, :email
+            %th=sort_link [:office,@q], :email
             %th=t(:address)
             %th{:colspan => "2"}
               %label.checkbox
@@ -24,14 +24,14 @@
             %tr{:class => "line-#{cycle("1","2")}"}
               %td=clerk.email
               %td=clerk.whole_address
-              %td= link_to t(:show) , clerk_path(clerk), :title => t(:show)
-              %td= link_to t(:edit), edit_clerk_path(clerk), :title => t(:edit)
+              %td= link_to t(:show) , office.clerk_path(clerk), :title => t(:show)
+              %td= link_to t(:edit), office.edit_clerk_path(clerk), :title => t(:edit)
     = paginate @clerks
   .col-md-3
-    = search_form_for @q, :url => search_clerks_path, :html => { :class => "form-horizontal" }, :method => :post do |f|
+    = search_form_for @q, :url => office.search_clerks_path, :html => { :class => "form-horizontal" }, :method => :get do |f|
       .form-group
         = f.text_field :email_cont , :class => "form-control" , :placeholder =>  t(:email)
       .form-group
         = f.text_field :address_cont ,:class => "form-control" , :placeholder =>  t(:address)
       = f.submit t(:filter),  :id => :filter , :class => "btn btn-success"
-      = link_to  t(:cancel), clerks_path, :class => "btn btn-warning"
+      = link_to  t(:cancel), office.clerks_path, :class => "btn btn-warning"