diff --git a/packages/Webkul/Admin/src/Listeners/Product.php b/packages/Webkul/Admin/src/Listeners/Product.php index 1f259232f..758155f26 100644 --- a/packages/Webkul/Admin/src/Listeners/Product.php +++ b/packages/Webkul/Admin/src/Listeners/Product.php @@ -268,6 +268,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..cf43766b8 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', @@ -97,6 +101,7 @@ return [ 'status' => 'Status', 'account-is-active' => 'Account is Active' ], + 'sessions' => [ 'title' => 'Sign In', 'email' => 'Email', @@ -106,6 +111,7 @@ return [ 'submit-btn-title' => 'Sign In' ] ], + 'sales' => [ 'orders' => [ 'title' => 'Orders', @@ -157,6 +163,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 +185,7 @@ return [ 'print' => 'Print', 'order-date' => 'Order Date' ], + 'shipments' => [ 'title' => 'Shipments', 'id' => 'Id', @@ -196,6 +204,7 @@ return [ 'view-title' => 'Shipment #:shipment_id', ] ], + 'catalog' => [ 'products' => [ 'title' => 'Products', @@ -227,8 +236,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/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php index c1d2b0194..3666a9dd4 100644 --- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php +++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php @@ -268,7 +268,7 @@ class ProductController extends Controller Event::fire('catelog.product.update.after', $product); } else if($data['update-options'] == 1 && $data['selected-option-text'] == 'Active') { Event::fire('catelog.product.update.before', $productId); - + $result = $this->product->updateAttribute($product, $attribute, $data['update-options']); if($result) @@ -277,7 +277,7 @@ class ProductController extends Controller } } - session()->flash('success', trans('admin::app.catalog.products.mass-delete-success')); + session()->flash('success', trans('admin::app.catalog.products.mass-update-success')); return redirect()->route($this->_config['redirect']); } diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index bf022bf20..cadaae9fc 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -456,7 +456,11 @@ input { } .product-card:hover { - box-shadow: 1px 1px 10px #ccc; + outline: 1px solid #eaeaec; + box-shadow: 0 1px 2px rgba(0,0,0,0.05); + -webkit-box-shadow: 0px 2px 16px 4px rgba(40, 44, 63, 0.07); + -moz-box-shadow: 0px 2px 16px 4px rgba(40, 44, 63, 0.07); + box-shadow: 0px 2px 16px 4px rgba(40, 44, 63, 0.07); } @media only screen and (max-width: 580px) {