vyapari 0.1.5dev10 → 0.1.5

data/app/models/country.rb

@@ -1,12 +1,14 @@
 class Country < Vyapari::ApplicationRecord
 
+  DELETE_MESSAGE = "Cannot delete the country. You should first remove all the cities and exchange rates associated with this country."
+
   # Validations
-  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 :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
 
   # Associations
   has_many :regions
-  has_many :stores
+  has_many :exchange_rates
   
   # ------------------
   # Class Methods
@@ -19,33 +21,6 @@ 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 }
-
-    return if row[:name].blank?
-
-    country = Country.find_by_code(row[:code]) || Country.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
   # ------------------
@@ -59,7 +34,8 @@ class Country < Vyapari::ApplicationRecord
   end
 
   def can_be_deleted?
-    if self.regions.any? || self.stores.any?
+    if self.regions.any? || self.exchange_rates.any?
+      self.errors.add(:base, DELETE_MESSAGE) 
       return false
     else
       return true

data/app/models/exchange_rate.rb

@@ -1,11 +1,13 @@
 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, numericality: { greater_than: 0 }
+  validates :currency_name, presence: true, length: {minimum: 2, maximum: 4}, allow_blank: false
+  validates :value, presence: true
   validates :effective_date, presence: true
 
+  # Associations
+  belongs_to :country
+  
   # ------------------
   # Class Methods
   # ------------------
@@ -15,41 +17,14 @@ class ExchangeRate < Vyapari::ApplicationRecord
   # == Examples
   #   >>> obj.search(query)
   #   => ActiveRecord::Relation object
-  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)
-
-    row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
-
-    return if row[:base_currency].blank?
-
-    exchange_rate = ExchangeRate.where("base_currency = ? AND counter_currency = ?", row[:base_currency], row[:counter_currency]).first || ExchangeRate.new
-    
-    exchange_rate.base_currency = row[:base_currency]
-    exchange_rate.counter_currency = row[:counter_currency]
-    exchange_rate.value = row[:value]
-    exchange_rate.effective_date = row[:effective_date]
-    
-    # Initializing error hash for displaying all errors altogether
-    error_object = Kuppayam::Importer::ErrorHash.new
-
-    if exchange_rate.valid?
-      exchange_rate.save!
-    else
-      summary = "Error while saving exchange_rate: #{exchange_rate.name}"
-      details = "Error! #{exchange_rate.errors.full_messages.to_sentence}"
-      error_object.errors << { summary: summary, details: details }
-    end
-
-    return error_object
-  end
+  scope :search, lambda {|query| joins(:country).where("LOWER(exchange_rates.currency_name) LIKE LOWER('%#{query}%') OR LOWER(countries.name) LIKE LOWER('%#{query}%')")}
 
   # ------------------
   # Instance Methods
   # ------------------
 
   def display_name
-    "#{self.base_currency_was} to #{self.counter_currency_was}"
+    "#{self.currency_name_was}, #{self.country.try(:name)}"
   end
 
   def can_be_edited?

data/app/models/product.rb

@@ -4,26 +4,25 @@ class Product < Vyapari::ApplicationRecord
   PUBLISHED = "published"
   UNPUBLISHED = "unpublished"
   REMOVED = "removed"
-  
-  STATUS = {"Published" => PUBLISHED, "Unpublished" => UNPUBLISHED, "Removed" => REMOVED}
-  STATUS_REVERSE = {PUBLISHED => "Published", UNPUBLISHED => "Unpublished", REMOVED => "Removed"}
+  STATUS_HASH = {"Published" => PUBLISHED, "Unpublished" => UNPUBLISHED, "Removed" => REMOVED}
+  STATUS_HASH_REVERSE = {PUBLISHED => "Published", UNPUBLISHED => "Unpublished", REMOVED => "Removed"}
 
   FEATURED_HASH = {"Featured" => true, "Non Featured" => false}
   FEATURED_HASH_REVERSE = {true => "Featured", false => "Non Featured"}
 
   # Callbacks
+  before_validation :update_permalink
   before_validation :update_top_category
 
 	# Validations
   validates :name, presence: true
-  validates :ean_sku, presence: true
-  
   #validates :description, presence: true
-  validates :status, :presence=> true, :inclusion => {:in => STATUS_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
+  validates :permalink, presence: true, uniqueness: true
+  validates :status, :presence=> true, :inclusion => {:in => STATUS_HASH_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"
-  #has_one :brochure, :as => :documentable, :dependent => :destroy, :class_name => "Document::Brochure"
+  has_one :brochure, :as => :documentable, :dependent => :destroy, :class_name => "Document::Brochure"
   
   belongs_to :brand
   belongs_to :category
@@ -34,14 +33,14 @@ class Product < Vyapari::ApplicationRecord
   # == Examples
   #   >>> object.search(query)
   #   => ActiveRecord::Relation object
-  scope :search, lambda {|query| joins("LEFT JOIN categories on categories.id = products.category_id").
-                                 where("LOWER(products.ean_sku) LIKE LOWER('%#{query}%') OR\
-                                        LOWER(products.reference_number) LIKE LOWER('%#{query}%') OR\
-                                        LOWER(products.name) LIKE LOWER('%#{query}%') OR\
+  scope :search, lambda {|query| joins("INNER JOIN categories on categories.id = products.category_id").
+                                 where("LOWER(products.name) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(products.permalink) LIKE LOWER('%#{query}%') OR\
                                         LOWER(products.one_liner) LIKE LOWER('%#{query}%') OR\
                                         LOWER(products.description) LIKE LOWER('%#{query}%') OR\
                                         LOWER(categories.name) LIKE LOWER('%#{query}%') OR\
-                                        LOWER(categories.one_liner) LIKE LOWER('%#{query}%')")
+                                        LOWER(categories.one_liner) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(categories.description) LIKE LOWER('%#{query}%')")
                         }
 
   scope :status, lambda { |status| where("LOWER(status)='#{status}'") }
@@ -51,57 +50,10 @@ class Product < Vyapari::ApplicationRecord
   scope :unpublished, -> { where(status: UNPUBLISHED) }
   scope :removed, -> { where(status: REMOVED) }
 
-  def self.save_row_data(row)
-
-    row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
-
-    return if row[:name].blank?
-
-    product = Product.find_by_name(row[:name]) || Product.new
-
-    product.name = row[:name]
-    product.one_liner = row[:one_liner]
-    product.description = row[:description]
-    product.ean_sku = row[:ean_sku].to_s
-    product.reference_number = row[:reference_number]
-
-    product.brand = Brand.find_by_name(row[:brand])
-    product.category = Category.find_by_name(row[:category])
-    product.top_category = product.category.top_category if product.category
-
-    product.featured = row[:featured]
-    product.status = row[:status]
-    product.priority = row[:priority]
-    
-    # Initializing error hash for displaying all errors altogether
-    error_object = Kuppayam::Importer::ErrorHash.new
-
-    if product.valid?
-      product.save!
-    else
-      summary = "Error while saving product: #{product.name}"
-      details = "Error! #{product.errors.full_messages.to_sentence}"
-      error_object.errors << { summary: summary, details: details }
-    end
-    return error_object
-  end
-
   # ------------------
   # Instance variables
   # ------------------
 
-  def display_name
-    "#{self.ean_sku} : #{self.name}"
-  end
-
-  def slug
-    self.name.parameterize
-  end
-
-  def to_param
-    "#{id}-#{slug}"
-  end
-  
   # * Return true if the brand is published, else false.
   # == Examples
   #   >>> brand.published?
@@ -153,22 +105,7 @@ class Product < Vyapari::ApplicationRecord
     self.update_attributes(status: REMOVED, featured: false)
   end
 
-  def can_be_published?
-    unpublished? or removed?
-  end
-
-  def can_be_unpublished?
-    published? or removed?
-  end
-
-  def can_be_removed?
-    published? or unpublished? or removed?
-  end
-
-  def can_be_edited?
-    true
-  end
-
+  # TODO
   def can_be_deleted?
     #if self.jobs.any?
     #  self.errors.add(:base, DELETE_MESSAGE) 
@@ -179,6 +116,10 @@ class Product < Vyapari::ApplicationRecord
     return true
   end
 
+  def default_image_url(size="medium")
+    "/assets/defaults/product-#{size}.png"
+  end
+
   protected
 
   def update_top_category
@@ -191,4 +132,8 @@ class Product < Vyapari::ApplicationRecord
     end
   end
 
+  def update_permalink
+    self.permalink = "#{id}-#{name.parameterize}" if self.permalink.blank?
+  end
+
 end

data/app/models/region.rb

@@ -1,13 +1,15 @@
 class Region < Vyapari::ApplicationRecord
 
+  DELETE_MESSAGE = "Cannot delete this Region. You should first delete all the dependant data like Company Cities, Jobs, Budgets etc tagged with this Region"
+
   # Validations
-  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 :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 :country, presence: true
   
   # Associations
   belongs_to :country
-  has_many :stores
+  # has_many :stores
   
   # ------------------
   # Class Methods
@@ -18,35 +20,7 @@ class Region < Vyapari::ApplicationRecord
   # == Examples
   #   >>> obj.search(query)
   #   => ActiveRecord::Relation object
-  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)
-
-    row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
-
-    return if row[:name].blank?
-
-    region = Region.find_by_code(row[:code]) || Region.new
-    region.name = row[:name]
-    region.code = row[:code]
-    region.country = Country.find_by_code(row[:country]) || Country.find_by_name(row[:country])
-
-    # Initializing error hash for displaying all errors altogether
-    error_object = Kuppayam::Importer::ErrorHash.new
-
-    if region.valid?
-      region.save!
-    else
-      summary = "Error while saving region: #{region.name}"
-      details = "Error! #{region.errors.full_messages.to_sentence}"
-      error_object.errors << { summary: summary, details: details }
-    end
-
-    return error_object
-  end
+  scope :search, lambda {|query| joins(:country).where("LOWER(cities.name) LIKE LOWER('%#{query}%') OR LOWER(countries.name) LIKE LOWER('%#{query}%')")}
 
   # ------------------
   # Instance Methods
@@ -65,11 +39,20 @@ class Region < Vyapari::ApplicationRecord
   end
 
   def can_be_deleted?
-    if self.stores.any?
-      return false
-    else
-      return true
-    end
+    # 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(", ")
   end
 
 end

data/app/models/vyapari/application_record.rb

@@ -1,9 +1,6 @@
 module Vyapari
   class ApplicationRecord < ActiveRecord::Base
 	  self.abstract_class = true
-
-	  extend Kuppayam::Importer
-	  extend Kuppayam::Validators
 	end
 end
 

data/app/views/layouts/kuppayam/_footer.html.erb

@@ -5,7 +5,7 @@
 		<!-- Add your copyright text here -->
 		<div class="footer-text">
 			&copy; 2017 
-			<strong>Company Name</strong> 
+			<strong>Kuppayam</strong> 
 
 			All rights reserved. <br>developed, maintained and hosted by <a href="http://rightsolutions.io" target="_blank" style="color:red">Right Solutions</a>
 		</div>

data/app/views/layouts/kuppayam/_sidebar.html.erb

@@ -26,109 +26,108 @@
 					<i class="fa-bars"></i>
 				</a>
 			</div>
+			
 		</header>
 		
+		
+		
 		<ul id="main-menu" class="main-menu">
 			
 			<!-- add class "multiple-expanded" to allow multiple submenus to open -->
 			
 			<!-- class "auto-inherit-active-class" will automatically add "active" class for parent elements who are marked already with class "active" -->
 			
-			<!-- Dashboard -->
 			<li class="<%= nav_active?('admin/dashboard') ? 'active' : ''  %>">
-				<%= link_to raw("<i class=\"linecons-desktop\"></i> <span class='title'>Admin Dashboard</span>"), vyapari.admin_dashboard_url %>
+				<%= link_to raw("<i class=\"linecons-desktop\"></i> <span class='title'>Dashboard</span>"), vyapari.admin_dashboard_url %>
 			</li>
-			
-			<!-- Manage Store -->
-			<li class="<%= nav_active?('store_manager/stores') ? 'active' : ''  %>">
-				<%= link_to raw("<i class=\"linecons-shop\"></i> <span class='title'>Manage Store / POS</span>"), vyapari.user_dashboard_url %>
-			</li>
-			
-			<!-- Configurations -->
-			<% if @current_user.super_admin? %>
+
 			<li class="">
-				<a href="#">
-					<i class="linecons-params"></i>
+				<a href="/xenon/xenon-files/html/dashboard-1.html">
+					<i class="linecons-database"></i>
 					<span class="title">Configurations</span>
 				</a>
 				<ul>
 
+					<li class="<%= nav_class("admin/users") %>">
+				    <%= link_to raw("<i class=\"linecons-user\"></i> <span class='title'>Manage Users</span>"), usman.admin_users_url %>
+				  </li>
+					
+					<li class="<%= nav_class("admin/users") %>">
+						<%= link_to raw("<i class=\"linecons-lock\"></i> <span class='title'>Manage Permissions</span>"), usman.admin_permissions_url %>
+					</li>
+
 					<li class="">
-						<%= link_to raw("<i class=\"linecons-globe\"></i> <span class='title'>Countries</span>"), vyapari.admin_countries_url %>
+						<%= link_to raw("<i class=\"linecons-diamond\"></i> <span class='title'>Features</span>"), usman.admin_features_url %>
 					</li>
 
 					<li class="">
-						<%= link_to raw("<i class=\"linecons-location\"></i> <span class='title'>Manage Regions</span>"), vyapari.admin_regions_url %>
+						<%= link_to raw("<i class=\"linecons-diamond\"></i> <span class='title'>Roles</span>"), usman.admin_roles_url %>
 					</li>
 
 					<li class="">
-						<%= link_to raw("<i class=\"linecons-money\"></i> <span class='title'>Exchange Rates</span>"), vyapari.admin_exchange_rates_url %>
+						<%= link_to raw("<i class=\"linecons-database\"></i> <span class='title'>Countries</span>"), vyapari.admin_countries_url %>
 					</li>
 
 					<li class="">
-						<%= link_to raw("<i class=\"linecons-diamond\"></i> <span class='title'>Features</span>"), usman.admin_features_url %>
+						<%= link_to raw("<i class=\"linecons-database\"></i> <span class='title'>Regions</span>"), vyapari.admin_regions_url %>
 					</li>
 
-					<li class="<%= nav_class("admin/users") %>">
-						<%= link_to raw("<i class=\"linecons-lock\"></i> <span class='title'>Manage Permissions</span>"), usman.admin_permissions_url %>
+					<li class="">
+						<%= link_to raw("<i class=\"linecons-database\"></i> <span class='title'>Exchange Rates</span>"), vyapari.admin_exchange_rates_url %>
 					</li>
 
 				</ul>
 			</li>
-			<% end %>
 
-			<!-- Administration -->
-			<% if @current_user.super_admin? || @current_user.has_role?("Site Admin") %>
 			<li class="">
-				<a href="#">
-					<i class="linecons-cog"></i>
-					<span class="title">Administration</span>
+				<a href="/xenon/xenon-files/html/dashboard-1.html">
+					<i class="linecons-database"></i>
+					<span class="title">Stock Management</span>
 				</a>
 				<ul>
-
-					<li class="<%= nav_class("admin/users") %>">
-				    <%= link_to raw("<i class=\"linecons-user\"></i> <span class='title'>Manage Users</span>"), usman.admin_users_url %>
-				  </li>
-
-				  <li class="">
-						<%= link_to raw("<i class=\"linecons-graduation-cap\"></i> <span class='title'>Manage Roles</span>"), usman.admin_roles_url %>
-					</li>
-
 					<li class="">
-						<%= link_to raw("<i class=\"linecons-database\"></i> <span class='title'>Manage Brands</span>"), vyapari.admin_brands_url %>
+						<%= link_to raw("<i class=\"linecons-database\"></i> <span class='title'>Manage Suppliers</span>"), vyapari.admin_suppliers_url %>
 					</li>
 
 					<li class="">
-						<%= link_to raw("<i class=\"linecons-database\"></i> <span class='title'>Manage Categories</span>"), vyapari.admin_categories_url %>
+						<%= link_to raw("<i class=\"linecons-diamond\"></i> <span class='title'>Manage Stores</span>"), vyapari.admin_stores_url %>
 					</li>
-					
+
 					<li class="">
-						<%= link_to raw("<i class=\"linecons-shop\"></i> <span class='title'>Manage Stores</span>"), vyapari.admin_stores_url %>
+						<%= link_to raw("<i class=\"linecons-database\"></i> <span class='title'>Manage Brands</span>"), vyapari.admin_brands_url %>
 					</li>
 
 					<li class="">
-						<%= link_to raw("<i class=\"linecons-database\"></i> <span class='title'>Manage Suppliers</span>"), vyapari.admin_suppliers_url %>
+						<%= link_to raw("<i class=\"linecons-database\"></i> <span class='title'>Manage Categories</span>"), vyapari.admin_categories_url %>
 					</li>
 
 				</ul>
 			</li>
-			<% end %>
 
-			<% if @current_user.super_admin? %>
 			<li class="">
-				<a href="#">
+				<a href="/xenon/xenon-files/html/dashboard-1.html">
 					<i class="linecons-database"></i>
-					<span class="title">Monitoring</span>
+					<span class="title">POS</span>
 				</a>
 				<ul>
-					
 					<li class="">
-						<%= link_to raw("<i class=\"linecons-truck\"></i> <span class='title'>Manage Products</span>"), vyapari.admin_products_url %>
+						<%= link_to raw("<i class=\"linecons-database\"></i> <span class='title'>Manage Suppliers</span>"), vyapari.admin_suppliers_url %>
+					</li>
+
+					<li class="">
+						<%= link_to raw("<i class=\"linecons-diamond\"></i> <span class='title'>Manage Stores</span>"), vyapari.admin_stores_url %>
+					</li>
+
+					<li class="">
+						<%= link_to raw("<i class=\"linecons-database\"></i> <span class='title'>Manage Brands</span>"), vyapari.admin_brands_url %>
+					</li>
+
+					<li class="">
+						<%= link_to raw("<i class=\"linecons-database\"></i> <span class='title'>Manage Categories</span>"), vyapari.admin_categories_url %>
 					</li>
 
 				</ul>
 			</li>
-			<% end %>
 
 		</ul>