Initial SMS integration for trigger notifications and additional chan…

…nel. Thanks to sys4 AG!
Juliels1986 · Oct 16, 2018 · 22b2f44 · 22b2f44
1 parent 2711020
commit 22b2f44
Show file tree

Hide file tree

Showing 60 changed files with 2,336 additions and 335 deletions.
diff --git a/Gemfile b/Gemfile
@@ -105,6 +105,9 @@ gem 'icalendar-recurrence'
 # feature - phone number formatting
 gem 'telephone_number'
 
+# feature - SMS
+gem 'twilio-ruby'
+
 # integrations
 gem 'clearbit'
 gem 'net-ldap'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -447,6 +447,10 @@ GEM
     thread_safe (0.3.6)
     tilt (2.0.8)
     tins (1.15.1)
+    twilio-ruby (5.10.2)
+      faraday (~> 0.9)
+      jwt (>= 1.5, <= 2.5)
+      nokogiri (>= 1.6, < 2.0)
     twitter (6.2.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
@@ -578,6 +582,7 @@ DEPENDENCIES
   telephone_number
   test-unit
   therubyracer
+  twilio-ruby
   twitter
   uglifier
   unicorn

diff --git a/app/assets/javascripts/app/controllers/_application_controller_form.coffee b/app/assets/javascripts/app/controllers/_application_controller_form.coffee
@@ -25,7 +25,8 @@ class App.ControllerForm extends App.Controller
       @form = @formGen()
 
     # add alert placeholder
-    @form.prepend('<div class="alert alert--danger js-alert hide" role="alert"></div>')
+    @form.prepend('<div class="alert alert--danger js-danger js-alert hide" role="alert"></div>')
+    @form.prepend('<div class="alert alert--success js-success hide" role="alert"></div>')
 
     # if element is given, prepend form to it
     if @el

diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee
@@ -295,15 +295,15 @@ class App.ControllerGenericDestroyConfirm extends App.ControllerModal
     App.i18n.translateContent('Sure to delete this object?')
 
   onSubmit: =>
-    @item.destroy(
-      done: =>
-        @close()
-        if @callback
-          @callback()
-      fail: =>
-        @log 'errors'
-        @close()
-    )
+    options = @options || {}
+    options.done = =>
+      @close()
+      if @callback
+        @callback()
+    options.fail = =>
+      @log 'errors'
+      @close()
+    @item.destroy(options)
 
 class App.ControllerConfirm extends App.ControllerModal
   buttonClose: true

diff --git a/app/assets/javascripts/app/controllers/_channel/email.coffee b/app/assets/javascripts/app/controllers/_channel/email.coffee
@@ -67,7 +67,7 @@ class App.ChannelEmailFilter extends App.Controller
       container: @el.closest('.content')
       callback: @load
     )
-    
+
   edit: (id, e) =>
     e.preventDefault()
     new App.ControllerGenericEdit(