update v1.0.7.9 R.C.
This is a Release Candidate. We are still testing.
This commit is contained in:
@@ -29,10 +29,10 @@ class AgentUpdate extends Request
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
'user_name' => 'required|max:30',
|
||||
'user_name' => 'required|max:30|min:3|unique:users,user_name,'.$this->segment(2),
|
||||
'first_name' => 'required|max:30',
|
||||
'last_name' => 'required|max:30',
|
||||
'email' => 'required|email',
|
||||
'email' => 'required|email|unique:users,email,'.$this->segment(2),
|
||||
'active' => 'required',
|
||||
'role' => 'required',
|
||||
'group' => 'required',
|
||||
|
@@ -31,7 +31,7 @@ class CreateTicketRequest extends Request
|
||||
return [
|
||||
|
||||
'email' => 'required|email|max:60',
|
||||
'fullname' => 'required|min:3|max:40',
|
||||
'user_name' => 'required|min:3|max:40',
|
||||
'helptopic' => 'required',
|
||||
// 'dept' => 'required',
|
||||
'sla' => 'required',
|
||||
|
@@ -29,10 +29,9 @@ class Sys_userRequest extends Request
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
|
||||
'email' => 'required|unique:users,email',
|
||||
'full_name' => 'required',
|
||||
// 'phone' => 'size:10',
|
||||
'first_name' => 'required',
|
||||
'user_name' => 'required|min:3|unique:users,user_name',
|
||||
'email' => 'required|unique:users,email',
|
||||
];
|
||||
}
|
||||
}
|
||||
|
@@ -3,7 +3,7 @@
|
||||
namespace App\Http\Requests\helpdesk;
|
||||
|
||||
use App\Http\Requests\Request;
|
||||
|
||||
//use Illuminate\Http\Request as Req;
|
||||
/**
|
||||
* Sys_userUpdate.
|
||||
*
|
||||
@@ -29,9 +29,9 @@ class Sys_userUpdate extends Request
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
'user_name' => 'required',
|
||||
// 'email' => 'required|email',
|
||||
// 'phone' => 'size:10',
|
||||
'first_name' => 'required',
|
||||
'user_name' => 'required|min:3|unique:users,user_name,'.$this->segment(2),
|
||||
'email' => 'required|email|unique:users,email,'.$this->segment(2),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
@@ -9,15 +9,14 @@ use App\Http\Requests\Request;
|
||||
*
|
||||
* @author Ladybird <info@ladybirdweb.com>
|
||||
*/
|
||||
class TicketRequest extends Request
|
||||
{
|
||||
class TicketRequest extends Request {
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function authorize()
|
||||
{
|
||||
public function authorize() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -26,12 +25,46 @@ class TicketRequest extends Request
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
// 'To' => 'required',
|
||||
'ticket_ID' => 'required',
|
||||
'reply_content' => 'required',
|
||||
];
|
||||
public function rules() {
|
||||
$error = "";
|
||||
try {
|
||||
$size = $this->size();
|
||||
if ($size > 800 || $size==0) {
|
||||
throw new \Exception("File size exceeded", 422);
|
||||
}
|
||||
} catch (\Exception $ex) {
|
||||
dd($ex);
|
||||
$error = $this->error($ex);
|
||||
}
|
||||
// return [
|
||||
// 'attachment' => 'not_in:'.$error,
|
||||
// ];
|
||||
}
|
||||
|
||||
public function size() {
|
||||
$files = $this->file('attachment');
|
||||
if (!$files) {
|
||||
throw new \Exception("exceeded", 422);
|
||||
}
|
||||
$size = 0;
|
||||
if (count($files) > 0) {
|
||||
foreach ($files as $file) {
|
||||
$size +=$file->getSize();
|
||||
}
|
||||
}
|
||||
return $size;
|
||||
}
|
||||
|
||||
public function error($e) {
|
||||
if ($this->ajax() || $this->wantsJson()) {
|
||||
|
||||
$message = $e->getMessage();
|
||||
if (is_object($message)) {
|
||||
$message = $message->toArray();
|
||||
}
|
||||
|
||||
return $message;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -23,9 +23,9 @@ class CategoryRequest extends Request
|
||||
*/
|
||||
public function rules()
|
||||
{
|
||||
$id = $this->segment(2);
|
||||
return [
|
||||
'name' => 'required|max:250',
|
||||
'slug' => 'required|unique:kb_category',
|
||||
'name' => 'required|max:250|unique:kb_category,name,'.$id,
|
||||
'description' => 'required',
|
||||
];
|
||||
}
|
||||
|
@@ -1,32 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests\kb;
|
||||
|
||||
use App\Http\Requests\Request;
|
||||
|
||||
class CategoryUpdate extends Request
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function authorize()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
'name' => 'required|max:250',
|
||||
'slug' => 'required',
|
||||
'description' => 'required',
|
||||
];
|
||||
}
|
||||
}
|
@@ -23,10 +23,9 @@ class PageRequest extends Request
|
||||
*/
|
||||
public function rules()
|
||||
{
|
||||
$slug = $this->segment(2);
|
||||
return [
|
||||
'name' => 'required',
|
||||
'slug' => 'required|unique:kb_pages',
|
||||
//'description' => 'required',
|
||||
'name' => 'required|unique:kb_pages,slug,'.$slug
|
||||
];
|
||||
}
|
||||
}
|
||||
|
@@ -1,32 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests\kb;
|
||||
|
||||
use App\Http\Requests\Request;
|
||||
|
||||
class PageUpdate extends Request
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function authorize()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
'name' => 'required',
|
||||
'slug' => 'required',
|
||||
//'description' => 'required',
|
||||
];
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user