dhatu 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aa15ef1778f28fd3c9a4c2e5fa38c70a04691fb
-  data.tar.gz: db924144919db1ce6795890dac67ec1e969d4aa8
+  metadata.gz: f51c750289d9a5c2e5c5285c6838e99fd8d7fa5f
+  data.tar.gz: ba4a2da4bb22359c41521d3bb0e67638463c1a62
 SHA512:
-  metadata.gz: 06ee7c08dfed11f1b3c2c753b0f3fce3bf64ae2aa043ad9dde093fc9c8cd7cbd90f927345632161c6907c203e5c4e710c027e2b2ab026a15bd0b985a53e36159
-  data.tar.gz: 7d3a7f3177d7df229009a8cc9f9dc313e19bd230061c5ab6a86be036e0e68bc11321d9cce89573d2c28dda3b7c7cc085829e2801d988b48ba2b1a48a72f1313a
+  metadata.gz: edb42de7e28b445b175755393a13f28441b05502211d96ed6ed17acb3bd575dd97e63dd3e3b475fd977ef4eb88234fcab2ffdff5dfe18a0e33269782ffa520c4
+  data.tar.gz: 29ba424274a5e616bf86d2a0fd1b310c5f43509c8da4041eba8e85106f8e1e02d156389bbe920c70903959aa644a73aec071282c744aa8db66334e984130dc97

data/app/controllers/dhatu/blog_posts_controller.rb

@@ -8,7 +8,7 @@ module Dhatu
     end
 
     def get_collections
-      @relation = BlogPost.includes(:cover_image).where("")
+      @relation = Dhatu::BlogPost.includes(:cover_image).where("")
       params[:st] = "published" if params[:st].nil?
       parse_filters
       apply_filters
@@ -43,9 +43,9 @@ module Dhatu
         status: {
           object_filter: false,
           select_label: "Select Status",
-          display_hash: BlogPost::STATUS,
+          display_hash: Dhatu::BlogPost::STATUS,
           current_value: @status,
-          values: BlogPost::STATUS_REVERSE,
+          values: Dhatu::BlogPost::STATUS_REVERSE,
           current_filters: @filters,
           filters_to_remove: [],
           filters_to_add: {},
@@ -62,7 +62,7 @@ module Dhatu
         view_path: "dhatu/blog_posts",
         collection_name: :blog_posts,
         item_name: :blog_post,
-        class: BlogPost
+        class: Dhatu::BlogPost
       }
     end
 
@@ -71,7 +71,7 @@ module Dhatu
         heading: "Manage Blog",
         icon: "fa-newspaper-o",
         description: "Listing all Blog Posts",
-        links: [{name: "Dashboard", link: dashboard_path, icon: 'fa-dashboard'}, 
+        links: [{name: "Dashboard", link: breadcrumb_home_path, icon: 'fa-dashboard'}, 
                   {name: "Manage Blog", link: dhatu.blog_posts_path, icon: 'fa-newspaper-o', active: true}]
       }
     end

data/app/controllers/dhatu/bookings_controller.rb

@@ -0,0 +1,76 @@
+module Dhatu
+  class BookingsController < ResourceController
+
+    def show
+      @booking = @r_object = Dhatu::Booking.find_by_id(params[:id])
+      if @booking
+        @booking.read! if @booking.new? || @booking.unread?
+      else
+        set_notification(false, I18n.t('status.error'), I18n.t('status.not_found', item: default_item_name.titleize))
+      end
+    end
+
+    private
+
+    def get_collections
+      @new_bookings_count = Dhatu::Booking.new_ones.count
+      @unread_bookings_count = Dhatu::Booking.unread.count
+      @relation = Dhatu::Booking.where("")
+      params[:st] = "new" if params[:st].nil? && params[:q].nil?
+      parse_filters
+      apply_filters
+      @bookings = @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
+      @relation = @relation.order("created_at DESC")
+    end
+
+    def configure_filter_settings
+      @filter_settings = {
+        string_filters: [
+          { filter_name: :query },
+          { filter_name: :status }
+        ],
+
+        boolean_filters: [],
+
+        reference_filters: [],
+        variable_filters: [],
+      }
+    end
+
+    def configure_filter_ui_settings
+      @filter_ui_settings = {}
+    end
+
+    def resource_controller_configuration
+      {
+        page_title: "Bookings",
+        js_view_path: "/kuppayam/workflows/peacock",
+        view_path: "dhatu/bookings",
+        collection_name: :bookings,
+        item_name: :booking,
+        class: Dhatu::Booking
+      }
+    end
+
+    def breadcrumbs_configuration
+      {
+        heading: "Manage Bookings",
+        icon: "fa-calendar",
+        description: "Listing all Bookings",
+        links: [{name: "Dashboard", link: breadcrumb_home_path, icon: 'fa-dashboard'}, 
+                  {name: "Manage Bookings", link: dhatu.bookings_path, icon: 'fa-calendar', active: true}]
+      }
+    end
+
+    def set_navs
+      set_nav("dhatu/bookings")
+    end
+
+  end
+end

data/app/controllers/dhatu/branches_controller.rb

@@ -103,7 +103,7 @@ module Dhatu
         heading: "Manage Branches",
         icon: "fa-phone-square",
         description: "Listing all Branches",
-        links: [{name: "Dashboard", link: dashboard_path, icon: 'fa-dashboard'}, 
+        links: [{name: "Dashboard", link: breadcrumb_home_path, icon: 'fa-dashboard'}, 
                   {name: "Manage Branches", link: dhatu.branches_path, icon: 'fa-phone-square', active: true}]
       }
     end

data/app/controllers/dhatu/categories_controller.rb

@@ -1,7 +1,8 @@
 module Dhatu
   class CategoriesController < ResourceController
-
+    
     before_action :require_update_permission, only: [:update_status, :make_parent, :mark_as_featured, :remove_from_featured]
+    before_action :get_features, only: [:index, :new, :edit]    
 
     def update_status
       @category = @r_object = Dhatu::Category.find(params[:id])
@@ -38,8 +39,12 @@ module Dhatu
 
     private
 
+    def get_features
+      @features = Feature.categorisable.published.order("name ASC").all
+    end
+
     def permitted_params
-      params[:category].permit(:name, :permalink, :one_liner, :description, :parent_id, :priority)
+      params[:category].permit(:name, :permalink, :one_liner, :description, :parent_id, :priority, :category_type)
     end
 
     def set_navs
@@ -47,9 +52,6 @@ module Dhatu
     end
 
     def get_collections
-      @category_types = Dhatu::Category.distinct.pluck(:category_type)
-      @category_types.unshift('All')
-
       @current_category = Dhatu::Category.find_by_id(params[:parent_id])
 
       filter_param_mapping
@@ -66,21 +68,21 @@ module Dhatu
       end
       
       @relation = @relation.order("priority ASC, name ASC")
-      
       apply_filters
-      
       @categories = @r_objects = @relation.page(@current_page).per(@per_page)
-      
       return true
     end
 
     def apply_filters
-
       @category_type = params[:category_type] || "All"
-      if @category_type && @category_type != "All"
+      case @category_type 
+      when "none"
+        @relation = @relation.joins("LEFT JOIN features f on f.name = categories.category_type").where("f.name is NULL")
+      when "All"
+        @relation = @relation.where("")
+      else 
         @relation = @relation.where("category_type = ?", params[:category_type])
       end
-
       @relation = @relation.search(@query) if @query
       @relation = @relation.status(@status) if @status
       @relation = @relation.featured(@featured) unless @featured.nil?
@@ -116,7 +118,7 @@ module Dhatu
         heading: "Manage Categories",
         icon: "fa-sitemap",
         description: "Listing all Categories",
-        links: [{name: "Home", link: dashboard_path, icon: 'fa-home'}, 
+        links: [{name: "Home", link: breadcrumb_home_path, icon: 'fa-home'}, 
                   {name: "Manage Categories", link: dhatu.categories_path, icon: 'fa-sitemap', active: true}]
       }
     end

data/app/controllers/dhatu/events_controller.rb

@@ -4,11 +4,11 @@ module Dhatu
     private
 
     def permitted_params
-      params.require("dhatu/event").permit(:title, :venue, :description, :date, :starts_at, :ends_at)
+      params.require("dhatu/event").permit(:title, :venue, :description, :date, :starts_at, :ends_at, :priority, :category_id)
     end
 
     def get_collections
-      @relation = Event.includes(:cover_image).where("")
+      @relation = Dhatu::Event.includes(:cover_image).where("")
       params[:st] = "published" if params[:st].nil?
       parse_filters
       apply_filters
@@ -19,9 +19,7 @@ module Dhatu
     def apply_filters
       @relation = @relation.search(@query) if @query
       @relation = @relation.status(@status) if @status
-      
-      @order_by = "created_at desc" unless @order_by
-      @relation = @relation.order(@order_by)
+      @relation = @relation.order("priority ASC, title ASC")
     end
 
     def configure_filter_settings
@@ -43,9 +41,9 @@ module Dhatu
         status: {
           object_filter: false,
           select_label: "Select Status",
-          display_hash: Event::STATUS,
+          display_hash: Dhatu::Event::STATUS,
           current_value: @status,
-          values: Event::STATUS_REVERSE,
+          values: Dhatu::Event::STATUS_REVERSE,
           current_filters: @filters,
           filters_to_remove: [],
           filters_to_add: {},
@@ -62,7 +60,7 @@ module Dhatu
         view_path: "dhatu/events",
         collection_name: :events,
         item_name: :event,
-        class: Event
+        class: Dhatu::Event
       }
     end
 
@@ -71,7 +69,7 @@ module Dhatu
         heading: "Manage Events",
         icon: "fa-map-marker",
         description: "Listing all Events",
-        links: [{name: "Dashboard", link: dashboard_path, icon: 'fa-dashboard'}, 
+        links: [{name: "Dashboard", link: breadcrumb_home_path, icon: 'fa-dashboard'}, 
                   {name: "Manage Events", link: dhatu.events_path, icon: 'fa-calendar', active: true}]
       }
     end

data/app/controllers/dhatu/offers_controller.rb

@@ -4,11 +4,11 @@ module Dhatu
     private
 
     def permitted_params
-      params.require("dhatu/offer").permit(:title, :offer_text, :description, :starts_at, :ends_at)
+      params.require("dhatu/offer").permit(:title, :offer_text, :description, :starts_at, :ends_at, :priority, :category_id)
     end
 
     def get_collections
-      @relation = Offer.includes(:cover_image).where("")
+      @relation = Dhatu::Offer.includes(:cover_image).where("")
       params[:st] = "published" if params[:st].nil?
       parse_filters
       apply_filters
@@ -19,9 +19,7 @@ module Dhatu
     def apply_filters
       @relation = @relation.search(@query) if @query
       @relation = @relation.status(@status) if @status
-      
-      @offer_by = "created_at desc" unless @offer_by
-      @relation = @relation.order(@offer_by)
+      @relation = @relation.order("priority ASC, title ASC")
     end
 
     def configure_filter_settings
@@ -43,9 +41,9 @@ module Dhatu
         status: {
           object_filter: false,
           select_label: "Select Status",
-          display_hash: Offer::STATUS,
+          display_hash: Dhatu::Offer::STATUS,
           current_value: @status,
-          values: Offer::STATUS_REVERSE,
+          values: Dhatu::Offer::STATUS_REVERSE,
           current_filters: @filters,
           filters_to_remove: [],
           filters_to_add: {},
@@ -62,7 +60,7 @@ module Dhatu
         view_path: "dhatu/offers",
         collection_name: :offers,
         item_name: :offer,
-        class: Offer
+        class: Dhatu::Offer
       }
     end
 

data/app/controllers/dhatu/prices_controller.rb

@@ -0,0 +1,90 @@
+module Dhatu
+  class PricesController < ResourceController
+
+    private
+
+    def permitted_params
+      params.require("dhatu/price").permit(:title, :sub_title, :price, :category_id, :priority)
+    end
+
+    def get_collections
+      category_ids = Dhatu::Price.distinct.pluck(:category_id)
+      @categories = Dhatu::Category.where(id: category_ids).to_a
+      @categories.unshift(Dhatu::Category.new(id: -1, name: "All"))
+
+      @relation = Dhatu::Price.where("")
+      parse_filters
+      apply_filters
+      @prices = @r_objects = @relation.page(@current_page).per(@per_page)
+      return true
+    end
+
+    def apply_filters
+      @category = Dhatu::Category.find_by_id(params[:ct]) || Dhatu::Category.new(id: -1, name: "All")
+      
+      if @category && @category.id != -1
+        @relation = @relation.where("category_id = ?", @category.id)
+      end
+
+      @relation = @relation.search(@query) if @query
+      @relation = @relation.status(@status) if @status
+      @relation = @relation.order("priority ASC, title ASC")
+    end
+
+    def configure_filter_settings
+      @filter_settings = {
+        string_filters: [
+          { filter_name: :query },
+          { filter_name: :status }
+        ],
+
+        boolean_filters: [],
+
+        reference_filters: [],
+        variable_filters: [],
+      }
+    end
+
+    def configure_filter_ui_settings
+      @filter_ui_settings = {
+        status: {
+          object_filter: false,
+          select_label: "Select Status",
+          display_hash: Dhatu::Price::STATUS,
+          current_value: @status,
+          values: Dhatu::Price::STATUS_REVERSE,
+          current_filters: @filters,
+          filters_to_remove: [],
+          filters_to_add: {},
+          url_method_name: 'prices_url',
+          show_all_filter_on_top: true
+        }
+      }
+    end
+
+    def resource_controller_configuration
+      {
+        page_title: "Prices",
+        js_view_path: "/kuppayam/workflows/parrot",
+        view_path: "dhatu/prices",
+        collection_name: :prices,
+        item_name: :price,
+        class: Dhatu::Price
+      }
+    end
+
+    def breadcrumbs_configuration
+      {
+        heading: "Manage Prices",
+        icon: "fa-dollar",
+        description: "Listing all Prices",
+        links: [{name: "Dashboard", link: breadcrumb_home_path, icon: 'fa-dashboard'}, 
+                  {name: "Manage Prices", link: dhatu.prices_path, icon: 'fa-dollar', active: true}]
+      }
+    end
+
+    def set_navs
+      set_nav("price")
+    end
+  end
+end

data/app/controllers/dhatu/sections_controller.rb

@@ -4,7 +4,7 @@ module Dhatu
     private
 
     def permitted_params
-      params.require("dhatu/section").permit(:section_type, :title, :sub_title, :short_description, :long_description, :button_one_text, :button_two_text, :button_one_link, :button_two_link)
+      params.require("dhatu/section").permit(:section_type, :title, :sub_title, :short_description, :long_description, :button_one_text, :button_two_text, :button_one_link, :button_two_link, :category_id)
     end
 
     def get_collections
@@ -68,11 +68,11 @@ module Dhatu
 
     def breadcrumbs_configuration
       {
-        heading: "Manage sections",
+        heading: "Manage Sections",
         icon: "fa-reorder",
-        description: "Listing all sections",
-        links: [{name: "Dashboard", link: dashboard_path, icon: 'fa-dashboard'}, 
-                  {name: "Manage sections", link: dhatu.sections_path, icon: 'fa-calendar', active: true}]
+        description: "Listing all Sections",
+        links: [{name: "Dashboard", link: breadcrumb_home_path, icon: 'fa-dashboard'}, 
+                  {name: "Manage Sections", link: dhatu.sections_path, icon: 'fa-calendar', active: true}]
       }
     end
 

data/app/controllers/dhatu/services_controller.rb

@@ -30,9 +30,7 @@ module Dhatu
 
       @relation = @relation.search(@query) if @query
       @relation = @relation.status(@status) if @status
-      
-      @order_by = "created_at desc" unless @order_by
-      @relation = @relation.order(@order_by)
+      @relation = @relation.order("priority ASC, name ASC")
     end
 
     def configure_filter_settings
@@ -79,11 +77,11 @@ module Dhatu
 
     def breadcrumbs_configuration
       {
-        heading: "Manage services",
-        icon: "fa-reorder",
-        description: "Listing all services",
-        links: [{name: "Dashboard", link: dashboard_path, icon: 'fa-dashboard'}, 
-                  {name: "Manage services", link: dhatu.services_path, icon: 'fa-calendar', active: true}]
+        heading: "Manage Services",
+        icon: "fa-glass",
+        description: "Listing all Services",
+        links: [{name: "Dashboard", link: breadcrumb_home_path, icon: 'fa-dashboard'}, 
+                  {name: "Manage Services", link: dhatu.services_path, icon: 'fa-glass', active: true}]
       }
     end