update v1.0.3.3

code/.gitignore → .gitignore

@@ -1,3 +1,3 @@
-/vendor
+
 /node_modules
 .env

README.md

@@ -1,49 +1,27 @@
+## Laravel PHP Framework
 
-<h3>About Faveo</h3>
-<p>Headquartered in Bangalore, Faveo HELPDESK provides Businesses with an automated Helpdesk system to manage customer support. 
-<br/><br/>
-The word Faveo comes from Latin which means to be favourable. Which truly highlights vision and the scope as well as the functionality of the product that Faveo is. It is specifically designed to cater the needs of startups and SME’s empowering them with state of art, ticket based support system. In today’s competitive startup scenario customer retention is one of the major challenges. Handling client query diligently is all the difference between retaining or losing a long lasting relationship. The company is driven with passion of providing tools for managing consumer queries for strategic insights and helping companies take those decisive decisions.
-<br/><br/>
-To date, Faveo has been integrated with 6 platforms and every month there is 1 to 2 update releases with new features & platform integration.
-<br/><br/>
-Faveo can also be customised according to requirement and we do undertake such request.
-<br/><br/>
-Faveo is designed & developed by <a href="http://www.ladybirdweb.com/" target="_blank">Ladybird Web Solution Pvt Ltd</a>, and launched in October 2015.</p>
-<h3>Flavors of Faveo</h3>
-<ul>
-  <li>Community Edition – Free, Open source edition</li>
-  <li>Pro Edition – Downloadable edition. Install it in location of our choice on premises or any hosting of your choice </li>
-  <li>Cloud Edition – Coming soon. Get started in 5 minutes. We will take care of servers, backup etc. Always stay updated with the latest updates of Faveo</li>
-</ul>
-
-
-<h3><a id="user-content-faveo-user-manual" href="https://github.com/ladybirdweb/faveo-helpdesk#faveo-user-manual" aria-hidden="true"></a>Faveo User Manual</h3>
-<p>Check out Faveo Knowledge Base <a href="http://www.ladybirdweb.com/support/knowledgebase" target="_blank">here</a></p>
-<h3><a id="user-content-requirements" href="https://github.com/ladybirdweb/faveo-helpdesk#requirements" aria-hidden="true"></a>Requirements</h3>
-<p>To run Faveo your host just needs a couple of things:</p>
-<ul>
-  <li>PHP 5.5 or greater</li>
-  <li>MySQL 5.5 or greater</li>
-  <li>The mod_rewrite Apache module</li>
-</ul>
-
-<h3>Faveo Web Hosting</h3>
-<p><a href="http://www.store.ladybirdwebhost.com/" target="_blank">Ladybird Web Host</a> Offers hosting with minimum requirement to host Faveo web application. Faveo has been tested on Ladybird Web Host servers &amp; works very well in their server environment. All web hosting packages offered by Ladybird Web Host come with 30 day money back gurantee.</p>
-<h3><a id="user-content-credits" href="https://github.com/ladybirdweb/faveo-helpdesk#credits" aria-hidden="true"></a>Credits</h3>
-<ul>
-  <li>Laravel Framework</li>
-  <li>Admin LTE Theme</li>
-</ul>
-
-<h3><a id="user-content-website" href="https://github.com/ladybirdweb/faveo-helpdesk#website" aria-hidden="true"></a>Website</h3>
-<p><a href="http://www.faveohelpdesk.com/" target="_blank">www.faveohelpdesk.com</a></p>
-
-<h3>YouTube Channel</h3>
-<p><a href="https://www.youtube.com/channel/UC-eqh-h241b1janp6sU7Iiw" target="_blank">Click here</a></p>
-
-
-<h3>Road Map for Community Edition:</h3>
-<p><a href="http://www.faveohelpdesk.com/faveo-helpdesk-road-map" target="_blank">Click here</a></p>
-
-<h3>Don't panic if you come across bugs</h3>
-<p>Faveo is very very new in the market, the product is fully working and is production worthy but it definitely will have some bugs like any software. We fully support Faveo whether free or pro edition, incase you come across any bugs, email us through the <a href="http://www.faveohelpdesk.com/contact-us/">contact form</a>. We want to make your experience of using Faveo as memorable as possible, so help us make Faveo a World, top class helpdesk application. Do check out our roadmap to stayed tuned with future releases </p>
+[![Build Status](https://travis-ci.org/laravel/framework.svg)](https://travis-ci.org/laravel/framework)
+[![Total Downloads](https://poser.pugx.org/laravel/framework/d/total.svg)](https://packagist.org/packages/laravel/framework)
+[![Latest Stable Version](https://poser.pugx.org/laravel/framework/v/stable.svg)](https://packagist.org/packages/laravel/framework)
+[![Latest Unstable Version](https://poser.pugx.org/laravel/framework/v/unstable.svg)](https://packagist.org/packages/laravel/framework)
+[![License](https://poser.pugx.org/laravel/framework/license.svg)](https://packagist.org/packages/laravel/framework)
+
+Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable, creative experience to be truly fulfilling. Laravel attempts to take the pain out of development by easing common tasks used in the majority of web projects, such as authentication, routing, sessions, queueing, and caching.
+
+Laravel is accessible, yet powerful, providing powerful tools needed for large, robust applications. A superb inversion of control container, expressive migration system, and tightly integrated unit testing support give you the tools you need to build any application with which you are tasked.
+
+## Official Documentation
+
+Documentation for the framework can be found on the [Laravel website](http://laravel.com/docs).
+
+## Contributing
+
+Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](http://laravel.com/docs/contributions).
+
+## Security Vulnerabilities
+
+If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell at taylor@laravel.com. All security vulnerabilities will be promptly addressed.
+
+### License
+
+The Laravel framework is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)

code/app/Http/Controllers/Agent/helpdesk/MailController.php → app/Http/Controllers/Agent/helpdesk/MailController.php

@@ -115,8 +115,10 @@ public function readmails(Emails $emails, Email $settings_email, System $system)
 							// echo $_SERVER['DOCUMENT_ROOT'];
 							$dir_img_paths = __DIR__;
 							$dir_img_path = explode('/code', $dir_img_paths);
-							$filepath = explode('../../../../../public/',$attachment->filePath);
-                            $path = $dir_img_path[0]."/code/public/".$filepath[1];
+							$filepath = explode('../../../../../../public/',$attachment->filePath);
+							// dd($filepath);
+                            // $path = $dir_img_path[0]."/public/".$filepath[1];
+                            $path = public_path().'/'.$filepath[1];
                             // dd($path);
 							$filesize = filesize($path);
 							$file_data = file_get_contents($path);

code/app/Http/Controllers/Agent/helpdesk/NotificationController.php → app/Http/Controllers/Agent/helpdesk/NotificationController.php

@@ -24,10 +24,10 @@ class NotificationController extends Controller {
 	public function send_notification() {
 		// $this->test();
 		$company = $this->company();
-		$this->send_notification_to_admin($company);
-		$this->send_notification_to_team_lead($company);
-		$this->send_notification_to_manager($company);
-		$this->send_notification_to_agent($company);
+		// $this->send_notification_to_admin($company);
+		// $this->send_notification_to_team_lead($company);
+		// $this->send_notification_to_manager($company);
+		// $this->send_notification_to_agent($company);
 	}
 
 	/**

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

@@ -49,6 +49,50 @@ public function index() {
 		}
 	}
 
+	/**
+	 * This function is used to display the list of Organizations
+	 * @return datatable
+	 */
+	public function org_list() {
+		return \Datatable::collection(Organization::all())
+			->searchColumns('name')
+			->orderColumns('name', 'website')
+			->addColumn('name', function ($model) {
+				return $model->name;
+			})
+			->addColumn('website', function ($model) {
+				$website = $model->website;
+				return $website;
+			})
+			->addColumn('phone', function ($model) {
+				$phone = $model->phone;
+				return $phone;
+			})
+			->addColumn('Actions', function ($model) {
+				//return '<a href=article/delete/ ' . $model->id . ' class="btn btn-danger btn-flat" onclick="myFunction()">Delete</a>&nbsp;<a href=article/' . $model->id . '/edit class="btn btn-warning btn-flat">Edit</a>&nbsp;<a href=show/' . $model->id . ' class="btn btn-warning btn-flat">View</a>';
+				//return '<form action="article/delete/ ' . $model->id . '" method="post" onclick="alert()"><button type="sumbit" value="Delete"></button></form><a href=article/' . $model->id . '/edit class="btn btn-warning btn-flat">Edit</a>&nbsp;<a href=show/' . $model->id . ' class="btn btn-warning btn-flat">View</a>';
+				return '<span  data-toggle="modal" data-target="#deletearticle'.$model->id .'"><a href="#" ><button class="btn btn-danger btn-xs"></a> ' . \Lang::get('lang.delete') . ' </button></span>&nbsp;<a href="'.route('organizations.edit', $model->id).'" class="btn btn-warning btn-xs">' . \Lang::get('lang.edit') . '</a>&nbsp;<a href="'.route('organizations.show', $model->id).'" class="btn btn-primary btn-xs">' . \Lang::get('lang.view') . '</a>
+				<div class="modal fade" id="deletearticle'.$model->id .'">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title">Are You Sure ?</h4>
+                </div>
+                <div class="modal-body">
+                '.$model->user_name.'
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">Close</button>
+                    <a href="'.route('org.delete',$model->id).'"><button class="btn btn-danger">delete</button></a>
+                </div>
+            </div><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+    </div>';
+			})
+			->make();
+	}
+
 	/**
 	 * Show the form for creating a new resource.
 	 * @return type Response

code/app/Http/Controllers/Agent/helpdesk/TicketController.php → app/Http/Controllers/Agent/helpdesk/TicketController.php

@@ -565,7 +565,7 @@ public function create_user($emailadd, $username, $subject, $body, $phone, $help
 			$user->role = "user";
 			$user->active = "1";
 			// mail user his/her password
-
+			\Event::fire(new \App\Events\ClientTicketFormPost($from_data,$emailadd,$source));
 				if ($user->save()) {	
 				$user_id = $user->id;
 				// Event fire 

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

@@ -66,6 +66,72 @@ public function index() {
 		}
 	}
 
+	/**
+	 * This function is used to display the list of users
+	 * @return datatable
+	 */
+	public function user_list() {
+
+		return \Datatable::collection(User::where('role','!=','admin')->where('role','!=','agent')->get())
+			->searchColumns('user_name')
+			->orderColumns('user_name', 'email')
+			->addColumn('user_name', function ($model) {
+				return $model->user_name;
+			})
+			->addColumn('email', function ($model) {
+				$email = $model->email;
+				return $email;
+			})
+			->addColumn('phone', function ($model) {
+				$phone = "";
+				if($model->phone_number) {
+					$phone = $model->ext . ' ' . $model->phone_number;	
+				}
+				$mobile = "";
+				if($model->mobile) {
+					$mobile = $model->mobile;
+				}
+				$phone = $phone ."   ". $mobile;
+				return $phone;
+			})
+			->addColumn('status', function ($model) {
+				$status = $model->active;
+				if($status == 1) {
+					$stat = '<button class="btn btn-success btn-xs">Active</button>';
+				} else {
+					$stat = '<button class="btn btn-danger btn-xs">Inactive</button>';
+				}
+				return $stat;
+			})
+			->addColumn('lastlogin', function ($model) {
+				$t = $model->updated_at;
+				return TicketController::usertimezone($t);
+			})
+			->addColumn('Actions', function ($model) {
+				//return '<a href=article/delete/ ' . $model->id . ' class="btn btn-danger btn-flat" onclick="myFunction()">Delete</a>&nbsp;<a href=article/' . $model->id . '/edit class="btn btn-warning btn-flat">Edit</a>&nbsp;<a href=show/' . $model->id . ' class="btn btn-warning btn-flat">View</a>';
+				//return '<form action="article/delete/ ' . $model->id . '" method="post" onclick="alert()"><button type="sumbit" value="Delete"></button></form><a href=article/' . $model->id . '/edit class="btn btn-warning btn-flat">Edit</a>&nbsp;<a href=show/' . $model->id . ' class="btn btn-warning btn-flat">View</a>';
+				return '<span  data-toggle="modal" data-target="#deletearticle'.$model->id .'"><a href="#" ><button class="btn btn-danger btn-xs"></a> ' . \Lang::get('lang.delete') . ' </button></span>&nbsp;<a href="'.route('user.edit', $model->id).'" class="btn btn-warning btn-xs">' . \Lang::get('lang.edit') . '</a>&nbsp;<a href="'.route('user.show', $model->id).'" class="btn btn-primary btn-xs">' . \Lang::get('lang.view') . '</a>
+				<div class="modal fade" id="deletearticle'.$model->id .'">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title">Are You Sure ?</h4>
+                </div>
+                <div class="modal-body">
+                '.$model->user_name.'
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">Close</button>
+                    <a href="'.route('user.delete',$model->id).'"><button class="btn btn-danger">delete</button></a>
+                </div>
+            </div><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+    </div>';
+			})
+			->make();
+	}
+
 	/**
 	 * Show the form for creating a new resource.
 	 * @return type Response