dhatu 0.1.5 → 0.1.6

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

@@ -0,0 +1,79 @@
+<div class="row">
+      
+  <div class="col-md-12">
+    
+    <div class="tabs-vertical-env">
+
+      <ul id="div_category_types" class="nav tabs-vertical">
+        <!-- <li class="<%= @status.blank? ? 'active' : '' %>">
+          <%#= link_to "All", bookings_path, style: "text-align:left;" %>
+        </li> -->
+        <% Readable::STATUS_REVERSE.keys.each do |st| %>
+          <% 
+            if st == "new" && @new_bookings_count > 0
+              text = raw("#{st.titleize} <span class='badge badge-success ml-5'>#{@new_bookings_count}</span>")
+            elsif st == "unread" && @unread_bookings_count > 0
+              text = raw("#{st.titleize} <span class='badge badge-info ml-5'>#{@unread_bookings_count}</span>")
+            else
+              text = st.titleize
+            end
+          %>
+          <li class="<%= st == @status ? 'active' : '' %>">
+            <%= link_to text, bookings_path(st: st), style: "text-align:left;" %>
+          </li>
+        <% end %>        
+      </ul>
+
+      <!-- <ul class="nav nav-tabs nav-tabs-justified">
+        <%# Dhatu::Booking::STATUS.each do |key, value| %>
+        <li class="<%#= @status == value ? 'active' : '' %>">
+          <%#= link_to dhatu.bookings_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_booking_action_buttons">
+            <div class="row">
+              <div class="col-sm-6">
+                <%= theme_button('Refresh', 'refresh', dhatu.bookings_path(st: @status), classes: "pull-left mr-10", btn_type: "white") %>
+              </div>
+              <div class="col-sm-6">
+                <%= search_form_kuppayam(Dhatu::Booking, dhatu.bookings_path, text: @filters[:query]) %>
+              </div>
+            </div>
+
+          </div>
+          <%= clear_tag(10) %>
+
+          <div id="div_booking_index">
+            <%= render :partial=>"dhatu/bookings/index" %>
+          </div>
+          <%= clear_tag(10) %>
+
+        </div>
+      </div>
+
+    </div>
+    
+  </div>
+
+</div>
+
+<script type="text/javascript">
+  $('body').on('change', '#inp_name', function() {
+    var bookingId = $('#inp_permalink').data("id");
+    if(bookingId){
+    } else {
+      var permalink = convertToSlug($(this).val()).slice(0, 63);
+      $('#inp_permalink').val(permalink);
+    }
+  });
+</script>
+
+

data/app/views/dhatu/bookings/show.js.erb

@@ -0,0 +1,17 @@
+<% if @r_object %>
+
+	// Show the details in the large modal
+	var heading = "<%= raw @r_object.try(:display_name) %>";
+	var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/show")) %>";
+	showLargeModal(heading, bodyContent, false);
+
+	// Updating the edited row and highlighting it
+  $('#tr_<%= @resource_options[:item_name] %>_<%= @r_object.id %>').replaceWith("<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/row", locals: { @resource_options[:item_name].to_sym => @r_object, i: -1})) %>");
+  $("#tr_<%= @resource_options[:item_name] %>_<%= @r_object.id %>").css("background-color", "#fffddd");
+
+<% else %>
+
+	// Showing Growl Like Message
+  notifyError("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(raw(@notification[:message])) %>");
+
+<% end %>

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

@@ -10,7 +10,10 @@
 
         <%= theme_form_field(@category, :name) %>
 
-        <%= theme_form_field(@category, :category_type, required: true) %>
+        <% options_list = Array[*@features.collect {|f| [f.display_name, f.name] }].sort %>
+
+        <%= theme_form_select_group(@category, :category_type, options_list, param_name: "dhatu/category[category_type]", label: "Choose Type", prompt: true) %>
+
         <%= theme_form_field(@category, :one_liner, required: false) %>
         <%= theme_form_field(@category, :description, required: false, html_options: {type: :textarea}) %>
         <%= theme_form_field(@category, :priority, required: false, html_options: {type: :number, style: "width:70px;"}) %>
@@ -23,15 +26,11 @@
         <% options = {assoc_collection: categories, required: false, editable: true, assoc_display_method: :name} %>
         <%= theme_form_assoc_group(@category, :parent_id, **options) %>
       </div>
-
-      
     
       <div>
-        
         <%= submit_tag("Save", :class=>"btn btn-primary pull-right ml-10") %>
         
-        <%= link_to raw("<i class='fa fa-close mr-5'></i><span>Cancel</span>"), "#", onclick: "closeGenericModal();", class: "pull-right ml-10 btn btn-white" %>
-
+        <%= link_to raw("<i class='fa fa-close mr-5'></i><span>Cancel</span>"), "#", onclick: "closeLargeModal();", class: "pull-right ml-10 btn btn-white" %>
       </div>
       <%= clear_tag(10) %>
   </div>

data/app/views/dhatu/categories/_index.html.erb

@@ -48,6 +48,7 @@
 			<tr> 
 				<th style="text-align: center;width:60px">#</th> 
 				<th>Name</th>
+				<th>Type</th>
 				<!-- <th>Parent</th>
 				<th>Top Parent</th> -->
 				<th style="text-align: center;width:100px;">Status</th>
@@ -77,6 +78,8 @@
 		      		<%= link_to raw("<i class=\"fa fa-caret-right\"></i> #{category.display_name}"), categories_path(parent_id: category.id), remote: true %></td>
 		      <% end %>
 
+		      <td><%= category.category_type %></td>
+
 		      <!--
 		      <%# if category.parent == @current_category %>
 		      	<td class="category-name"><%#= category.parent.display_name if category.parent  %></td>

data/app/views/dhatu/categories/_row.html.erb

@@ -15,6 +15,8 @@
       <%= link_to raw("<i class=\"fa fa-caret-right\"></i> #{category.display_name}"), categories_path(parent_id: category.id), remote: true %></td>
   <% end %>
 
+  <td><%= category.display_category_type %></td>
+
   <!--
   <%# if category.parent == @current_category %>
     <td class="category-name"><%#= category.parent.display_name if category.parent  %></td>

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

@@ -2,19 +2,19 @@
 
   <div class="row">
     
-    <!-- <div class="col-md-3 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;"> -->
-      <%# if display_edit_links? %>
-      <%#= edit_image(@category, 
-          "cover_image.image.large.url",
-          upload_image_link(@category, :cover_image, nil ),
-          remove_image_link(@category, :cover_image, nil ),
-          image_options: {assoc_name: :cover_image }) %>
-      <%# else %>
-        <%#= display_image(@category, "cover_image.image.large.url", class: "img-inline", alt: @category.display_name) %>
-      <%# end %>
-    <!-- </div> -->
-
-    <div class="col-md-9 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+    <div class="col-md-3 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+      <% if display_edit_links? %>
+      <%= edit_image(@category, 
+          "category_image.image.url",
+          upload_image_link(@category, :category_image, nil ),
+          remove_image_link(@category, :category_image, nil ),
+          image_options: {assoc_name: :category_image }) %>
+      <% else %>
+        <%= display_image(@category, "category_image.image.url", class: "img-inline", alt: @category.display_name) %>
+      <% end %>
+    </div>
+
+    <div class="col-md-5 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
 
       <%= theme_panel_heading(@category.name) %>
 
@@ -31,7 +31,7 @@
     </div>
 
     <% if display_manage_links? %>
-    <div class="col-md-3 col-sm-12 col-xs-12">
+    <div class="col-md-4 col-sm-12 col-xs-12">
       <%= display_manage_buttons(@category) %>
       <%= display_publishable_buttons(@category) %>
       <%= display_featurable_buttons(@category) %>
@@ -66,8 +66,21 @@
             </tr>
 
             <tr>
-              <th>Parent</th><td><%= @category.parent.try(:display_name) %> (<%= @category.parent.try(:id) %>)</td>
-              <th>Top Parent</th><td><%= @category.top_parent.try(:display_name) %> (<%= @category.top_parent.try(:id) %>)</td>
+              <th>Category Type</th><td><%= @category.category_type %></td>
+              <th></th><td></td>
+            </tr>
+
+            <tr>
+              <th>Parent</th><td>
+                <% if @category.parent %>
+                <%= @category.parent.try(:display_name) %> (<%= @category.parent.try(:id) %>)
+                <% end %>
+              </td>
+              <th>Top Parent</th><td>
+                <% if @category.top_parent %>
+                <%= @category.top_parent.try(:display_name) %> (<%= @category.top_parent.try(:id) %>)
+                <% end %>
+              </td>
             </tr>
 
             <tr>

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

@@ -4,11 +4,17 @@
     <div class="tabs-vertical-env">
           
       <ul id="div_category_types" class="nav tabs-vertical">
-        <% @category_types.each do |ctype| %>
-          <li class="<%= ctype == @category_type ? 'active' : '' %>">
-            <%= link_to ctype, categories_path(category_type: ctype) %>
+        <li class="<%= @category_type == "All" ? 'active' : '' %>">
+          <%= link_to "All", categories_path %>
+        </li>
+        <% @features.each do |feature| %>
+          <li class="<%= @category_type == feature.name ? 'active' : '' %>">
+            <%= link_to feature.display_name, categories_path(category_type: feature.name) %>
           </li>
-        <% end %>        
+        <% end %>
+        <li class="<%= @category_type == "none" ? 'active' : '' %>">
+          <%= link_to "None", categories_path(category_type: :none) %>
+        </li>
       </ul>
       
       <div class="tab-content">

data/app/views/dhatu/dashboard/_index.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/app/views/dhatu/events/_form.html.erb

@@ -17,12 +17,15 @@
         <%= theme_form_field(@event, :description, required: true, html_options: {type: :textarea, class: "form-control wysihtml5", "data-stylesheet-url": "assets/wysiwyg-color.css"}, form_style: "top-bottom") %>
 
         <div class="row">
-          <div class="col-md-4 pr-20">
+          <div class="col-md-3 pr-20">
             <%= theme_form_field(@event, :starts_at, required: false, html_options: {type: :date}, form_style: "top-bottom") %>
           </div>
-          <div class="col-md-4 pl-20">
+          <div class="col-md-3 pl-20">
             <%= theme_form_field(@event, :ends_at, required: false, html_options: {type: :date}, form_style: "top-bottom") %>
           </div>
+          <div class="col-md-3 pl-20">
+            <%= theme_form_field(@event, :priority, required: false, html_options: {type: :number, style: "width:70px;"}, form_style: "top-bottom") %>
+          </div>
         </div>
         
       </div>

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

@@ -17,12 +17,15 @@
       <%= theme_form_field(@offer, :description, required: true, html_options: {type: :textarea, class: "form-control wysihtml5", "data-stylesheet-url": "assets/wysiwyg-color.css"}, form_style: "top-bottom") %>
 
       <div class="row">
-        <div class="col-md-4 pr-20">
+        <div class="col-md-3 pr-20">
           <%= theme_form_field(@offer, :starts_at, required: false, html_options: {type: :date}, form_style: "top-bottom") %>
         </div>
-        <div class="col-md-4 pl-20">
+        <div class="col-md-3 pl-20">
           <%= theme_form_field(@offer, :ends_at, required: false, html_options: {type: :date}, form_style: "top-bottom") %>
         </div>
+        <div class="col-md-3 pl-20">
+          <%= theme_form_field(@offer, :priority, required: false, html_options: {type: :number, style: "width:70px;"}, form_style: "top-bottom") %>
+        </div>
       </div>
       
     </div>

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

@@ -0,0 +1,45 @@
+<%= form_for(@price,
+    :url => (@price.new_record? ? dhatu.prices_path : dhatu.price_path),
+    :method => (@price.new_record? ? :post : :put),
+    :remote => true,
+    :html => {:id=>"form_price", :class=>"mb-0 form-horizontal"}) do |f| %>
+
+    <div id="price_form_error">
+      <%= @price.errors[:base].to_sentence %>
+    </div>
+
+    <div class="form-inputs m-15">
+
+      <%= theme_form_field(@price, :title, required: true, form_style: "top-bottom", html_options: { placeholder: "", "data-id": @price.id.to_s}) %>
+
+      <div class="row">
+        <div class="col-md-6">
+          <%= theme_form_field(@price, :sub_title, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
+        </div>
+        <div class="col-md-6">
+          <% options = {assoc_collection: Dhatu::Category.filter_by_category_type("Price").published.select("id, name").order("name ASC").all, editable: true, assoc_display_method: :name} %>
+          <%= theme_form_assoc_group(@price, :category_id, label: "Choose Category", form_style: "top-bottom", **options) %>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-md-6">
+          <%= theme_form_field(@price, :price, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
+        </div>
+        <div class="col-md-6">
+          <%= theme_form_field(@price, :priority, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
+        </div>
+      </div>
+      
+    </div>
+
+    <div>
+      <%= submit_tag("Save", :class=>"btn btn-primary pull-right ml-10") %>
+
+      <%= link_to raw("<i class='fa fa-close mr-5'></i><span>Cancel</span>"), "#", onclick: "closeGenericModal();", class: "pull-right btn btn-white" %>
+    </div>
+
+    <%= clear_tag %>
+
+<% end %>
+

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

@@ -0,0 +1,49 @@
+<div class="table-responsive"> 
+	<table class="table table-hover members-table middle-align">
+	  <thead> 
+			<tr> 
+				<th style="text-align: center;width:5%">#</th> 
+				<th>Item</th>
+				<th style="width:200px">Price</th>
+				<th style="width:100px;" class="hidden-sm hidden-xs">Status</th>
+				<% if display_manage_links? %>
+				<th style="text-align: center;" colspan="2" class="hidden-sm hidden-xs" >Actions</th>
+				<% end %>
+			</tr> 
+		</thead>
+	  <tbody>
+	  	<tr id="tr_price_0"></tr>
+	  	<% @prices.each_with_index do |price, i| %>
+	  		<tr id="tr_price_<%= price.id %>">
+
+					<th scope="row" style="text-align: center;">
+						<%= serial_number(i) %>
+					</th>
+
+					<td class="display-link">
+						<%= link_to price.title, price_path(price), remote: true %><br>
+						<%= link_to price.category.try(:display_name), price_path(price), remote: true, style: "color:darkred" %>
+					</td>
+
+					<td class="hidden-sm hidden-xs"><%= price.price %></td>
+
+					<td class="hidden-sm hidden-xs"><%= display_publishable_status(price) %></td>
+
+		      <% if display_manage_links? %>
+			    <td class="action-links hidden-sm hidden-xs" style="width:15%"><%= display_publishable_links(price) %></td>
+
+			    <td class="action-links hidden-sm hidden-xs" style="width:15%">
+			      <%= display_manage_links(price, @current_user) %>
+			    </td>
+			    <% end %>
+		    </tr>
+		  <% end %>
+	  </tbody>
+	</table>
+</div>
+
+<div class="row">
+  <div class="col-sm-12">
+    <%= paginate_kuppayam(@prices) %>
+  </div>
+</div>

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

@@ -0,0 +1,24 @@
+<tr id="tr_price_<%= price.id %>">
+
+  <th scope="row" style="text-align: center;">
+    <%= serial_number(i) %>
+  </th>
+
+  <td class="display-link">
+    <%= link_to price.title, price_path(price), remote: true %><br>
+    <%= link_to price.category.try(:display_name), price_path(price), remote: true %>
+  </td>
+
+  <td class="hidden-sm hidden-xs"><%= price.price %></td>
+
+  <td class="hidden-sm hidden-xs"><%= display_publishable_status(price) %></td>
+
+  <% if display_manage_links? %>
+  <td class="action-links hidden-sm hidden-xs" style="width:10%"><%= display_publishable_links(price) %></td>
+
+  <td class="action-links hidden-sm hidden-xs" style="width:10%">
+    <%= display_manage_links(price, @current_user) %>
+  </td>
+  <% end %>
+  
+</tr>

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

@@ -0,0 +1,76 @@
+<div id="div_price_show">
+
+  <div class="row">
+    
+    <!-- <div class="col-md-3 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+      <%# if display_edit_links? %>
+      <%#= edit_image(@price, 
+            "cover_image.image.large.url",
+            upload_image_link(@price, :cover_image, nil ),
+            remove_image_link(@price, :cover_image, nil ),
+            image_options: {assoc_name: :cover_image }) %>
+      <%# else %>
+        <%#= display_image(@price, "cover_image.image.large.url", class: "img-inline", alt: @price.display_name) %>
+      <%# end %>
+    </div> -->
+
+    <div class="col-md-8 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+
+      <%= theme_panel_heading(@price.title) %>
+
+      <%= theme_panel_description(@price.sub_title) %>
+
+      <%= theme_panel_sub_heading(@price.category.try(:display_name), "#") if @price.category %>
+
+      <%= clear_tag(10) %>
+
+      <%= display_publishable_status(@price) %>
+      
+      <%= display_featured(@price) %>
+
+      <%= clear_tag(20) %>
+
+      <div class="table-responsive"> 
+        <table class="table table-striped table-condensed table-bordered mb-60"> 
+          <tbody>
+            
+            <tr>
+              <th>ID</th><td><%= @price.id %></td>
+            </tr>
+
+            <tr>
+              <th>Status</th><td><%= @price.status %></td>
+            </tr>
+
+            <tr>
+              <th>Created At</th><td><%= @price.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @price.created_at %></td>
+            </tr>
+
+            <tr>
+              <th>Updated At</th><td><%= @price.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @price.updated_at %></td>
+            </tr>
+            
+          </tbody>
+        </table>
+      </div>
+
+      <%= clear_tag(20) %>
+    </div>
+
+    <% if display_manage_links? %>
+    <div class="col-md-4 col-sm-12 col-xs-12">
+      <%= display_manage_buttons(@price) %>
+      <%= display_publishable_buttons(@price) %>
+      <%= display_featurable_buttons(@price) %>
+    </div>
+    <% end %>
+
+  </div>
+
+  <div class="visible-sm visible-xs mb-50"></div>
+
+  <%= link_to "Close", "#", onclick: "closeGenericModal();", class: "btn btn-primary pull-right" %>
+
+  <%= clear_tag %>
+
+</div>