diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php index 0e8382e5d..bb6caf11c 100644 --- a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php @@ -150,22 +150,22 @@ class AttributeDataGrid 'type' => 'string', 'label' => 'Type', ], [ - 'name' => 'is_required', + 'column' => 'is_required', 'alias' => 'attributeIsRequired', 'type' => 'boolean', 'label' => 'Required', ], [ - 'name' => 'is_unique', + 'column' => 'is_unique', 'alias' => 'attributeIsUnique', 'type' => 'boolean', 'label' => 'Unique', ], [ - 'name' => 'value_per_locale', + 'column' => 'value_per_locale', 'alias' => 'attributeValuePerLocale', 'type' => 'boolean', 'label' => 'Locale based', ], [ - 'name' => 'value_per_channel', + 'column' => 'value_per_channel', 'alias' => 'attributeValuePerChannel', 'type' => 'boolean', 'label' => 'Channel based', diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index c6faf091b..1bd3dbc1f 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -123,7 +123,7 @@ class ProductDataGrid 'type' => 'string', 'label' => 'Product Quantity', 'sortable' => true, - ], + ] ], 'filterable' => [ @@ -149,7 +149,7 @@ class ProductDataGrid 'type' => 'string', 'label' => 'Product Type', ], [ - 'name' => 'prods.status', + 'column' => 'prods.status', 'alias' => 'ProductStatus', 'type' => 'boolean', 'label' => 'Status' diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index 28c0dee76..7a2f0a56c 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -324,6 +324,10 @@ Route::group(['middleware' => ['web']], function () { //delete backend user Route::get('/users/delete/{id}', 'Webkul\User\Http\Controllers\UserController@destroy')->name('admin.users.delete'); + Route::post('/confirm/destroy', 'Webkul\User\Http\Controllers\UserController@destroySelf')->defaults('_config', [ + 'redirect' => 'admin.users.index' + ])->name('admin.users.confirm.destroy'); + // User Role Routes Route::get('/roles', 'Webkul\User\Http\Controllers\RoleController@index')->defaults('_config', [ 'view' => 'admin::users.roles.index' diff --git a/packages/Webkul/Admin/src/Listeners/Product.php b/packages/Webkul/Admin/src/Listeners/Product.php index 1f259232f..b8c3d8d40 100644 --- a/packages/Webkul/Admin/src/Listeners/Product.php +++ b/packages/Webkul/Admin/src/Listeners/Product.php @@ -73,24 +73,29 @@ class Product { $variants = []; - $this->productGrid->create($gridObject); + $found = $this->productGrid->findOneByField('product_id', $product->id); - if($product->type == 'configurable') { - $variants = $product->variants()->get(); + //extra measure to stop duplicate entries + if($found == null) { + $this->productGrid->create($gridObject); - foreach($variants as $variant) { - $variantObj = [ - 'product_id' => $variant->id, - 'sku' => $variant->sku, - 'type' => $variant->type, - 'attribute_family_name' => $variant->toArray()['attribute_family']['name'], - 'name' => $variant->name, - 'quantity' => 0, - 'status' => $variant->status, - 'price' => $variant->price, - ]; + if($product->type == 'configurable') { + $variants = $product->variants()->get(); - $this->productGrid->create($variantObj); + foreach($variants as $variant) { + $variantObj = [ + 'product_id' => $variant->id, + 'sku' => $variant->sku, + 'type' => $variant->type, + 'attribute_family_name' => $variant->toArray()['attribute_family']['name'], + 'name' => $variant->name, + 'quantity' => 0, + 'status' => $variant->status, + 'price' => $variant->price, + ]; + + $this->productGrid->create($variantObj); + } } } @@ -268,6 +273,13 @@ class Product { $gridObject = []; } + + $this->findRepeated(); + return true; } + + public function findRepeated() { + + } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index faec0f03c..6f4753234 100644 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -50,6 +50,7 @@ return [ 'change-password' => 'Change Account Password', 'current-password' => 'Current Password' ], + 'users' => [ 'forget-password' => [ 'title' => 'Forget Password', @@ -60,6 +61,7 @@ return [ 'back-link-title' => 'Back to Sign In', 'submit-btn-title' => 'Email Password Reset Link' ], + 'reset-password' => [ 'title' => 'Reset Password', 'title' => 'Reset Password', @@ -69,6 +71,7 @@ return [ 'back-link-title' => 'Back to Sign In', 'submit-btn-title' => 'Reset Password' ], + 'roles' => [ 'title' => 'Roles', 'add-role-title' => 'Add Role', @@ -82,6 +85,7 @@ return [ 'custom' => 'Custom', 'all' => 'All' ], + 'users' => [ 'title' => 'User', 'add-user-title' => 'Add User', @@ -95,8 +99,15 @@ return [ 'status-and-role' => 'Status and Role', 'role' => 'Role', 'status' => 'Status', - 'account-is-active' => 'Account is Active' + 'account-is-active' => 'Account is Active', + 'current-password' => 'Enter Current Password', + 'confirm-delete' => 'Confirm Delete This Account', + 'confirm-delete-title' => 'Confirm password before delete', + 'delete-last' => 'At least one admin is required.', + 'delete-success' => 'Success! User deleted', + 'incorrect-password' => 'The password you entered is incorrect' ], + 'sessions' => [ 'title' => 'Sign In', 'email' => 'Email', @@ -106,6 +117,7 @@ return [ 'submit-btn-title' => 'Sign In' ] ], + 'sales' => [ 'orders' => [ 'title' => 'Orders', @@ -157,6 +169,7 @@ return [ 'total-due' => 'Total Due', 'cancel-confirm-msg' => 'Are you sure you want to cancel this order ?' ], + 'invoices' => [ 'title' => 'Invoices', 'id' => 'Id', @@ -178,6 +191,7 @@ return [ 'print' => 'Print', 'order-date' => 'Order Date' ], + 'shipments' => [ 'title' => 'Shipments', 'id' => 'Id', @@ -196,6 +210,7 @@ return [ 'view-title' => 'Shipment #:shipment_id', ] ], + 'catalog' => [ 'products' => [ 'title' => 'Products', @@ -227,8 +242,10 @@ return [ 'add-variant-title' => 'Add Variant', 'variant-already-exist-message' => 'Variant with same attribute options already exists.', 'add-image-btn-title' => 'Add Image', - 'mass-delete-success' => 'All the selected index of products have been deleted successfully' + 'mass-delete-success' => 'All the selected index of products have been deleted successfully', + 'mass-update-success' => 'All the selected index of products have been updated successfully' ], + 'attributes' => [ 'title' => 'Attributes', 'add-title' => 'Add Attribute', diff --git a/packages/Webkul/Admin/src/Resources/views/customers/confirm-password.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/confirm-password.blade.php new file mode 100644 index 000000000..125112c81 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/customers/confirm-password.blade.php @@ -0,0 +1,37 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.customers.customers.title') }} +@stop + +@section('content') +
+
+
+

{{ __('admin::app.users.users.confirm-delete-title') }}

+
+
+ +
+
+ +
+
+ @csrf +
+ + + + + + @{{ errors.first('password') }} + +
+ + +
+
+
+@endsection diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php index 16f6dfd27..46e72c591 100644 --- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php @@ -30,6 +30,9 @@