diff --git a/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php index f2e78df56..2a69b952e 100644 --- a/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php @@ -88,6 +88,15 @@ class AddressDataGrid extends DataGrid */ public function addColumns() { + $this->addColumn([ + 'index' => 'address_id', + 'label' => trans('admin::app.datagrid.id'), + 'type' => 'number', + 'searchable' => true, + 'sortable' => true, + 'filterable' => true, + ]); + $this->addColumn([ 'index' => 'company_name', 'label' => trans('admin::app.customers.addresses.company-name'), diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php index 080daf492..0dee4c31d 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php @@ -3,6 +3,7 @@ namespace Webkul\Admin\Http\Controllers\Customer; use Webkul\Admin\Http\Controllers\Controller; +use Illuminate\Support\Facades\Event; use Webkul\Customer\Repositories\CustomerGroupRepository; class CustomerGroupController extends Controller @@ -72,7 +73,11 @@ class CustomerGroupController extends Controller $data['is_user_defined'] = 1; - $this->customerGroupRepository->create($data); + Event::dispatch('customer.customer_group.create.before'); + + $customerGroup = $this->customerGroupRepository->create($data); + + Event::dispatch('customer.customer_group.create.after', $customerGroup); session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Customer Group'])); @@ -105,7 +110,11 @@ class CustomerGroupController extends Controller 'name' => 'required', ]); - $this->customerGroupRepository->update(request()->all(), $id); + Event::dispatch('customer.customer_group.update.before', $id); + + $customerGroup = $this->customerGroupRepository->update(request()->all(), $id); + + Event::dispatch('customer.customer_group.update.after', $customerGroup); session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Customer Group'])); @@ -128,8 +137,12 @@ class CustomerGroupController extends Controller session()->flash('warning', trans('admin::app.response.customer-associate', ['name' => 'Customer Group'])); } else { try { + Event::dispatch('customer.customer_group.delete.before', $id); + $this->customerGroupRepository->delete($id); + Event::dispatch('customer.customer_group.delete.after', $id); + session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Customer Group'])); return response()->json(['message' => true], 200); diff --git a/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php index 0214c6003..0b52df8f3 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php @@ -13,7 +13,11 @@