Fixed autocomplete when using xero integration

andrewdrake · andrewdrake · commit 63f99c3d2b70 · 2023-04-11T10:43:21.000+10:00
diff --git a/resources/views/livewire/deal-form.blade.php b/resources/views/livewire/deal-form.blade.php
@@ -171,7 +171,6 @@ function bindClientAutocomplete(){
                             @this.set('client_id',item.value);
                             @this.set('client_name',item.label);
                             @this.set('organisation_id', $(element).closest('form').find("input[name='organisation_id']").val());
-                            @this.set('organisation_name', $(element).closest('form').find("input[name='organisation_name']").val());
                             @this.set('person_id', $(element).closest('form').find("input[name='person_id']").val());
                             @this.set('person_name', $(element).closest('form').find("input[name='person_name']").val());
                             $(element).closest('.autocomplete').find('input[name="client_id"]').val(item.value).trigger('change');
@@ -215,7 +214,6 @@ function bindPersonAutocomplete(){
                             @this.set('person_id',item.value);
                             @this.set('person_name',item.label);
                             @this.set('organisation_id', $(element).closest('form').find("input[name='organisation_id']").val());
-                            @this.set('organisation_name', $(element).closest('form').find("input[name='organisation_name']").val());
 
                             $(element).closest('.autocomplete').find('input[name="person_id"]').val(item.value).trigger('change');
 
@@ -269,7 +267,6 @@ function bindOrganisationAutocomplete(){
                             @this.set('person_id', $(element).closest('form').find("input[name='person_id']").val());
                             @this.set('person_name', $(element).closest('form').find("input[name='person_name']").val());
                             @this.set('organisation_id', item.value);
-                            @this.set('organisation_name', item.label);
 
                             $(element).closest('.autocomplete').find('input[name="organisation_id"]').val(item.value).trigger('change');
 
diff --git a/resources/views/livewire/live-lead-form.blade.php b/resources/views/livewire/live-lead-form.blade.php
@@ -171,7 +171,6 @@ function bindClientAutocomplete(){
                             @this.set('client_id',item.value);
                             @this.set('client_name',item.label);
                             @this.set('organisation_id', $(element).closest('form').find("input[name='organisation_id']").val());
-                            @this.set('organisation_name', $(element).closest('form').find("input[name='organisation_name']").val());
                             @this.set('person_id', $(element).closest('form').find("input[name='person_id']").val());
                             @this.set('person_name', $(element).closest('form').find("input[name='person_name']").val());
                             $(element).closest('.autocomplete').find('input[name="client_id"]').val(item.value).trigger('change');
@@ -215,7 +214,6 @@ function bindPersonAutocomplete(){
                             @this.set('person_id',item.value);
                             @this.set('person_name',item.label);
                             @this.set('organisation_id', $(element).closest('form').find("input[name='organisation_id']").val());
-                            @this.set('organisation_name', $(element).closest('form').find("input[name='organisation_name']").val());
 
                             $(element).closest('.autocomplete').find('input[name="person_id"]').val(item.value).trigger('change');
 
@@ -269,7 +267,6 @@ function bindOrganisationAutocomplete(){
                             @this.set('person_id', $(element).closest('form').find("input[name='person_id']").val());
                             @this.set('person_name', $(element).closest('form').find("input[name='person_name']").val());
                             @this.set('organisation_id', item.value);
-                            @this.set('organisation_name', item.label);
 
                             $(element).closest('.autocomplete').find('input[name="organisation_id"]').val(item.value).trigger('change');
 
diff --git a/resources/views/livewire/quote-form.blade.php b/resources/views/livewire/quote-form.blade.php
@@ -45,7 +45,7 @@
                 ]   
             ])
             <script type="text/javascript">
-                let organisations = {!! \VentureDrake\LaravelCrm\Http\Helpers\AutoComplete\organisations() !!}
+                let organisations = {!! \VentureDrake\LaravelCrm\Http\Helpers\AutoComplete\organisations(true) !!}
             </script>
             <span wire:ignore>
                 @include('laravel-crm::partials.form.text',[
@@ -171,7 +171,6 @@ function bindClientAutocomplete(){
                             @this.set('client_id',item.value);
                             @this.set('client_name',item.label);
                             @this.set('organisation_id', $(element).closest('form').find("input[name='organisation_id']").val());
-                            @this.set('organisation_name', $(element).closest('form').find("input[name='organisation_name']").val());
                             @this.set('person_id', $(element).closest('form').find("input[name='person_id']").val());
                             @this.set('person_name', $(element).closest('form').find("input[name='person_name']").val());
                             $(element).closest('.autocomplete').find('input[name="client_id"]').val(item.value).trigger('change');
@@ -215,7 +214,6 @@ function bindPersonAutocomplete(){
                             @this.set('person_id',item.value);
                             @this.set('person_name',item.label);
                             @this.set('organisation_id', $(element).closest('form').find("input[name='organisation_id']").val());
-                            @this.set('organisation_name', $(element).closest('form').find("input[name='organisation_name']").val());
 
                             $(element).closest('.autocomplete').find('input[name="person_id"]').val(item.value).trigger('change');
 
@@ -266,10 +264,10 @@ function bindOrganisationAutocomplete(){
                     $('input[name="organisation_name"]').autocomplete({
                         source: organisations,
                         onSelectItem: function (item, element) {
+                            console.log(element);
                             @this.set('person_id', $(element).closest('form').find("input[name='person_id']").val());
                             @this.set('person_name', $(element).closest('form').find("input[name='person_name']").val());
                             @this.set('organisation_id', item.value);
-                            @this.set('organisation_name', item.label);
 
                             $(element).closest('.autocomplete').find('input[name="organisation_id"]').val(item.value).trigger('change');
 
diff --git a/src/Http/Helpers/AutoComplete.php b/src/Http/Helpers/AutoComplete.php
@@ -35,7 +35,7 @@ function organisations()
 
     foreach (Organisation::all() as $organisation) {
         if ($organisation->xeroContact) {
-            $data[$organisation->name. ' (xero contact)'] = $organisation->id;
+            $data[$organisation->name . ' (xero contact)'] = $organisation->id;
         } else {
             $data[$organisation->name] = $organisation->id;
         }
diff --git a/src/Http/Livewire/LiveDealForm.php b/src/Http/Livewire/LiveDealForm.php
@@ -86,6 +86,7 @@ public function updatedOrganisationId($value)
                 'address_code' => $address->code ?? null,
                 'address_country' => $address->country ?? null,
             ]);
+            $this->organisation_name = $organisation->name;
         } else {
             $this->dispatchBrowserEvent('selectedOrganisation');
         }
diff --git a/src/Http/Livewire/LiveLeadForm.php b/src/Http/Livewire/LiveLeadForm.php
@@ -86,6 +86,7 @@ public function updatedOrganisationId($value)
                 'address_code' => $address->code ?? null,
                 'address_country' => $address->country ?? null,
             ]);
+            $this->organisation_name = $organisation->name;
         } else {
             $this->dispatchBrowserEvent('selectedOrganisation');
         }
diff --git a/src/Http/Livewire/LiveOrderForm.php b/src/Http/Livewire/LiveOrderForm.php
@@ -4,6 +4,7 @@
 
 use Livewire\Component;
 use VentureDrake\LaravelCrm\Models\Client;
+use VentureDrake\LaravelCrm\Models\Organisation;
 
 class LiveOrderForm extends Component
 {
@@ -48,6 +49,13 @@ public function updatedClientName($value)
             $this->dispatchBrowserEvent('clientNameUpdated');
         }
     }
+
+    public function updatedOrganisationId($value)
+    {
+        if ($organisation = Organisation::find($value)) {
+            $this->organisation_name = $organisation->name;
+        } 
+    }
     
     public function getClientOrganisations()
     {
diff --git a/src/Http/Livewire/LiveQuoteForm.php b/src/Http/Livewire/LiveQuoteForm.php
@@ -86,6 +86,7 @@ public function updatedOrganisationId($value)
                 'address_code' => $address->code ?? null,
                 'address_country' => $address->country ?? null,
             ]);
+            $this->organisation_name = $organisation->name;
         } else {
             $this->dispatchBrowserEvent('selectedOrganisation');
         }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ function organisations()`
`35`	`35`
`36`	`36`	`foreach (Organisation::all() as $organisation) {`
`37`	`37`	`if ($organisation->xeroContact) {`
`38`		`- $data[$organisation->name. ' (xero contact)'] = $organisation->id;`
	`38`	`+ $data[$organisation->name . ' (xero contact)'] = $organisation->id;`
`39`	`39`	`} else {`
`40`	`40`	`$data[$organisation->name] = $organisation->id;`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ public function updatedOrganisationId($value)`
`86`	`86`	`'address_code' => $address->code ?? null,`
`87`	`87`	`'address_country' => $address->country ?? null,`
`88`	`88`	`]);`
	`89`	`+ $this->organisation_name = $organisation->name;`
`89`	`90`	`} else {`
`90`	`91`	`$this->dispatchBrowserEvent('selectedOrganisation');`
`91`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`use Livewire\Component;`
`6`	`6`	`use VentureDrake\LaravelCrm\Models\Client;`
	`7`	`+use VentureDrake\LaravelCrm\Models\Organisation;`
`7`	`8`
`8`	`9`	`class LiveOrderForm extends Component`
`9`	`10`	`{`
`@@ -48,6 +49,13 @@ public function updatedClientName($value)`
`48`	`49`	`$this->dispatchBrowserEvent('clientNameUpdated');`
`49`	`50`	`}`
`50`	`51`	`}`
	`52`	`+`
	`53`	`+ public function updatedOrganisationId($value)`
	`54`	`+ {`
	`55`	`+ if ($organisation = Organisation::find($value)) {`
	`56`	`+ $this->organisation_name = $organisation->name;`
	`57`	`+ }`
	`58`	`+ }`
`51`	`59`
`52`	`60`	`public function getClientOrganisations()`
`53`	`61`	`{`