vyapari 0.1.5dev10 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78c3cde2ff155082088ef1e7606db93fca5223b0
-  data.tar.gz: 73bca11944d2b9f8996af22561030bd94094f0c1
+  metadata.gz: 909bdbbbd91605efa3e132044390c03dfa9e51c0
+  data.tar.gz: 50305de2181b3f5de0f4ee5e641e853c05daf683
 SHA512:
-  metadata.gz: 5e5af5f8a109d10ea7161c5a34611ccf8d999b8e2b1543772bcb135cb630bb12ceb4aad6bff8a2729b6d79007087ea2aac79663bd0c15bd2f01b59951dabdfb3
-  data.tar.gz: 1e07162b8f01363c58c93567608d67a93dae49ebeb595dec43347a7c170f3145163f05c2882b1610ea2abdd53f175061e84b9ca684e8a9a5b7fd211da9ea272d
+  metadata.gz: d0cb0012ee08b60b372925fb4b363cd5184cc87ffb3b6b106bf363571fe58a80a5915bad89e4b19edbfb4b4c8a168d91c1d705e86a6bf9b4b2edf8ac4a972225
+  data.tar.gz: 0ddc9adf0f78d06f2015e3f83078e0e3c7b20abcf67c796995ff849c7bc1974a90ac7611010411190a7c594bf90c04d473ef08c7218db21aeaf60cd3ad2629a9

data/app/controllers/vyapari/admin/base_controller.rb

@@ -5,21 +5,12 @@ module Vyapari
       layout 'kuppayam/admin'
       
       before_action :require_user
-      before_action :require_site_admin
       
       private
 
       def set_default_title
         set_title("Vyapari Admin | Vyapari Stock Management Module")
       end
-
-      def require_site_admin
-        unless @current_user.has_role?("Site Admin")
-          text = "#{I18n.t("authentication.permission_denied.heading")}: #{I18n.t("authentication.permission_denied.message")}"
-          set_flash_message(text, :error, false) if defined?(flash) && flash
-          redirect_to default_redirect_url_after_sign_in
-        end
-      end
       
     end	
   end

data/app/controllers/vyapari/admin/countries_controller.rb

@@ -18,7 +18,7 @@ module Vyapari
       def apply_filters
         @relation = @relation.search(@query) if @query
         
-        @order_by = "name ASC" unless @order_by
+        @order_by = "created_at desc" unless @order_by
         @relation = @relation.order(@order_by)
       end
 
@@ -39,7 +39,7 @@ module Vyapari
 
       def resource_controller_configuration
         {
-          page_title: "Countries",
+          page_title: "Manage Countries",
           current_nav: "admin/countries",
           js_view_path: "/kuppayam/workflows/parrot",
           view_path: "/vyapari/admin/countries"

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

@@ -2,8 +2,6 @@ module Vyapari
 	module Admin
 	  class DashboardController < Vyapari::Admin::BaseController
 
-	  	before_action :require_site_admin
-
 	  	# GET /dashboard
 	    def index
 	    end
@@ -12,7 +10,7 @@ module Vyapari
 
 	    def breadcrumbs_configuration
 	      {
-	        heading: "Admin Dashboard",
+	        heading: "Stock Dashboard",
 	        description: "A Quick view of stocks",
 	        links: [{name: "Dashboard", link: admin_dashboard_path, icon: 'fa-dashboard'}]
 	      }

data/app/controllers/vyapari/admin/exchange_rates_controller.rb

@@ -39,7 +39,7 @@ module Vyapari
 
       def resource_controller_configuration
         {
-          page_title: "Exchange Rates",
+          page_title: "Manage Countries",
           collection_name: :exchange_rates,
           item_name: :exchange_rate,
           class: ExchangeRate,
@@ -58,7 +58,7 @@ module Vyapari
       end
 
       def permitted_params
-        params.require(:exchange_rate).permit(:base_currency, :counter_currency, :value, :effective_date)
+        params.require(:exchange_rate).permit(:currency_name, :value, :effective_date, :country_id)
       end
 
       def set_navs

data/app/controllers/vyapari/admin/regions_controller.rb

@@ -39,7 +39,7 @@ module Vyapari
 
       def resource_controller_configuration
         {
-          page_title: "Regions",
+          page_title: "Manage Countries",
           js_view_path: "/kuppayam/workflows/parrot",
           view_path: "/vyapari/admin/regions"
         }

data/app/controllers/vyapari/admin/resource_controller.rb

@@ -4,7 +4,6 @@ module Vyapari
 
 	  	include ResourceHelper
 
-	  	before_action :require_site_admin
 	    before_action :configure_resource_controller
 
 	    def resource_url(obj)

data/app/controllers/vyapari/admin/users_controller.rb

@@ -0,0 +1,130 @@
+module Usman
+  module Admin
+    class UsersController < ResourceController
+
+      def make_super_admin
+        @user = @r_object = User.find(params[:id])
+        if @user
+          @user.super_admin = true
+          if @user.valid?
+            @user.save
+            set_notification(true, I18n.t('status.success'), I18n.t('state.changed', item: default_item_name.titleize, new_state: @user.status))
+          else
+            set_notification(false, I18n.t('status.error'), I18n.translate("error"), @user.errors.full_messages.join("<br>"))
+          end
+        else
+          set_notification(false, I18n.t('status.not_found'), I18n.t('status.not_found', item: default_item_name.titleize))
+        end
+        render_row
+      end
+
+      def remove_super_admin
+        @user = @r_object = User.find(params[:id])
+        if @user
+          @user.super_admin = false
+          if @user.valid?
+            @user.save
+            set_notification(true, I18n.t('status.success'), I18n.t('state.changed', item: default_item_name.titleize, new_state: @user.status))
+          else
+            set_notification(false, I18n.t('status.error'), I18n.translate("error"), @user.errors.full_messages.join("<br>"))
+          end
+        else
+          set_notification(false, I18n.t('status.not_found'), I18n.t('status.not_found', item: default_item_name.titleize))
+        end
+        render_row
+      end
+
+      def masquerade
+        @user = @r_object = User.find(params[:id])
+        masquerade_as_user(@user)
+      end
+
+      private
+
+      def get_collections
+        # Fetching the users
+        @relation = User.includes(:profile_picture).where("")
+
+        parse_filters
+        apply_filters
+        
+        @users = @r_objects = @relation.page(@current_page).per(@per_page)
+
+        return true
+      end
+
+      def apply_filters
+        @relation = @relation.search(@query) if @query
+        @relation = @relation.status(@status) if @status
+        
+        # Normal users should not be able to view super admins
+        # He should not be seeing admins even while searching
+        if @current_user.is_super_admin?
+          @relation = @relation.where("super_admin IS #{@super_admin.to_s.upcase}") if @super_admin.nil? == false && @query.nil?
+        else
+          @relation = @relation.where("super_admin IS FALSE")
+        end
+
+        @order_by = "created_at desc" unless @order_by
+        @relation = @relation.order(@order_by)
+      end
+
+      def configure_filter_settings
+        @filter_settings = {
+          string_filters: [
+            { filter_name: :query },
+            { filter_name: :status }
+          ],
+
+          boolean_filters: [
+            { filter_name: :super_admin, options: {default: false }}
+          ],
+
+          reference_filters: [],
+          variable_filters: [],
+        }
+      end
+
+      def configure_filter_ui_settings
+        @filter_ui_settings = {
+          status: {
+            object_filter: false,
+            select_label: "Select Status",
+            display_hash: User::STATUS,
+            current_value: @status,
+            values: User::STATUS_REVERSE,
+            current_filters: @filters,
+            filters_to_remove: [],
+            filters_to_add: {},
+            url_method_name: 'admin_users_url',
+            show_all_filter_on_top: true
+          }
+        }
+      end
+
+      def resource_controller_configuration
+        {
+          view_path: "usman/admin/users"
+        }
+      end
+
+      def breadcrumbs_configuration
+        {
+          heading: "Manage Users",
+          description: "Listing all Users",
+          links: [{name: "Home", link: admin_dashboard_path, icon: 'fa-home'}, 
+                    {name: "Manage Users", link: admin_users_path, icon: 'fa-user', active: true}]
+        }
+      end
+
+      def permitted_params
+        params.require(:user).permit(:name, :username, :email, :designation, :phone, :password, :password_confirmation)
+      end
+
+      def set_navs
+        set_nav("admin/users")
+      end
+
+    end
+  end
+end

data/app/controllers/vyapari/application_controller.rb

@@ -9,16 +9,5 @@ module Vyapari
 	    set_title("Vyapari - User Management System")
 	  end
 
-	  def default_redirect_url_after_sign_in
-      vyapari.user_dashboard_url
-      # if @current_user.has_role?("Admin")
-      #   vyapari.admin_dashboard_url
-      # elsif @current_user.has_role?("Admin")
-      #   vyapari.store_dashboard_url
-      # else
-      #   vyapari.admin_dashboard_url
-      # end
-    end
-
   end
 end

data/app/models/brand.rb

@@ -5,19 +5,18 @@ class Brand < Vyapari::ApplicationRecord
   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"}
 
   # Validations
-  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" }
+  validates :name, :presence=> true
+  validates :status, :presence=> true, :inclusion => {:in => STATUS_HASH_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"
-  has_many :products
 
   # ------------------
   # Class Methods
@@ -32,60 +31,16 @@ class Brand < Vyapari::ApplicationRecord
   #   => ActiveRecord::Relation object
   scope :search, lambda { |query| where("LOWER(name) LIKE LOWER('%#{query}%')")
                         }
-  scope :featured, lambda { |val| where(featured: val) }
 
   scope :status, lambda { |status| where("LOWER(status)='#{status}'") }
+  scope :featured, lambda { |val| where(featured: val) }
+
   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 }
-
-    return if row[:name].blank?
-
-    brand = Brand.find_by_name(row[:name]) || Brand.new
-    
-    brand.name = row[:name]
-    brand.featured = row[:featured]
-    brand.status = row[:status]
-    brand.priority = row[:priority]
-    
-    # Initializing error hash for displaying all errors altogether
-    error_object = Kuppayam::Importer::ErrorHash.new
-
-    if brand.valid?
-      brand.save!
-    else
-      summary = "Error while saving brand: #{brand.name}"
-      details = "Error! #{brand.errors.full_messages.to_sentence}"
-      error_object.errors << { summary: summary, details: details }
-    end
-    return error_object
-  end
-
-  # ------------------
-  # Instance Methods
-  # ------------------
-
-  def display_name
-    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?
@@ -137,26 +92,23 @@ class Brand < 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?
+  # TODO
+  def can_be_deleted?
+    #if self.jobs.any?
+    #  self.errors.add(:base, DELETE_MESSAGE) 
+    #  return false
+    #else
+    #  return true
+    #end
+    return true
   end
 
-  def can_be_removed?
-    published? or unpublished?
+  def display_name
+    self.name
   end
 
-  # TODO
-
-  def can_be_edited?
-    true
-  end
-  
-  def can_be_deleted?
-    removed? && self.products.blank?
+  def default_image_url(size="medium")
+    "/assets/defaults/brand-#{size}.png"
   end
   
 end

data/app/models/category.rb

@@ -5,21 +5,23 @@ class Category < Vyapari::ApplicationRecord
   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"}
 
-  # Validations
-  validates :name, presence: true, uniqueness: true
+  # Callbacks
+  before_validation :update_permalink
+
+	# Validations
+  validates :name, presence: true
   validates :one_liner, presence: false
-  validates :status, :presence=> true, :inclusion => {:in => STATUS_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
+  validates :status, :presence=> true, :inclusion => {:in => STATUS_HASH_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
 
   # Associations
   has_many :products
   belongs_to :parent, :class_name => 'Category', optional: true
-  belongs_to :top_parent, :class_name => 'Category', optional: true
   has_many :sub_categories, :foreign_key => "parent_id", :class_name => "Category" 
   has_one :category_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::CategoryImage"
 
@@ -29,7 +31,9 @@ class Category < Vyapari::ApplicationRecord
   #   >>> object.search(query)
   #   => ActiveRecord::Relation object
   scope :search, lambda {|query| where("LOWER(name) LIKE LOWER('%#{query}%') OR\
-                                        LOWER(one_liner) LIKE LOWER('%#{query}%')")
+                                        LOWER(permalink) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(one_liner) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(description) LIKE LOWER('%#{query}%')")
                         }
 
   scope :status, lambda { |status| where("LOWER(status)='#{status}'") }
@@ -39,52 +43,10 @@ class Category < 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?
-
-    category = Category.find_by_name(row[:name]) || Category.new
-    
-    category.name = row[:name]
-    category.one_liner = row[:one_liner]
-    category.parent = Category.find_by_name(row[:parent])
-    category.top_parent = category.parent.top_parent if category.parent
-    
-    category.featured = row[:featured]
-    category.status = row[:status]
-    category.priority = row[:priority]
-    
-    # Initializing error hash for displaying all errors altogether
-    error_object = Kuppayam::Importer::ErrorHash.new
-
-    if category.valid?
-      category.save!
-    else
-      summary = "Error while saving category: #{category.name}"
-      details = "Error! #{category.errors.full_messages.to_sentence}"
-      error_object.errors << { summary: summary, details: details }
-    end
-    return error_object
-  end
-
   # ------------------
   # Instance variables
   # ------------------
 
-  def display_name
-    self.name
-  end
-  
-  def slug
-    self.name.parameterize
-  end
-
-  def to_param
-    "#{id}-#{slug}"
-  end
-
   # * Return true if the category is published, else false.
   # == Examples
   #   >>> category.published?
@@ -136,24 +98,18 @@ class Category < Vyapari::ApplicationRecord
     self.update_attribute(:status, REMOVED)
   end
 
-  def can_be_published?
-    unpublished? or removed?
+  def default_image_url(size="medium")
+    "/assets/defaults/category-#{size}.png"
   end
 
-  def can_be_unpublished?
-    published? or removed?
-  end
-
-  def can_be_removed?
-    published? or unpublished?
-  end
-
-  def can_be_edited?
-    true
+  def display_name
+    self.name
   end
 
-  def can_be_deleted?
-    true
+  protected
+  
+  def update_permalink
+    self.permalink = "#{self.id}-#{name.parameterize}"
   end
 
 end