2.1.0 Bumped wrong versoin

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 - 2023 Rick Barrette
+Copyright (c) 2016 - 2024 Rick Barrette
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

app/controllers/qbo_controller.rb

@@ -26,9 +26,10 @@ class QboController < ApplicationController
   # Called when the user requests that Redmine to connect to QBO
   #
   def authenticate
+    redirect_uri = "https://" + Setting.host_name + qbo_oauth_callback_path
+    logger.info "redirect_uri: " + redirect_uri
     oauth2_client = Qbo.construct_oauth2_client
-    callback = Setting.host_name + "/qbo/oauth_callback/" 
+    grant_url = oauth2_client.auth_code.authorize_url(redirect_uri: redirect_uri, response_type: "code", state: SecureRandom.hex(12), scope: "com.intuit.quickbooks.accounting")
-    grant_url = oauth2_client.auth_code.authorize_url(redirect_uri: callback, response_type: "code", state: SecureRandom.hex(12), scope: "com.intuit.quickbooks.accounting")
     redirect_to grant_url
   end
   
@@ -39,7 +40,7 @@ class QboController < ApplicationController
     if params[:state].present?
       oauth2_client = Qbo.construct_oauth2_client
       # use the state value to retrieve from your backend any information you need to identify the customer in your system
-      redirect_uri = Setting.host_name + "/qbo/oauth_callback/"
+      redirect_uri = "https://" + Setting.host_name + qbo_oauth_callback_path
       if resp = oauth2_client.auth_code.get_token(params[:code], redirect_uri: redirect_uri)
         
         # Remove the last authentication information
@@ -123,7 +124,7 @@ class QboController < ApplicationController
       Qbo.update_time_stamp
       
       # The webhook doesn't require a response but let's make sure we don't send anything
-      render :nothing => true
+      render :nothing => true, status: 200
     else
       render nothing: true, status: 400
     end

app/controllers/vehicles_controller.rb

@@ -84,7 +84,7 @@ class VehiclesController < ApplicationController
     @customer = params[:customer]
     begin
       @vehicle = Vehicle.find_by_id(params[:id])
-      if @vehicle.update_attributes(allowed_params)
+      if @vehicle.update(allowed_params)
         flash[:notice] = "Vehicle updated"
         redirect_to @vehicle
       else

app/models/customer.rb

@@ -155,11 +155,13 @@ class Customer < ActiveRecord::Base
       logger.info "Processing customer #{c.id}"
       customer = Customer.find_or_create_by(id: c.id)
       if c.active?
-        if not customer.name.eql? c.display_name
+        #if not customer.name.eql? c.display_name
           customer.name = c.display_name
           customer.id = c.id
+          customer.phone_number = c.primary_phone.free_form_number.tr('^0-9', '') unless c.primary_phone.nil?
+          customer.mobile_phone_number = c.mobile_phone.free_form_number.tr('^0-9', '') unless c.mobile_phone.nil?
           customer.save_without_push
-        end
+        #end
       else
         if not c.new_record?
           customer.delete
@@ -178,20 +180,22 @@ class Customer < ActiveRecord::Base
   # This needs to be simplified
   def self.sync_by_id(id) 
     qbo = Qbo.first
-    customer = qbo.perform_authenticated_request do |access_token|
+    c = qbo.perform_authenticated_request do |access_token|
       service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
       service.fetch_by_id(id)
     end
 
-    return unless customer
+    return unless c
 
-    customer = Customer.find_or_create_by(id: customer.id)
+    customer = Customer.find_or_create_by(id: c.id)
-    if customer.active?
+    if c.active?
-      if not customer.name.eql? customer.display_name
+      #if not customer.name.eql? c.display_name
-        customer.name = customer.display_name
+        customer.name = c.display_name
-        customer.id = customer.id
+        customer.id = c.id
+        customer.phone_number = c.primary_phone.free_form_number.tr('^0-9', '') unless c.primary_phone.nil?
+        customer.mobile_phone_number = c.mobile_phone.free_form_number.tr('^0-9', '') unless c.mobile_phone.nil?
         customer.save_without_push
-      end
+      #end
     else
       if not customer.new_record?
         customer.delete
@@ -205,7 +209,7 @@ class Customer < ActiveRecord::Base
       qbo = Qbo.first
       @details = qbo.perform_authenticated_request do |access_token|
         service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
-        serivce.update(@details)
+        service.update(@details)
       end
       #raise "QBO Fault" if @details.fault?
       self.id = @details.id

app/views/customers/_details.html.erb

@@ -1,5 +1,11 @@
 <table>
   <tbody>
+
+    <tr>
+      <th><%=t(:label_name)%></th>
+      <td><%= customer.name %></td>
+    </tr>
+
     <tr>
       <th><%=t(:label_email)%></th>
       <td><%= customer.email %></td>

app/views/customers/show.html.erb

@@ -1,4 +1,4 @@
-<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= @customer.name %> </h2>
+<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= link_to @customer.to_s, "https://app.qbo.intuit.com/app/customerdetail?nameId=#{@customer.id}", target: :_blank %> </h2>
   <div class="issue">
 
     <div class="splitcontent">

app/views/qbo/_settings.html.erb

@@ -15,7 +15,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 <!-- configure the Intuit object: 'grantUrl' is a URL in your application which kicks off the flow, see below -->
 <script>
-  intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= Setting.host_name %>/qbo/authenticate'});
+  intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= qbo_authenticate_path %>'});
 </script>
 
 <table >

config/locales/en.yml

@@ -88,4 +88,5 @@ en:
   label_qbo_sync_success: "Successfully synced to Quickbooks"
   label_hours: "Hours"
   label_oauth2_refresh_token_expires_at: "Refresh Token Expires At"
+  label_name: "Name"
   

init.rb

@@ -22,7 +22,7 @@ Redmine::Plugin.register :redmine_qbo do
   name 'Redmine Quickbooks Online plugin'
   author 'Rick Barrette'
   description 'This is a plugin for Redmine to intergrate with Quickbooks Online to allow for seamless intergration CRM and invoicing of completed issues'
-  version '2.0.2'
+  version '2.1.0'
   url 'https://github.com/rickbarrette/redmine_qbo'
   author_url 'https://barrettefabrication.com'
   settings :default => {'empty' => true}, :partial => 'qbo/settings'