From dd9ff1629da2998c91354d7d5f5f02362cc7c7ca Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Tue, 13 Aug 2019 23:31:14 +0530 Subject: [PATCH] Fixed issue #1287 --- packages/Webkul/Admin/src/Providers/EventServiceProvider.php | 2 -- .../Webkul/Attribute/src/Repositories/AttributeRepository.php | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php index 0651d4859..ac1cf5ac1 100755 --- a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php @@ -21,7 +21,5 @@ class EventServiceProvider extends ServiceProvider Event::listen('sales.shipment.save.after', 'Webkul\Admin\Listeners\Order@sendNewShipmentMail'); Event::listen('checkout.order.save.after', 'Webkul\Admin\Listeners\Order@updateProductInventory'); - - Event::listen('products.datagrid.sync', 'Webkul\Admin\Listeners\Product@sync'); } } \ No newline at end of file diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php index 4c7c921a9..96d43a944 100755 --- a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php +++ b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php @@ -224,7 +224,7 @@ class AttributeRepository extends Repository if ($attribute->options()->exists()) { array_push($trimmed, [ 'id' => $attribute->id, - 'name' => $attribute->name, + 'name' => $attribute->admin_name, 'type' => $attribute->type, 'code' => $attribute->code, 'has_options' => true, @@ -233,7 +233,7 @@ class AttributeRepository extends Repository } else { array_push($trimmed, [ 'id' => $attribute->id, - 'name' => $attribute->name, + 'name' => $attribute->admin_name, 'type' => $attribute->type, 'code' => $attribute->code, 'has_options' => false,