Merge remote-tracking branch 'refs/remotes/origin/arindam-bugg'

# Conflicts:
#	resources/lang/en/lang.php

app/Http/Controllers/Agent/helpdesk/OrganizationController.php

@@ -61,6 +61,16 @@ class OrganizationController extends Controller
         }
     }
 
+     /**
+      * This function is used autofill organizations name .
+      *
+      * @return datatable
+      */
+     public function organizationAutofill()
+     {
+         return view('themes.default1.agent.helpdesk.organization.getautocomplete');
+     }
+
     /**
      * This function is used to display the list of Organizations.
      *

app/Http/Controllers/Agent/helpdesk/UserController.php

@@ -747,7 +747,8 @@ class UserController extends Controller
      */
     public function UserAssignOrg($id)
     {
-        $org = Input::get('org');
+        $org_name = Input::get('org');
+        $org = Organization::where('name', '=', $org_name)->lists('id')->first();
         $user_org = new User_org();
         $user_org->org_id = $org;
         $user_org->user_id = $id;

app/Http/routes.php

@@ -505,6 +505,7 @@ Route::group(['middleware' => ['web']], function () {
             $breadcrumbs->push(Lang::get('lang.view_organization_profile'), url('organizations/{organizations}'));
         });
         Route::get('org-list', ['as' => 'org.list', 'uses' => 'Agent\helpdesk\OrganizationController@org_list']);
+        Route::get('organization-autofill', ['as' => 'post.organization.autofill', 'uses' => 'Agent\helpdesk\OrganizationController@organizationAutofill']); //auto fill organization name//
         Route::get('org/delete/{id}', ['as' => 'org.delete', 'uses' => 'Agent\helpdesk\OrganizationController@destroy']);
         Route::get('org-chart/{id}', 'Agent\helpdesk\OrganizationController@orgChartData');
 //    Route::post('org-chart-range', ['as' => 'post.org.chart', 'uses' => 'Agent\helpdesk\OrganizationController@orgChartData']);