Update v1.0.6.5
This commit is contained in:
@@ -18,6 +18,8 @@ use App\Model\helpdesk\Utility\Priority;
|
||||
use App\User;
|
||||
use Exception;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Pagination\LengthAwarePaginator;
|
||||
use Illuminate\Support\Collection;
|
||||
|
||||
/**
|
||||
* -----------------------------------------------------------------------------
|
||||
@@ -528,6 +530,46 @@ class ApiController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all customers having client_id, client_picture, client_name, client_email, client_phone.
|
||||
*
|
||||
* @return json
|
||||
*/
|
||||
public function getCustomersWith()
|
||||
{
|
||||
try {
|
||||
$users = $this->faveoUser->select('id', 'user_name', 'first_name', 'last_name', 'email', 'phone_number', 'profile_pic')->where('role', 'user')->get();
|
||||
$result = [];
|
||||
foreach ($users as $key => $user) {
|
||||
$result[$key]['id'] = $user->id;
|
||||
$result[$key]['user_name'] = $user->user_name;
|
||||
$result[$key]['first_name'] = $user->first_name;
|
||||
$result[$key]['last_name'] = $user->last_name;
|
||||
$result[$key]['email'] = $user->email;
|
||||
$result[$key]['phone_number'] = $user->phone_number;
|
||||
if ($user->profile_pic) {
|
||||
$path = 'lb-faveo/media/profilepic/'.$user->profile_pic;
|
||||
} else {
|
||||
$path = \Gravatar::src($user->email);
|
||||
}
|
||||
$result[$key]['picture'] = $path;
|
||||
}
|
||||
$result = $this->createPagination($result, 10);
|
||||
//$result->toJson();
|
||||
return $result->toJson();
|
||||
} catch (Exception $e) {
|
||||
$error = $e->getMessage();
|
||||
$line = $e->getLine();
|
||||
$file = $e->getFile();
|
||||
|
||||
return response()->json(compact('error', 'file', 'line'));
|
||||
} catch (\TokenExpiredException $e) {
|
||||
$error = $e->getMessage();
|
||||
|
||||
return response()->json(compact('error'));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a customer by id.
|
||||
*
|
||||
@@ -545,7 +587,7 @@ class ApiController extends Controller
|
||||
return response()->json(compact('error'));
|
||||
}
|
||||
$id = $this->request->input('user_id');
|
||||
$result = $this->faveoUser->where('id', $id)->first();
|
||||
$result = $this->faveoUser->where('id', $id)->where('role', 'user')->first();
|
||||
|
||||
return response()->json(compact('result'));
|
||||
} catch (Exception $e) {
|
||||
@@ -1071,4 +1113,33 @@ class ApiController extends Controller
|
||||
return response()->json(compact('error'));
|
||||
}
|
||||
}
|
||||
|
||||
public function createPagination($array, $perPage)
|
||||
{
|
||||
try {
|
||||
//Get current page form url e.g. &page=6
|
||||
$currentPage = LengthAwarePaginator::resolveCurrentPage();
|
||||
|
||||
//Create a new Laravel collection from the array data
|
||||
$collection = new Collection($array);
|
||||
|
||||
//Slice the collection to get the items to display in current page
|
||||
$currentPageSearchResults = $collection->slice($currentPage * $perPage, $perPage)->all();
|
||||
|
||||
//Create our paginator and pass it to the view
|
||||
$paginatedResults = new LengthAwarePaginator($currentPageSearchResults, count($collection), $perPage);
|
||||
|
||||
return $paginatedResults;
|
||||
} catch (\Exception $e) {
|
||||
$error = $e->getMessage();
|
||||
$line = $e->getLine();
|
||||
$file = $e->getFile();
|
||||
|
||||
return response()->json(compact('error', 'file', 'line'));
|
||||
} catch (\TokenExpiredException $e) {
|
||||
$error = $e->getMessage();
|
||||
|
||||
return response()->json(compact('error'));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -37,8 +37,34 @@ class InstallerApiController extends Controller
|
||||
*/
|
||||
public function config_database(Request $request)
|
||||
{
|
||||
error_reporting(E_ALL & ~E_NOTICE);
|
||||
$validator = \Validator::make(
|
||||
[
|
||||
'database' => $request->database,
|
||||
'host' => $request->host,
|
||||
'databasename' => $request->databasename,
|
||||
'dbusername' => $request->dbusername,
|
||||
'port' => $request->port,
|
||||
],
|
||||
[
|
||||
'database' => 'required|min:1',
|
||||
'host' => 'required',
|
||||
'databasename' => 'required|min:1',
|
||||
'dbusername' => 'required|min:1',
|
||||
'port' => 'integer|min:0',
|
||||
]
|
||||
);
|
||||
if ($validator->fails()) {
|
||||
$jsons = $validator->messages();
|
||||
$val = '';
|
||||
foreach ($jsons->all() as $key => $value) {
|
||||
$val .= $value;
|
||||
}
|
||||
$return_data = rtrim(str_replace('.', ',', $val), ',');
|
||||
|
||||
return ['response' => 'fail', 'reason' => $return_data, 'status' => '0'];
|
||||
}
|
||||
// dd($validator->messages());
|
||||
// error_reporting(E_ALL & ~E_NOTICE);
|
||||
// Check for pre install
|
||||
if (\Config::get('database.install') == '%0%') {
|
||||
$default = $request->database;
|
||||
@@ -47,9 +73,7 @@ class InstallerApiController extends Controller
|
||||
$dbusername = $request->dbusername;
|
||||
$dbpassword = $request->dbpassword;
|
||||
$port = $request->port;
|
||||
|
||||
if (isset($default) && isset($host) && isset($database) && isset($dbusername)) {
|
||||
|
||||
// Setting environment values
|
||||
$_ENV['DB_TYPE'] = $default;
|
||||
$_ENV['DB_HOST'] = $host;
|
||||
@@ -57,12 +81,10 @@ class InstallerApiController extends Controller
|
||||
$_ENV['DB_DATABASE'] = $database;
|
||||
$_ENV['DB_USERNAME'] = $dbusername;
|
||||
$_ENV['DB_PASSWORD'] = $dbpassword;
|
||||
|
||||
$config = '';
|
||||
foreach ($_ENV as $key => $val) {
|
||||
$config .= "{$key}={$val}\n";
|
||||
}
|
||||
|
||||
// Write environment file
|
||||
$fp = fopen(base_path().'/.env', 'w');
|
||||
fwrite($fp, $config);
|
||||
@@ -85,6 +107,36 @@ class InstallerApiController extends Controller
|
||||
*/
|
||||
public function config_system(Request $request)
|
||||
{
|
||||
$validator = \Validator::make(
|
||||
[
|
||||
'firstname' => $request->firstname,
|
||||
'lastname' => $request->lastname,
|
||||
'email' => $request->email,
|
||||
'username' => $request->username,
|
||||
'password' => $request->password,
|
||||
'timezone' => $request->timezone,
|
||||
'datetime' => $request->datetime,
|
||||
],
|
||||
[
|
||||
'firstname' => 'required|alpha|min:1',
|
||||
'lastname' => 'required|alpha|min:1',
|
||||
'email' => 'required|email|min:1',
|
||||
'username' => 'required|min:4',
|
||||
'password' => 'required|min:6',
|
||||
'timezone' => 'required|min:1',
|
||||
'datetime' => 'required|min:1',
|
||||
]
|
||||
);
|
||||
if ($validator->fails()) {
|
||||
$jsons = $validator->messages();
|
||||
$val = '';
|
||||
foreach ($jsons->all() as $key => $value) {
|
||||
$val .= $value;
|
||||
}
|
||||
$return_data = rtrim(str_replace('.', ',', $val), ',');
|
||||
|
||||
return ['response' => 'fail', 'reason' => $return_data, 'status' => '0'];
|
||||
}
|
||||
// Check for pre install
|
||||
if (\Config::get('database.install') == '%0%') {
|
||||
$firstname = $request->firstname;
|
||||
@@ -101,12 +153,16 @@ class InstallerApiController extends Controller
|
||||
|
||||
// checking requested timezone for the admin and system
|
||||
$timezones = Timezones::where('name', '=', $timezone)->first();
|
||||
if ($timezones->id == null) {
|
||||
if ($timezones == null) {
|
||||
Artisan::call('migrate:reset', ['--force' => true]);
|
||||
|
||||
return ['response' => 'fail', 'reason' => 'Invalid time-zone', 'status' => '0'];
|
||||
}
|
||||
// checking requested date time format for the admin and system
|
||||
$date_time_format = Date_time_format::where('format', '=', $datetime)->first();
|
||||
if ($date_time_format->id == null) {
|
||||
if ($date_time_format == null) {
|
||||
Artisan::call('migrate:reset', ['--force' => true]);
|
||||
|
||||
return ['response' => 'fail', 'reason' => 'invalid date-time format', 'status' => '0'];
|
||||
}
|
||||
// Creating minum settings for system
|
||||
|
@@ -469,4 +469,16 @@ class TestController extends Controller
|
||||
return response()->json(compact('error', 'file', 'line'));
|
||||
}
|
||||
}
|
||||
|
||||
public function getCustomersWith()
|
||||
{
|
||||
try {
|
||||
} catch (\Exception $e) {
|
||||
$error = $e->getMessage();
|
||||
$line = $e->getLine();
|
||||
$file = $e->getFile();
|
||||
|
||||
return response()->json(compact('error', 'file', 'line'));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -55,8 +55,9 @@ class TokenAuthController extends Controller
|
||||
return response()->json(compact('error'));
|
||||
}
|
||||
|
||||
$user_id = \Auth::user()->id;
|
||||
// if no errors are encountered we can return a JWT
|
||||
return response()->json(compact('token'));
|
||||
return response()->json(compact('token', 'user_id'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user