merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

customer changes

This commit is contained in:
rahul shukla 2018-10-25 10:38:51 +05:30
parent 52999c971e
commit 8d9627c194
7 changed files with 15 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php
View File

@ -84,30 +84,17 @@ class CustomerGroupDataGrid
'sortable' => true,
],
[
'name' => 'cg.group_name',
'name' => 'cg.name',
'alias' => 'Name',
'type' => 'string',
'label' => 'Name',
'sortable' => true,
],
[
'name' => 'cg.is_user_defined',
'alias' => 'User Defined',
'type' => 'boolean',
'label' => 'User Defined',
'sortable' => true,
'wrapper' => function ($value) {
if($value == 1)
return "False";
else
return "True";
},
],
],
//don't use aliasing in case of filters
'filterable' => [
[
'column' => 'cg.group_name',
'column' => 'cg.name',
'alias' => 'Name',
'type' => 'string',
'label' => 'Name'
@ -118,12 +105,6 @@ class CustomerGroupDataGrid
'type' => 'number',
'label' => 'ID'
],
[
'column' => 'cg.is_user_defined',
'alias' => 'User Defined',
'type' => 'boolean',
'label' => 'User Defined'
]
],
//don't use aliasing in case of searchables
'searchable' => [
@ -158,6 +139,5 @@ class CustomerGroupDataGrid
public function render() {
return $this->createCustomerGroupDataGrid()->render();
}
}

4
packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php
View File

@ -70,7 +70,7 @@ class CustomerGroupController extends Controller
public function store()
{
$this->validate(request(), [
'group_name' => 'string|required',
'name' => 'string|required',
]);
$this->customerGroup->create(request()->all());
@ -103,7 +103,7 @@ class CustomerGroupController extends Controller
public function update(Request $request, $id)
{
$this->validate(request(), [
'group_name' => 'string|required',
'name' => 'string|required',
]);
$this->customerGroup->update(request()->all(),$id);

2
packages/Webkul/Admin/src/Resources/views/customers/create.blade.php
View File

@ -71,7 +71,7 @@
<label for="customerGroup" >{{ __('admin::app.customers.customers.customer_group') }}</label>
<select class="control" name="customer_group_id">
@foreach ($customerGroup as $group)
<option value="{{ $group->id }}"> {{ $group->group_name}} </>
<option value="{{ $group->id }}"> {{ $group->name}} </>
@endforeach
</select>
</div>

2
packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
View File

@ -82,7 +82,7 @@
<select class="control" name="customer_group_id">
@foreach($customerGroup as $group)
<option value="{{ $group->id }}" {{ $selectedCustomerOption == $group->id ? 'selected' : '' }}>
{{ $group->group_name}}
{{ $group->name}}
</option>
@endforeach
</select>

19
packages/Webkul/Admin/src/Resources/views/customers/group/create.blade.php
View File

@ -27,23 +27,12 @@
<div class="form-container">
@csrf()
<div class="control-group" :class="[errors.has('group_name') ? 'has-error' : '']">
<label for="group_name" class="required">
<div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
<label for="name" class="required">
{{ __('admin::app.customers.groups.name') }}
</label>
<input type="text" class="control" name="group_name" v-validate="'required'" value="{{ old('group_name') }}">
<span class="control-error" v-if="errors.has('group_name')">@{{ errors.first('group_name') }}</span>
</div>
<div class="control-group">
<label for="is_user_defined">
{{ __('admin::app.customers.groups.is_user_defined') }}
</label>
<span class="checkbox">
<input type="checkbox" name="is_user_defined" value="0">
<label class="checkbox-view" for="is_user_defined"></label>
{{ __('admin::app.customers.groups.yes') }}
</span>
<input type="text" class="control" name="name" v-validate="'required'" value="{{ old('name') }}">
<span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
</div>
</div>

20
packages/Webkul/Admin/src/Resources/views/customers/group/edit.blade.php
View File

@ -29,25 +29,13 @@
<input name="_method" type="hidden" value="PUT">
<div class="control-group" :class="[errors.has('group_name') ? 'has-error' : '']">
<label for="group_name" class="required">
<div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
<label for="name" class="required">
{{ __('admin::app.customers.groups.name') }}
</label>
<input type="text" class="control" name="group_name" v-validate="'required'" value="{{ $group->group_name }}">
<span class="control-error" v-if="errors.has('group_name')">@{{ errors.first('group_name') }}</span>
<input type="text" class="control" name="name" v-validate="'required'" value="{{ $group->name }}">
<span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
</div>
<div class="control-group">
<label for="is_user_defined">
{{ __('admin::app.customers.groups.is_user_defined') }}
</label>
<span class="checkbox">
<input type="checkbox" name="is_user_defined" value="{{ $group->is_user_defined }}" {{ $group->is_user_defined ? 'checked' : '' }}>
<label class="checkbox-view" for="is_user_defined"></label>
{{ __('admin::app.customers.groups.yes') }}
</span>
</div>
</div>
</div>
</form>

2
packages/Webkul/Customer/src/Models/CustomerGroup.php
View File

@ -7,5 +7,5 @@ class CustomerGroup extends Model
{
protected $table = 'customer_groups';
protected $fillable = ['group_name', 'is_user_defined'];
protected $fillable = ['name', 'is_user_defined'];
}