knitkit 3.0.0 → 3.2.0

data/app/widgets/contact_us/base.rb

@@ -1,31 +1,41 @@
 module Widgets
   module ContactUs
     class Base < ErpApp::Widgets::Base
+
       include ActionView::Helpers::SanitizeHelper
+      include Knitkit::Extensions::Railties::ActionController::CaptchaHelper
 
       def index
         render
       end
 
       def new
-        website = Website.find_by_host(request.host_with_port)
-
-        website_inquiry = WebsiteInquiry.new
-        website_inquiry.created_by = current_user unless current_user.nil?
-        website_inquiry.website = website
-        website_inquiry.first_name = params[:first_name].strip
-        website_inquiry.last_name = params[:last_name].strip
-        website_inquiry.message = params[:message].strip
-        website_inquiry.email = params[:email].strip
-
-        if website_inquiry.save
-          if website.email_inquiries?
-            WebsiteInquiryMailer.inquiry(website_inquiry).deliver
-          end
-          render :update => {:id => "#{@uuid}_result", :view => :success}
+        if captcha_valid?
+
+          website = Website.find_by_host(request.host_with_port)
+
+          website_inquiry = WebsiteInquiry.new
+          website_inquiry.created_by = current_user unless current_user.nil?
+          website_inquiry.website = website
+          website_inquiry.first_name = params[:first_name].strip
+          website_inquiry.last_name = params[:last_name].strip
+          website_inquiry.message = params[:message].strip
+          website_inquiry.email = params[:email].strip
+       
+          if website_inquiry.save
+            if website.email_inquiries?
+              WebsiteInquiryMailer.inquiry(website_inquiry, website.dba_organization).deliver
+            end
+            render :update => {:id => "container", :view => :success}
 
+          else
+            @errors = website_inquiry.errors.full_messages
+            render :update => {:id => "#{@uuid}_result", :view => :error}
+
+          end
         else
-          @errors = @website_inquiry.errors.full_messages
+          @errors = ['Captcha Invalid']
+
           render :update => {:id => "#{@uuid}_result", :view => :error}
 
         end

data/app/widgets/contact_us/javascript/contact_us.js

@@ -8,7 +8,7 @@ Compass.ErpApp.Widgets.ContactUs = {
 
 Compass.ErpApp.Widgets.AvailableWidgets.push({
     name: 'Contact Us',
-    iconUrl: '/images/icons/mail/mail_48x48.png',
+    iconUrl: '/assets/icons/mail/mail_48x48.png',
     onClick: Compass.ErpApp.Widgets.ContactUs.addContactUs,
     about: 'This widget creates a form to allow for website inquiries.'
 });

data/app/widgets/contact_us/views/error.html.erb

@@ -1,8 +1,12 @@
 <div class="alert alert-danger">
   <strong>An Error Occurred</strong>
   <ul>
-    <% @errors.each do |k, v| %>
-        <li><%= v %></li>
+    <% @errors.each do |error| %>
+        <li><%= error %></li>
     <% end %>
   </ul>
-</div>
+</div>
+
+<script type="text/javascript">
+Captcha.refresh();
+</script>

data/app/widgets/contact_us/views/index.html.erb

@@ -1,28 +1,36 @@
-<div id="<%= widget_result_id %>"></div>
-
-<%= form_remote_tag build_widget_url(:new) do %>
-    <div class="form-group">
-      <%= label_tag :first_name %>
-      <%= text_field_tag "first_name", nil, :class => "form-control", :required => true %>
-    </div>
-
-    <div class="form-group">
-      <%= label_tag :last_name %>
-      <%= text_field_tag "last_name", nil, :class => "form-control", :required => true %>
-    </div>
-
-    <div class="form-group">
-      <%= label_tag :email %>
-      <%= text_field_tag "email", nil, :class => "form-control", :required => true %>
-    </div>
-
-    <div class="form-group">
-      <%= label_tag :message %>
-      <%= text_area_tag "message", nil, :class => "form-control", :rows => 5, :required => true %>
-    </div>
-
-    <p class="text-center">
-      <%= submit_tag "Submit", :disable_with => "Please wait...", :class => "btn btn-primary submit", :style => '' %>
-    </p>
-
-<% end %>
+<div id="container">
+  <div id="<%= widget_result_id %>"></div>
+  
+  <%= form_remote_tag build_widget_url(:new) do %>
+  <div class="form-group">
+    <%= label_tag :first_name %>
+    <%= text_field_tag "first_name", nil, :class => "form-control", :required => true %>
+  </div>
+  
+  <div class="form-group">
+    <%= label_tag :last_name %>
+    <%= text_field_tag "last_name", nil, :class => "form-control", :required => true %>
+  </div>
+  
+  <div class="form-group">
+    <%= label_tag :email %>
+    <%= text_field_tag "email", nil, :class => "form-control", :required => true %>
+  </div>
+  
+  <div class="form-group">
+    <%= label_tag :message %>
+    <%= text_area_tag "message", nil, :class => "form-control", :rows => 5, :required => true %>
+  </div>
+  
+  <div id="captcha"></div>
+  
+  <p class="text-center">
+    <%= submit_tag "Submit", :disable_with => "Please wait...", :class => "btn btn-primary submit", :style => '' %>
+  </p>
+  
+  <% end %>
+  
+  <script type="text/javascript">
+  Captcha.setup('captcha');
+  </script>
+</div>

data/app/widgets/google_map/javascript/google_map.js

@@ -182,7 +182,7 @@ Compass.ErpApp.Widgets.GoogleMap = {
 
 Compass.ErpApp.Widgets.AvailableWidgets.push({
     name: 'Google Map',
-    iconUrl: '/images/icons/map/map_48x48.png',
+    iconUrl: '/assets/icons/map/map_48x48.png',
     onClick: Compass.ErpApp.Widgets.GoogleMap.addGoogleMap,
     about: 'This widget creates a google map with drop points you setup.'
 });

data/app/widgets/google_map/views/index.html.erb

@@ -1,4 +1,4 @@
-<div id='<%= @uuid %>' style='width:<%=@map_width%>px;height:<%=@map_height%>px;border:solid 1px black;'></div>
+<div id='<%= @uuid %>' style='width: 100%;height:<%=@map_height%>px;border:solid 1px black;'></div>
 <script type='text/javascript'>
     //we do not want to load google libraries more than once.
     window.loadMap_<%=@uuid%> = function () {

data/app/widgets/login/javascript/login.js

@@ -161,7 +161,7 @@ Compass.ErpApp.Widgets.Login = {
 
 Compass.ErpApp.Widgets.AvailableWidgets.push({
     name: 'Login',
-    iconUrl: '/images/icons/login/login_48x48.png',
+    iconUrl: '/assets/icons/login/login_48x48.png',
     onClick: Compass.ErpApp.Widgets.Login.addLogin,
     about: 'This widget creates a login form to allow users to log into the website.'
 });

data/app/widgets/login/views/index.html.erb

@@ -1,4 +1,4 @@
-<div style="width:500px;" id="<%= widget_result_id %>">
+<div id="<%= widget_result_id %>">
   <% if @message %>
       <div class="alert alert-info">
         <button type="button" class="close" data-dismiss="alert">&times;</button>

data/app/widgets/manage_profile/base.rb

@@ -41,8 +41,6 @@ module Widgets
         @individual.current_first_name = params[:first_name]
         @individual.current_last_name = params[:last_name]
         @individual.current_middle_name = params[:middle_name]
-        @individual.gender = params[:gender]
-        @individual.birth_date = Date.strptime(params[:birth_date], '%m/%d/%Y')
         @user.email = params[:email]
 
         #### check validation then save and render message ####
@@ -65,159 +63,189 @@ module Widgets
 
       end
 
-
       def update_password
-        if @user = User.authenticate(current_user.username, params[:old_password])
+        ActiveRecord::Base.connection.transaction do
+          begin
+            if @user = User.authenticate(current_user.username, params[:old_password])
+
+              if !params[:new_password].blank? && !params[:password_confirmation].blank? && params[:new_password] == params[:password_confirmation]
+
+                @user.password_confirmation= params[:password_confirmation]
+
+                if @user.change_password!(params[:new_password])
+                  @message = "Password Updated"
 
-          if !params[:new_password].blank? && !params[:password_confirmation].blank? && params[:new_password] == params[:password_confirmation]
+                  render :update => {:id => "#{@uuid}_result", :view => :success}
+                else
+                  @message = "Error Updating Password"
 
-            @user.password_confirmation= params[:password_confirmation]
+                  #### validation failed ####
+                  render :update => {:id => "#{@uuid}_result", :view => :error}
+                end
 
-            if @user.change_password!(params[:new_password])
-              @message = "Password Updated"
+              else
+                #### password and password confirmation cant be blank or unequal ####
+                @message = "Password Confirmation Must Match Password"
 
-              render :update => {:id => "#{@uuid}_result", :view => :success}
+                render :update => {:id => "#{@uuid}_result", :view => :error}
+              end
             else
-              @message = "Error Updating Password"
+              #### old password wrong ####
+              @message = "Invalid Old Password"
 
-              #### validation failed ####
               render :update => {:id => "#{@uuid}_result", :view => :error}
             end
+          rescue => ex
+            Rails.logger.error ex.message
+            Rails.logger.error ex.backtrace.join("\n")
 
-          else
-            #### password and password confirmation cant be blank or unequal ####
-            @message = "Password Confirmation Must Match Password"
+            ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
+
+            @message = 'Could not update password'
 
             render :update => {:id => "#{@uuid}_result", :view => :error}
           end
-        else
-          #### old password wrong ####
-          @message = "Invalid Old Password"
-
-          render :update => {:id => "#{@uuid}_result", :view => :error}
         end
 
       end
 
       def add_email_address
-        begin
-          email_address = params[:email_address].strip
-          contact_purpose = params[:contact_purpose]
-
-          email = current_user.party.add_contact(EmailAddress,
-                                                 {email_address: email_address},
-                                                 ContactPurpose.find_by_internal_identifier(contact_purpose))
-
-          {:json => {success: true, message: 'Email added', email: email.to_hash(:only => [:id, :email_address],
-                                                                                 :contact_purpose => email.contact_purpose.description)}}
-        rescue => ex
-          Rails.logger.error ex.message
-          Rails.logger.error ex.backtrace.join("\n")
-          #TODO send out notification
-
-          {:json => {success: false, message: 'Could not add email'}}
+        ActiveRecord::Base.connection.transaction do
+          begin
+            email_address = params[:email_address].strip
+            contact_purpose = params[:contact_purpose]
+
+            email = current_user.party.add_contact(EmailAddress,
+                                                   {email_address: email_address},
+                                                   ContactPurpose.find_by_internal_identifier(contact_purpose))
+
+            {:json => {success: true, message: 'Email added', email: email.to_hash(:only => [:id, :email_address],
+                                                                                   :contact_purpose => ContactPurpose.find_by_internal_identifier(contact_purpose).description)}}
+          rescue => ex
+            Rails.logger.error ex.message
+            Rails.logger.error ex.backtrace.join("\n")
+
+            ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
+
+            {:json => {success: false, message: 'Could not add email'}}
+          end
         end
       end
 
       def remove_email_address
-        begin
-          email_address_id = params[:email_address_id].strip
+        ActiveRecord::Base.connection.transaction do
+          begin
+            email_address_id = params[:email_address_id].strip
+
+            EmailAddress.find(email_address_id).destroy
 
-          EmailAddress.find(email_address_id).destroy
+            {:json => {success: true, message: 'Email removed'}}
+          rescue => ex
+            Rails.logger.error ex.message
+            Rails.logger.error ex.backtrace.join("\n")
 
-          {:json => {success: true, message: 'Email removed'}}
-        rescue => ex
-          Rails.logger.error ex.message
-          Rails.logger.error ex.backtrace.join("\n")
-          #TODO send out notification
+            ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
 
-          {:json => {success: false, message: 'Could not remove email'}}
+            {:json => {success: false, message: 'Could not remove email'}}
+          end
         end
       end
 
       def add_phone_number
-        begin
-          phone_number = params[:phone_number].strip
-          contact_purpose = params[:contact_purpose]
-
-          phone_number = current_user.party.add_contact(PhoneNumber,
-                                                        {phone_number: phone_number},
-                                                        ContactPurpose.find_by_internal_identifier(contact_purpose))
-
-          {:json => {success: true, message: 'Phone number added', phone: phone_number.to_hash(:only => [:id, :phone_number],
-                                                                                               :contact_purpose => phone_number.contact_purpose.description)}}
-        rescue => ex
-          Rails.logger.error ex.message
-          Rails.logger.error ex.backtrace.join("\n")
-          #TODO send out notification
-
-          {:json => {success: false, message: 'Could not add phone number'}}
+        ActiveRecord::Base.connection.transaction do
+          begin
+            phone_number = params[:phone_number].strip
+            contact_purpose = params[:contact_purpose]
+
+            phone_number = current_user.party.add_contact(PhoneNumber,
+                                                          {phone_number: phone_number},
+                                                          ContactPurpose.find_by_internal_identifier(contact_purpose))
+
+            {:json => {success: true, message: 'Phone number added', phone: phone_number.to_hash(:only => [:id, :phone_number],
+                                                                                                 :contact_purpose => ContactPurpose.find_by_internal_identifier(contact_purpose).description)}}
+          rescue => ex
+            Rails.logger.error ex.message
+            Rails.logger.error ex.backtrace.join("\n")
+
+            ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
+
+            {:json => {success: false, message: 'Could not add phone number'}}
+          end
         end
       end
 
       def remove_phone_number
-        begin
-          phone_number_id = params[:phone_number_id].strip
+        ActiveRecord::Base.connection.transaction do
+          begin
+            phone_number_id = params[:phone_number_id].strip
 
-          PhoneNumber.find(phone_number_id).destroy
+            PhoneNumber.find(phone_number_id).destroy
 
-          {:json => {success: true, message: 'Phone number removed'}}
-        rescue => ex
-          Rails.logger.error ex.message
-          Rails.logger.error ex.backtrace.join("\n")
-          #TODO send out notification
+            {:json => {success: true, message: 'Phone number removed'}}
+          rescue => ex
+            Rails.logger.error ex.message
+            Rails.logger.error ex.backtrace.join("\n")
 
-          {:json => {success: false, message: 'Could not remove phone number'}}
+            ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
+
+            {:json => {success: false, message: 'Could not remove phone number'}}
+          end
         end
       end
 
       def add_address
-        begin
-          address_line_1 = params[:address_line_1].strip
-          address_line_2 = params[:address_line_2].strip
-          city = params[:city].strip
-          geo_zone_id = params[:state].strip
-          postal_code = params[:postal_code].strip
-          contact_purpose = params[:contact_purpose]
-
-          postal_address = current_user.party.add_contact(PostalAddress,
-                                                          {
-                                                              address_line_1: address_line_1,
-                                                              address_line_2: address_line_2,
-                                                              city: city,
-                                                              geo_zone_id: geo_zone_id,
-                                                              state: GeoZone.find(geo_zone_id).zone_name,
-                                                              zip: postal_code,
-                                                          },
-                                                          ContactPurpose.find_by_internal_identifier(contact_purpose))
-
-          {:json => {success: true,
-                     message: 'Address added',
-                     address: postal_address.to_hash(:only => [:id, :address_line_1, :address_line_2,
-                                                               :city, :state, :zip],
-                                                     :contact_purpose => postal_address.contact_purpose.description)}}
-        rescue => ex
-          Rails.logger.error ex.message
-          Rails.logger.error ex.backtrace.join("\n")
-          #TODO send out notification
-
-          {:json => {success: false, message: 'Could not add address'}}
+        ActiveRecord::Base.connection.transaction do
+          begin
+            address_line_1 = params[:address_line_1].strip
+            address_line_2 = params[:address_line_2].strip
+            city = params[:city].strip
+            geo_zone_id = params[:state].strip
+            postal_code = params[:postal_code].strip
+            contact_purpose = params[:contact_purpose]
+
+            postal_address = current_user.party.add_contact(PostalAddress,
+                                                            {
+                                                                address_line_1: address_line_1,
+                                                                address_line_2: address_line_2,
+                                                                city: city,
+                                                                geo_zone_id: geo_zone_id,
+                                                                state: GeoZone.find(geo_zone_id).zone_name,
+                                                                zip: postal_code,
+                                                            },
+                                                            ContactPurpose.find_by_internal_identifier(contact_purpose))
+
+            {:json => {success: true,
+                       message: 'Address added',
+                       address: postal_address.to_hash(:only => [:id, :address_line_1, :address_line_2,
+                                                                 :city, :state, :zip],
+                                                       :contact_purpose => ContactPurpose.find_by_internal_identifier(contact_purpose).description)}}
+          rescue => ex
+            Rails.logger.error ex.message
+            Rails.logger.error ex.backtrace.join("\n")
+
+            ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
+
+            {:json => {success: false, message: 'Could not add address'}}
+          end
         end
       end
 
       def remove_address
-        begin
-          address_id = params[:address_id].strip
+        ActiveRecord::Base.connection.transaction do
+          begin
+            address_id = params[:address_id].strip
 
-          PostalAddress.find(address_id).destroy
+            PostalAddress.find(address_id).destroy
 
-          {:json => {success: true, message: 'address removed'}}
-        rescue => ex
-          Rails.logger.error ex.message
-          Rails.logger.error ex.backtrace.join("\n")
-          #TODO send out notification
+            {:json => {success: true, message: 'address removed'}}
+          rescue => ex
+            Rails.logger.error ex.message
+            Rails.logger.error ex.backtrace.join("\n")
 
-          {:json => {success: false, message: 'Could not remove address'}}
+            ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
+
+            {:json => {success: false, message: 'Could not remove address'}}
+          end
         end
       end
 
@@ -244,8 +272,9 @@ module Widgets
             return nil
           end
         end
-      end
-    end
-  end
-end
+      end # Class Methods
+
+    end # Base
+  end # ManageProfile
+end # Widgets