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

Column 'code' added in customer_groups table

This commit is contained in:
jitendra 2019-06-15 18:50:38 +05:30
parent 86c1b453ee
commit a2d1e1aa85
12 changed files with 83 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ class CustomerGroupDataGrid extends DataGrid
public function prepareQueryBuilder()
{
$queryBuilder = DB::table('customer_groups')->addSelect('id', 'name');
$queryBuilder = DB::table('customer_groups')->addSelect('id', 'code', 'name');
$this->setQueryBuilder($queryBuilder);
}
@ -35,6 +35,15 @@ class CustomerGroupDataGrid extends DataGrid
'filterable' => true
]);
$this->addColumn([
'index' => 'code',
'label' => 'Code',
'type' => 'number',
'searchable' => false,
'sortable' => true,
'filterable' => true
]);
$this->addColumn([
'index' => 'name',
'label' => 'Name',

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

@ -83,7 +83,7 @@ class CustomerController extends Controller
*/
public function create()
{
$customerGroup = $this->customerGroup->findWhere([['id', '<>', 0]]);
$customerGroup = $this->customerGroup->findWhere([['code', '<>', 'guest']]);
$channelName = $this->channel->all();
@ -131,7 +131,7 @@ class CustomerController extends Controller
{
$customer = $this->customer->findOrFail($id);
$customerGroup = $this->customerGroup->findWhere([['id', '<>', 0]]);
$customerGroup = $this->customerGroup->findWhere([['code', '<>', 'guest']]);
$channelName = $this->channel->all();

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

@ -72,7 +72,8 @@ class CustomerGroupController extends Controller
public function store()
{
$this->validate(request(), [
'name' => 'string|required',
'code' => ['required', 'unique:customer_groups,code', new \Webkul\Core\Contracts\Validations\Code],
'name' => 'required',
]);
$data = request()->all();
@ -109,7 +110,8 @@ class CustomerGroupController extends Controller
public function update(Request $request, $id)
{
$this->validate(request(), [
'name' => 'string|required',
'code' => ['required', 'unique:customer_groups,code,' . $id, new \Webkul\Core\Contracts\Validations\Code],
'name' => 'required',
]);
$this->customerGroup->update(request()->all(), $id);

1
packages/Webkul/Admin/src/Resources/lang/ar/app.php
View File

@ -659,6 +659,7 @@ return [
'save-btn-title' => 'احفظ المجموعة',
'title' => 'المجموعات',
'save-btn-title' => 'احفظ المجموعة',
'code' => 'Code',
'name' => 'Name',
'is_user_defined' => 'تعريف المستخدم',
'yes' => 'نعم.'

1
packages/Webkul/Admin/src/Resources/lang/en/app.php
View File

@ -735,6 +735,7 @@ return [
'save-btn-title' => 'Save Group',
'title' => 'Groups',
'save-btn-title' => 'Save Group',
'code' => 'Code',
'name' => 'Name',
'is_user_defined' => 'User Defined',
'yes' => 'Yes'

1
packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
View File

@ -673,6 +673,7 @@ return [
'save-btn-title' => 'Salvar Grupo',
'title' => 'Grupos',
'save-btn-title' => 'Salvar Grupo',
'code' => 'Code',
'name' => 'Nome',
'is_user_defined' => 'Usuário Definido',
'yes' => 'Sim'

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

@ -28,6 +28,13 @@
<div class="form-container">
@csrf()
<div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
<label for="code" class="required">{{ __('admin::app.customers.groups.code') }}</label>
<input v-validate="'required'" class="control" id="code" name="code" data-vv-as="&quot;{{ __('admin::app.customers.groups.code') }}&quot;" v-code/>
<span class="control-error" v-if="errors.has('code')">@{{ errors.first('code') }}</span>
</div>
<div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
<label for="name" class="required">
{{ __('admin::app.customers.groups.name') }}

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

@ -31,6 +31,13 @@
<input name="_method" type="hidden" value="PUT">
<div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
<label for="code" class="required">{{ __('admin::app.customers.groups.code') }}</label>
<input type="text" v-validate="'required'" class="control" id="code" name="code" data-vv-as="&quot;{{ __('admin::app.customers.groups.code') }}&quot;" value="{{ $group->code }}" disabled="disabled"/>
<input type="hidden" name="code" value="{{ $group->code }}"/>
<span class="control-error" v-if="errors.has('code')">@{{ errors.first('code') }}</span>
</div>
<div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
<label for="name" class="required">
{{ __('admin::app.customers.groups.name') }}

32
packages/Webkul/Customer/src/Database/Migrations/2019_06_15_183412_add_code_column_in_customer_groups_table.php Normal file
View File

@ -0,0 +1,32 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AddCodeColumnInCustomerGroupsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('customer_groups', function (Blueprint $table) {
$table->string('code');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('customer_groups', function (Blueprint $table) {
//
});
}
}

27
packages/Webkul/Customer/src/Database/Seeders/CustomerGroupTableSeeder.php
View File

@ -12,17 +12,22 @@ class CustomerGroupTableSeeder extends Seeder
DB::table('customer_groups')->delete();
DB::table('customer_groups')->insert([
'id' => 0,
'name' => 'Guest',
'is_user_defined' => 0,
], [
'id' => 1,
'name' => 'General',
'is_user_defined' => 0,
], [
'id' => 2,
'name' => 'Wholesale',
'is_user_defined' => 0,
[
'id' => 1,
'code' => 'guest',
'name' => 'Guest',
'is_user_defined' => 0,
], [
'id' => 2,
'code' => 'general',
'name' => 'General',
'is_user_defined' => 0,
], [
'id' => 3,
'code' => 'wholesale',
'name' => 'Wholesale',
'is_user_defined' => 0,
]
]);
}
}

2
packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
View File

@ -75,7 +75,7 @@ class RegistrationController extends Controller
$data['is_verified'] = 1;
}
$data['customer_group_id'] = $this->customerGroup->findOneWhere(['name' => 'General'])->id;
$data['customer_group_id'] = $this->customerGroup->findOneWhere(['code' => 'general'])->id;
$verificationData['email'] = $data['email'];
$verificationData['token'] = md5(uniqid(rand(), true));

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

@ -8,7 +8,7 @@ class CustomerGroup extends Model implements CustomerGroupContract
{
protected $table = 'customer_groups';
protected $fillable = ['name', 'is_user_defined'];
protected $fillable = ['name', 'code', 'is_user_defined'];
/**
* Get the customer for this group.