c80_order_form 0.1.0.1 → 0.1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d170f1173fd71f93027b511d02ba41553874152
-  data.tar.gz: fa27995fb62a5338762c27a91a84903bbc71b999
+  metadata.gz: 69d9b2b451b40fb1bc3071bb174b7f466fd546aa
+  data.tar.gz: da2134f1e0b56829a3e002777498e08532dfb894
 SHA512:
-  metadata.gz: c98e9e303cacb777586300c5d4296923f03393ae39e3e2bb58e7d443477feef5ddc89c18b195f331761ea0cdd2f93328900d2a873cc7ed80a07bb0451de547eb
-  data.tar.gz: 649ffe5fde65d019f380c363cc0ecf12758f6de1c76493937f1ca10a5f4557f193ac474e3341d1ef4c570c4b57245e6f6208e1e8ae43acbabd248cfc6f62495f
+  metadata.gz: 33d93f4b41fba194797118995d3c7df68c07f78e804a9c3366b69389dbd07ae8883a2acab1efcc581fba2efadaef6176004ed9ed36bebaa1bb026b1cb10f72c7
+  data.tar.gz: 1dc7d34ad612d875f7aae1fcf7308a235e859b835b59c6eabd1dc2c5c10a8852e05b24b617893e1cf495ba1eeb04c4bd0013dc3af81c6b9296a4ea4bc6b13fd9

data/.gitignore

@@ -8,3 +8,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/README.md

@@ -59,8 +59,6 @@ Add this line into `routes.rb`:
 
     mount C80OrderForm::Engine => '/'
 
-Form invoked by link with class `c80_order_invoking_btn`.
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -69,7 +67,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-1. Fork it ( https://github.com/c080609a/c80_order_form/fork )
+1. Fork it ( https://github.com/[my-github-username]/c80_order_form/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/app/admin/c80_order_form/message_orders.rb

@@ -2,7 +2,7 @@ ActiveAdmin.register C80OrderForm::MessageOrder, :as => 'MessageOrder' do
 
   before_filter :skip_sidebar!, :only => :index
 
-  menu :parent => 'Сообщения', :label => 'Заявки' # TODO_MY:: слово "заявки" перенести в базу, в настройки гема
+  menu :parent => 'Сообщения', :label => C80OrderForm::Settings.first.admin_label_menu
 
   index do
     selectable_column

data/app/assets/javascripts/frontend/ajax_form.js

@@ -80,9 +80,17 @@ $(function () {
                             predefined_comment = $clickedButton.data('comment-text');
                         }
 
+                        var subj_id = -1;
+                        if ($clickedButton.data('subj-id') != undefined) {
+                            subj_id = $clickedButton.data('subj-id');
+                        }
+
                         $.ajax({
                             url: '/give_me_order_form',
-                            data:{predefined_comment:predefined_comment},
+                            data:{
+                                predefined_comment:predefined_comment,
+                                subj_id:subj_id
+                            },
                             type: 'POST',
                             dataType: 'script'
                         }).done(function (data, result) {

data/app/assets/stylesheets/backend/active_admin_custom.scss

@@ -1,6 +1,6 @@
 body.admin_message_orders {
   // прячем кнопку batch actions
-  //.table_tools { display: none; }
+  .table_tools { display: none; }
   // прячем кнопку "создать новую запись"
   div.action_items { display: none; }
   //прячем ссылку "редактировать"

data/app/controllers/c80_order_form/mess_controller.rb

@@ -2,13 +2,14 @@ module C80OrderForm
   class MessController < ApplicationController
 
     def handle_message_order
-      puts "<MessController.handle_message_order>"
+      # puts "<MessController.handle_message_order>"
       m = MessageOrder.new(mess_params)
       respond_to do |format|
         if m.save
 
           format.js
-          MessageOrderMailer.send_mess(m, "Заявка").deliver # TODO_MY:: слово "заявка" поместить в базу, в модель настроек гема
+          settings = Settings.first
+          MessageOrderMailer.send_mess(m, settings.message_letter_subj).deliver
         else
           puts "<MessController.handle_message_order> errors: #{m.errors}"
           format.js { render json: m.errors, status: :unprocessable_entity }
@@ -17,7 +18,7 @@ module C80OrderForm
     end
 
     def mess_params
-      params.require(:mess).permit(:name, :email_or_phone, :comment, :kapcha)
+      params.require(:mess).permit(:name, :email_or_phone, :comment, :kapcha, :subj_id)
     end
 
   end

data/app/controllers/c80_order_form/site_controller.rb

@@ -2,6 +2,7 @@ module C80OrderForm
   class SiteController < ApplicationController
     def give_me_form
       @predefined_comment = params[:predefined_comment]
+      @subj_id = params[:subj_id]
     end
   end
 end

data/app/helpers/c80_order_form/site_helper.rb

@@ -1,21 +1,25 @@
 module C80OrderForm
   module SiteHelper
 
-    def render_order_form(predefined_comment="")
+    def render_order_form(predefined_comment="",subj_id=-1)
+
+      @settings = Settings.first
 
       render :partial => "c80_order_form/site/shared/order_form",
              :locals => {
                  :mess => "MessageOrder.new",
-                 :predefined_comment => predefined_comment
+                 :predefined_comment => predefined_comment,
+                 :subj_id => subj_id
              }
 
     end
 
     def render_ok_message
+      settings = Settings.first
       render :partial => "c80_order_form/site/shared/ok_message",
              :locals => {
-                 ok_text: "Мы свяжемся с Вами в ближайшее время.", # TODO_MY:: текст "мы свяжемся с вами ..." перенести в базу, в модель настроек гема
-                 wtitle: "Ваша заявка отправлена" # TODO_MY:: текст "ваше сообщение отправлено" перенести в базу, в модель настроек гема
+                 ok_text: settings.ok_text,
+                 wtitle: settings.ok_text_title
              }
     end
 

data/app/mailers/c80_order_form/message_order_mailer.rb

@@ -15,13 +15,17 @@ module C80OrderForm
       #puts "#{SiteProps.first.mail_to}"
     end
 
-    private
+    # private
 
     def format_message(message)
-      result = "<br> • Имя: #{message.name}"
-      result += "<br> • Email или телефон: #{message.email_or_phone}"
-      result += "<br> • Сообщение: #{message.comment}"
-      result
+      m = Settings.first.message_text
+      m = m.gsub!('{name}',message.name)
+      m = m.gsub!('{email_or_phone}',message.email_or_phone)
+      m = m.gsub!('{comment}',message.comment)
+      m = m.gsub!('{subj_id}',message.subj_id)
+      # puts "<format_message> m: #{m}"
+      message.update(:comment => m)
+      m
     end
 
   end

data/app/models/c80_order_form/settings.rb

@@ -0,0 +1,4 @@
+module C80OrderForm
+  class Settings < ActiveRecord::Base
+  end
+end

data/app/views/c80_order_form/site/give_me_form.js.erb

@@ -1,3 +1,3 @@
-var html_str = "<%= j render_order_form(@predefined_comment) %>";
+var html_str = "<%= j render_order_form(@predefined_comment,@subj_id) %>";
 orderForm.show(html_str);
 

data/app/views/c80_order_form/site/shared/_order_form.html.erb

@@ -4,7 +4,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title medium" id="myModalLabel">Обратная связь</h4> <!-- TODO_MY:: слово "обратная связь" перенести в настроки гема, в базу, в модель -->
+        <h4 class="modal-title medium" id="myModalLabel"><%= @settings.order_form_title %></h4>
       </div>
       <div class="modal-body regular">
 
@@ -21,13 +21,13 @@
                      } do |f| %>
 
             <div class="form-group clearfix">
-              <%= f.label :name, "Имя", class: 'control-label must' %>
+              <%= f.label :name, @settings.order_form_label_name, class: 'control-label must' %>
               <%= f.text_field :name, class: 'form-control' %>
               <span class="help-block col-md-12"></span>
             </div>
 
             <div class="form-group clearfix">
-              <%= f.label :email_or_phone, "Email или телефон", class: 'control-label must' %>
+              <%= f.label :email_or_phone, @settings.order_form_label_email_or_phone, class: 'control-label must' %>
               <%= f.text_field :email_or_phone, class: 'form-control' %>
               <span class="help-block col-md-12"></span>
             </div>
@@ -38,18 +38,24 @@
               <span class="help-block col-md-12"></span>
             </div>
 
+            <div class="form-group kapcha clearfix">
+              <%= f.label :subj_id, "subj_id", class: 'control-label' %>
+              <%= f.text_field :subj_id, class: 'form-control', :value => subj_id %>
+              <span class="help-block col-md-12"></span>
+            </div>
+
             <div class="form-group clearfix" style="margin-bottom: 0;">
-              <%= f.label :comment, "Сообщение", class: 'control-label' %>
+              <%= f.label :comment, @settings.order_form_label_comment, class: 'control-label' %>
               <%= f.text_area :comment, class: 'form-control', :rows => "4", :value => predefined_comment %>
               <span class="help-block col-md-12"></span>
             </div>
 
             <div class="actions clearfix">
               <%= f.label " ", class: 'control-label' %>
-              <%= f.submit "Отправить", # TODO_MY:: надпись "Отправить" перенести в модель, в настройки гема
+              <%= f.submit @settings.order_form_label_button_send,
                            class: 'btn btn-primary',
                            data: {
-                                   disable_with: 'Отправляется...' # TODO_MY:: надпись 'Отправляется...' перенести в модель, в настройки гема
+                                   disable_with: @settings.order_form_label_button_sending
                            }
               %>
             </div>

data/c80_order_form.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency 'activesupport', ['>= 3.0.0']
+
 end

data/db/migrate/20151229144545_add_subj_id_to_c80_order_form_message_orders.rb

@@ -0,0 +1,5 @@
+class AddSubjIdToC80OrderFormMessageOrders < ActiveRecord::Migration
+  def change
+    add_column :c80_order_form_message_orders, :subj_id, :integer
+  end
+end

data/db/migrate/20151229234343_create_c80_order_form_settings.rb

@@ -0,0 +1,18 @@
+class CreateC80OrderFormSettings < ActiveRecord::Migration
+  def change
+    create_table :c80_order_form_settings, :options => 'COLLATE=utf8_unicode_ci' do |t|
+      t.string :order_form_title
+      t.string :order_form_label_name
+      t.string :order_form_label_email_or_phone
+      t.string :order_form_label_comment
+      t.string :order_form_label_button_send
+      t.string :order_form_label_button_sending
+      t.string :ok_text
+      t.string :ok_text_title
+      t.string :admin_label_menu
+      t.text   :message_text
+      t.string :message_letter_subj
+      t.timestamps
+    end
+  end
+end

data/lib/c80_order_form/version.rb

@@ -1,3 +1,3 @@
 module C80OrderForm
-  VERSION = "0.1.0.1"
+  VERSION = "0.1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_order_form
 version: !ruby/object:Gem::Version
-  version: 0.1.0.1
+  version: 0.1.0.3
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: Order form
 email:
 - c080609a@gmail.com
@@ -68,6 +82,7 @@ files:
 - app/mailers/c80_order_form/message_order_mailer.rb
 - app/models/c80_order_form/message_order.rb
 - app/models/c80_order_form/message_order_validator.rb
+- app/models/c80_order_form/settings.rb
 - app/views/c80_order_form/mess/handle_message_order.js.erb
 - app/views/c80_order_form/message_order_mailer/mail_mess.html.erb
 - app/views/c80_order_form/site/give_me_form.js.erb
@@ -78,6 +93,8 @@ files:
 - c80_order_form.gemspec
 - config/routes.rb
 - db/migrate/20151221164444_create_c80_order_form_message_orders.rb
+- db/migrate/20151229144545_add_subj_id_to_c80_order_form_message_orders.rb
+- db/migrate/20151229234343_create_c80_order_form_settings.rb
 - lib/c80_order_form.rb
 - lib/c80_order_form/engine.rb
 - lib/c80_order_form/version.rb