spree_contact_form 3.0.6 → 4.0.0

data/app/controllers/spree/admin/contact_topics_controller.rb

@@ -0,0 +1,13 @@
+module Spree
+	module Admin
+		class ContactTopicsController < ResourceController
+			
+		  # create.wants.html { redirect_to collection_path }
+		  # update.wants.html { redirect_to collection_path }
+		  # 
+		  # new_action.response do |wants| 
+		  #   wants.html {render :action => :new, :layout => !request.xhr?}
+		  # end
+		end
+	end
+end

data/app/controllers/spree/contact_controller.rb

@@ -0,0 +1,25 @@
+module Spree
+	class ContactController < BaseController
+	  before_filter :load_topics
+
+	  def show
+	    @message = Message.new
+	  end
+
+	  def create
+	    @message = Message.new(params[:message] || {})
+	    if @message.save
+	      ContactMailer.message_email(@message).deliver
+	      flash[:notice] = t('contact_thank_you')
+	      redirect_to root_path
+	    else
+	      render :action => 'show'
+	    end
+	  end
+
+	private
+	  def load_topics
+	    @topics = ContactTopic.all
+	  end
+	end	
+end

data/app/helpers/spree/admin/contact_topics_helper.rb

@@ -0,0 +1,6 @@
+module Spree
+	module Admin
+		module ContactTopicsHelper
+		end
+	end
+end

data/app/helpers/spree/contact_helper.rb

@@ -0,0 +1,4 @@
+module Spree
+	module ContactHelper
+	end
+end

data/app/mailers/spree/contact_mailer.rb

@@ -0,0 +1,12 @@
+module Spree
+	class ContactMailer < ActionMailer::Base
+	  helper "spree/base"
+
+	  def message_email(message)
+	    subject = "#{Spree::Config[:site_name]} - Message from #{message.email}"
+
+	    @message = message
+	    mail(:to => message.topic.emails, :subject => subject, :reply_to => message.email) 
+	  end
+	end	
+end

data/app/models/spree/contact_topic.rb

@@ -0,0 +1,6 @@
+module Spree
+	class ContactTopic < ActiveRecord::Base
+	  validates :name, :emails, :presence => true
+	  validates :name,          :uniqueness => true
+	end
+end

data/app/models/spree/message.rb

@@ -0,0 +1,10 @@
+module Spree
+	class Message < ActiveRecord::Base
+	  validates :name, :message, :topic_id, :presence => true
+
+	  validates :email,        :format => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
+	  validates :order_number, :format => /(^$)|(^R\d{9}$)/i
+  
+	  belongs_to :topic, :class_name => 'ContactTopic'
+	end
+end

data/app/overrides/admin.rb

@@ -1,5 +1,12 @@
-Deface::Override.new(:virtual_path => "admin/configurations/index",
+Deface::Override.new(:virtual_path => "spree/admin/configurations/index",
                      :name => "converted_admin_configurations_menu_394888068",
                      :insert_after => "[data-hook='admin_configurations_menu'], #admin_configurations_menu[data-hook]",
+                     # :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
                      :text => "<%= configurations_menu_item(I18n.t('contact_topics'), admin_contact_topics_path, I18n.t('contact_topics_description')) %>",
                      :disabled => false)
+
+# Deface::Override.new(:virtual_path => "spree/layouts/admin",
+#                      :name => "promo_admin_tabs",
+#                      :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
+#                      :text => "<%= tab(:promotions, :url => spree.admin_promotions_path) %>",
+#                      :disabled => false)

data/app/views/{admin → spree/admin}/contact_topics/_form.html.erb

@@ -1,6 +1,6 @@
 <%- locals = {:f => f} %>
 
-<%= render "shared/error_messages", :target => f.object %>
+<%= render "spree/shared/error_messages", :target => f.object %>
 
 <div data-hook="admin_contact_topic_form">
 
@@ -12,7 +12,7 @@
 
   <%= f.field_container :emails do %>
     <%= f.label :emails, t("emails") %> (<%= t('comma_delimited') %>) <span class="required">*</span><br />
-    <%= f.text_field :emails, :class => 'fullwidth title'  %>  
+    <%= f.text_field :emails, :class => 'fullwidth title'  %>
     <%= f.error_message_on :emails %>
   <% end %>
 

data/app/views/{admin → spree/admin}/contact_topics/index.html.erb

@@ -1,7 +1,7 @@
 <div class='toolbar'>
   <ul class='actions'>
     <li id="new_contact_topic_link">
-      <%= button_link_to t("new_contact_topic"), new_object_url, {:remote => true, :icon => 'add'} %>
+			<p><%= button_link_to t(:new_contact_topic), new_object_url, :icon => 'add' %></p>
     </li>
   </ul>
   <br class='clear' />

data/app/views/{admin → spree/admin}/contact_topics/new.html.erb

@@ -1,4 +1,9 @@
+<h1><%= t(:topic) %></h1>
+
 <%= form_for(@contact_topic, :url => collection_url) do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
-  <%= render :partial => 'admin/shared/new_resource_links' %>
+  <%= render :partial => 'spree/admin/shared/new_resource_links' %>
 <% end %>
+
+
+

data/app/views/{contact → spree/contact}/show.html.erb

@@ -5,7 +5,8 @@
   <h1><%= t("contact_us") %></h1>
 
   <div data-hook='contact'>
-    <%= render "shared/error_messages", :target => @message %>
+    <%= render "spree/shared/error_messages", :target => @message %>
+		<br/>
 
     <%= form_for(:message, :url => contact_path) do |f| %>
 
@@ -26,7 +27,7 @@
         </p>
 
         <p>
-          <%= f.label :order_number, t("order_number") %> (<%= t('optional') %>)<br />
+          <%= f.label :order_number, t(:order_number) %> (<%= t('optional') %>)<br />
           <%= f.text_field :order_number  %>  
         </p>
 

data/config/locales/en.yml

@@ -1,9 +1,10 @@
 en:
-  contact_us: Contact Us 
+  contact_us: Contact us
   send_message: Send Message
   subject: Subject
   optional: optional
   message: Message
+  order_number: Order number (if you are contacting regarding an order)
   topic: Topic
   invalid_order_number: "should start with letter 'R' followed by 9 numbers (e.g. R123123213)"
   contact_thank_you: "Thank you! Your message has been sent successfully, we will be contacting you shortly"

data/config/routes.rb

@@ -1,7 +1,7 @@
-Rails.application.routes.draw do
+Spree::Core::Engine.routes.prepend do
   resource :contact, :controller => 'contact'
 
   namespace :admin do 
     resources :contact_topics
-  end
-end
+  end	
+end

data/lib/generators/spree_contact_form/install/install_generator.rb

@@ -3,13 +3,13 @@ module SpreeContactForm
     class InstallGenerator < Rails::Generators::Base
 
       def add_javascripts
-        append_file "app/assets/javascripts/store/all.js", "//= require store/spree_contact_form\n"
-        append_file "app/assets/javascripts/admin/all.js", "//= require admin/spree_contact_form\n"
+        #append_file "app/assets/javascripts/store/all.js", "//= require store/spree_contact_form\n"
+        #append_file "app/assets/javascripts/admin/all.js", "//= require admin/spree_contact_form\n"
       end
 
       def add_stylesheets
-        inject_into_file "app/assets/stylesheets/store/all.css", " *= require store/spree_contact_form\n", :before => /\*\//, :verbose => true
-        inject_into_file "app/assets/stylesheets/admin/all.css", " *= require admin/spree_contact_form\n", :before => /\*\//, :verbose => true
+        #inject_into_file "app/assets/stylesheets/store/all.css", " *= require store/spree_contact_form\n", :before => /\*\//, :verbose => true
+        #inject_into_file "app/assets/stylesheets/admin/all.css", " *= require admin/spree_contact_form\n", :before => /\*\//, :verbose => true
       end
 
       def add_migrations

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_contact_form
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 4.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-11 00:00:00.000000000Z
+date: 2012-04-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &77798830 !ruby/object:Gem::Requirement
+  requirement: &85535040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.70.RC1
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *77798830
+  version_requirements: *85535040
 description: Add a contact form for your spree website, you can setup topics and when
   the user submits the form, it is emailed to the site admin
 email: joshnuss@gmail.com
@@ -33,20 +33,20 @@ files:
 - lib/generators/spree_contact_form/install/install_generator.rb
 - lib/spree_contact_form.rb
 - lib/spree_contact_form/engine.rb
-- app/views/contact_mailer/message_email.text.erb
-- app/views/admin/contact_topics/edit.html.erb
-- app/views/admin/contact_topics/_form.html.erb
-- app/views/admin/contact_topics/index.html.erb
-- app/views/admin/contact_topics/new.html.erb
-- app/views/contact/show.html.erb
-- app/mailers/contact_mailer.rb
+- app/views/spree/contact_mailer/message_email.text.erb
+- app/views/spree/admin/contact_topics/edit.html.erb
+- app/views/spree/admin/contact_topics/_form.html.erb
+- app/views/spree/admin/contact_topics/index.html.erb
+- app/views/spree/admin/contact_topics/new.html.erb
+- app/views/spree/contact/show.html.erb
+- app/mailers/spree/contact_mailer.rb
 - app/overrides/admin.rb
-- app/models/message.rb
-- app/models/contact_topic.rb
-- app/helpers/contact_helper.rb
-- app/helpers/admin/contact_topics_helper.rb
-- app/controllers/contact_controller.rb
-- app/controllers/admin/contact_topics_controller.rb
+- app/models/spree/message.rb
+- app/models/spree/contact_topic.rb
+- app/helpers/spree/contact_helper.rb
+- app/helpers/spree/admin/contact_topics_helper.rb
+- app/controllers/spree/contact_controller.rb
+- app/controllers/spree/admin/contact_topics_controller.rb
 - config/routes.rb
 - config/locales/en.yml
 homepage: http://spreecommerce.com
@@ -60,7 +60,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/controllers/admin/contact_topics_controller.rb

@@ -1,11 +0,0 @@
-class Admin::ContactTopicsController < Admin::BaseController
-  resource_controller
-
-  create.wants.html { redirect_to collection_path }
-  update.wants.html { redirect_to collection_path }
-
-  new_action.response do |wants| 
-    wants.html {render :action => :new, :layout => !request.xhr?}
-  end 
-
-end

data/app/controllers/contact_controller.rb

@@ -1,23 +0,0 @@
-class ContactController < Spree::BaseController
-  before_filter :load_topics
-
-  def show
-    @message = Message.new
-  end
-
-  def create
-    @message = Message.new(params[:message] || {})
-    if @message.save
-      ContactMailer.message_email(@message).deliver
-      flash[:notice] = t('contact_thank_you')
-      redirect_to root_path
-    else
-      render :action => 'show'
-    end
-  end
-
-private
-  def load_topics
-    @topics = ContactTopic.all
-  end
-end

data/app/helpers/admin/contact_topics_helper.rb

@@ -1,2 +0,0 @@
-module Admin::ContactTopicsHelper
-end

data/app/helpers/contact_helper.rb

@@ -1,2 +0,0 @@
-module ContactHelper
-end

data/app/mailers/contact_mailer.rb

@@ -1,10 +0,0 @@
-class ContactMailer < ActionMailer::Base
-  helper "spree/base"
-
-  def message_email(message)
-    subject = "#{Spree::Config[:site_name]} - Message from #{message.email}"
-
-    @message = message
-    mail(:to => message.topic.emails, :subject => subject, :reply_to => message.email) 
-  end
-end

data/app/models/contact_topic.rb

@@ -1,4 +0,0 @@
-class ContactTopic < ActiveRecord::Base
-  validates :name, :emails, :presence => true
-  validates :name,          :uniqueness => true
-end

data/app/models/message.rb

@@ -1,8 +0,0 @@
-class Message < ActiveRecord::Base
-  validates :name, :message, :topic_id, :presence => true
-
-  validates :email,        :format => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
-  validates :order_number, :format => /(^$)|(^R\d{9}$)/i
-  
-  belongs_to :topic, :class_name => 'ContactTopic'
-end