dhatu 0.1.5 → 0.1.6

data/app/views/dhatu/prices/index.html.erb

@@ -0,0 +1,69 @@
+<div class="row">
+      
+  <div class="col-md-12">
+    
+    <div class="tabs-vertical-env">
+
+      <ul id="div_category_types" class="nav tabs-vertical">
+        <% @categories.each do |ct| %>
+          <li class="<%= ct == @category ? 'active' : '' %>">
+            <%= link_to ct.name, prices_path(ct: ct.id) %>
+          </li>
+        <% end %>        
+      </ul>
+
+      <!-- <ul class="nav nav-tabs nav-tabs-justified">
+        <%# Dhatu::Price::STATUS.each do |key, value| %>
+        <li class="<%#= @status == value ? 'active' : '' %>">
+          <%#= link_to dhatu.prices_path(st: value), "aria-expanded" => "#{ @status == value ? 'true' : 'false' }" do %>
+            <span class="visible-xs"><i class="fa-gift"></i></span>
+            <span class="hidden-xs"><%#= key %></span>
+          <%# end %>
+        </li>
+        <%# end %>
+      </ul> -->
+
+      <div class="tab-content">
+        <div class="tab-pane active">
+
+          <div id="div_price_action_buttons">
+            <div class="row">
+              <div class="col-sm-6">
+                <%= theme_button('Add a Price', 'plus', dhatu.new_price_path(), classes: "pull-left mr-10", btn_type: "success") if @current_user.has_create_permission?(Dhatu::Price) %>
+
+                <%= theme_button('Refresh', 'refresh', dhatu.prices_path(st: @status), classes: "pull-left mr-10", btn_type: "white") %>
+              </div>
+              <div class="col-sm-6">
+                <%= search_form_kuppayam(Dhatu::Price, dhatu.prices_path(st: @status), text: @filters[:query]) %>
+              </div>
+            </div>
+
+          </div>
+          <%= clear_tag(10) %>
+
+          <div id="div_price_index">
+            <%= render :partial=>"dhatu/prices/index" %>
+          </div>
+          <%= clear_tag(10) %>
+
+        </div>
+      </div>
+
+    </div>
+    
+  </div>
+
+</div>
+
+<script type="text/javascript">
+  $('body').on('change', '#inp_name', function() {
+    var priceId = $('#inp_permalink').data("id");
+    if(priceId){
+    } else {
+      var permalink = convertToSlug($(this).val()).slice(0, 63);
+      $('#inp_permalink').val(permalink);
+    }
+  });
+</script>
+
+

data/app/views/dhatu/services/_show.html.erb

@@ -34,6 +34,7 @@
     <div class="col-md-3 col-sm-12 col-xs-12">
       <%= display_manage_buttons(@service) %>
       <%= display_publishable_buttons(@service) %>
+      <%= display_featurable_buttons(@service) %>
     </div>
     <% end %>
 

data/app/views/dhatu/team_members/_form.html.erb

@@ -14,8 +14,16 @@
       <!-- Name (string) -->
       <%= theme_form_field(@team_member, :name, form_style: "top-bottom", html_options: { placeholder: "Dr. Alexander Grahambell"}) -%>
                     
-      <!-- Designation (string) -->
-      <%= theme_form_field(@team_member, :designation, form_style: "top-bottom", html_options: { placeholder: "Vice President"}, required: false) -%>
+      <div class="row">
+        <div class="col-md-4 pr-20">
+          <!-- Designation (string) -->
+          <%= theme_form_field(@team_member, :designation, form_style: "top-bottom", html_options: { placeholder: "Vice President"}, required: false) -%>
+        </div>
+        <div class="col-md-4 pr-20">
+          <!-- Priority (integer) -->
+          <%= theme_form_field(@team_member, :priority, required: false, html_options: {type: :number, style: "width:70px;"}, form_style: "top-bottom") %>
+        </div>
+      </div>
                     
       <!-- Statement (text) -->
       <%= theme_form_field(@team_member, :description, required: true, required: false, html_options: {type: :textarea, class: "form-control wysihtml5", "data-stylesheet-url": "assets/wysiwyg-color.css"}, form_style: "top-bottom") -%>

data/app/views/dhatu/testimonials/_form.html.erb

@@ -10,15 +10,28 @@
 
     <div class="form-inputs m-15">
 
-    <!-- Name (string) -->
-    <%= theme_form_field(@testimonial, :name, form_style: "top-bottom", html_options: { placeholder: "Dr. Alexander Grahambell"}) -%>
-                  
-    <!-- Designation (string) -->
-    <%= theme_form_field(@testimonial, :designation, form_style: "top-bottom", html_options: { placeholder: "Vice President"}) -%>
-                  
-    <!-- Organisation (string) -->
-    <%= theme_form_field(@testimonial, :organisation, form_style: "top-bottom", html_options: { placeholder: "ABC Oil Corporation"}) -%>
+    <div class="row">
+      <div class="col-md-4 pr-20">
+        <!-- Name (string) -->
+        <%= theme_form_field(@testimonial, :name, form_style: "top-bottom", html_options: { placeholder: "Dr. Alexander Grahambell"}) -%>
+      </div>
+      <div class="col-md-4 pr-20">
+        <!-- Designation (string) -->
+        <%= theme_form_field(@testimonial, :designation, form_style: "top-bottom", html_options: { placeholder: "Vice President"}) -%>
+      </div>
+    </div>
                   
+    <div class="row">
+      <div class="col-md-4 pr-20">
+        <!-- Organisation (string) -->
+        <%= theme_form_field(@testimonial, :organisation, form_style: "top-bottom", html_options: { placeholder: "ABC Oil Corporation"}) -%>
+      </div>
+      <div class="col-md-4 pr-20">
+        <!-- Priority (integer) -->
+        <%= theme_form_field(@team_member, :priority, required: false, html_options: {type: :number, style: "width:70px;"}, form_style: "top-bottom") %>
+      </div>
+    </div>
+
     <!-- Statement (text) -->
     <%= theme_form_field(@testimonial, :statement, required: true, html_options: {type: :textarea, class: "form-control wysihtml5", "data-stylesheet-url": "assets/wysiwyg-color.css"}, form_style: "top-bottom") -%>
         

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

@@ -1,5 +1,11 @@
 <%
 	dhatu_items = {
+		bookings: {
+			text: "Bookings",
+			icon_class: "fa-calendar",
+			url: dhatu.bookings_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Booking)
+		},
 		sections: {
 			text: "Sections",
 			icon_class: "fa-reorder",
@@ -18,6 +24,12 @@
 			url: dhatu.services_url,
 			has_permission: @current_user.has_read_permission?(Dhatu::Service)
 		},
+		prices: {
+			text: "Prices",
+			icon_class: "fa-dollar",
+			url: dhatu.prices_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Price)
+		},
 		branches: {
 			text: "Branches",
 			icon_class: "fa-location-arrow",

data/config/routes.rb

@@ -4,6 +4,14 @@ Dhatu::Engine.routes.draw do
 
 	scope :admin do
 
+		resources :bookings, only: [:index, :show] do
+			member do
+				put :update_status, as:  :update_status
+				put :mark_as_featured
+	      put :remove_from_featured
+			end
+		end
+
 		resources :services do
 			member do
 				put :update_status, as:  :update_status
@@ -12,6 +20,14 @@ Dhatu::Engine.routes.draw do
 			end
 		end
 
+		resources :prices do
+			member do
+				put :update_status, as:  :update_status
+				put :mark_as_featured
+	      put :remove_from_featured
+			end
+		end
+
 		resources :branches do
 			member do
 				put :make_main, as:  :make_main

data/lib/dhatu/version.rb

@@ -1,3 +1,3 @@
 module Dhatu
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/spec/dummy/spec/factories/blog_post.rb

@@ -10,6 +10,8 @@ FactoryGirl.define do
     meta_description "Blog post meta description which explain the essence of the post."
     description "Some Blog Post Description which is not less than 10 characters."
     
+    association :category, factory: :published_blog_post_category
+
     posted_at { Time.now - 4.hours }
     tags {{key1: "val1", key2: "val2"}}
 

data/spec/dummy/spec/factories/category.rb

@@ -0,0 +1,51 @@
+FactoryGirl.define do
+
+  factory :category, class: Dhatu::Category do
+    name "Category Name"
+    one_liner "Category Name"
+    description "Category Short Description"
+    featured false
+    end_node true
+  end
+
+  factory :published_category, parent: :category do
+    status "published"
+  end
+
+  factory :unpublished_category, parent: :category do
+    status "unpublished"
+  end
+
+  factory :removed_category, parent: :category do
+    status "removed"
+  end
+
+  factory :featured_category, parent: :published_category do
+    featured true
+  end
+
+  factory :published_blog_post_category, parent: :category do
+    category_type "Dhatu::BlogPost"
+  end
+
+  factory :published_event_category, parent: :category do
+    category_type "Dhatu::Event"
+  end
+
+  factory :published_offer_category, parent: :category do
+    category_type "Dhatu::Offer"
+  end
+
+  factory :published_price_category, parent: :category do
+    category_type "Dhatu::Price"
+  end
+
+  factory :published_section_category, parent: :category do
+    category_type "Dhatu::Section"
+  end
+
+  factory :published_services_category, parent: :category do
+    category_type "Dhatu::Service"
+  end
+  
+end

data/spec/dummy/spec/factories/event.rb

@@ -8,6 +8,8 @@ FactoryGirl.define do
     
     date { Date.today }
 
+    association :category, factory: :published_event_category
+
     starts_at { Time.now - 4.hours }
     ends_at { Time.now - 1.hours }
 

data/spec/dummy/spec/factories/offer.rb

@@ -4,7 +4,7 @@ FactoryGirl.define do
     title "Offer Title"
     offer_text "AED 1000 only"
     description "Some Offer Description"
-    
+    association :category, factory: :published_offer_category
     starts_at { Time.now - 4.hours }
     ends_at { Time.now - 1.hours }
   end

data/spec/dummy/spec/factories/section.rb

@@ -14,6 +14,8 @@ FactoryGirl.define do
     button_one_link "www.domain.com/link_one"
     button_two_link "www.domain.com/link_two"
 
+    association :category, factory: :published_section_category
+
   end
 
   factory :published_section, parent: :unpublished_section do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhatu
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-04 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -107,7 +107,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.19
+        version: 0.1.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.19
+        version: 0.1.22
 - !ruby/object:Gem::Dependency
   name: pattana
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.1.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.1.18
 - !ruby/object:Gem::Dependency
   name: usman
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.12
+        version: 0.3.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -157,7 +157,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.12
+        version: 0.3.16
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -407,11 +407,13 @@ files:
 - app/assets/stylesheets/dhatu/application.css
 - app/controllers/dhatu/application_controller.rb
 - app/controllers/dhatu/blog_posts_controller.rb
+- app/controllers/dhatu/bookings_controller.rb
 - app/controllers/dhatu/branches_controller.rb
 - app/controllers/dhatu/categories_controller.rb
 - app/controllers/dhatu/dashboard_controller.rb
 - app/controllers/dhatu/events_controller.rb
 - app/controllers/dhatu/offers_controller.rb
+- app/controllers/dhatu/prices_controller.rb
 - app/controllers/dhatu/resource_controller.rb
 - app/controllers/dhatu/sections_controller.rb
 - app/controllers/dhatu/services_controller.rb
@@ -422,10 +424,12 @@ files:
 - app/mailers/dhatu/application_mailer.rb
 - app/models/dhatu/application_record.rb
 - app/models/dhatu/blog_post.rb
+- app/models/dhatu/booking.rb
 - app/models/dhatu/branch.rb
 - app/models/dhatu/category.rb
 - app/models/dhatu/event.rb
 - app/models/dhatu/offer.rb
+- app/models/dhatu/price.rb
 - app/models/dhatu/section.rb
 - app/models/dhatu/service.rb
 - app/models/dhatu/team_member.rb
@@ -437,6 +441,11 @@ files:
 - app/views/dhatu/blog_posts/_row.html.erb
 - app/views/dhatu/blog_posts/_show.html.erb
 - app/views/dhatu/blog_posts/index.html.erb
+- app/views/dhatu/bookings/_index.html.erb
+- app/views/dhatu/bookings/_row.html.erb
+- app/views/dhatu/bookings/_show.html.erb
+- app/views/dhatu/bookings/index.html.erb
+- app/views/dhatu/bookings/show.js.erb
 - app/views/dhatu/branches/_form.html.erb
 - app/views/dhatu/branches/_index.html.erb
 - app/views/dhatu/branches/_row.html.erb
@@ -459,6 +468,11 @@ files:
 - app/views/dhatu/offers/_row.html.erb
 - app/views/dhatu/offers/_show.html.erb
 - app/views/dhatu/offers/index.html.erb
+- app/views/dhatu/prices/_form.html.erb
+- app/views/dhatu/prices/_index.html.erb
+- app/views/dhatu/prices/_row.html.erb
+- app/views/dhatu/prices/_show.html.erb
+- app/views/dhatu/prices/index.html.erb
 - app/views/dhatu/sections/_form.html.erb
 - app/views/dhatu/sections/_index.html.erb
 - app/views/dhatu/sections/_row.html.erb
@@ -497,6 +511,7 @@ files:
 - spec/dummy/spec/factories/blog_post_cover_image.rb
 - spec/dummy/spec/factories/blog_post_gallery_image.rb
 - spec/dummy/spec/factories/branch.rb
+- spec/dummy/spec/factories/category.rb
 - spec/dummy/spec/factories/event.rb
 - spec/dummy/spec/factories/event_cover_image.rb
 - spec/dummy/spec/factories/event_gallery_image.rb