dhatu 0.1.11 → 0.1.12

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

@@ -0,0 +1,148 @@
+<div id="div_promotion_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(@promotion, 
+          "cover_image.image.large.url",
+          upload_image_link(@promotion, :cover_image, nil ),
+          remove_image_link(@promotion, :cover_image, nil ),
+          image_options: {assoc_name: :cover_image }) %>
+      <% else %>
+        <%= display_image(@promotion, "cover_image.image.large.url", class: "img-inline", alt: @promotion.display_name) %>
+      <% end %>
+    </div>
+
+    <div class="col-md-6 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+
+      <%= theme_panel_heading(@promotion.title) %>
+
+      <%= theme_panel_sub_heading(@promotion.short_description, "#") if @promotion.short_description %>
+      
+      <%= clear_tag(10) %>
+
+      <%= display_publishable_status(@promotion) %>
+      
+      <%= display_featured(@promotion) %>
+
+      <%= clear_tag(20) %>
+
+      <table class="table table-condensed table-bordered mb-20"> 
+        <tbody>
+          
+          <tr>
+            <th>Display Name</th>
+            <td><%= @promotion.display_name ? "Yes" : "No" %></td>
+            <th>Name Mandatory?</th>
+            <td><%= @promotion.name_mandatory ? "Yes" : "No" %></td>
+          </tr>
+
+          <tr>
+            <th>Display Email</th>
+            <td><%= @promotion.display_email ? "Yes" : "No" %></td>
+            <th>Email Mandatory?</th>
+            <td><%= @promotion.email_mandatory ? "Yes" : "No" %></td>
+          </tr>
+
+          <tr>
+            <th>Display Phone</th>
+            <td><%= @promotion.display_phone ? "Yes" : "No" %></td>
+            <th>Phone Mandatory?</th>
+            <td><%= @promotion.phone_mandatory ? "Yes" : "No" %></td>
+          </tr>
+          
+        </tbody>
+      </table>
+    </div>
+
+    <% if display_manage_links? %>
+    <div class="col-md-3 col-sm-12 col-xs-12">
+      <%= display_manage_buttons(@promotion) %>
+      <%= display_publishable_buttons(@promotion) %>
+      <%= display_featurable_buttons(@promotion) %>
+    </div>
+    <% end %>
+
+  </div>
+
+  <hr>
+
+  <div class="visible-sm visible-xs mb-50"></div>
+
+  <%= clear_tag(20) %>
+
+  <ul class="nav nav-pills">
+    <li class="active">
+      <a href="#technical_details" data-toggle="tab" aria-expanded="false">
+        <span class="visible-xs"><i class="fa-database"></i></span>
+        <span class="hidden-xs">Technical Details</span>
+      </a>
+    </li>
+
+    <li class="">
+      <a href="#additional_attributes" data-toggle="tab" aria-expanded="false">
+        <span class="visible-xs"><i class="fa-database"></i></span>
+        <span class="hidden-xs">Additional Attributes</span>
+      </a>
+    </li>
+  </ul>
+
+  <div class="tab-content">
+    <div class="tab-pane active" id="technical_details" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;max-height: 400px;overflow-y: auto;">
+      
+      <%= clear_tag(20) %>
+
+      <div class="table-responsive"> 
+        <table class="table table-striped table-condensed table-bordered mb-60"> 
+          <tbody>
+            
+            <tr>
+              <th>ID</th><td><%= @promotion.id %></td>
+              <th>Code</th><td><%= @promotion.code %></td>
+            </tr>
+            <tr>
+              <th>Featured</th><td><%= @promotion.featured %></td>
+              <th>Status</th><td><%= @promotion.status %></td>
+            </tr>
+            <tr>
+              <th>Created At</th><td><%= @promotion.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @promotion.created_at %></td>
+              <th>Updated At</th><td><%= @promotion.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @promotion.updated_at %></td>
+            </tr>
+            
+          </tbody>
+        </table>
+      </div>
+        
+    </div>
+
+    <div class="tab-pane" id="additional_attributes" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;max-height: 400px;overflow-y: auto;">
+      
+      <%= clear_tag(20) %>
+
+      <div id="div_promotion_attribute_action_buttons">
+        <div class="row">
+          <div class="col-md-6">
+
+            <%= theme_button('Add a Promotion Attribute', 'plus', new_promotion_attribute_path(pr: @promotion.id), classes: "pull-left", btn_type: "success") %>
+
+            <%= theme_button('Refresh', 'refresh', promotion_attributes_path(pr: @promotion.id), classes: "pull-left ml-10", btn_type: "white") %>
+
+          </div>
+          <div class="col-md-6"></div>
+        </div>
+      </div>
+      <%= clear_tag(10) %>
+
+      <div id="div_promotion_attribute_index">
+        <%= render :partial=>"dhatu/promotion_attributes/index" %>
+      </div>
+      <%= clear_tag(10) %>
+    </div>
+  </div>
+
+  <%= link_to "Close", "#", onclick: "closeLargeModal();", class: "btn btn-primary pull-right" %>
+
+  <%= clear_tag %>
+
+</div>

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

@@ -0,0 +1,46 @@
+<div class="row">
+      
+  <div class="col-md-12">
+    
+    <ul class="nav nav-tabs nav-tabs-justified">
+      <% Dhatu::Promotion::STATUS.each do |key, value| %>
+      <li class="<%= @status == value ? 'active' : '' %>">
+        <%= link_to promotions_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_promotion_action_buttons">
+          
+          <div class="row">
+            <div class="col-sm-6">
+              <%= theme_button('Add a Promotion', 'plus', new_promotion_path(), classes: "pull-left mr-10", btn_type: "success") if @current_user.has_create_permission?(Dhatu::Promotion) %>
+
+              <%= theme_button('Refresh', 'refresh', promotions_path(st: @status), classes: "pull-left mr-10", btn_type: "white") %>
+            </div>
+            <div class="col-sm-6">
+              <%= search_form_kuppayam(Dhatu::Promotion, promotions_path(st: @status), text: @filters[:query]) %>
+            </div>
+          </div>
+
+        </div>
+        <%= clear_tag(10) %>
+
+        <div id="div_promotion_index">
+          <%= render :partial=>"dhatu/promotions/index" %>
+        </div>
+        <%= clear_tag(10) %>
+
+      </div>
+    </div>
+
+  </div>
+
+</div>
+

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

@@ -1,5 +1,17 @@
 <%
 	dhatu_items = {
+		promotions: {
+			text: "Promotions",
+			icon_class: "fa-gift",
+			url: dhatu.promotions_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Promotion)
+		},
+		promotion_enquiries: {
+			text: "Promotional Enquiries",
+			icon_class: "linecons-sound",
+			url: dhatu.promotion_enquiries_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::PromotionEnquiry)
+		},
 		bookings: {
 			text: "Bookings",
 			icon_class: "fa-calendar",
@@ -103,6 +115,18 @@
 			icon_class: "linecons-diamond",
 			url: usman.features_url,
 			has_permission: @current_user.has_read_permission?(Feature)
+		},
+		section_types: {
+			text: "Manage Section Types",
+			icon_class: "fa-reorder",
+			url: dhatu.section_types_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::SectionType)
+		},
+		promotion_attributes: {
+			text: "Promotion Attributes",
+			icon_class: "fa-list",
+			url: dhatu.promotion_attributes_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::PromotionAttribute)
 		}
 	}
 %>
@@ -200,7 +224,7 @@
 				</ul>
 			</li>
 			<% end %>
-			
+
 			<% if configuration_items.map{|x,y| x if y[:has_permission] }.compact.any? %>
 			<li class="">
 				<a href="#">

data/config/routes.rb

@@ -4,6 +4,28 @@ Dhatu::Engine.routes.draw do
 
 	scope :admin do
 
+		resources :promotions do
+			member do
+				put :update_status, as:  :update_status
+				put :mark_as_featured
+	      put :remove_from_featured
+			end
+		end
+
+		resources :promotion_attributes do
+			member do
+				put :update_status, as:  :update_status
+			end
+		end
+
+		resources :promotion_enquiries, only: [:index, :show] do
+			member do
+				put :update_status, as:  :update_status
+				put :mark_as_featured
+	      put :remove_from_featured
+			end
+		end
+
 		resources :bookings, only: [:index, :show] do
 			member do
 				put :update_status, as:  :update_status

data/lib/dhatu/version.rb

@@ -1,3 +1,3 @@
 module Dhatu
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end

data/spec/dummy/spec/factories/promotion.rb

@@ -0,0 +1,48 @@
+FactoryGirl.define do
+  
+  factory :unpublished_promotion, class: Dhatu::Promotion do
+    title "Offer Title"
+    code "108273"
+    short_description "Some Promotion Description"
+
+    display_name true
+    display_email true
+    display_phone true
+
+    name_mandatory true
+    email_mandatory false
+    phone_mandatory false
+  end
+
+  factory :published_promotion, parent: :unpublished_promotion do
+    after :build do |e|
+      e.publish
+    end
+  end
+
+  factory :removed_promotion, parent: :unpublished_promotion do
+    after :build do |e|
+      e.remove
+    end
+  end
+
+  factory :archived_promotion, parent: :unpublished_promotion do
+    after :build do |e|
+      e.archive
+    end
+  end
+
+  factory :featured_promotion, parent: :published_promotion do
+    after :build do |e|
+      e.mark_as_featured
+    end
+  end
+
+  factory :non_featured_promotion, parent: :published_promotion do
+    after :build do |e|
+      e.remove_from_featured
+    end
+  end
+
+  
+end

data/spec/dummy/spec/factories/promotion_attributes.rb

@@ -0,0 +1,36 @@
+FactoryGirl.define do
+  factory :promotion_attribute do
+    name "Attribute Name"
+
+    # Data Type could be text, integer, date, list_drop_down (Select from a List), list_radio_button (Choose one) & boolean (Checkbox)
+    data_type "text"
+    mandatory false
+    promotion
+  end
+
+  factory :text_promotion_attribute, parent: :promotion_attribute do
+    data_type "text"
+  end
+
+  factory :integer_promotion_attribute, parent: :promotion_attribute do
+    data_type "integer"
+  end
+
+  factory :date_promotion_attribute, parent: :promotion_attribute do
+    data_type "date"
+  end
+
+  factory :list_drop_down_promotion_attribute, parent: :promotion_attribute do
+    data_type "list_drop_down"
+    values ["Value 1", "Value 2", "Value 3"]
+  end
+
+  factory :list_radio_button_promotion_attribute, parent: :promotion_attribute do
+    data_type "list_radio_button"
+    values ["Radio 1", "Radio 2", "Radio 3"]
+  end
+
+  factory :boolean_promotion_attribute, parent: :promotion_attribute do
+    data_type "boolean"
+  end
+end

data/spec/dummy/spec/factories/promotion_cover_image.rb

@@ -0,0 +1,13 @@
+FactoryGirl.define do
+  
+  factory :promotion_cover_image, class: Image::CoverImage do
+    image { Rack::Test::UploadedFile.new('spec/dummy/spec/factories/test.jpg', 'image.png') }
+    association :imageable, factory: :published_promotion
+  end
+
+  factory :oversized_promotion_cover_image, class: Image::CoverImage do
+    image { Rack::Test::UploadedFile.new('spec/dummy/spec/factories/test.jpg', 'image.png') }
+    association :imageable, factory: :published_promotion
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dhatu
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - kpvarma
@@ -107,7 +107,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.27
+        version: 0.1.28
   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.27
+        version: 0.1.28
 - !ruby/object:Gem::Dependency
   name: pattana
   requirement: !ruby/object:Gem::Requirement
@@ -418,6 +418,8 @@ files:
 - app/controllers/dhatu/events_controller.rb
 - app/controllers/dhatu/offers_controller.rb
 - app/controllers/dhatu/prices_controller.rb
+- app/controllers/dhatu/promotion_attributes_controller.rb
+- app/controllers/dhatu/promotions_controller.rb
 - app/controllers/dhatu/resource_controller.rb
 - app/controllers/dhatu/section_types_controller.rb
 - app/controllers/dhatu/sections_controller.rb
@@ -435,6 +437,9 @@ files:
 - app/models/dhatu/event.rb
 - app/models/dhatu/offer.rb
 - app/models/dhatu/price.rb
+- app/models/dhatu/promotion.rb
+- app/models/dhatu/promotion_attribute.rb
+- app/models/dhatu/promotion_enquiry.rb
 - app/models/dhatu/section.rb
 - app/models/dhatu/section_type.rb
 - app/models/dhatu/service.rb
@@ -479,6 +484,16 @@ files:
 - app/views/dhatu/prices/_row.html.erb
 - app/views/dhatu/prices/_show.html.erb
 - app/views/dhatu/prices/index.html.erb
+- app/views/dhatu/promotion_attributes/_form.html.erb
+- app/views/dhatu/promotion_attributes/_index.html.erb
+- app/views/dhatu/promotion_attributes/_row.html.erb
+- app/views/dhatu/promotion_attributes/_show.html.erb
+- app/views/dhatu/promotion_attributes/index.html.erb
+- app/views/dhatu/promotions/_form.html.erb
+- app/views/dhatu/promotions/_index.html.erb
+- app/views/dhatu/promotions/_row.html.erb
+- app/views/dhatu/promotions/_show.html.erb
+- app/views/dhatu/promotions/index.html.erb
 - app/views/dhatu/section_types/_form.html.erb
 - app/views/dhatu/section_types/_index.html.erb
 - app/views/dhatu/section_types/_row.html.erb
@@ -529,6 +544,9 @@ files:
 - spec/dummy/spec/factories/offer.rb
 - spec/dummy/spec/factories/offer_cover_image.rb
 - spec/dummy/spec/factories/offer_gallery_image.rb
+- spec/dummy/spec/factories/promotion.rb
+- spec/dummy/spec/factories/promotion_attributes.rb
+- spec/dummy/spec/factories/promotion_cover_image.rb
 - spec/dummy/spec/factories/section.rb
 - spec/dummy/spec/factories/section_cover_image.rb
 - spec/dummy/spec/factories/section_gallery_image.rb