Skip to content

Commit 5a11379

Browse files
jitendra-webkuljitendra-webkul
authored
Merge pull request #116 from jitendra-webkul/master
Fixed issues
2 parents 6b14ce8 + c059934 commit 5a11379

File tree

17 files changed

+185
-72
lines changed

17 files changed

+185
-72
lines changed

‎CHANGELOG for v1.x.x.md‎

Lines changed: 65 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## **v1.0.0 (14th of October 2021)** - *First Release*
1+
## **v1.0.0 (21th of July 2021)** - *First Release*
22

33
* [feature] Descriptive and Simple Admin Panel.
44

@@ -8,4 +8,67 @@
88

99
* [feature] Built on Modular Approach.
1010

11-
* [feature] Email parsing via Sendgrid.
11+
* [feature] Email parsing via Sendgrid.
12+
13+
14+
* #26 [fixed] - VAT number is missing for organization
15+
16+
* #28 [fixed] - Organization is not found while adding person to organization
17+
18+
* #29 [fixed] - Users to teams
19+
20+
* #31 [fixed] - Add Phone to source & type to the new lead form
21+
22+
* #32 [fixed] - Error on installation
23+
24+
* #33 [fixed] - update favicon
25+
26+
* #34 [fixed] - product is not listed even success alert is visible
27+
28+
* #35 [fixed] - Dashboard widgets are not draggable
29+
30+
* #38 [fixed] - Lead stages
31+
32+
* #39 [fixed] - unable to save the lead
33+
34+
* #40 [fixed] - Move icon is missing
35+
36+
* #41 [fixed] - unable to open the lead in kanban view
37+
38+
* #42 [fixed] - Lead without product
39+
40+
* #43 [fixed] - dashboard move icon is not working
41+
42+
* #54 [fixed] - Compose email is not working
43+
44+
* #55 [fixed] - Filter at kanban view does not work
45+
46+
* #56 [fixed] - Unable to back from single view to outbox or any email grid
47+
48+
* #57 [fixed] - wrong button name
49+
50+
* #60 [fixed] - date picker gets removed while selecting date on activity section
51+
52+
* #61 [fixed] - No validation on product SKU field
53+
54+
* #62 [fixed] - Getting exception when filter organization/products/admin roles
55+
56+
* #63 [fixed] - missing translation for compose mail
57+
58+
* #65 [fixed] - can't enter Email & Contact details for person
59+
60+
* #71 [fixed] - Menus are not visible
61+
62+
* #72 [fixed] - Alignment problem
63+
64+
* #79 [fixed] - Reset Password Mail is not sent and error is shown
65+
66+
* #81 [fixed] - Issue with Leads Filter in Layout
67+
68+
* #82 [fixed] - Exception issue in Organisation
69+
70+
* #83 [fixed] - Issue with Actions Alignment on Organisation page
71+
72+
* #84 [fixed] - Issue with user access
73+
74+
* #111 [fixed] - Fetch custom attribute types from config file

‎packages/Webkul/Admin/src/DataGrids/Lead/LeadDataGrid.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
class LeadDataGrid extends DataGrid
99
{
1010
protected $users = [];
11+
1112
protected $tabFilters = [];
13+
1214
protected $stagesMassActionOptions;
1315

1416
protected $redirectRow = [

‎packages/Webkul/Admin/src/Http/Controllers/Lead/QuoteController.php‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Illuminate\Support\Facades\Event;
66
use Webkul\Lead\Repositories\LeadRepository;
7+
use Webkul\Quote\Repositories\QuoteRepository;
78
use Webkul\Admin\Http\Controllers\Controller;
89

910
class QuoteController extends Controller
@@ -15,16 +16,29 @@ class QuoteController extends Controller
1516
*/
1617
protected $leadRepository;
1718

19+
/**
20+
* QuoteRepository object
21+
*
22+
* @var \Webkul\Quote\Repositories\QuoteRepository
23+
*/
24+
protected $quoteRepository;
25+
1826
/**
1927
* Create a new controller instance.
2028
*
2129
* @param \Webkul\Lead\Repositories\LeadRepository $leadRepository
30+
* @param \Webkul\Quote\Repositories\QuoteRepository $quoteRepository
2231
*
2332
* @return void
2433
*/
25-
public function __construct(LeadRepository $leadRepository)
34+
public function __construct(
35+
LeadRepository $leadRepository,
36+
QuoteRepository $quoteRepository
37+
)
2638
{
2739
$this->leadRepository = $leadRepository;
40+
41+
$this->quoteRepository = $quoteRepository;
2842
}
2943

3044
/**

‎packages/Webkul/Admin/src/Http/Controllers/Quote/QuoteController.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ public function index()
6262
*/
6363
public function create()
6464
{
65-
return view('admin::quotes.create');
65+
$lead = $this->leadRepository->findOrFail(request('id'));
66+
67+
return view('admin::quotes.create', compact('lead'));
6668
}
6769

6870
/**

‎packages/Webkul/Admin/src/Resources/lang/en/app.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -541,26 +541,26 @@
541541
'adjustment' => 'Adjustment',
542542
'grand-total' => 'Grand Total',
543543
'persons_count' => 'Persons count',
544-
'assigned_to' => 'Assigned to',
545-
'entity_type' => 'Entity type',
544+
'assigned_to' => 'Assigned To',
545+
'entity_type' => 'Entity Type',
546546
'created_at' => 'Created Date',
547547
'schedule_from' => 'Schedule From',
548548
'schedule_to' => 'Schedule To',
549549
'description' => 'Description',
550-
'update_stage' => 'Update stage',
550+
'update_stage' => 'Update Stage',
551551
'contact_person' => 'Contact Person',
552-
'contact_numbers' => 'Contact numbers',
553-
'permission_type' => 'Permission type',
554-
'organization_name' => 'Organization name',
552+
'contact_numbers' => 'Contact Numbers',
553+
'permission_type' => 'Permission Type',
554+
'organization_name' => 'Organization Name',
555555
'update-success' => ':resource updated successfully.',
556556
'destroy-success' => ':resource deleted successfully.',
557557
'destroy-failed' => ':resource can not be deleted.',
558558
'filters' => [
559559
'yesterday' => 'Yesterday',
560560
'today' => 'Today',
561561
'tomorrow' => 'Tomorrow',
562-
'this-week' => 'This week',
563-
'this-month' => 'This month',
562+
'this-week' => 'This Week',
563+
'this-month' => 'This Month',
564564
'custom' => 'Custom',
565565
]
566566
],

‎packages/Webkul/Admin/src/Resources/views/common/custom-attributes/edit/address.blade.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,6 @@ class="control"
116116
}
117117
},
118118
119-
watch: {
120-
data: function(newVal, oldVal) {
121-
this.country = newVal ? newVal['country'] : '';
122-
123-
this.state = newVal ? newVal['state'] : '';
124-
}
125-
},
126-
127119
methods: {
128120
haveStates: function () {
129121
if (this.countryStates[this.country] && this.countryStates[this.country].length) {

‎packages/Webkul/Admin/src/Resources/views/quotes/create.blade.php‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@
55
@stop
66

77
@section('content-wrapper')
8+
9+
@php
10+
$quote = app('\Webkul\Quote\Repositories\QuoteRepository')->getModel();
11+
12+
if (isset($lead)) {
13+
$quote->fill([
14+
'person_id' => $lead->person_id,
15+
'user_id' => $lead->user_id,
16+
'billing_address' => $lead->person->organization ? $lead->person->organization->address : []
17+
]);
18+
}
19+
@endphp
20+
821
<div class="content full-page adjacent-center">
922
{!! view_render_event('admin.quotes.create.header.before') !!}
1023

@@ -51,17 +64,18 @@
5164

5265
@include('admin::common.custom-attributes.edit', [
5366
'customAttributes' => app('Webkul\Attribute\Repositories\AttributeRepository')
54-
->scopeQuery(function($query){
55-
return $query
56-
->where('entity_type', 'quotes')
57-
->whereIn('code', [
58-
'user_id',
59-
'subject',
60-
'description',
61-
'expired_at',
62-
'person_id',
63-
]);
64-
})->get()
67+
->scopeQuery(function($query){
68+
return $query
69+
->where('entity_type', 'quotes')
70+
->whereIn('code', [
71+
'user_id',
72+
'subject',
73+
'description',
74+
'expired_at',
75+
'person_id',
76+
]);
77+
})->get(),
78+
'entity' => $quote,
6579
])
6680

6781
</div>
@@ -84,7 +98,8 @@
8498
'billing_address',
8599
'shipping_address',
86100
]);
87-
})->get()
101+
})->get(),
102+
'entity' => $quote,
88103
])
89104

90105
</div>

‎packages/Webkul/Admin/src/Resources/views/settings/groups/create.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
@csrf()
4444

4545
<div class="form-group" :class="[errors.has('name') ? 'has-error' : '']">
46-
<label>
46+
<label class="required">
4747
{{ __('admin::app.layouts.name') }}
4848
</label>
4949

@@ -63,7 +63,7 @@ class="control"
6363
</div>
6464

6565
<div class="form-group" :class="[errors.has('description') ? 'has-error' : '']">
66-
<label>
66+
<label class="required">
6767
{{ __('admin::app.settings.groups.description') }}
6868
</label>
6969

‎packages/Webkul/Admin/src/Resources/views/settings/groups/edit.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<input name="_method" type="hidden" value="PUT">
4646

4747
<div class="form-group" :class="[errors.has('name') ? 'has-error' : '']">
48-
<label>
48+
<label class="required">
4949
{{ __('admin::app.layouts.name') }}
5050
</label>
5151

@@ -66,7 +66,7 @@ class="control"
6666
</div>
6767

6868
<div class="form-group" :class="[errors.has('description') ? 'has-error' : '']">
69-
<label>
69+
<label class="required">
7070
{{ __('admin::app.settings.groups.description') }}
7171
</label>
7272

‎packages/Webkul/Admin/src/Resources/views/settings/roles/create.blade.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,14 @@
4343
@csrf()
4444

4545
<div class="form-group" :class="[errors.has('name') ? 'has-error' : '']">
46-
<label>
46+
<label class="required">
4747
{{ __('admin::app.layouts.name') }}
4848
</label>
4949

5050
<input
5151
type="text"
5252
name="name"
53+
value="{{ old('name') }}"
5354
class="control"
5455
v-validate="'required'"
5556
data-vv-as="{{ __('admin::app.layouts.name') }}"
@@ -62,7 +63,7 @@ class="control"
6263
</div>
6364

6465
<div class="form-group" :class="[errors.has('description') ? 'has-error' : '']">
65-
<label>
66+
<label class="required">
6667
{{ __('admin::app.settings.roles.description') }}
6768
</label>
6869

@@ -72,8 +73,7 @@ class="control"
7273
v-validate="'required'"
7374
data-vv-as="{{ __('admin::app.settings.roles.description') }}"
7475
placeholder="{{ __('admin::app.settings.roles.description') }}"
75-
>
76-
</textarea>
76+
>{{ old('description') }}</textarea>
7777

7878
<span class="control-error" v-if="errors.has('description')">
7979
@{{ errors.first('description') }}
@@ -92,11 +92,11 @@ class="control"
9292
v-validate="'required'"
9393
data-vv-as="{{ __('admin::app.settings.roles.role') }}"
9494
>
95-
<option value="custom">
95+
<option value="custom" {{ old('permission_type') == 'custom' ? 'selected' : '' }}>
9696
{{ __('admin::app.settings.roles.custom') }}
9797
</option>
9898

99-
<option value="all">
99+
<option value="all" {{ old('permission_type') == 'all' ? 'selected' : '' }}>
100100
{{ __('admin::app.settings.roles.all') }}
101101
</option>
102102
</select>
@@ -106,7 +106,7 @@ class="control"
106106
</span>
107107
</div>
108108

109-
<div class="control-group tree-wrapper">
109+
<div class="control-group tree-wrapper {{ old('permission_type') == 'all' ? 'hide' : '' }}">
110110
<tree-view value-field="key" id-field="key" items='@json($acl->items)'></tree-view>
111111
</div>
112112

0 commit comments

Comments
 (0)