Skip to content

Commit f7cdeb8

Browse files
andrewdrakeandrewdrake
committed
Updated nav in settings section
1 parent 858c9c4 commit f7cdeb8

38 files changed

+1691
-891
lines changed

‎database/seeders/LaravelCrmTablesSeeder.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -652,6 +652,11 @@ public function run()
652652
Permission::firstOrCreate(['name' => 'edit crm clients', 'crm_permission' => 1]);
653653
Permission::firstOrCreate(['name' => 'delete crm clients', 'crm_permission' => 1]);
654654

655+
Permission::firstOrCreate(['name' => 'create crm pipelines', 'crm_permission' => 1]);
656+
Permission::firstOrCreate(['name' => 'view crm pipelines', 'crm_permission' => 1]);
657+
Permission::firstOrCreate(['name' => 'edit crm pipelines', 'crm_permission' => 1]);
658+
Permission::firstOrCreate(['name' => 'delete crm pipelines', 'crm_permission' => 1]);
659+
655660
if (config('permission.teams')) {
656661
$roleArray = ['name' => 'Owner', 'crm_role' => 1, 'team_id' => null];
657662
} else {
@@ -750,6 +755,10 @@ public function run()
750755
'view crm clients',
751756
'edit crm clients',
752757
'delete crm clients',
758+
'create crm pipelines',
759+
'view crm pipelines',
760+
'edit crm pipelines',
761+
'delete crm pipelines',
753762
]);
754763

755764
if (config('permission.teams')) {
@@ -832,6 +841,10 @@ public function run()
832841
'view crm clients',
833842
'edit crm clients',
834843
'delete crm clients',
844+
'create crm pipelines',
845+
'view crm pipelines',
846+
'edit crm pipelines',
847+
'delete crm pipelines',
835848
]);
836849
}
837850
}

‎resources/lang/en/lang.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,5 +485,13 @@
485485
'pickup' => 'pickup',
486486
'unreject' => 'unreject',
487487
'quote_unrejected' => 'quote unrejected',
488-
'stage' => 'stage'
488+
'stage' => 'stage',
489+
'edit_custom_field' => 'edit custom field',
490+
'create_custom_field' => 'create custom field',
491+
'custom_field' => 'custom field',
492+
'custom_field_group' => 'custom field group',
493+
'create_custom_field_group' => 'create custom field group',
494+
'edit_custom_field_group' => 'edit custom field group',
495+
'back_to_custom_field_groups' => 'back to custom field groups',
496+
'pipelines' => 'pipelines',
489497
];

‎resources/views/field-groups/create.blade.php

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,31 @@
44

55
<form method="POST" action="{{ url(route('laravel-crm.field-groups.store')) }}">
66
@csrf
7-
<div class="card">
8-
<div class="card-header">
9-
@include('laravel-crm::layouts.partials.nav-settings')
7+
<div class="container-fluid pl-0">
8+
<div class="row">
9+
<div class="col col-md-2">
10+
<div class="card">
11+
<div class="card-body py-3 px-2">
12+
@include('laravel-crm::layouts.partials.nav-settings')
13+
</div>
14+
</div>
15+
</div>
16+
<div class="col col-md-10">
17+
<div class="card">
18+
<div class="card-header">
19+
<h3 class="card-title float-left m-0">{{ ucfirst(trans('laravel-crm::lang.create_custom_field_group')) }}</h3>
20+
<span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.field-groups.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(trans('laravel-crm::lang.back_to_custom_field_groups')) }}</a></span>
21+
</div>
22+
<div class="card-body">
23+
@include('laravel-crm::field-groups.partials.fields')
24+
</div>
25+
@component('laravel-crm::components.card-footer')
26+
<a href="{{ url(route('laravel-crm.field-groups.index')) }}" class="btn btn-outline-secondary">{{ ucfirst(trans('laravel-crm::lang.cancel')) }}</a>
27+
<button type="submit" class="btn btn-primary">{{ ucfirst(trans('laravel-crm::lang.save')) }}</button>
28+
@endcomponent
29+
</div>
30+
</div>
1031
</div>
11-
<div class="card-body">
12-
<h3 class="mb-3">{{ ucfirst(trans('laravel-crm::lang.create_field_group')) }} <span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.field-groups.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(trans('laravel-crm::lang.back_to_field_groups')) }}</a></span></h3>
13-
@include('laravel-crm::field-groups.partials.fields')
14-
</div>
15-
@component('laravel-crm::components.card-footer')
16-
<a href="{{ url(route('laravel-crm.field-groups.index')) }}" class="btn btn-outline-secondary">{{ ucfirst(trans('laravel-crm::lang.cancel')) }}</a>
17-
<button type="submit" class="btn btn-primary">{{ ucfirst(trans('laravel-crm::lang.save')) }}</button>
18-
@endcomponent
1932
</div>
2033
</form>
2134

‎resources/views/field-groups/edit.blade.php

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,31 @@
55
<form method="POST" action="{{ url(route('laravel-crm.field-groups.update', $fieldGroup)) }}">
66
@csrf
77
@method('PUT')
8-
<div class="card">
9-
<div class="card-header">
10-
@include('laravel-crm::layouts.partials.nav-settings')
8+
<div class="container-fluid pl-0">
9+
<div class="row">
10+
<div class="col col-md-2">
11+
<div class="card">
12+
<div class="card-body py-3 px-2">
13+
@include('laravel-crm::layouts.partials.nav-settings')
14+
</div>
15+
</div>
16+
</div>
17+
<div class="col col-md-10">
18+
<div class="card">
19+
<div class="card-header">
20+
<h3 class="card-title float-left m-0">{{ ucfirst(trans('laravel-crm::lang.edit_custom_field_group')) }}</h3>
21+
<span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.field-groups.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(trans('laravel-crm::lang.back_to_custom_field_groups')) }}</a></span>
22+
</div>
23+
<div class="card-body">
24+
@include('laravel-crm::field-groups.partials.fields')
25+
</div>
26+
@component('laravel-crm::components.card-footer')
27+
<a href="{{ url(route('laravel-crm.fields.index')) }}" class="btn btn-outline-secondary">{{ ucfirst(trans('laravel-crm::lang.cancel')) }}</a>
28+
<button type="submit" class="btn btn-primary">{{ ucwords(trans('laravel-crm::lang.save_changes')) }}</button>
29+
@endcomponent
30+
</div>
31+
</div>
1132
</div>
12-
<div class="card-body">
13-
<h3 class="mb-3"> {{ ucfirst(trans('laravel-crm::lang.edit_field_group')) }} <span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.field-groups.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(trans('laravel-crm::lang.back_to_field_groups')) }}</a></span></h3>
14-
@include('laravel-crm::field-groups.partials.fields')
15-
</div>
16-
@component('laravel-crm::components.card-footer')
17-
<a href="{{ url(route('laravel-crm.fields.index')) }}" class="btn btn-outline-secondary">{{ ucfirst(trans('laravel-crm::lang.cancel')) }}</a>
18-
<button type="submit" class="btn btn-primary">{{ ucwords(trans('laravel-crm::lang.save_changes')) }}</button>
19-
@endcomponent
2033
</div>
2134
</form>
2235

‎resources/views/field-groups/index.blade.php

Lines changed: 57 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,58 +2,68 @@
22

33
@section('content')
44

5-
<div class="card">
6-
<div class="card-header">
7-
@include('laravel-crm::layouts.partials.nav-settings')
8-
</div>
9-
<div class="card-body">
10-
<div class="tab-content">
11-
<div class="tab-pane active" id="roles" role="tabpanel">
12-
<h3 class="mb-3"> {{ ucfirst(__('laravel-crm::lang.custom_field_groups')) }} @can('create crm fields')<span class="float-right"><a type="button" class="btn btn-primary btn-sm" href="{{ url(route('laravel-crm.field-groups.create')) }}"><span class="fa fa-plus"></span> {{ ucfirst(__('laravel-crm::lang.add_custom_field_group')) }}</a></span>@endcan</h3>
13-
<div class="table-responsive">
14-
<table class="table mb-0 card-table table-hover">
15-
<thead>
16-
<tr>
17-
<th scope="col">{{ ucfirst(__('laravel-crm::lang.name')) }}</th>
18-
<th scope="col">{{ ucfirst(__('laravel-crm::lang.system')) }}</th>
19-
<th scope="col">{{ ucfirst(__('laravel-crm::lang.fields')) }}</th>
20-
<th scope="col"></th>
21-
</tr>
22-
</thead>
23-
<tbody>
24-
@foreach($fieldGroups as $fieldGroup)
25-
<tr class="has-link" data-url="{{ url(route('laravel-crm.field-groups.show',$fieldGroup)) }}">
26-
<td>{{ $fieldGroup->name }}</td>
27-
<td>{{ ($fieldGroup->system == 1) ? ucfirst(__('laravel-crm::lang.yes')) : ucfirst(__('laravel-crm::lang.no')) }}</td>
28-
<td>{{ $fieldGroup->fields->count() }}</td>
29-
<td class="disable-link text-right">
30-
@can('view crm fields')
31-
<a href="{{ route('laravel-crm.field-groups.show', $fieldGroup) }}" class="btn btn-outline-secondary btn-sm"><span class="fa fa-eye" aria-hidden="true"></span></a>
32-
@endcan
33-
@can('edit crm fields')
34-
<a href="{{ route('laravel-crm.field-groups.edit', $fieldGroup) }}" class="btn btn-outline-secondary btn-sm {{ ($fieldGroup->system == 1) ? 'disabled' : null }}"><span class="fa fa-edit" aria-hidden="true"></span></a>
35-
@endcan
36-
@can('delete crm fields')
37-
<form action="{{ route('laravel-crm.field-groups.destroy',$fieldGroup) }}" method="POST" class="form-check-inline mr-0 form-delete-button">
38-
{{ method_field('DELETE') }}
39-
{{ csrf_field() }}
40-
<button class="btn btn-danger btn-sm" type="submit" data-model="{{ __('laravel-crm::lang.field_group') }}" {{ ($fieldGroup->system == 1) ? 'disabled' : null }}><span class="fa fa-trash-o" aria-hidden="true"></span></button>
41-
</form>
42-
@endcan
43-
</td>
5+
<div class="container-fluid pl-0">
6+
<div class="row">
7+
<div class="col col-md-2">
8+
<div class="card">
9+
<div class="card-body py-3 px-2">
10+
@include('laravel-crm::layouts.partials.nav-settings')
11+
</div>
12+
</div>
13+
</div>
14+
<div class="col col-md-10">
15+
<div class="card">
16+
<div class="card-header">
17+
<h3 class="card-title float-left m-0"> {{ ucfirst(__('laravel-crm::lang.custom_field_groups')) }}</h3>
18+
@can('create crm fields')<span class="float-right"><a type="button" class="btn btn-primary btn-sm" href="{{ url(route('laravel-crm.field-groups.create')) }}"><span class="fa fa-plus"></span> {{ ucfirst(__('laravel-crm::lang.add_custom_field_group')) }}</a></span>@endcan
19+
20+
</div>
21+
<div class="card-body p-0">
22+
<div class="table-responsive">
23+
<table class="table mb-0 card-table table-hover">
24+
<thead>
25+
<tr>
26+
<th scope="col">{{ ucfirst(__('laravel-crm::lang.name')) }}</th>
27+
<th scope="col">{{ ucfirst(__('laravel-crm::lang.system')) }}</th>
28+
<th scope="col">{{ ucfirst(__('laravel-crm::lang.fields')) }}</th>
29+
<th scope="col"></th>
4430
</tr>
45-
@endforeach
46-
</tbody>
47-
</table>
31+
</thead>
32+
<tbody>
33+
@foreach($fieldGroups as $fieldGroup)
34+
<tr class="has-link" data-url="{{ url(route('laravel-crm.field-groups.show',$fieldGroup)) }}">
35+
<td>{{ $fieldGroup->name }}</td>
36+
<td>{{ ($fieldGroup->system == 1) ? ucfirst(__('laravel-crm::lang.yes')) : ucfirst(__('laravel-crm::lang.no')) }}</td>
37+
<td>{{ $fieldGroup->fields->count() }}</td>
38+
<td class="disable-link text-right">
39+
@can('view crm fields')
40+
<a href="{{ route('laravel-crm.field-groups.show', $fieldGroup) }}" class="btn btn-outline-secondary btn-sm"><span class="fa fa-eye" aria-hidden="true"></span></a>
41+
@endcan
42+
@can('edit crm fields')
43+
<a href="{{ route('laravel-crm.field-groups.edit', $fieldGroup) }}" class="btn btn-outline-secondary btn-sm {{ ($fieldGroup->system == 1) ? 'disabled' : null }}"><span class="fa fa-edit" aria-hidden="true"></span></a>
44+
@endcan
45+
@can('delete crm fields')
46+
<form action="{{ route('laravel-crm.field-groups.destroy',$fieldGroup) }}" method="POST" class="form-check-inline mr-0 form-delete-button">
47+
{{ method_field('DELETE') }}
48+
{{ csrf_field() }}
49+
<button class="btn btn-danger btn-sm" type="submit" data-model="{{ __('laravel-crm::lang.field_group') }}" {{ ($fieldGroup->system == 1) ? 'disabled' : null }}><span class="fa fa-trash-o" aria-hidden="true"></span></button>
50+
</form>
51+
@endcan
52+
</td>
53+
</tr>
54+
@endforeach
55+
</tbody>
56+
</table>
57+
</div>
4858
</div>
59+
@if($fieldGroups instanceof \Illuminate\Pagination\LengthAwarePaginator )
60+
@component('laravel-crm::components.card-footer')
61+
{{ $fieldGroups->links() }}
62+
@endcomponent
63+
@endif
4964
</div>
5065
</div>
5166
</div>
52-
@if($fieldGroups instanceof \Illuminate\Pagination\LengthAwarePaginator )
53-
@component('laravel-crm::components.card-footer')
54-
{{ $fieldGroups->links() }}
55-
@endcomponent
56-
@endif
5767
</div>
5868

5969
@endsection

0 commit comments

Comments
 (0)