dhatu 0.1.16 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4332cb6da0a238d179e6741a58052d4c3980f979
-  data.tar.gz: feb098e4645175e51091757febd1870741cad2ea
+  metadata.gz: 8a31c4186a8a046b6b45aedbc0e8b051b2e3ca94
+  data.tar.gz: 7828c199d77737380d93a7703eb6f3c6bfce9de3
 SHA512:
-  metadata.gz: 21a8f24d8cccea2de937779133a064253512e1829588978285c29505409968bf9f8d48e559258299826c7ff71c0c5b5b13f0a209d6a04177696c6f6a5263042b
-  data.tar.gz: 4931a0d76494a9c5eec283299ddb10f11c524766202e3feb54463f97730ccbab0b9fd7fb7d98e76cc0218fdb56d86dca9b7a253b034394de46be615f11a924be
+  metadata.gz: c2d5692673467bb172246ded35e8ee5d12cdd33e8333b2018c04eb2f78e04901e55ad65fffa86114a345a791d3ce9e3460f1ec6a08ef734d6460483ace234d1b
+  data.tar.gz: d69aa7af35ac67bd1149b00f2b535dd0f0dc20f62c61d79814f757942f7a5a90e73bc63f5138834b79ebfce5a98388447cdae18cf8c6c068f775073ae34bd0db

data/app/controllers/dhatu/categories_controller.rb

@@ -59,7 +59,7 @@ module Dhatu
     end
 
     def get_features
-      @features = Feature.categorisable.published.order("priority ASC, name ASC").all
+      @features = Feature.categorisable.published.order("name ASC").all
     end
 
     def permitted_params
@@ -97,6 +97,8 @@ module Dhatu
       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_including_children"
+        @relation = Dhatu::Category.where("")
       when "All"
         @relation = @relation.where("")
       else 

data/app/models/dhatu/blog_post.rb

@@ -35,6 +35,49 @@ class Dhatu::BlogPost < Dhatu::ApplicationRecord
 
   scope :upcoming, lambda { where("starts_at >= ?", Time.now) }
   scope :past, lambda { where("starts_at < ?", Time.now) }
+
+  def self.save_row_data(hsh)
+    # Initializing error hash for displaying all errors altogether
+    error_object = Kuppayam::Importer::ErrorHash.new
+
+    return error_object if hsh[:title].to_s.strip.blank?
+
+    category = Dhatu::Category.find_by_name(hsh[:category].to_s.strip)
+
+    unless category
+      puts "Category '#{hsh[:category].to_s.strip}' not found".red
+      return
+    end
+
+    blog_post = Dhatu::BlogPost.where("title = ? AND category_id = ?", hsh[:title].to_s.strip, category.id).first || Dhatu::BlogPost.new
+    
+    blog_post.title = hsh[:title].to_s.strip
+    blog_post.slug = blog_post.title.parameterize[0..64] if blog_post.title
+    blog_post.author = hsh[:author].to_s.strip
+    blog_post.meta_description = hsh[:meta_description].to_s.strip
+    blog_post.description = hsh[:description].to_s.strip
+    blog_post.posted_at = hsh[:posted_at].to_s.strip
+
+    blog_post.category = category
+
+    blog_post.featured = ["true", "t","1","yes","y"].include?(hsh[:featured].to_s.strip)
+    blog_post.status = hsh[:status].to_s.strip.blank? ? PUBLISHED : hsh[:status].to_s.strip
+
+    if blog_post.valid?
+      begin
+        blog_post.save!
+      rescue Exception => e
+        summary = "uncaught #{e} exception while handling connection: #{e.message}"
+        details = "Stack trace: #{e.backtrace.map {|l| "  #{l}\n"}.join}"
+        error_object.errors << { summary: summary, details: details }        
+      end
+    else
+      summary = "Error while saving blog_post: #{blog_post.title}"
+      details = "Error! #{blog_post.errors.full_messages.to_sentence}"
+      error_object.errors << { summary: summary, details: details }
+    end
+    return error_object
+  end
   
   # ------------------
   # Instance Methods

data/app/models/dhatu/booking.rb

@@ -28,7 +28,7 @@ class Dhatu::Booking < Dhatu::ApplicationRecord
   scope :past, lambda { where("created_at < ?", Time.now) }
 
   # ------------------
-  # Instance variables
+  # Instance Methods
   # ------------------
 
   # Generic Methods

data/app/models/dhatu/branch.rb

@@ -57,8 +57,55 @@ class Dhatu::Branch < Dhatu::ApplicationRecord
   scope :past, lambda { where("created_at < ?", Time.now) }
   scope :main_branch, lambda { where("main_branch is TRUE")}
 
+  def self.save_row_data(hsh)
+    # Initializing error hash for displaying all errors altogether
+    error_object = Kuppayam::Importer::ErrorHash.new
+
+    return error_object if hsh[:title].to_s.strip.blank?
+
+    branch = Dhatu::Branch.find_by_title(hsh[:title].to_s.strip) || Dhatu::Branch.new
+    
+    branch.title = hsh[:title].to_s.strip
+    branch.address_1 = hsh[:address_1].to_s.strip
+    branch.address_2 = hsh[:address_2].to_s.strip
+    branch.address_3 = hsh[:address_3].to_s.strip
+    branch.email = hsh[:email].to_s.strip
+    branch.landline = hsh[:landline].to_s.strip
+    branch.fax = hsh[:fax].to_s.strip
+    branch.mobile = hsh[:mobile].to_s.strip
+
+    branch.facebook = hsh[:facebook].to_s.strip
+    branch.twitter = hsh[:twitter].to_s.strip
+    branch.google_plus = hsh[:google_plus].to_s.strip
+    branch.linked_in = hsh[:linked_in].to_s.strip
+    branch.youtube = hsh[:youtube].to_s.strip
+    branch.instagram = hsh[:instagram].to_s.strip
+    branch.tumblr = hsh[:tumblr].to_s.strip
+    branch.pinterest = hsh[:pinterest].to_s.strip
+    branch.blog = hsh[:blog].to_s.strip
+    branch.status = hsh[:status].to_s.strip.blank? ? PUBLISHED : hsh[:status].to_s.strip
+
+    branch.featured = ["true", "t","1","yes","y"].include?(hsh[:featured].to_s.strip)
+    branch.main_branch = ["true", "t","1","yes","y"].include?(hsh[:main_branch].to_s.strip)
+
+    if branch.valid?
+      begin
+        branch.save!
+      rescue Exception => e
+        summary = "uncaught #{e} exception while handling connection: #{e.message}"
+        details = "Stack trace: #{e.backtrace.map {|l| "  #{l}\n"}.join}"
+        error_object.errors << { summary: summary, details: details }        
+      end
+    else
+      summary = "Error while saving branch: #{branch.title}"
+      details = "Error! #{branch.errors.full_messages.to_sentence}"
+      error_object.errors << { summary: summary, details: details }
+    end
+    return error_object
+  end
+
   # ------------------
-  # Instance variables
+  # Instance Methods
   # ------------------
 
   # Generic Methods

data/app/models/dhatu/category.rb

@@ -92,7 +92,7 @@ class Dhatu::Category < Dhatu::ApplicationRecord
   end
   
   # ------------------
-  # Instance methods
+  # Instance Methods
   # ------------------
 
   # Other Methods

data/app/models/dhatu/offer.rb

@@ -63,7 +63,7 @@ class Dhatu::Offer < Dhatu::ApplicationRecord
   end
 
   # ------------------
-  # Instance variables
+  # Instance Methods
   # ------------------
 
   # Generic Methods

data/app/models/dhatu/price.rb

@@ -64,7 +64,7 @@ class Dhatu::Price < Dhatu::ApplicationRecord
   end
 
   # ------------------
-  # Instance variables
+  # Instance Methods
   # ------------------
 
   # Generic Methods

data/app/models/dhatu/promotion.rb

@@ -30,8 +30,48 @@ class Dhatu::Promotion < Dhatu::ApplicationRecord
   scope :upcoming, lambda { where("starts_at >= ?", Time.now) }
   scope :past, lambda { where("starts_at < ?", Time.now) }
   
+  def self.save_row_data(hsh)
+    # Initializing error hash for displaying all errors altogether
+    error_object = Kuppayam::Importer::ErrorHash.new
+
+    return error_object if hsh[:title].to_s.strip.blank?
+
+    promotion = Dhatu::Promotion.find_by_title(hsh[:title].to_s.strip) || Dhatu::Promotion.new
+
+    promotion.title = hsh[:title].to_s.strip
+    promotion.code = hsh[:code].to_s.strip
+    promotion.short_description = hsh[:short_description].to_s.strip
+
+    promotion.display_name = ["true", "t","1","yes","y"].include?(hsh[:display_name].to_s.strip)
+    promotion.display_email = ["true", "t","1","yes","y"].include?(hsh[:display_email].to_s.strip)
+    promotion.display_phone = ["true", "t","1","yes","y"].include?(hsh[:display_phone].to_s.strip)
+
+    promotion.name_mandatory = ["true", "t","1","yes","y"].include?(hsh[:name_mandatory].to_s.strip)
+    promotion.email_mandatory = ["true", "t","1","yes","y"].include?(hsh[:email_mandatory].to_s.strip)
+    promotion.phone_mandatory = ["true", "t","1","yes","y"].include?(hsh[:phone_mandatory].to_s.strip)
+    
+    promotion.featured = ["true", "t","1","yes","y"].include?(hsh[:featured].to_s.strip)
+    promotion.status = hsh[:status].to_s.strip.blank? ? PUBLISHED : hsh[:status].to_s.strip
+    promotion.priority = hsh[:priority].to_s.strip.blank? ? 1000 : hsh[:priority].to_s.strip
+
+    if promotion.valid?
+      begin
+        promotion.save!
+      rescue Exception => e
+        summary = "uncaught #{e} exception while handling connection: #{e.message}"
+        details = "Stack trace: #{e.backtrace.map {|l| "  #{l}\n"}.join}"
+        error_object.errors << { summary: summary, details: details }        
+      end
+    else
+      summary = "Error while saving promotion: #{promotion.title}"
+      details = "Error! #{promotion.errors.full_messages.to_sentence}"
+      error_object.errors << { summary: summary, details: details }
+    end
+    return error_object
+  end
+
   # ------------------
-  # Instance variables
+  # Instance Methods
   # ------------------
 
   # Generic Methods
@@ -46,7 +86,7 @@ class Dhatu::Promotion < Dhatu::ApplicationRecord
 
   def promotion_attributes_with_values
     hsh = {}
-    self.promotion_attributes.each do |pa|
+    self.promotion_attributes.published.where("mandatory is TRUE").order("priority ASC, name ASC").each do |pa|
       hsh[pa.name] = { values: pa.values, selected: "selected", data_type: pa.data_type, mandatory: pa.mandatory}
     end
     hsh
@@ -69,5 +109,27 @@ class Dhatu::Promotion < Dhatu::ApplicationRecord
   def generate_and_save_code
     self.update_attribute(:code, SecureRandom.hex(4))
   end
+
+  # Image Configuration
+  # -------------
+  def self.image_configuration
+    {
+      "Image::CoverImage" => {
+        max_upload_limit: 10485760,
+        min_upload_limit: 1,
+        resolutions: [1000, 500],
+        form_upload_image_label: "Upload a new Image",
+        form_title: "Upload an Image",
+        form_sub_title: "Please read the instructions below:",
+        form_instructions: [
+          "the filename should be in .jpg / .jpeg or .png format",
+          "the image resolutions should be <strong>1000 x 500 Pixels</strong>",
+          "the file size should be greater than 100 Kb and or lesser than <strong>10 MB</strong>",
+          "Note: most cameras and camera phones will produce images bigger than this"
+        ]
+       }  
+    }
+    
+  end
   
 end

data/app/models/dhatu/promotion_attribute.rb

@@ -26,7 +26,7 @@ class Dhatu::PromotionAttribute < Dhatu::ApplicationRecord
   before_validation :convert_string_values_to_array
 
   # ------------------
-  # Instance variables
+  # Instance Methods
   # ------------------
 
   # Other Methods

data/app/models/dhatu/promotion_enquiry.rb

@@ -29,7 +29,7 @@ class Dhatu::PromotionEnquiry < Dhatu::ApplicationRecord
   scope :past, lambda { where("created_at < ?", Time.now) }
 
   # ------------------
-  # Instance variables
+  # Instance Methods
   # ------------------
 
   # Generic Methods

data/app/models/dhatu/section.rb

@@ -44,38 +44,45 @@ class Dhatu::Section < Dhatu::ApplicationRecord
 
     return error_object if hsh[:title].to_s.strip.blank?
 
-    service = Dhatu::Section.find_by_title(hsh[:title].to_s.strip) || Dhatu::Section.new
+    section_type = Dhatu::SectionType.find_by_code(hsh[:section_type].to_s.strip)
+
+    unless section_type
+      puts "Section Type '#{hsh[:section_type].to_s.strip}' not found".red
+      return
+    end
+
+    section = Dhatu::Section.where("title = ? AND section_type_id = ?", hsh[:title].to_s.strip, section_type.id).first || Dhatu::Section.new
     
-    service.title = hsh[:title].to_s.strip
-    service.sub_title = hsh[:sub_title].to_s.strip
-    service.short_description = hsh[:short_description].to_s.strip
-    service.long_description = hsh[:long_description].to_s.strip
-    service.button_one_text = hsh[:button_one_text].to_s.strip
-    service.button_two_text = hsh[:button_two_text].to_s.strip
-    service.button_one_link = hsh[:button_one_link].to_s.strip
-    service.button_two_link = hsh[:button_two_link].to_s.strip
-
-    service.section_type = Dhatu::SectionType.find_by_code(hsh[:section_type].to_s.strip)
-    service.status = hsh[:status].to_s.strip || PUBLISHED
-
-    if service.valid?
+    section.title = hsh[:title].to_s.strip
+    section.sub_title = hsh[:sub_title].to_s.strip
+    section.short_description = hsh[:short_description].to_s.strip
+    section.long_description = hsh[:long_description].to_s.strip
+    section.button_one_text = hsh[:button_one_text].to_s.strip
+    section.button_two_text = hsh[:button_two_text].to_s.strip
+    section.button_one_link = hsh[:button_one_link].to_s.strip
+    section.button_two_link = hsh[:button_two_link].to_s.strip
+
+    section.section_type = section_type
+    section.status = hsh[:status].to_s.strip || PUBLISHED
+
+    if section.valid?
       begin
-        service.save!
+        section.save!
       rescue Exception => e
         summary = "uncaught #{e} exception while handling connection: #{e.message}"
         details = "Stack trace: #{e.backtrace.map {|l| "  #{l}\n"}.join}"
         error_object.errors << { summary: summary, details: details }        
       end
     else
-      summary = "Error while saving service: #{service.title}"
-      details = "Error! #{service.errors.full_messages.to_sentence}"
+      summary = "Error while saving section: #{section.title}"
+      details = "Error! #{section.errors.full_messages.to_sentence}"
       error_object.errors << { summary: summary, details: details }
     end
     return error_object
   end
 
   # ------------------
-  # Instance variables
+  # Instance Methods
   # ------------------
 
   # Generic Methods

data/app/models/dhatu/section_type.rb

@@ -47,7 +47,7 @@ class Dhatu::SectionType < Dhatu::ApplicationRecord
   end
 
   # ------------------
-  # Instance variables
+  # Instance Methods
   # ------------------
 
   # Generic Methods

data/app/models/dhatu/service.rb

@@ -69,7 +69,7 @@ class Dhatu::Service < Dhatu::ApplicationRecord
   end
 
   # ------------------
-  # Instance variables
+  # Instance Methods
   # ------------------
 
   # Generic Methods

data/app/models/dhatu/team_member.rb

@@ -69,7 +69,7 @@ class Dhatu::TeamMember < Dhatu::ApplicationRecord
   end
 
   # ------------------
-  # Instance variables
+  # Instance Methods
   # ------------------
 
   # Generic Methods

data/app/models/dhatu/testimonial.rb

@@ -63,7 +63,7 @@ class Dhatu::Testimonial < Dhatu::ApplicationRecord
   end
 
   # ------------------
-  # Instance variables
+  # Instance Methods
   # ------------------
 
   # Generic Methods

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

@@ -12,9 +12,14 @@
             <%= link_to feature.display_name, categories_path(category_type: feature.name) %>
           </li>
         <% end %>
+        <% if @current_user.super_admin? %>
         <li class="<%= @category_type == "none" ? 'active' : '' %>">
           <%= link_to "None", categories_path(category_type: :none) %>
         </li>
+        <li class="<%= @category_type == "all_including_children" ? 'active' : '' %>">
+          <%= link_to "All Including Children", categories_path(category_type: :all_including_children) %>
+        </li>
+        <% end %>
       </ul>
       
       <div class="tab-content">

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

@@ -1,53 +1,51 @@
-<div class="table-responsive"> 
-	<table class="table table-hover members-table middle-align">
-	  <thead> 
-			<tr> 
-				<th style="text-align: center;width:5%">#</th> 
-				<th style="text-align: center;width:100px"><i class="fa fa-photo"></i></th> 
-				<th>Offer Title</th>
-				<th>Offer Text</th>
-				<th style="width:100px;" class="hidden-sm hidden-xs">Featured</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>
+<table class="table table-hover members-table middle-align">
+  <thead> 
+		<tr> 
+			<th style="text-align: center;width:5%" class="hidden-sm hidden-xs">#</th> 
+			<th style="text-align: center;width:100px" class="hidden-sm hidden-xs"><i class="fa fa-photo"></i></th> 
+			<th>Offer Title</th>
+			<th class="hidden-sm hidden-xs">Offer Text</th>
+			<th style="width:100px;" class="hidden-sm hidden-xs">Featured</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_offer_0"></tr>
+  	<% @offers.each_with_index do |offer, i| %>
+  		<tr id="tr_offer_<%= offer.id %>">
+
+				<th scope="row" style="text-align: center;" class="hidden-sm hidden-xs">
+					<%= serial_number(i) %>
+				</th>
+
+				<td class="display-image hidden-sm hidden-xs">
+					<%= display_thumbnail_small(offer) %>
+				</td>
+
+				<td class="display-link"><%= link_to offer.title, offer_path(offer), remote: true %></td>
+
+				<td class="display-link hidden-sm hidden-xs"><%= link_to offer.offer_text, offer_path(offer), remote: true %></td>
+
+				<td class="hidden-sm hidden-xs"><%= display_featured(offer) %></td>
+	      
+	      <td class="hidden-sm hidden-xs"><%= display_publishable_status(offer) %></td>
+
+	      <% if display_manage_links? %>
+	      <td class="action-links hidden-sm hidden-xs" style="width:10%"><%= display_publishable_links(offer) %></td>
+
+	      <td class="action-links hidden-sm hidden-xs" style="width:10%">
+					<%= display_featurable_links(offer) %>
+					<%= display_manage_links(offer, @current_user) %>
+				</td>
 				<% end %>
-			</tr> 
-		</thead>
-	  <tbody>
-	  	<tr id="tr_offer_0"></tr>
-	  	<% @offers.each_with_index do |offer, i| %>
-	  		<tr id="tr_offer_<%= offer.id %>">
-
-					<th scope="row" style="text-align: center;">
-						<%= serial_number(i) %>
-					</th>
-
-					<td class="display-image">
-						<%= display_thumbnail_small(offer) %>
-					</td>
-
-					<td class="display-link"><%= link_to offer.title, offer_path(offer), remote: true %></td>
-
-					<td class="display-link"><%= link_to offer.offer_text, offer_path(offer), remote: true %></td>
-
-					<td class="hidden-sm hidden-xs"><%= display_featured(offer) %></td>
-		      
-		      <td class="hidden-sm hidden-xs"><%= display_publishable_status(offer) %></td>
-
-		      <% if display_manage_links? %>
-		      <td class="action-links hidden-sm hidden-xs" style="width:10%"><%= display_publishable_links(offer) %></td>
-
-		      <td class="action-links hidden-sm hidden-xs" style="width:10%">
-						<%= display_featurable_links(offer) %>
-						<%= display_manage_links(offer, @current_user) %>
-					</td>
-					<% end %>
-
-		    </tr>
-		  <% end %>
-	  </tbody>
-	</table>
-</div>
+
+	    </tr>
+	  <% end %>
+  </tbody>
+</table>
 
 <div class="row">
   <div class="col-sm-12">