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

customer group add and delete fixes

This commit is contained in:
prashant-webkul 2018-12-03 18:58:57 +05:30
parent 5d42bebbf1
commit 40f37cddd4
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,11 @@ class CustomerGroupController extends Controller
'name' => 'string|required',
]);
$this->customerGroup->create(request()->all());
$data = request()->all();
$data['is_user_defined'] = 1;
$this->customerGroup->create($data);
session()->flash('success', 'Customer Group created successfully.');
@ -125,22 +129,12 @@ class CustomerGroupController extends Controller
{
$group = $this->customerGroup->findOneByField('id', $id);
$checked = false;
if($group->is_user_defined == 0) {
session()->flash('warning', 'Cannot delete the default group');
} else {
session()->flash('success', 'Customer Group deleted successfully');
if($group->is_user_defined == 1) {
$checked = true;
session()->flash('warning', 'Cannot delete the last customer group');
}
if(!$check) {
if(count($this->customerGroup->all()) == 1) {
session()->flash('warning', 'Cannot delete the last customer group');
} else {
session()->flash('success', 'Customer Group deleted successfully');
$this->customerGroup->delete($id);
}
$this->customerGroup->delete($id);
}
return redirect()->back();

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

@ -14,7 +14,7 @@ class CustomerGroupTableSeeder extends Seeder
DB::table('customer_groups')->insert([
'id' => 1,
'name' => 'General',
'is_user_defined' => 1,
'is_user_defined' => 0,
], [
'id' => 2,
'name' => 'Wholesale',