scrivito_crm_form_widget 1.0.0.beta4 → 1.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 837f3a977ac51d6bd0604980465ca6cca0a98db2
-  data.tar.gz: b530390126b9be97bfa286b6da57e09d4d0b98d5
+  metadata.gz: 2e9119d84829ac864fb0e9331e35adea866aa494
+  data.tar.gz: 3793bae1eb8586dcb894424677918245801425d1
 SHA512:
-  metadata.gz: bbd9937102083a39fbfe6586730ef4e75d64144875dbf001fc2dae922ce1d99988504eb912fdfe27e8ad7ff8e3955b82e7c24ddb1007ba92f3c558c61d3568d4
-  data.tar.gz: c1b120d9957f2a8210fed86f9e758326c1a76e4513fcfa4b20316ba62d3dd42014e8c40deeb6b91e9218fe61ab97fb05a5aecd2b210e029e86681d443212ceec
+  metadata.gz: 6f69d0e62578a3db7e78733f58b6bb10e13dec47800e965bb0314f380515eb6bbbd0b07a76965e37740b4285ad22ffc4e88f7cb1478781d0a50a0926b1b0a1ab
+  data.tar.gz: f10fc0046f257339970c36d03cbf3d3a5cda8fb2e52b990bf7ae42e14416596492e34a7851938193738f8e657452021acc240a6b8a93d9ec7d22f34372986390

data/app/assets/styles/scrivito_crm_form_widget.scss

@@ -1,3 +1,6 @@
+//= require scrivito_advanced_editors
+//= require_self
+
 form .form-group.last {
   display: none;
 }
@@ -19,7 +22,8 @@ form.form-horizontal.label-position-top {
     .form-group {
       width: 50%;
       float: left;
-      margin: 0;
+      margin-left: 0;
+      margin-right: 0;
     }
 
     .form-submit-button-container {
@@ -28,7 +32,7 @@ form.form-horizontal.label-position-top {
 
     .btn {
       margin-right: 15px;
-      margin-top: 15px;
+      margin-top: 0;
     }
   }
 }

data/app/models/crm_form_widget.rb

@@ -37,11 +37,19 @@ class CrmFormWidget < Widget
   end
 
   def attributes
-    activity.attribute_definitions
+    @attributes ||= activity.attribute_definitions
   end
 
   def activity
-    Crm::Type.find(activity_id)
+    @activity ||= Crm::Type.find(activity_id)
+  end
+
+  def validate(params)
+    errors = []
+    attributes.each do |name, options|
+      errors << {attribute: name, message: "Attribute #{name} can not be blank.", code: 'blank'} if options[:mandatory] && !params[name].present?
+    end
+    errors
   end
 
   def activity_id?

data/app/presenter/crm_form_presenter.rb

@@ -12,10 +12,10 @@ class CrmFormPresenter
     @params = request.params["crm_form_presenter"]
     @dynamic_params = set_dynamic_params
     @access_code = generate_random_string(12)
-    errors = validate_params
+    errors = (request.post? || !@params.nil?) ? validate_params : nil
 
     if errors.present?
-      return {status: "error", message: errors}
+      controller.redirect_to("/#{@page.id}", alert: { status: "error", message: errors, widget_id: @widget.id })
     elsif request.post? && widget.id == @params[:widget_id]
       request.session['access_via_form'] = @access_code
       redirect_after_submit(controller, widget, self.submit)
@@ -28,10 +28,12 @@ class CrmFormPresenter
     else
       @params.delete('email')
     end
-    @params.delete('access_via_form')
 
     prepare_contact(@params['custom_email'], @params['custom_last_name'])
     prepare_activity_params
+
+    Obj.crm_form_before_send_hook(@params, @activity) if Obj.respond_to?('before_send_hook')
+
     Crm::Activity.create(@params)
     return {status: "success", message: "Your form was send successfully"}
   rescue Crm::Errors::InvalidValues => e
@@ -47,6 +49,7 @@ class CrmFormPresenter
       @params.delete(:custom_file)
     end
 
+    @params.delete('access_via_form')
     @params.delete("widget_id")
     @params["title"] = @params[:title].empty? ? @activity.id : @params[:title]
     @params["type_id"] = @activity.id
@@ -125,17 +128,18 @@ class CrmFormPresenter
 
   def redirect_after_submit(controller, widget, submit_message)
     if submit_message[:status] == "success"
-      controller.redirect_to(redirect_path(@page, widget), notice: submit_message[:message])
+      controller.redirect_to(redirect_path(@page, widget), notice: [submit_message[:message]])
     elsif submit_message[:status] == "error"
-      controller.redirect_to("/#{@page.id}", alert: submit_message[:message])
+      controller.redirect_to("/#{@page.id}", alert: [submit_message[:message]])
     end
   end
 
   def validate_params
-    return false if @params.nil?
-    email = valid_email?(@params['custom_email'])
-    hook = Obj.respond_to?('crm_form_validation') ? Obj.crm_form_validation(@params) : false
-    !email || hook
+    email = valid_email?(@params['custom_email']) ? [] : [{attribute: 'custom_email', message: 'The email is not a valid email address.', code: 'email'}]
+    hook = Obj.respond_to?('crm_form_validation_hook') ? Obj.crm_form_validation_hook(@params, @widget) : []
+    crm = @widget.validate(@params)
+
+    email + hook + crm
   end
 
   def valid_email?(email)

data/app/views/crm_form_widget/_error_messages.html.erb

@@ -0,0 +1,12 @@
+<div class="alert-danger crm-form-message alert">
+  <ul>
+    <% flash['alert']['message'].each do |msg| %>
+      <li>
+        <%= t("helpers.messages.crm_form_presenter.#{msg['code']}",
+          field: t("helpers.label.crm_form_presenter.#{msg['attribute']}", default: msg['attribute']),
+          default: msg['message']).html_safe
+        %>
+      </li>
+    <% end %>
+  </ul>
+</div>

data/app/views/crm_form_widget/show.html.erb

@@ -1,8 +1,16 @@
 <% if widget.activity_id? %>
+  <% if(flash[:alert] && ScrivitoCrmFormWidget.configuration.show_error_message && (flash[:alert]['widget_id'] == widget.id)) %>
+    <%= render 'crm_form_widget/error_messages' %>
+  <% end %>
+  <% if flash[:notice] && ScrivitoCrmFormWidget.configuration.show_error_message %>
+    <div class="alert-success crm-form-message alert">
+      <%= t('helpers.messages.crm_form_presenter.success', default: 'Thank you for your message.').html_safe %>
+    </div>
+  <% end %>
   <%= render 'crm_form_widget/form', widget: widget %>
 <% else %>
   <div class="alert alert-warning">
     <p><strong>Select an activty</strong></p>
     <%= scrivito_tag(:div, widget, :activity_id, data: {toggle_button_list: CrmFormWidget.activity_ids, scrivito_editors_reload: true }) %>
   </div>
-<% end %>
+<% end %>

data/lib/scrivito_crm_form_widget/configuration.rb

@@ -1,9 +1,11 @@
 module ScrivitoCrmFormWidget
   class Configuration
     attr_accessor :hidden_attributes
+    attr_accessor :show_error_message
 
     def initialize
       @hidden_attributes = ['origin','referrer','tracking','service']
+      @show_error_message = true
     end
   end
 end

data/lib/scrivito_crm_form_widget/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoCrmFormWidget
-  VERSION = "1.0.0.beta4"
+  VERSION = "1.0.0.beta5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_crm_form_widget
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta4
+  version: 1.0.0.beta5
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scrivito
@@ -90,6 +90,7 @@ files:
 - app/views/crm_form_widget/_crm_string.html.erb
 - app/views/crm_form_widget/_crm_text.html.erb
 - app/views/crm_form_widget/_dynamic_attributes.html.erb
+- app/views/crm_form_widget/_error_messages.html.erb
 - app/views/crm_form_widget/_file_upload.html.erb
 - app/views/crm_form_widget/_form.html.erb
 - app/views/crm_form_widget/details.html.erb