Skip to content

Commit f3fee52

Browse files
author
ruchit-viitorcloud
authored
Merge branch 'master' into master
2 parents 952e30e + a495639 commit f3fee52

File tree

61 files changed

+664
-773
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+664
-773
lines changed

‎app/Console/Commands/Stubs/Attribute.stub‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ trait AttributeClass
1717
*/
1818
public function getActionButtonsAttribute()
1919
{
20-
return '<div class="btn-group action-btn">'.
21-
//call your attribute functions here
22-
'</div>';
20+
return '<div class="btn-group action-btn">
21+
'.$this->getEditButtonAttribute(editPermission, editRoute).'
22+
'.$this->getDeleteButtonAttribute(deletePermission, deleteRoute).'
23+
</div>';
2324
}
2425
}

‎app/Console/Commands/Stubs/Model.stub‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@
22

33
namespace DummyNamespace;
44

5+
use App\Models\ModelTrait;
56
use Illuminate\Database\Eloquent\Model;
67
use DummyAttribute;
78
use DummyRelationship;
89

910
class DummyModel extends Model
1011
{
11-
use AttributeName,
12-
RelationshipName;
12+
use ModelTrait,
13+
AttributeName,
14+
RelationshipName {
15+
// AttributeName::getEditButtonAttribute insteadof ModelTrait;
16+
}
1317

1418
/**
1519
* NOTE : If you want to implement Soft Deletes in this model,

‎app/Console/Commands/Stubs/Repository.stub‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class DummyRepoName extends BaseRepository
4545
public function create(array $input)
4646
{
4747
$dummy_small_model_name = self::MODEL;
48+
$dummy_small_model_name = new $dummy_small_model_name();
4849
if ($dummy_small_model_name->save($input)) {
4950
return true;
5051
}

‎app/Http/Controllers/Backend/Blogs/BlogsController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public function createTagsArray($tags)
155155
if (is_numeric($tag)) {
156156
$tags_array[] = $tag;
157157
} else {
158-
$newTag = BlogTag::create(['name'=>$tag, 'status'=>1, 'created_by'=>1]);
158+
$newTag = BlogTag::create(['name' => $tag, 'status' => 1, 'created_by' => 1]);
159159
$tags_array[] = $newTag->id;
160160
}
161161
}

‎app/Http/Controllers/Frontend/Auth/ResetPasswordController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ public function showResetForm($token = null)
6363
protected function rules()
6464
{
6565
return [
66-
'token' => 'required',
67-
'email' => 'required|email',
68-
'password' => 'required|min:8|confirmed|regex:"^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{8,}$"',
66+
'token' => 'required',
67+
'email' => 'required|email',
68+
'password' => 'required|min:8|confirmed|regex:"^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{8,}$"',
6969
];
7070
}
7171

‎app/Http/Middleware/VerifyJWTToken.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function handle($request, Closure $next)
2626
} elseif ($e instanceof \Tymon\JWTAuth\Exceptions\TokenInvalidException) {
2727
return response()->json(['token_invalid'], $e->getStatusCode());
2828
} else {
29-
return response()->json(['error'=>'Token is required']);
29+
return response()->json(['error' => 'Token is required']);
3030
}
3131
}
3232

‎app/Http/Requests/Backend/Access/User/StoreUserRequest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ public function authorize()
2828
public function rules()
2929
{
3030
return [
31-
'first_name' => 'required|max:255',
32-
'last_name' => 'required|max:255',
33-
'email' => ['required', 'email', 'max:255', Rule::unique('users')],
34-
'password' => 'required|min:6|confirmed',
35-
'state_id' => 'required',
36-
'city_id' => 'required',
37-
'zip_code' => 'required|regex:/^[0-9]+$/',
38-
'ssn' => 'required|regex:/^[0-9]+$/|max:9|min:9',
31+
'first_name' => 'required|max:255',
32+
'last_name' => 'required|max:255',
33+
'email' => ['required', 'email', 'max:255', Rule::unique('users')],
34+
'password' => 'required|min:6|confirmed',
35+
'state_id' => 'required',
36+
'city_id' => 'required',
37+
'zip_code' => 'required|regex:/^[0-9]+$/',
38+
'ssn' => 'required|regex:/^[0-9]+$/|max:9|min:9',
3939
];
4040
}
4141

‎app/Http/Requests/Backend/Access/User/UpdateUserRequest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ public function authorize()
2727
public function rules()
2828
{
2929
return [
30-
'email' => 'required|email',
31-
'first_name' => 'required',
32-
'last_name' => 'required',
33-
'state_id' => 'required',
34-
'city_id' => 'required',
35-
'zip_code' => 'required|regex:/^[0-9]+$/',
36-
'ssn' => 'required|regex:/^[0-9]+$/|max:9|min:9',
30+
'email' => 'required|email',
31+
'first_name' => 'required',
32+
'last_name' => 'required',
33+
'state_id' => 'required',
34+
'city_id' => 'required',
35+
'zip_code' => 'required|regex:/^[0-9]+$/',
36+
'ssn' => 'required|regex:/^[0-9]+$/|max:9|min:9',
3737
];
3838
}
3939

‎app/Http/Requests/Backend/Faqs/StoreFaqsRequest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public function authorize()
2424
public function rules()
2525
{
2626
return [
27-
'question' => 'required|max:191',
28-
'answer' => 'required',
27+
'question' => 'required|max:191',
28+
'answer' => 'required',
2929
];
3030
}
3131

@@ -37,9 +37,9 @@ public function rules()
3737
public function messages()
3838
{
3939
return [
40-
'question.required' => 'Question field is required.',
41-
'question.max' => 'Question may not be grater than 191 character.',
42-
'answer.required' => 'Answer field is required.',
40+
'question.required' => 'Question field is required.',
41+
'question.max' => 'Question may not be grater than 191 character.',
42+
'answer.required' => 'Answer field is required.',
4343
];
4444
}
4545
}

‎app/Http/Requests/Backend/Faqs/UpdateFaqsRequest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public function authorize()
2424
public function rules()
2525
{
2626
return [
27-
'question' => 'required|max:191',
28-
'answer' => 'required',
27+
'question' => 'required|max:191',
28+
'answer' => 'required',
2929
];
3030
}
3131

@@ -37,9 +37,9 @@ public function rules()
3737
public function messages()
3838
{
3939
return [
40-
'question.required' => 'Question field is required.',
41-
'question.max' => 'Question may not be grater than 191 character.',
42-
'answer.required' => 'Answer field is required.',
40+
'question.required' => 'Question field is required.',
41+
'question.max' => 'Question may not be grater than 191 character.',
42+
'answer.required' => 'Answer field is required.',
4343
];
4444
}
4545
}

0 commit comments

Comments
 (0)