Please view description

Spud Inquiries Updates
- Added send_recipt flag to configuration.rb and default to false.
- Added new column, :receipt_content, this will be the message the user
will receive via email after submission of form
- :receipt_content will toggle depending on :send_receipt flag
- Added help text for content, thank you text, and receipt content
- Added :reply_to field for mail method, it will default to
from_address if none is found, this is only applicable to the
send_receipt method
- Added send_receipt.html.erb and .text.erb view

Author: Kenn K. Lau

Diff for: Gemfile.lock

@@ -9,94 +9,124 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.0.4)
-      actionpack (= 4.0.4)
-      mail (~> 2.5.4)
-    actionpack (4.0.4)
-      activesupport (= 4.0.4)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
+    actionmailer (4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.0)
+      actionview (= 4.2.0)
+      activesupport (= 4.2.0)
+      rack (~> 1.6.0)
       rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
     actionpack-action_caching (1.1.1)
       actionpack (>= 4.0.0, < 5.0)
     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)
-    activemodel (4.0.4)
-      activesupport (= 4.0.4)
-      builder (~> 3.1.0)
-    activerecord (4.0.4)
-      activemodel (= 4.0.4)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.4)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.4)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.2)
-    authlogic (3.4.2)
+    actionview (4.2.0)
+      activesupport (= 4.2.0)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.0)
+      activesupport (= 4.2.0)
+      globalid (>= 0.3.0)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
+      builder (~> 3.1)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.0)
+    authlogic (3.4.4)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       request_store (~> 1.0)
-    bcrypt (3.1.7)
+      scrypt (~> 1.2)
+    bcrypt (3.1.9)
     bootstrap-will_paginate (0.0.10)
       will_paginate
     breadcrumbs_on_rails (2.3.0)
-    builder (3.1.4)
-    codemirror-rails (4.4)
+    builder (3.2.2)
+    codemirror-rails (4.8)
       railties (>= 3.0, < 5)
     database_cleaner (1.0.0.RC1)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     factory_girl (3.6.2)
       activesupport (>= 3.0.0)
-    ffi (1.9.3)
+    ffi (1.9.6)
     ffi-compiler (0.1.3)
       ffi (>= 1.0.0)
       rake
+    globalid (0.3.0)
+      activesupport (>= 4.1.0)
     hike (1.2.3)
-    i18n (0.6.9)
-    jquery-rails (3.1.0)
-      railties (>= 3.0, < 5.0)
+    i18n (0.7.0)
+    jquery-rails (4.0.3)
+      rails-dom-testing (~> 1.0)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    liquid (2.6.1)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    json (1.8.2)
+    liquid (3.0.0)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     metaclass (0.0.4)
-    mime-types (1.25.1)
-    minitest (4.7.5)
+    mime-types (2.4.3)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.9.2)
-    mysql2 (0.3.15)
-    polyglot (0.3.5)
+    multi_json (1.10.1)
+    mysql2 (0.3.17)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
     protected_attributes (1.0.8)
       activemodel (>= 4.0.1, < 5.0)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.6.0)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.0.4)
-      actionmailer (= 4.0.4)
-      actionpack (= 4.0.4)
-      activerecord (= 4.0.4)
-      activesupport (= 4.0.4)
+    rails (4.2.0)
+      actionmailer (= 4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      activemodel (= 4.2.0)
+      activerecord (= 4.2.0)
+      activesupport (= 4.2.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.4)
-      sprockets-rails (~> 2.0.0)
+      railties (= 4.2.0)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.5)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.1)
+      loofah (~> 2.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
-    railties (4.0.4)
-      actionpack (= 4.0.4)
-      activesupport (= 4.0.4)
+    railties (4.2.0)
+      actionpack (= 4.2.0)
+      activesupport (= 4.2.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.1)
-    request_store (1.0.8)
+    rake (10.4.2)
+    request_store (1.1.0)
     retina_tag (1.3.1)
       jquery-rails
       rails (>= 3.1)
@@ -127,16 +157,16 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sprockets (2.12.1)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.2.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    spud_core (1.0.4)
+      sprockets (>= 2.8, < 4.0)
+    spud_core (1.0.6)
       actionpack-action_caching
       actionpack-page_caching
       authlogic (~> 3.4.0)
@@ -153,14 +183,12 @@ GEM
       tinymce-rails (= 3.5.9)
       will_paginate
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     tinymce-rails (3.5.9)
       railties (>= 3.1.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.39)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     will_paginate (3.0.7)
 
 PLATFORMS

Diff for: app/controllers/contacts_controller.rb

@@ -36,7 +36,7 @@ def inquire
 			val = params[:spud_inquiry][field.field_name]
 			if field.required && val.blank?
 				flash[:error] = "Not all required fields were entered"
-				@spud_inquiry.errors.add field.field_name,"is a required field"
+				@spud_inquiry.errors.add field.field_name,"is a required field.  "
 			end
 
 			if field.validation_rule
@@ -60,6 +60,10 @@ def inquire
 			if !@spud_inquiry.recipients.blank?
 				Spud::InquiryMailer.inquiry_notification(@spud_inquiry).deliver
 			end
+
+      if Spud::Inquiries.send_receipt && @spud_inquiry.email != 'Unknown Sender' && !@inquiry_form.receipt_content.blank?
+			  Spud::InquiryMailer.send_receipt(@spud_inquiry, @inquiry_form).deliver
+		  end
 		else
 			flash[:error] = "Whoops! Something went wrong. Please try again!"
 			respond_to do |format|

Diff for: app/controllers/spud/admin/inquiry_forms_controller.rb

@@ -54,6 +54,6 @@ def load_form
 	end
 
 	def inquiry_form_params
-		params.require(:spud_inquiry_form).permit(:name,:url_name,:recipients,:content,:subject,{:spud_inquiry_form_fields_attributes => [:id,:name,:options,:default_value,:field_type,:spud_inquiry_form_id,:field_order,:required, :placeholder, :class_name, :validation_rule, :validation_error_message, :_destroy]}, :created_at, :updated_at, :thank_you_content, :submit_title)
+		params.require(:spud_inquiry_form).permit(:name,:url_name,:recipients,:content, :receipt_content, :subject,{:spud_inquiry_form_fields_attributes => [:id,:name,:options,:default_value,:field_type,:spud_inquiry_form_id,:field_order,:required, :placeholder, :class_name, :validation_rule, :validation_error_message, :_destroy]}, :created_at, :updated_at, :thank_you_content, :submit_title)
 	end
 end

Diff for: app/mailers/spud/inquiry_mailer.rb

@@ -7,4 +7,11 @@ def inquiry_notification(inquiry)
   	# @url = "/spud/admin/inquiries/#{@inquiry.id}"
   	mail(:from =>Spud::Inquiries.from_address,:to => @inquiry.recipients.split(","), :subject => @inquiry.subject.blank? ? "No Subject" : @inquiry.subject)
   end
+
+  def send_receipt(inquiry, form)
+    @inquiry = inquiry
+    @form = form
+
+    mail(:from => Spud::Inquiries.from_address, :reply_to => Spud::Inquiries.reply_to.blank? ? Spud::Inquiries.from_address : Spud::Inquiries.reply_to, :to => @inquiry.email, :subject => @inquiry.subject.blank? ? "No Subject" : @inquiry.subject)
+  end
 end

Diff for: app/views/spud/admin/inquiry_forms/_form.html.erb

@@ -22,17 +22,29 @@
     		</div>
       </div>
       <div class="form-group">
-	    	<%=f.label :content, :required=>true, :class=>"control-label col-sm-4"%>
-  			<div class="col-sm-8">
-  				<%=f.text_area :content,:cols => 75,:rows => 5,:class => "spud-formatted-editor form-control"%>
-  			</div>
+        <%=f.label :content, :required=>true, :class=>"control-label col-sm-4"%>
+        <div class="col-sm-8">
+          <%=f.text_area :content,:cols => 75,:rows => 5,:class => "spud-formatted-editor form-control"%>
+        </div>
       </div>
       <div class="form-group">
         <%=f.label :thank_you_content,"Thank You Text", :required=>true, :class=>"control-label col-sm-4"%>
         <div class="col-sm-8">
           <%=f.text_area :thank_you_content,:cols => 75,:rows => 5,:class => "spud-formatted-editor form-control"%>
+          <p class="help-block">The above message will be display on the page to the user immediately after submission of inquiry.  </p>
+        </div>
+      </div>
+
+      <% if Spud::Inquiries.send_receipt %>
+      <div class="form-group">
+        <%=f.label :receipt_content, :class=>"control-label col-sm-4"%>
+        <div class="col-sm-8">
+          <%=f.text_area :receipt_content,:cols => 75,:rows => 5,:class => "spud-formatted-editor form-control"%>
+          <p class="help-block">We will email the above message after submission of inquiry.  Also, please ensure one of the inquiry fields below has the name of 'email'.</p>
         </div>
       </div>
+      <% end %>
+
       <div class="form-group">
         <%=f.label :submit_title, "Submit Button Title", :required=>true, :class=>"control-label col-sm-4"%>
         <div class="col-sm-8">

Diff for: app/views/spud/inquiry_mailer/send_receipt.html.erb

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+  </head>
+<body>
+
+<%= @form.receipt_content.html_safe %>
+
+</body>
+</html>
+  

Diff for: app/views/spud/inquiry_mailer/send_receipt.text.erb

@@ -0,0 +1,5 @@
+
+Inquiry Received
+=================
+
+<%= strip_tags @form.receipt_content %>

Diff for: db/migrate/20150116011426_add_receipt_content_to_spud_inquiry_form.rb

@@ -0,0 +1,5 @@
+class AddReceiptContentToSpudInquiryForm < ActiveRecord::Migration
+  def change
+    add_column :spud_inquiry_forms, :receipt_content, :text
+  end
+end

Diff for: lib/spud_inquiries/configuration.rb

@@ -2,15 +2,17 @@ module Spud
   module Inquiries
     include ActiveSupport::Configurable
 
-    config_accessor :default_contact_form,:enable_routes,:mail_delivery_format,:base_layout,:from_address,:enable_sitemap,:enable_action_caching, :automount
+    config_accessor :default_contact_form,:enable_routes,:mail_delivery_format,:base_layout,:from_address,:enable_sitemap,:enable_action_caching, :automount, :reply_to, :send_receipt
 
     self.enable_routes = true
     self.automount = true
     self.default_contact_form = "contact"
     self.base_layout = "application"
     self.mail_delivery_format = :html
     self.from_address = "[email protected]"
+    self.reply_to = "[email protected]"
     self.enable_sitemap = true
     self.enable_action_caching = false
+    self.send_receipt = false
   end
-end
+end