vyapari 0.1.5dev9 → 0.1.5dev10

data/app/controllers/vyapari/store_manager/reports/stock_controller.rb

@@ -111,7 +111,7 @@ module Vyapari
         end
 
       	def set_navs
-          set_nav("reports/stock")
+          set_nav("store_manager/reports")
         end
 
         def render_report

data/app/controllers/vyapari/terminal_staff/dashboard_controller.rb

@@ -4,6 +4,7 @@ module Vyapari
 
 	  	# GET /dashboard
 	    def index
+	    	@date = params[:date] ? Date.parse(params[:date]) : Date.today
 	    end
 
 	    def search
@@ -19,7 +20,7 @@ module Vyapari
 	        description: "#{@store.name}",
 	        links: [
 	        	{name: "Home", link: user_dashboard_path, icon: 'fa-building-o'},
-	        	{name: @terminal.name, link: terminal_staff_dashboard_path(@store), icon: 'fa-desktop'}
+	        	{name: @terminal.name, link: terminal_staff_dashboard_path(@store), icon: 'fa-desktop', active: true}
 	        ]
 	      }
 	    end

data/app/models/bank_account.rb

@@ -0,0 +1,44 @@
+class BankAccount < Vyapari::ApplicationRecord
+
+  # Validations
+  validates :account_number, presence: true
+  #validates :email, length: {maximum: 128}, allow_blank: true
+  #validates :phone, length: {maximum: 128}, allow_blank: true
+
+  # Associations
+  belongs_to :bank_accountable, :polymorphic => true
+  
+  # ------------------
+  # Class Methods
+  # ------------------
+
+  # return an active record relation object with the search query in its where clause
+  # Return the ActiveRecord::Relation object
+  # == Examples
+  #   >>> obj.search(query)
+  #   => ActiveRecord::Relation object
+  scope :search, lambda {|query| joins(:country).where("LOWER(bank_accounts.account_number) LIKE LOWER('%#{query}%') OR
+                                        LOWER(bank_accounts.iban) LIKE LOWER('%#{query}%') OR
+                                        LOWER(bank_accounts.ifsc_swiftcode) LIKE LOWER('%#{query}%') OR
+                                        LOWER(bank_accounts.bank_name) LIKE LOWER('%#{query}%') OR
+                                        LOWER(bank_accounts.city) LIKE LOWER('%#{query}%') OR
+                                        LOWER(countries.name) LIKE LOWER('%#{query}%')
+                        ")}
+
+  # ------------------
+  # Instance Methods
+  # ------------------
+
+  def display_name
+    self.account_number_was
+  end
+
+  def can_be_edited?
+    true
+  end
+
+  def can_be_deleted?
+    false
+  end
+
+end

data/app/models/brand.rb

@@ -5,15 +5,15 @@ class Brand < Vyapari::ApplicationRecord
   UNPUBLISHED = "unpublished"
   REMOVED = "removed"
   
-  STATUS_HASH = {"Published" => PUBLISHED, "Unpublished" => UNPUBLISHED, "Removed" => REMOVED}
-  STATUS_HASH_REVERSE = {PUBLISHED => "Published", UNPUBLISHED => "Unpublished", REMOVED => "Removed"}
+  STATUS = {"Published" => PUBLISHED, "Unpublished" => UNPUBLISHED, "Removed" => REMOVED}
+  STATUS_REVERSE = {PUBLISHED => "Published", UNPUBLISHED => "Unpublished", REMOVED => "Removed"}
 
   FEATURED_HASH = {"Featured" => true, "Non Featured" => false}
   FEATURED_HASH_REVERSE = {true => "Featured", false => "Non Featured"}
 
   # Validations
-  validates :name, :presence=> true, uniqueness: true
-  validates :status, :presence=> true, :inclusion => {:in => STATUS_HASH_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
+  validates :name, :presence=> true, uniqueness: true, length: {minimum: 3, maximum: 250}
+  validates :status, :presence=> true, :inclusion => {:in => STATUS_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
 
   # Associations
   has_one :brand_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::BrandImage"
@@ -32,16 +32,18 @@ class Brand < Vyapari::ApplicationRecord
   #   => ActiveRecord::Relation object
   scope :search, lambda { |query| where("LOWER(name) LIKE LOWER('%#{query}%')")
                         }
-
-  scope :status, lambda { |status| where("LOWER(status)='#{status}'") }
   scope :featured, lambda { |val| where(featured: val) }
 
+  scope :status, lambda { |status| where("LOWER(status)='#{status}'") }
   scope :published, -> { where(status: PUBLISHED) }
   scope :unpublished, -> { where(status: UNPUBLISHED) }
   scope :removed, -> { where(status: REMOVED) }
 
   scope :this_month, lambda { where("created_at >= ? AND created_at <= ?", Time.zone.now.beginning_of_month, Time.zone.now.end_of_month) }
   
+  # Import Methods
+  # --------------
+  
   def self.save_row_data(row)
 
     row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
@@ -155,13 +157,6 @@ class Brand < Vyapari::ApplicationRecord
   
   def can_be_deleted?
     removed? && self.products.blank?
-    #if self.jobs.any?
-    #  self.errors.add(:base, DELETE_MESSAGE) 
-    #  return false
-    #else
-    #  return true
-    #end
-    #return true
   end
   
 end

data/app/models/category.rb

@@ -5,8 +5,8 @@ class Category < Vyapari::ApplicationRecord
   UNPUBLISHED = "unpublished"
   REMOVED = "removed"
   
-  STATUS_HASH = {"Published" => PUBLISHED, "Unpublished" => UNPUBLISHED, "Removed" => REMOVED}
-  STATUS_HASH_REVERSE = {PUBLISHED => "Published", UNPUBLISHED => "Unpublished", REMOVED => "Removed"}
+  STATUS = {"Published" => PUBLISHED, "Unpublished" => UNPUBLISHED, "Removed" => REMOVED}
+  STATUS_REVERSE = {PUBLISHED => "Published", UNPUBLISHED => "Unpublished", REMOVED => "Removed"}
 
   FEATURED_HASH = {"Featured" => true, "Non Featured" => false}
   FEATURED_HASH_REVERSE = {true => "Featured", false => "Non Featured"}
@@ -14,7 +14,7 @@ class Category < Vyapari::ApplicationRecord
   # Validations
   validates :name, presence: true, uniqueness: true
   validates :one_liner, presence: false
-  validates :status, :presence=> true, :inclusion => {:in => STATUS_HASH_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
+  validates :status, :presence=> true, :inclusion => {:in => STATUS_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
 
   # Associations
   has_many :products

data/app/models/contact.rb

@@ -0,0 +1,72 @@
+class Contact < Vyapari::ApplicationRecord
+
+  # Validations
+  validates :name, presence: true, length: {minimum: 2, maximum: 250}, allow_blank: false
+  validates :email, length: {maximum: 128}, allow_blank: true
+  validates :phone, length: {maximum: 128}, allow_blank: true
+
+  # Associations
+  belongs_to :contactable, :polymorphic => true
+  
+  # ------------------
+  # Class Methods
+  # ------------------
+
+  # return an active record relation object with the search query in its where clause
+  # Return the ActiveRecord::Relation object
+  # == Examples
+  #   >>> obj.search(query)
+  #   => ActiveRecord::Relation object
+  scope :search, lambda {|query| where("LOWER(contacts.name) LIKE LOWER('%#{query}%') OR
+                                        LOWER(contacts.email) LIKE LOWER('%#{query}%') OR
+                                        LOWER(contacts.phone) LIKE LOWER('%#{query}%') OR
+                                        LOWER(contacts.landline) LIKE LOWER('%#{query}%') OR
+                                        LOWER(contacts.fax) LIKE LOWER('%#{query}%') OR
+                                        LOWER(contacts.designation) LIKE LOWER('%#{query}%')
+                        ")}
+
+  # Import Methods
+  # --------------
+  
+  # TODO - this is yet to be done
+  def self.save_row_data(row)
+
+    row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
+
+    return if row[:name].blank?
+
+    country = Contact.find_by_code(row[:code]) || Contact.new
+    country.name = row[:name]
+    country.code = row[:code]
+
+    # Initializing error hash for displaying all errors altogether
+    error_object = Kuppayam::Importer::ErrorHash.new
+
+    if country.valid?
+      country.save!
+    else
+      summary = "Error while saving country: #{country.name}"
+      details = "Error! #{country.errors.full_messages.to_sentence}"
+      error_object.errors << { summary: summary, details: details }
+    end
+
+    return error_object
+  end
+
+  # ------------------
+  # Instance Methods
+  # ------------------
+
+  def display_name
+    self.name_was
+  end
+
+  def can_be_edited?
+    true
+  end
+
+  def can_be_deleted?
+    false
+  end
+
+end

data/app/models/country.rb

@@ -1,8 +1,8 @@
 class Country < Vyapari::ApplicationRecord
 
   # Validations
-  validates :name, presence: true, length: {minimum: 2, maximum: 250}, allow_blank: false
-  validates :code, presence: true, uniqueness: true, length: {minimum: 2, maximum: 32}, allow_blank: false
+  validates :name, presence: true, length: {minimum: 2, maximum: 128}, allow_blank: false
+  validates :code, presence: true, uniqueness: true, length: {minimum: 2, maximum: 16}, allow_blank: false
 
   # Associations
   has_many :regions
@@ -19,6 +19,9 @@ class Country < Vyapari::ApplicationRecord
   #   => ActiveRecord::Relation object
   scope :search, lambda {|query| where("LOWER(countries.name) LIKE LOWER('%#{query}%')")}
 
+  # Import Methods
+  # --------------
+  
   def self.save_row_data(row)
 
     row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
@@ -56,8 +59,7 @@ class Country < Vyapari::ApplicationRecord
   end
 
   def can_be_deleted?
-    if self.regions.any?
-      #self.errors.add(:base, DELETE_MESSAGE) 
+    if self.regions.any? || self.stores.any?
       return false
     else
       return true

data/app/models/exchange_rate.rb

@@ -3,7 +3,7 @@ class ExchangeRate < Vyapari::ApplicationRecord
   # Validations
   validates :base_currency, presence: true, length: {minimum: 2, maximum: 6}, allow_blank: false
   validates :counter_currency, presence: true, length: {minimum: 2, maximum: 6}, allow_blank: false
-  validates :value, presence: true
+  validates :value, presence: true, numericality: { greater_than: 0 }
   validates :effective_date, presence: true
 
   # ------------------
@@ -15,7 +15,7 @@ class ExchangeRate < Vyapari::ApplicationRecord
   # == Examples
   #   >>> obj.search(query)
   #   => ActiveRecord::Relation object
-  scope :search, lambda {|query| where("LOWER(base_currency) LIKE LOWER('%#{query}%') OR LOWER(counter_currency) LIKE LOWER('%#{query}%')")}
+  scope :search, lambda {|query| where("LOWER(exchange_rates.base_currency) LIKE LOWER('%#{query}%') OR LOWER(exchange_rates.counter_currency) LIKE LOWER('%#{query}%')")}
 
   def self.save_row_data(row)
 

data/app/models/invoice.rb

@@ -10,8 +10,11 @@ class Invoice < Vyapari::ApplicationRecord
   CREDIT_CARD = "credit_card"
   CHEQUE = "cheque"
   
-  STATUS_HASH = {"Draft" => DRAFT, "Active" => ACTIVE, "Cancelled" => CANCELLED}
-  STATUS_HASH_REVERSE = {DRAFT => "Draft", ACTIVE => "Active", CANCELLED => "Cancelled"}
+  STATUS = {"Draft" => DRAFT, "Active" => ACTIVE, "Cancelled" => CANCELLED}
+  STATUS_REVERSE = {DRAFT => "Draft", ACTIVE => "Active", CANCELLED => "Cancelled"}
+
+  PAYMENT_METHOD = {"Cash" => CASH, "Credit" => CREDIT, "Credit Card" => CREDIT_CARD, "Cheque" => CHEQUE}
+  PAYMENT_METHOD_REVERSE = {CASH => "Cash", CREDIT => "Credid", CREDIT_CARD => "Credit Card", CHEQUE => "Cheque"}
 
   # Call backs
   before_save :calculate_gross_total_amount
@@ -20,7 +23,7 @@ class Invoice < Vyapari::ApplicationRecord
   validates :invoice_number, :presence=> true
   validates :invoice_date, :presence=> true
 
-  validates :status, :presence=> true, :inclusion => {:in => STATUS_HASH_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
+  validates :status, :presence=> true, :inclusion => {:in => STATUS_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
 
   # Associations
   belongs_to :terminal
@@ -40,7 +43,7 @@ class Invoice < Vyapari::ApplicationRecord
   # == Examples
   #   >>> invoice.search(query)
   #   => ActiveRecord::Relation object
-  scope :search, lambda { |query| where("LOWER(invoice_number) LIKE LOWER('%#{query}%') OR LOWER(customer_name) LIKE LOWER('%#{query}%') OR LOWER(customer_address) LIKE LOWER('%#{query}%')")
+  scope :search, lambda { |query| where("LOWER(invoice_number) LIKE LOWER('%#{query}%') OR LOWER(notes) LIKE LOWER('%#{query}%') OR LOWER(credit_card_number) LIKE LOWER('%#{query}%') OR LOWER(cheque_number) LIKE LOWER('%#{query}%') OR LOWER(customer_name) LIKE LOWER('%#{query}%') OR LOWER(customer_address) LIKE LOWER('%#{query}%') OR LOWER(net_total_amount) LIKE LOWER('%#{query}%')")
                         }
 
   scope :status, lambda { |status| where("LOWER(status)='#{status}'") }
@@ -54,10 +57,11 @@ class Invoice < Vyapari::ApplicationRecord
   scope :credit_card_invoices, -> { where(payment_method: CREDIT_CARD) }
   scope :cheque_invoices, -> { where(payment_method: CHEQUE) }
 
-  scope :payment_method, lambda { |pm| where("LOWER(payment_method)='#{payment_method}'") }
+  scope :payment_method, lambda { |pm| where("LOWER(payment_method)=?", ) }
 
-  scope :this_month, lambda { where("created_at >= ? AND created_at <= ?", Time.zone.now.beginning_of_month, Time.zone.now.end_of_month) }
-  scope :today, lambda { where('DATE(created_at) = ?', Date.current.in_time_zone)}
+  scope :this_month, lambda { where("invoice_date >= ? AND invoice_date <= ?", Time.zone.now.beginning_of_month, Time.zone.now.end_of_month) }
+  scope :today, lambda { where('DATE(invoice_date) = ?', Date.current.in_time_zone)}
+  scope :dated, lambda { |d| where('DATE(invoice_date) = ?', d)}
   
   # ------------------
   # Instance Methods
@@ -78,7 +82,7 @@ class Invoice < Vyapari::ApplicationRecord
   end
 
   def display_status
-    STATUS_HASH_REVERSE[self.status]
+    STATUS_REVERSE[self.status]
   end
 
   def display_payment_method

data/app/models/line_item.rb

@@ -7,8 +7,8 @@ class LineItem < Vyapari::ApplicationRecord
   RETURNED = "returned"
   CANCELLED = "cancelled"
   
-  STATUS_HASH = {"Draft" => DRAFT, "Sold" => SOLD, "Damaged" => DAMAGED, "Returned" => RETURNED, "Cancelled" => CANCELLED}
-  STATUS_HASH_REVERSE = {DRAFT => "Draft", SOLD => "Sold", DAMAGED => "Damaged", RETURNED => "Returned", CANCELLED => "Cancelled"}
+  STATUS = {"Draft" => DRAFT, "Sold" => SOLD, "Damaged" => DAMAGED, "Returned" => RETURNED, "Cancelled" => CANCELLED}
+  STATUS_REVERSE = {DRAFT => "Draft", SOLD => "Sold", DAMAGED => "Damaged", RETURNED => "Returned", CANCELLED => "Cancelled"}
 
   # Call backs
   before_save :calculate_total_amount
@@ -18,7 +18,7 @@ class LineItem < Vyapari::ApplicationRecord
   validates :quantity, :presence=> true
   validates :rate, :presence=> true
 
-  validates :status, :presence=> true, :inclusion => {:in => STATUS_HASH_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
+  validates :status, :presence=> true, :inclusion => {:in => STATUS_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
 
   # Associations
   belongs_to :product, optional: true

data/app/models/product.rb

@@ -5,8 +5,8 @@ class Product < Vyapari::ApplicationRecord
   UNPUBLISHED = "unpublished"
   REMOVED = "removed"
   
-  STATUS_HASH = {"Published" => PUBLISHED, "Unpublished" => UNPUBLISHED, "Removed" => REMOVED}
-  STATUS_HASH_REVERSE = {PUBLISHED => "Published", UNPUBLISHED => "Unpublished", REMOVED => "Removed"}
+  STATUS = {"Published" => PUBLISHED, "Unpublished" => UNPUBLISHED, "Removed" => REMOVED}
+  STATUS_REVERSE = {PUBLISHED => "Published", UNPUBLISHED => "Unpublished", REMOVED => "Removed"}
 
   FEATURED_HASH = {"Featured" => true, "Non Featured" => false}
   FEATURED_HASH_REVERSE = {true => "Featured", false => "Non Featured"}
@@ -19,7 +19,7 @@ class Product < Vyapari::ApplicationRecord
   validates :ean_sku, presence: true
   
   #validates :description, presence: true
-  validates :status, :presence=> true, :inclusion => {:in => STATUS_HASH_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
+  validates :status, :presence=> true, :inclusion => {:in => STATUS_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
 
   # Associations
   has_one :product_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::ProductImage"

data/app/models/region.rb

@@ -1,8 +1,8 @@
 class Region < Vyapari::ApplicationRecord
 
   # Validations
-  validates :name, presence: true, length: {minimum: 2, maximum: 250}, allow_blank: false
-  validates :code, presence: true, uniqueness: true, length: {minimum: 2, maximum: 32}, allow_blank: false
+  validates :name, presence: true, length: {minimum: 2, maximum: 128}, allow_blank: false
+  validates :code, presence: true, uniqueness: true, length: {minimum: 2, maximum: 16}, allow_blank: false
   validates :country, presence: true
   
   # Associations
@@ -18,7 +18,10 @@ class Region < Vyapari::ApplicationRecord
   # == Examples
   #   >>> obj.search(query)
   #   => ActiveRecord::Relation object
-  scope :search, lambda {|query| joins(:country).where("LOWER(cities.name) LIKE LOWER('%#{query}%') OR LOWER(countries.name) LIKE LOWER('%#{query}%')")}
+  scope :search, lambda {|query| joins(:country).where("LOWER(regions.name) LIKE LOWER('%#{query}%') OR LOWER(countries.name) LIKE LOWER('%#{query}%')")}
+
+  # Import Methods
+  # --------------
 
   def self.save_row_data(row)
 
@@ -62,20 +65,11 @@ class Region < Vyapari::ApplicationRecord
   end
 
   def can_be_deleted?
-    # if self.stores.any?
-    #   self.errors.add(:base, DELETE_MESSAGE) 
-    #   return false
-    # else
-    #   return true
-    # end
-    return true
-  end
-
-  def report_heading
-    rh = []
-    rh << self.company.try(:name) if self.company.name
-    rh << self.display_name
-    rh.join(", ")
+    if self.stores.any?
+      return false
+    else
+      return true
+    end
   end
 
 end

data/app/models/stock_bundle.rb

@@ -7,13 +7,13 @@ class StockBundle < ActiveRecord::Base
   ERRORED = "errored"
   APPROVED = "approved"
 
-  STATUS_HASH = {"Pending" => PENDING, "Approved" => APPROVED, "Errored" => ERRORED}
-  STATUS_HASH_REVERSE = {PENDING => "Pending", APPROVED => "Approved", ERRORED => "Errored"}
+  STATUS = {"Pending" => PENDING, "Approved" => APPROVED, "Errored" => ERRORED}
+  STATUS_REVERSE = {PENDING => "Pending", APPROVED => "Approved", ERRORED => "Errored"}
 
   # Validations
   validates :name, :presence=> true, uniqueness: true
   validates :uploaded_date, presence: true
-  validates :status, :presence=> true, :inclusion => {:in => STATUS_HASH_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
+  validates :status, :presence=> true, :inclusion => {:in => STATUS_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
   # validates :file, :presence=> true
   
   # Associations
@@ -163,7 +163,7 @@ class StockBundle < ActiveRecord::Base
   end
 
   def display_status
-    STATUS_HASH_REVERSE[self.status]
+    STATUS_REVERSE[self.status]
   end
 
   def display_file_name

data/app/models/stock_entry.rb

@@ -9,14 +9,14 @@ class StockEntry < Vyapari::ApplicationRecord
   RESERVED = "reserved"
   PENDING = "pending"
   
-  STATUS_HASH = {"Active" => ACTIVE, "Sold" => SOLD, "Damaged" => DAMAGED, "Received" => RECEIVED, "Reserved" => RESERVED, "Pending" => PENDING, "Returned" => RETURNED}
-  STATUS_HASH_REVERSE = {ACTIVE => "Active", SOLD => "Sold", DAMAGED => "Damaged", RECEIVED => "Received", RESERVED => "Reserved", PENDING => "Pending", RETURNED => "Returned"}
+  STATUS = {"Active" => ACTIVE, "Sold" => SOLD, "Damaged" => DAMAGED, "Received" => RECEIVED, "Reserved" => RESERVED, "Pending" => PENDING, "Returned" => RETURNED}
+  STATUS_REVERSE = {ACTIVE => "Active", SOLD => "Sold", DAMAGED => "Damaged", RECEIVED => "Received", RESERVED => "Reserved", PENDING => "Pending", RETURNED => "Returned"}
 
   # Validations
   validates :store, presence: true
   validates :product, presence: true
   validates :quantity, presence: true, numericality: true
-  validates :status, :presence=> true, :inclusion => {:in => STATUS_HASH_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
+  validates :status, :presence=> true, :inclusion => {:in => STATUS_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
   
   # Associations
   belongs_to :store
@@ -50,8 +50,9 @@ class StockEntry < Vyapari::ApplicationRecord
   scope :reserved, -> { where(status: RESERVED) }
   scope :in_stock, -> { where(status: [ACTIVE, RECEIVED, RETURNED]) }
 
-  scope :this_month, lambda { where("created_at >= ? AND created_at <= ?", Time.zone.now.beginning_of_month, Time.zone.now.end_of_month) }
-  scope :today, lambda { where('DATE(created_at) = ?', Date.current.in_time_zone)}
+  scope :this_month, lambda { joins(:invoice).where("invoices.invoice_date >= ? AND invoices.invoice_date <= ?", Time.zone.now.beginning_of_month, Time.zone.now.end_of_month) }
+  scope :today, lambda { joins(:invoice).where('DATE(invoices.invoice_date) = ?', Date.current.in_time_zone)}
+  scope :dated, lambda { |d| joins(:invoice).where('DATE(invoices.invoice_date) = ?', d)}
 
   def self.save_row_data(row)
 
@@ -112,11 +113,11 @@ class StockEntry < Vyapari::ApplicationRecord
   end
 
   def display_store_type
-    STATUS_HASH[self.status]
+    STATUS[self.status]
   end
 
   def display_status
-    STATUS_HASH_REVERSE[self.status]
+    STATUS_REVERSE[self.status]
   end
 
   def slug

data/app/models/store.rb

@@ -5,8 +5,8 @@ class Store < Vyapari::ApplicationRecord
   INACTIVE = "inactive"
   CLOSED = "closed"
   
-  STATUS_HASH = {"Active" => ACTIVE, "Inactive" => INACTIVE, "Closed" => CLOSED}
-  STATUS_HASH_REVERSE = {ACTIVE => "Active", INACTIVE => "Inactive", CLOSED => "Closed"}
+  STATUS = {"Active" => ACTIVE, "Inactive" => INACTIVE, "Closed" => CLOSED}
+  STATUS_REVERSE = {ACTIVE => "Active", INACTIVE => "Inactive", CLOSED => "Closed"}
 
   # Constants
   WAREHOUSE = "warehouse"
@@ -26,15 +26,18 @@ class Store < Vyapari::ApplicationRecord
   validates :name, presence: true, length: {minimum: 2, maximum: 250}, allow_blank: false
   validates :code, presence: true, uniqueness: true, length: {minimum: 2, maximum: 24}, allow_blank: false
   validates :store_type, :presence => true, :inclusion => {:in => STORE_TYPES.keys, :presence_of => :store_type, :message => "%{value} is not a valid store type" }
-  validates :status, :presence=> true, :inclusion => {:in => STATUS_HASH_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
+  validates :status, :presence=> true, :inclusion => {:in => STATUS_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
   
   # Associations
   belongs_to :region, optional: true
   belongs_to :country, optional: true
   
   has_many :terminals
+  has_many :invoices
   has_many :stock_entries
   has_many :stock_bundles
+  has_many :products, through: :stock_entries
+  
   
   # ------------------
   # Class Methods
@@ -131,6 +134,33 @@ class Store < Vyapari::ApplicationRecord
     true
   end
 
+  # Total Counts
+
+  def total_quantity_of_products_in_stock
+    self.stock_entries.active.sum(:quantity) - self.stock_entries.sold.sum(:quantity)
+  end
+
+  def total_no_of_products_in_stock
+    self.stock_entries.active.count 
+    # - self.stock_entries.sold.count
+    # self.stock_entries.active.count - self.stock_entries.sold.count
+    #begin
+      # result = Product.select("COUNT(products.id) as id, MAX(se.store_id) as store_id").
+      #               joins("LEFT JOIN stock_entries se ON se.product_id = products.id").
+      #               where("se.store_id = ?", self.id).
+      #               group("products.id")
+      # return result.size.to_i
+    #rescue
+      #0
+    #end
+  end
+
+  # Sold Items Count
+
+  def sold_items_count(date=Date.today)
+    self.stock_entries.dated(date).sold.sum(:quantity)
+  end
+
   def sold_items_count_for_today
     self.stock_entries.today.sold.sum(:quantity)
   end
@@ -139,6 +169,12 @@ class Store < Vyapari::ApplicationRecord
     self.stock_entries.this_month.sold.sum(:quantity)
   end
 
+  # Damaged Items Count
+
+  def damaged_items_count(date=Date.today)
+    self.stock_entries.dated(date).damaged.sum(:quantity)
+  end
+
   def damaged_items_count_for_today
     self.stock_entries.today.damaged.sum(:quantity)
   end
@@ -147,6 +183,12 @@ class Store < Vyapari::ApplicationRecord
     self.stock_entries.this_month.damaged.sum(:quantity)
   end
 
+  # Returned Items Count
+
+  def returned_items_count(date=Date.today)
+    self.stock_entries.dated(date).returned.sum(:quantity)
+  end
+
   def returned_items_count_for_today
     self.stock_entries.today.returned.sum(:quantity)
   end
@@ -155,6 +197,12 @@ class Store < Vyapari::ApplicationRecord
     self.stock_entries.this_month.returned.sum(:quantity)
   end
 
+  # Reserved Items Count
+
+  def reserved_items_count(date=Date.today)
+    self.stock_entries.dated(date).reserved.sum(:quantity)
+  end
+
   def reserved_items_count_for_today
     self.stock_entries.today.reserved.sum(:quantity)
   end
@@ -163,24 +211,7 @@ class Store < Vyapari::ApplicationRecord
     self.stock_entries.this_month.reserved.sum(:quantity)
   end
 
-  def in_stock_items_count_as_of_now
-    self.stock_entries.active.sum(:quantity) - self.stock_entries.sold.sum(:quantity)
-  end
-
-  def total_no_of_products_in_stock
-    self.stock_entries.active.count 
-    # - self.stock_entries.sold.count
-    # self.stock_entries.active.count - self.stock_entries.sold.count
-    #begin
-      # result = Product.select("COUNT(products.id) as id, MAX(se.store_id) as store_id").
-      #               joins("LEFT JOIN stock_entries se ON se.product_id = products.id").
-      #               where("se.store_id = ?", self.id).
-      #               group("products.id")
-      # return result.size.to_i
-    #rescue
-      #0
-    #end
-  end
+