cama_subscriber 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cc1675811b12cc95998c6a926fcd402877c96bc
-  data.tar.gz: a8711548e44438fd8d50898292563b2005d84968
+  metadata.gz: 91123d703030e08903c85b93554f8a7926c9c470
+  data.tar.gz: 1a4035ccc9466d3b95b76a7e32276dd0de58464a
 SHA512:
-  metadata.gz: 721198f19553a613fb76426de223d1dfabbb804d2aa239d5e43ca90632cae37ce6e7b7687f55e31e28c9354a49d799fb6ffea1ae8adbd05b2281f453faf12048
-  data.tar.gz: 9594149bc2b04789e5f7e441c609973cc80706b5bb948f788d9754e62cc4217c2423f1e6364374af24831c935381bba82a9422a2a078f07e52fbef88fed1b811
+  metadata.gz: 85edf934c1b20d643c26ead72b41708bab9421a90c91efb46b6c111ac18d08c8bcbbc661feb50e15d0ac8a846ed8f3742d446ad1d1818cb2eb7be11b9f27c2d2
+  data.tar.gz: 6928c352db5f3dcbc8098dcbe1ee4265e45c1d68a8f7e100aae8f10df46562c35c07e58ee2d338ca1314bcd35fcc47535f903a9e3f07163478728f5354868923

data/app/controllers/plugins/cama_subscriber/front_controller.rb

@@ -5,8 +5,9 @@ class Plugins::CamaSubscriber::FrontController < CamaleonCms::Apps::PluginsFront
   def subscribe
     msg = nil
     error = []
+    stat = 'success'
     unless params[:email].present?
-      error = t(".email_required", default: 'Your email is required to subscribe for this newsletter')
+      error << t(".email_required", default: 'Your email is required to subscribe for this newsletter')
     end
 
     group = params[:group_id].present? ? current_site.subscriber_groups.find(params[:group_id]) : current_site.subscriber_groups.first
@@ -17,9 +18,10 @@ class Plugins::CamaSubscriber::FrontController < CamaleonCms::Apps::PluginsFront
     end
 
     if error.present?
+      res = {errors: error, redirect: cama_root_url, status: stat}; hooks_run('cama_subscriber_error_subscription', res)
       respond_to do |format|
-        format.html { flash[:cama_subscriber][:error] = error.join("<br>"); redirect_to cama_root_url }
-        format.json{ render json: {message: error.join("<br>"), error: true} }
+        format.html { flash[:cama_subscriber][:error] = res[:errors].join("<br>"); redirect_to res[:redirect] }
+        format.json{ render json: {message: res[:errors].join("<br>"), error: true} }
       end
       return
     end
@@ -33,14 +35,18 @@ class Plugins::CamaSubscriber::FrontController < CamaleonCms::Apps::PluginsFront
       if @plugin.get_option('needs_confirmation') == 1
         cama_send_email(params[:email], @plugin.get_option('welcome_subject'), {content: @plugin.get_option('welcome_msg') + "<a href='#{plugins_cama_subscriber_verify_url(key: '')}'></a>"})
         msg = t(".please_confirm_email", default: 'Your subscription is pending, please confirm your subscription from your email')
+        stat = 'pending_confirmation'
       end
     end
 
     group.item_groups.create(item_id: item.id)
     msg = msg || t('.you_have_subscribed', default: 'You have been subscribed successfully')
+    
+    res = {msg: msg, redirect: cama_root_url, status: stat}; hooks_run('cama_subscriber_after_subscription', res)
+    
     respond_to do |format|
-      format.html { flash[:cama_subscriber][:notice] = msg;  redirect_to cama_root_url }
-      format.json{ render json: {message: msg, error: false} }
+      format.html { flash[:cama_subscriber][:notice] = res[:msg];  redirect_to res[:redirect] }
+      format.json{ render json: {message: res[:msg], error: false} }
     end
   end
 

data/lib/cama_subscriber/version.rb

@@ -1,3 +1,3 @@
 module CamaSubscriber
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cama_subscriber
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Owen Peredo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,9 +104,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: ": Summary of CamaSubscriber."
 test_files: []
-has_rdoc: