diff --git a/CHANGELOG for v0.1.x.md b/CHANGELOG for v0.1.x.md index f17f22b70..adb934414 100644 --- a/CHANGELOG for v0.1.x.md +++ b/CHANGELOG for v0.1.x.md @@ -4,6 +4,14 @@ ## **v0.1.2(30th of November, 2018)** - *Release* +* [feature] Paypal integration for online payments + +* [feature] Newsletter subscription + +* [feature] Email Verification for customers + +* [feature] News letter grid for Admin + * #185 - [fixed] Search not working in responsive mode * #187 - [fixed] We can add column "Group Name" instead of Group Id and also add this column in filter in Customers Grid @@ -126,14 +134,6 @@ * [fixes] More ACL added. -* [feature] Paypal integration. - -* [feature] Newsletter subscription. - -* [feature] Email Verification for customers. - -* [feature] News letter grid for Admin. - ## **v0.1.1(13th of November, 2018)** - *Release* diff --git a/README.md b/README.md index 435b4608f..808604b81 100644 --- a/README.md +++ b/README.md @@ -76,24 +76,18 @@ default. ### 4. Installation: -**1. Run the Command** +**Run these Commands Below** ~~~ php artisan migrate ~~~ - -**2. Run the Command** ~~~ php artisan db:seed ~~~ - -**3. Run the Command** ~~~ php artisan vendor:publish -> Press 0 and then press enter to publish all assets and configurations. ~~~ - -**4. Run the Command** ``` php artisan storage:link ``` @@ -110,7 +104,16 @@ php artisan storage:link > **php artisan vendor:publish** -### 6. License +### 6. Migration from v0.1.1 to v0.1.2 + +**Run commands below:** + +> **php artisan migrate** + +> **php artisan vendor:publish** + + +### 7. License Bagisto is a truly opensource E-Commerce framework which will always be free under the [MIT License](https://opensource.org/licenses/MIT). ### Coming Soon: diff --git a/config/jwt.php b/config/jwt.php deleted file mode 100644 index f83b6f796..000000000 --- a/config/jwt.php +++ /dev/null @@ -1,173 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -return [ - - /* - |-------------------------------------------------------------------------- - | JWT Authentication Secret - |-------------------------------------------------------------------------- - | - | Don't forget to set this, as it will be used to sign your tokens. - | A helper command is provided for this: `php artisan jwt:generate` - | - */ - - 'secret' => env('JWT_SECRET', 'changeme'), - - /* - |-------------------------------------------------------------------------- - | JWT time to live - |-------------------------------------------------------------------------- - | - | Specify the length of time (in minutes) that the token will be valid for. - | Defaults to 1 hour - | - */ - - 'ttl' => env('JWT_TTL', 120), - - /* - |-------------------------------------------------------------------------- - | Refresh time to live - |-------------------------------------------------------------------------- - | - | Specify the length of time (in minutes) that the token can be refreshed - | within. I.E. The user can refresh their token within a 2 week window of - | the original token being created until they must re-authenticate. - | Defaults to 2 weeks - | - */ - - 'refresh_ttl' => env('JWT_REFRESH_TTL', 86400), - - /* - |-------------------------------------------------------------------------- - | JWT hashing algorithm - |-------------------------------------------------------------------------- - | - | Specify the hashing algorithm that will be used to sign the token. - | - | See here: https://github.com/namshi/jose/tree/2.2.0/src/Namshi/JOSE/Signer - | for possible values - | - */ - - 'algo' => 'HS256', - - /* - |-------------------------------------------------------------------------- - | User Model namespace - |-------------------------------------------------------------------------- - | - | Specify the full namespace to your User model. - | e.g. 'Acme\Entities\User' - | - */ - - 'user' => 'App\User', - - /* - |-------------------------------------------------------------------------- - | User identifier - |-------------------------------------------------------------------------- - | - | Specify a unique property of the user that will be added as the 'sub' - | claim of the token payload. - | - */ - - 'identifier' => 'id', - - /* - |-------------------------------------------------------------------------- - | Required Claims - |-------------------------------------------------------------------------- - | - | Specify the required claims that must exist in any token. - | A TokenInvalidException will be thrown if any of these claims are not - | present in the payload. - | - */ - - 'required_claims' => ['iss', 'iat', 'exp', 'nbf', 'sub', 'jti'], - - /* - |-------------------------------------------------------------------------- - | Blacklist Enabled - |-------------------------------------------------------------------------- - | - | In order to invalidate tokens, you must have the blacklist enabled. - | If you do not want or need this functionality, then set this to false. - | - */ - - 'blacklist_enabled' => env('JWT_BLACKLIST_ENABLED', true), - - /* - |-------------------------------------------------------------------------- - | Providers - |-------------------------------------------------------------------------- - | - | Specify the various providers used throughout the package. - | - */ - - 'providers' => [ - - /* - |-------------------------------------------------------------------------- - | User Provider - |-------------------------------------------------------------------------- - | - | Specify the provider that is used to find the user based - | on the subject claim - | - */ - - 'user' => 'Tymon\JWTAuth\Providers\User\EloquentUserAdapter', - - /* - |-------------------------------------------------------------------------- - | JWT Provider - |-------------------------------------------------------------------------- - | - | Specify the provider that is used to create and decode the tokens. - | - */ - - 'jwt' => 'Tymon\JWTAuth\Providers\JWT\Namshi', - - /* - |-------------------------------------------------------------------------- - | Authentication Provider - |-------------------------------------------------------------------------- - | - | Specify the provider that is used to authenticate users. - | - */ - - 'auth' => 'Tymon\JWTAuth\Providers\Auth\Illuminate', - - /* - |-------------------------------------------------------------------------- - | Storage Provider - |-------------------------------------------------------------------------- - | - | Specify the provider that is used to store tokens in the blacklist - | - */ - - 'storage' => 'Tymon\JWTAuth\Providers\Storage\Illuminate' - - ], - -]; diff --git a/config/test.php b/config/test.php deleted file mode 100644 index c205929e6..000000000 --- a/config/test.php +++ /dev/null @@ -1,5 +0,0 @@ - 'Test' -]; diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php index df980d7ca..110bbdb0a 100644 --- a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php @@ -32,23 +32,23 @@ class AttributeDataGrid 'aliased' => true, 'massoperations' => [ - // [ - // 'route' => route('admin.datagrid.delete'), - // 'method' => 'DELETE', - // 'label' => 'Delete', - // 'type' => 'button', - // ], + [ + 'route' => route('admin.catalog.attributes.massdelete'), + 'method' => 'DELETE', + 'label' => 'Delete', + 'type' => 'button', + ] ], 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.catalog.attributes.edit', 'confirm_text' => 'Do you really want to edit this record?', 'icon' => 'icon pencil-lg-icon', ], [ 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.catalog.attributes.delete', 'confirm_text' => 'Do you really want to delete this record?', 'icon' => 'icon trash-icon', ], @@ -57,7 +57,6 @@ class AttributeDataGrid 'join' => [], //use aliasing on secodary columns if join is performed - 'columns' => [ [ 'name' => 'id', diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php index 2bf1bae1c..4a3666297 100644 --- a/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php @@ -44,12 +44,12 @@ class AttributeFamilyDataGrid 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.catalog.families.edit', 'confirm_text' => 'Do you really want to edit this record?', 'icon' => 'icon pencil-lg-icon', ], [ 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.catalog.families.delete', 'confirm_text' => 'Do you really want to delete this record?', 'icon' => 'icon trash-icon', ], diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php index 7cc12f244..87f7d0015 100644 --- a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php @@ -44,12 +44,12 @@ class CategoryDataGrid 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.catalog.categories.edit', 'confirm_text' => 'Do you really want to edit this record?', 'icon' => 'icon pencil-lg-icon', ], [ 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.catalog.categories.delete', 'confirm_text' => 'Do you really want to delete this record?', 'icon' => 'icon trash-icon', ], diff --git a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php index 7c6c03280..9367d6cd1 100644 --- a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php @@ -44,12 +44,12 @@ class ChannelDataGrid 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.channels.edit', 'confirm_text' => 'Do you really want to edit this record?', 'icon' => 'icon pencil-lg-icon', ], [ 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.channels.delete', 'confirm_text' => 'Do you really want to delete this record?', 'icon' => 'icon trash-icon', ], diff --git a/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php index 8d08c4f15..08238339d 100644 --- a/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php @@ -24,7 +24,7 @@ class CurrencyDataGrid public function createCurrencyDataGrid() { - return DataGrid::make([ + return DataGrid::make([ 'name' => 'Currencies', 'table' => 'currencies', 'select' => 'id', @@ -32,23 +32,23 @@ class CurrencyDataGrid 'aliased' => false, //use this with false as default and true in case of joins 'massoperations' =>[ - // [ - // 'route' => route('admin.datagrid.delete'), - // 'method' => 'DELETE', - // 'label' => 'Delete', - // 'type' => 'button', - // ], + [ + 'route' => route('admin.currencies.massdelete'), + 'method' => 'DELETE', + 'label' => 'Delete', + 'type' => 'button', + ] ], 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), - 'confirm_text' => 'Do you really want to edit this record?', + 'route' => 'admin.currencies.edit', + // 'confirm_text' => 'Do you really want to edit this record?', 'icon' => 'icon pencil-lg-icon', ], [ 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.currencies.delete', 'confirm_text' => 'Do you really want to delete this record?', 'icon' => 'icon trash-icon', ], @@ -65,9 +65,7 @@ class CurrencyDataGrid ], //use aliasing on secodary columns if join is performed - 'columns' => [ - [ 'name' => 'id', 'alias' => 'currencyId', diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php index 960103f1c..2931adb2e 100644 --- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -31,23 +31,23 @@ class CustomerDataGrid 'aliased' => true, //use this with false as default and true in case of joins 'massoperations' =>[ - [ - 'route' => route('admin.datagrid.delete'), - 'method' => 'DELETE', - 'label' => 'Delete', - 'type' => 'button', //select || button only - ], + // [ + // 'route' => route('admin.datagrid.delete'), + // 'method' => 'DELETE', + // 'label' => 'Delete', + // 'type' => 'button', //select || button only + // ], ], 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.customer.edit', 'confirm_text' => 'Do you really want to edit this record?', 'icon' => 'icon pencil-lg-icon', ], [ 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.customer.delete', 'confirm_text' => 'Do you really want to delete this record?', 'icon' => 'icon trash-icon', ], diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php index 6ce3070ff..8b0ba3407 100644 --- a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php @@ -53,13 +53,13 @@ class CustomerGroupDataGrid 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.groups.edit', 'confirm_text' => 'Do you really want to edit this record?', 'icon' => 'icon pencil-lg-icon', ], [ 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.groups.delete', 'confirm_text' => 'Do you really want to delete this record?', 'icon' => 'icon trash-icon', ], diff --git a/packages/Webkul/Admin/src/DataGrids/ProductReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php similarity index 94% rename from packages/Webkul/Admin/src/DataGrids/ProductReviewDataGrid.php rename to packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php index 0e7bfb76b..eedb654f5 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductReviewDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php @@ -7,13 +7,13 @@ use Webkul\Ui\DataGrid\Facades\DataGrid; /** - * Review DataGrid + * CustomerReview DataGrid * * @author Rahul Shukla @rahul-webkul * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) */ -class ProductReviewDataGrid +class CustomerReviewDataGrid { /** * The ProductReviewDataGrid @@ -23,7 +23,7 @@ class ProductReviewDataGrid * for Reviews */ - public function createProductReviewDataGrid() + public function createCustomerReviewDataGrid() { return DataGrid::make([ @@ -45,12 +45,12 @@ class ProductReviewDataGrid 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.customer.review.edit', 'confirm_text' => 'Do you really want to edit this record?', 'icon' => 'icon pencil-lg-icon', ], [ 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.customer.review.delete', 'confirm_text' => 'Do you really want to delete this record?', 'icon' => 'icon trash-icon', ], @@ -176,6 +176,6 @@ class ProductReviewDataGrid public function render() { - return $this->createProductReviewDataGrid()->render(); + return $this->createCustomerReviewDataGrid()->render(); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php index 5f2db32b8..b39861f8d 100644 --- a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php @@ -44,12 +44,12 @@ class ExchangeRatesDataGrid 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.exchange_rates.edit', 'confirm_text' => 'Do you really want to edit this record?', 'icon' => 'icon pencil-lg-icon', ], [ 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.exchange_rates.delete', 'confirm_text' => 'Do you really want to delete this record?', 'icon' => 'icon trash-icon', ], diff --git a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php index ca40fe7b6..ae4945cf2 100644 --- a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php @@ -42,12 +42,12 @@ class InventorySourcesDataGrid 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.edit'), + 'route' => 'admin.inventory_sources.edit', 'confirm_text' => 'Do you really want to edit this record?', 'icon' => 'icon pencil-lg-icon', ], [ 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.inventory_sources.delete', 'confirm_text' => 'Do you really want to delete this record?', 'icon' => 'icon trash-icon', ], diff --git a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php index 60dc9444a..ec67ce1a2 100644 --- a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php @@ -43,12 +43,12 @@ class LocalesDataGrid 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), - 'confirm_text' => 'Do you really want to edit this record?', + 'route' => 'admin.locales.edit', + // 'confirm_text' => 'Do you really want to edit this record?', 'icon' => 'icon pencil-lg-icon', ], [ 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.locales.delete', 'confirm_text' => 'Do you really want to delete this record?', 'icon' => 'icon trash-icon', ], diff --git a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php index dc94780b2..499916a2c 100644 --- a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php @@ -42,8 +42,13 @@ class NewsLetterDataGrid 'actions' => [ [ + 'type' => 'Edit', + 'route' => 'admin.customers.subscribers.edit', + // 'confirm_text' => 'Do you really want to delete this record?', + 'icon' => 'icon pencil-lg-icon', + ], [ 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.customers.subscribers.delete', 'confirm_text' => 'Do you really want to delete this record?', 'icon' => 'icon trash-icon', ], diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php index 59674fd0b..0ce7ad8ae 100644 --- a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php @@ -43,9 +43,10 @@ class OrderDataGrid 'actions' => [ [ 'type' => 'View', - 'route' => route('admin.datagrid.delete'), - 'confirm_text' => 'Do you really want to view this record?', - 'icon' => 'icon pencil-lg-icon', + 'route' => 'admin.sales.orders.view', + // 'confirm_text' => 'Do you really want to view this record?', + 'icon' => 'icon eye-icon', + 'icon-alt' => 'View' ], // [ // 'type' => 'Delete', diff --git a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php index 25aaf8853..ea8ce0a30 100644 --- a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php @@ -42,16 +42,11 @@ class OrderInvoicesDataGrid 'actions' => [ [ 'type' => 'View', - 'route' => route('admin.datagrid.delete'), - 'confirm_text' => 'Do you really want to view this record?', - 'icon' => 'icon pencil-lg-icon', + 'route' => 'admin.sales.invoices.view', + // 'confirm_text' => 'Do you really want to view this record?', + 'icon' => 'icon eye-icon', + 'icon-alt' => 'View' ], - // [ - // 'type' => 'Delete', - // 'route' => route('admin.datagrid.delete'), - // 'confirm_text' => 'Do you really want to do this?', - // 'icon' => 'icon trash-icon', - // ] ], 'join' => [ diff --git a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php index 51b3b0c70..06fa62af3 100644 --- a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php @@ -42,9 +42,10 @@ class OrderShipmentsDataGrid 'actions' => [ [ 'type' => 'View', - 'route' => route('admin.datagrid.delete'), - 'confirm_text' => 'Do you really want to view this record?', - 'icon' => 'icon pencil-lg-icon', + 'route' => 'admin.sales.shipments.view', + // 'confirm_text' => 'Do you really want to view this record?', + 'icon' => 'icon eye-icon', + 'icon-alt' => 'View' ], ], diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index 28b3f86fd..868400c75 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -36,12 +36,12 @@ class ProductDataGrid 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.catalog.products.edit', 'confirm_text' => 'Do you really want to edit this record?', 'icon' => 'icon pencil-lg-icon', ], [ 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.catalog.products.delete', 'confirm_text' => 'Do you really want to delete this record?', 'icon' => 'icon trash-icon', ], diff --git a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php index 82fdf957d..8bdcf5155 100644 --- a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php @@ -44,15 +44,10 @@ class RolesDataGrid 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.roles.edit', 'confirm_text' => 'Do you really want to edit this record?', 'icon' => 'icon pencil-lg-icon', - ], [ - 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), - 'confirm_text' => 'Do you really want to delete this record?', - 'icon' => 'icon trash-icon', - ], + ] ], 'join' => [ diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php index 0a4b9cfd2..211115e3e 100644 --- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php @@ -43,12 +43,12 @@ class SliderDataGrid 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.sliders.edit', 'confirm_text' => 'Do you really want to edit this record?', 'icon' => 'icon pencil-lg-icon', ], [ 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.sliders.delete', 'confirm_text' => 'Do you really want to delete this record?', 'icon' => 'icon trash-icon', ], diff --git a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php index f4eef1910..87410cf03 100644 --- a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php @@ -53,13 +53,13 @@ class TaxCategoryDataGrid 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.tax-categories.edit', 'confirm_text' => 'Do you really want to edit this record?', 'icon' => 'icon pencil-lg-icon', ], [ 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.tax-categories.delete', 'confirm_text' => 'Do you really want to delete this record?', 'icon' => 'icon trash-icon', ], diff --git a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php index d6f8eb1c7..a95fe3414 100644 --- a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php @@ -52,13 +52,13 @@ class TaxRateDataGrid 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.tax-rates.store', 'confirm_text' => 'Do you really want to edit this record?', 'icon' => 'icon pencil-lg-icon', ], [ 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.tax-rates.delete', 'confirm_text' => 'Do you really want to delete this record?', 'icon' => 'icon trash-icon', ], diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php index d8cfe0b45..b35088047 100644 --- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php @@ -55,13 +55,13 @@ class UserDataGrid 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.users.edit', 'confirm_text' => 'Do you really want to edit this record?', 'icon' => 'icon pencil-lg-icon', ], [ 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), + 'route' => 'admin.users.delete', 'confirm_text' => 'Do you really want to delete this record?', 'icon' => 'icon trash-icon', ], diff --git a/packages/Webkul/Admin/src/Exceptions/Handler.php b/packages/Webkul/Admin/src/Exceptions/Handler.php index 4a6d2d88f..109c25392 100644 --- a/packages/Webkul/Admin/src/Exceptions/Handler.php +++ b/packages/Webkul/Admin/src/Exceptions/Handler.php @@ -4,11 +4,11 @@ namespace Webkul\Admin\Exceptions; use Exception; use Illuminate\Auth\AuthenticationException; -use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; -use Symfony\Component\HttpKernel\Exception\HttpException; -use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Database\Eloquent\PDOException; use Illuminate\Database\Eloquent\ErrorException; +use Illuminate\Database\Eloquent\ModelNotFoundException; +use Symfony\Component\HttpKernel\Exception\HttpException; +use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; class Handler extends ExceptionHandler { @@ -22,60 +22,38 @@ class Handler extends ExceptionHandler */ public function render($request, Exception $exception) { + $path = $this->isAdminUri() ? 'admin' : 'shop'; if ($exception instanceof HttpException) { $statusCode = $exception->getStatusCode(); - if (strpos($_SERVER['REQUEST_URI'], 'admin') !== false) { - switch ($statusCode) { - case 404: - return response()->view('admin::errors.404', [], 404); - break; - case 403: - return response()->view('admin::errors.403', [], 403); - break; - case 401: - return response()->view('admin::errors.401', [], 401); - break; - default: - return response()->view('admin::errors.500', [], 500); - } - } else { - switch ($statusCode) { - case 404: - return response()->view('shop::errors.404', [], 404); - break; - case 403: - return response()->view('shop::errors.403', [], 403); - break; - case 401: - return response()->view('shop::errors.401', [], 401); - break; - default: - return response()->view('shop::errors.500', [], 500); - } - } - } else if ($exception instanceof \ModelNotFoundException) { - if (strpos($_SERVER['REQUEST_URI'], 'admin') !== false){ - return response()->view('admin::errors.404', [], 404); - }else { - return response()->view('shop::errors.404', [], 404); - } - } else if ($exception instanceof \PDOException) { - if (strpos($_SERVER['REQUEST_URI'], 'admin') !== false){ - return response()->view('admin::errors.500', [], 500); - } else { - return response()->view('shop::errors.500', [], 500); - } + $statusCode = in_array($statusCode, [401, 403, 404]) ? $statusCode : 500; + return $this->response($path, $statusCode); + } else if ($exception instanceof ModelNotFoundException) { + return $this->response($path, 404); + } else if ($exception instanceof PDOException) { + return $this->response($path, 500); } - // else if ($exception instanceof \ErrorException) { + // else if ($exception instanceof ErrorException) { // if(strpos($_SERVER['REQUEST_URI'], 'admin') !== false){ // return response()->view('admin::errors.500', [], 500); // }else { // return response()->view('shop::errors.500', [], 500); // } + // } return parent::render($request, $exception); } + + private function isAdminUri() + { + return strpos($_SERVER['REQUEST_URI'], 'admin') !== false ? true : false; + } + + private function response($path, $statusCode) + { + return response()->view("{$path}::errors.{$statusCode}", [], $statusCode); + } + } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php index 7f1125d77..f6b4a6dcf 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php @@ -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.'); @@ -123,14 +127,14 @@ class CustomerGroupController extends Controller */ public function destroy($id) { - $group = $this->customerGroup->findOneWhere(['id'=>$id]); + $group = $this->customerGroup->findOneByField('id', $id); - if(!$group->is_user_defined) { - session()->flash('error', 'This Customer Group can not be deleted'); + if($group->is_user_defined == 0) { + session()->flash('warning', 'Cannot delete the default group'); } else { - $this->customerGroup->delete($id); + session()->flash('success', 'Customer Group deleted successfully'); - session()->flash('success', 'Customer Group deleted successfully.'); + $this->customerGroup->delete($id); } return redirect()->back(); diff --git a/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php b/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php index d0aa132f3..8ffcb9388 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php @@ -11,172 +11,16 @@ use Webkul\Ui\DataGrid\Facades\DataGrid; * DataGrid controller * * @author Nikhil Malik @ysmnikhil + * @author Prashant Singh @prashant-webkul * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) */ class DataGridController extends Controller { - - /** - * Display a listing of the resource. - * - * @return \Illuminate\Http\Response - */ - public function index() - { - DataGrid::make([ - 'name' => 'Admin Datagrid', - 'table' => 'admins as u', - 'select' => 'u.id', - 'aliased' => true , //boolean to validate aliasing on the basis of this. - 'perpage' => 2, - 'filterable' => [ - [ - 'column' => 'u.id', - 'type' => 'integer', - 'label' => 'Admin ID' - ], [ - 'column' => 'u.email', - 'type' => 'string', - 'label' => 'Admin Email', - ], [ - 'column' => 'u.name', - 'type' => 'string', - 'label' => 'Admin Name', - ] - ], - 'searchables' =>[ - [ - 'name' => 'u.id', - 'label' => 'ID', - 'label' => 'Admin ID', - ], - [ - 'name' => 'u.name', - 'label' => 'Name', - 'label' => 'Admin Name', - ] - ], - 'join' => [ - [ - 'join' => 'leftjoin', - 'table' => 'roles as r', - 'primaryKey' => 'u.role_id', - 'condition' => '=', - 'secondaryKey' => 'r.id', - ] - ], - 'columns' => [ - [ - 'name' => 'u.id', - 'type' => 'string', - 'label' => 'Admin ID', - 'sortable' => true, - 'filterable' => true - ], - [ - 'name' => 'u.email', - 'type' => 'string', - 'label' => 'Admin Email', - 'sortable' => true, - 'filterable' => true - ], - [ - 'name' => 'u.name', - 'type' => 'string', - 'label' => 'Admin Name', - 'sortable' => true, - 'filterable' => true, - // will create on run time query - // 'filter' => [ - // 'function' => 'orwhere', // orwhere - // 'condition' => ['name', 'like', 'u'] // multiarray - // ], - 'attributes' => [ - 'class' => 'class-a class-b', - 'data-attr' => 'whatever you want', - 'onclick' => "window.alert('alert from datagrid column')" - ], - 'wrapper' => function ($value, $object) { - return '' . $object->name . ''; - }, - ], - [ - 'name' => 'r.name as x', - 'type' => 'string', - 'label' => 'Admin\'s Role', - 'sortable' => true, - 'filterable' => true, - ], - [ - 'name' => 'r.id as xx', - 'type' => 'integer', - 'label' => 'Role ID', - 'sortable' => false, - 'filterable' => false - ], - ], - - 'operators' => [ - 'eq' => "=", - 'lt' => "<", - 'gt' => ">", - 'lte' => "<=", - 'gte' => ">=", - 'neqn' => "!=", - 'ceq' => "<=>", - 'like' => "like", - 'nlike' => "not like", - ], - 'mass_operations' =>[ - [ - 'route' => route('admin.datagrid.delete'), - 'method' => 'DELETE', - 'label' => 'Delete', - 'type' => 'button', - - ] - ], - // 'css' => [] - - ]); - $result = DataGrid::render(); - return $result; + public function massDelete() { + dd(request()->all()); } - //for performing mass actions - public function massAction() - { - $make = [ - 'operations' =>[ - // [ - // 'route' => 'datagrid/update', - // 'method' => 'post', - // 'label' => 'Update', - // 'type' => 'select', - // 'name' => 'status', - // 'values' => [ - // [ - // 'label' => 'Enable', - // 'value' => 1 - // ], [ - // 'label' => 'Disable', - // 'value' => 0 - // ] - // ], - // ], - [ - 'route' => route('admin.datagrid.delete'), - 'method' => 'DELETE', - 'label' => 'Delete', - 'type' => 'button' - ] - ] - ]; - $result = DataGrid::makeMassAction($make); - } - - public function massDelete(Request $r) - { - return $r; + public function massUpdate() { + dd(request()->all()); } } diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index 710ea06f1..a499d25b2 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -7,11 +7,11 @@ Route::group(['middleware' => ['web']], function () { 'view' => 'admin::users.sessions.create' ])->name('admin.session.create'); + //login post route to admin auth controller Route::post('/login', 'Webkul\User\Http\Controllers\SessionController@store')->defaults('_config', [ 'redirect' => 'admin.dashboard.index' ])->name('admin.session.store'); - // Forget Password Routes Route::get('/forget-password', 'Webkul\User\Http\Controllers\ForgetPasswordController@create')->defaults('_config', [ 'view' => 'admin::users.forget-password.create' @@ -19,7 +19,6 @@ Route::group(['middleware' => ['web']], function () { Route::post('/forget-password', 'Webkul\User\Http\Controllers\ForgetPasswordController@store')->name('admin.forget-password.store'); - // Reset Password Routes Route::get('/reset-password/{token}', 'Webkul\User\Http\Controllers\ResetPasswordController@create')->defaults('_config', [ 'view' => 'admin::users.reset-password.create' @@ -36,13 +35,11 @@ Route::group(['middleware' => ['web']], function () { 'redirect' => 'admin.session.create' ])->name('admin.session.destroy'); - // Dashboard Route Route::get('dashboard', 'Webkul\Admin\Http\Controllers\DashboardController@index')->defaults('_config', [ 'view' => 'admin::dashboard.index' ])->name('admin.dashboard.index'); - //Customers Management Routes Route::get('customers', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config', [ 'view' => 'admin::customers.index' @@ -250,6 +247,7 @@ Route::group(['middleware' => ['web']], function () { Route::get('/attributes/delete/{id}', 'Webkul\Attribute\Http\Controllers\AttributeController@destroy')->name('admin.catalog.attributes.delete'); + Route::delete('/attributes/massdelete', 'Webkul\Attribute\Http\Controllers\AttributeController@massDestroy')->name('admin.catalog.attributes.massdelete'); // Catalog Family Routes Route::get('/families', 'Webkul\Attribute\Http\Controllers\AttributeFamilyController@index')->defaults('_config', [ @@ -275,17 +273,6 @@ Route::group(['middleware' => ['web']], function () { Route::get('/families/delete/{id}', 'Webkul\Attribute\Http\Controllers\AttributeFamilyController@destroy')->name('admin.catalog.families.delete'); }); - - // Datagrid Routes - - //for datagrid and its loading, filtering, sorting and queries - Route::get('datagrid', 'Webkul\Admin\Http\Controllers\DataGridController@index')->name('admin.datagrid.index'); - - Route::any('datagrid/massaction/delete', 'Webkul\Admin\Http\Controllers\DataGridController@massDelete')->name('admin.datagrid.delete'); - - Route::any('datagrid/massaction/edit','Webkul\Admin\Http\Controllers\DataGridController@massUpdate')->name('admin.datagrid.edit'); - - // User Routes Route::get('/users', 'Webkul\User\Http\Controllers\UserController@index')->defaults('_config', [ 'view' => 'admin::users.users.index' @@ -379,6 +366,8 @@ Route::group(['middleware' => ['web']], function () { Route::get('/currencies/delete/{id}', 'Webkul\Core\Http\Controllers\CurrencyController@destroy')->name('admin.currencies.delete'); + Route::any('/currencies/massdelete', 'Webkul\Core\Http\Controllers\CurrencyController@massDestroy')->name('admin.currencies.massdelete'); + // Exchange Rates Routes Route::get('/exchange_rates', 'Webkul\Core\Http\Controllers\ExchangeRateController@index')->defaults('_config', [ @@ -476,11 +465,19 @@ Route::group(['middleware' => ['web']], function () { // Admin Store Front Settings Route Route::get('/subscribers','Webkul\Core\Http\Controllers\SubscriptionController@index')->defaults('_config',[ - 'view' => 'admin::settings.subscribers.index' - ])->name('admin.subscribers.index'); + 'view' => 'admin::customers.subscribers.index' + ])->name('admin.customers.subscribers.index'); //destroy a newsletter subscription item - Route::get('subscribers/delete/{id}', 'Webkul\Core\Http\Controllers\SubscriptionController@destroy'); + Route::get('subscribers/delete/{id}', 'Webkul\Core\Http\Controllers\SubscriptionController@destroy')->name('admin.customers.subscribers.delete'); + + Route::get('subscribers/edit/{id}', 'Webkul\Core\Http\Controllers\SubscriptionController@edit')->defaults('_config', [ + 'view' => 'admin::customers.subscribers.edit' + ])->name('admin.customers.subscribers.edit'); + + Route::put('subscribers/update/{id}', 'Webkul\Core\Http\Controllers\SubscriptionController@update')->defaults('_config', [ + 'redirect' => 'admin.customers.subscribers.index' + ])->name('admin.customers.subscribers.update'); //slider index Route::get('/slider','Webkul\Shop\Http\Controllers\SliderController@index')->defaults('_config',[ @@ -508,7 +505,7 @@ Route::group(['middleware' => ['web']], function () { ])->name('admin.sliders.update'); //destroy a slider item - Route::get('slider/delete/{id}', 'Webkul\Shop\Http\Controllers\SliderController@destroy'); + Route::get('slider/delete/{id}', 'Webkul\Shop\Http\Controllers\SliderController@destroy')->name('admin.sliders.delete'); //tax routes Route::get('/tax-categories', 'Webkul\Tax\Http\Controllers\TaxController@index')->defaults('_config', [ diff --git a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php index 0e2283949..250775776 100644 --- a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php @@ -96,6 +96,12 @@ class EventServiceProvider extends ServiceProvider 'route' => 'admin.customer.review.index', 'sort' => 3, 'icon-class' => '', + ], [ + 'key' => 'customers.subscribers', + 'name' => 'Newsletter Subscription', + 'route' => 'admin.customers.subscribers.index', + 'sort' => 4, + 'icon-class' => '', ], [ 'key' => 'configuration', 'name' => 'Configure', @@ -200,13 +206,7 @@ class EventServiceProvider extends ServiceProvider 'route' => 'admin.tax-rates.index', 'sort' => 2, 'icon-class' => '', - ], [ - 'key' => 'settings.subscribers', - 'name' => 'Newsletter Subscription', - 'route' => 'admin.subscribers.index', - 'sort' => 9, - 'icon-class' => '', - ], + ] ]; /** diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 5eeb27264..3ea85928f 100644 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -2,9 +2,11 @@ return [ 'common' => [ - 'no-result-found' => 'We couldn\'t find any records.', + 'no-result-found' => 'We could not find any records.', 'country' => 'Country', - 'state' => 'State' + 'state' => 'State', + 'true' => 'True', + 'false' => 'False' ], 'dashboard' => [ 'title' => 'Dashboard', @@ -27,6 +29,15 @@ return [ 'stock-threshold' => 'Stock Threshold', 'qty-left' => ':qty Left', ], + + 'datagrid' => [ + 'mass-ops' => [ + 'method-error' => 'Error! Wrong method detected, please check mass action configuration', + 'delete-success' => 'Selected index of :resource were successfully deleted', + 'partial-action' => 'Some actions were not performed due restricted system constraints on :resource' + ] + ], + 'account' => [ 'title' => 'My Account', 'save-btn-title' => 'Save', @@ -498,10 +509,6 @@ return [ 'update-error' => 'Error! Tax Rate Cannot Be Updated', 'delete' => 'Tax Rate Deleted Successfully', 'atleast-one' => 'Cannot Delete Last Tax Rate' - ], - - 'subscribers' => [ - 'title' => 'News Letter Subscribers' ] ], @@ -540,6 +547,15 @@ return [ 'rating' => 'Rating', 'status' => 'Status', 'comment' => 'Comment' + ], + 'subscribers' => [ + 'title' => 'News Letter Subscribers', + 'title-edit' => 'Edit News Letter Subscriber', + 'email' => 'Email', + 'is_subscribed' => 'Subscribed', + 'edit-btn-title' => 'Update Subscriber', + 'update-success' => 'You updated subscriber', + 'update-failed' => 'Error! You cannot unsubscribed the subscriber' ] ], diff --git a/packages/Webkul/Admin/src/Resources/views/customers/review/index.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/review/index.blade.php index 487788ef2..b05f5f819 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/review/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/review/index.blade.php @@ -19,7 +19,7 @@
- @inject('review','Webkul\Admin\DataGrids\ProductReviewDataGrid') + @inject('review','Webkul\Admin\DataGrids\CustomerReviewDataGrid') {!! $review->render() !!}
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/subscribers/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/subscribers/edit.blade.php new file mode 100644 index 000000000..5769a35a2 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/customers/subscribers/edit.blade.php @@ -0,0 +1,43 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.customers.subscribers.title-edit') }} +@stop + +@section('content') + +
+
+
+
+

{{ __('admin::app.customers.subscribers.title-edit') }}

+
+ +
+ +
+
+ @csrf + @method('PUT') + +
+ + + @{{ errors.first('email') }} +
+ +
+ + + + + @{{ errors.first('is_subscribed') }} +
+
+
+@endsection \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/settings/subscribers/index.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/subscribers/index.blade.php similarity index 73% rename from packages/Webkul/Admin/src/Resources/views/settings/subscribers/index.blade.php rename to packages/Webkul/Admin/src/Resources/views/customers/subscribers/index.blade.php index 148538b95..a8863220f 100644 --- a/packages/Webkul/Admin/src/Resources/views/settings/subscribers/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/subscribers/index.blade.php @@ -1,7 +1,7 @@ @extends('admin::layouts.content') @section('page_title') - {{ __('admin::app.settings.subscribers.title') }} + {{ __('admin::app.customers.subscribers.title') }} @stop @section('content') @@ -10,12 +10,12 @@
-

{{ __('admin::app.settings.subscribers.title') }}

+

{{ __('admin::app.customers.subscribers.title') }}

{{--
- {{ __('admin::app.settings.subscribers.add-title') }} + {{ __('admin::app.customers.subscribers.add-title') }}
--}}
diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php index 0572aecbb..8adc8b98b 100644 --- a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php @@ -42,6 +42,8 @@ window.flashMessages = [{'type': 'alert-warning', 'message': "{{ $warning }}" }]; @elseif($error = session('error')) window.flashMessages = [{'type': 'alert-error', 'message': "{{ $error }}" }]; + @elseif($info = session('info')) + window.flashMessages = [{'type': 'alert-error', 'message': "{{ $info }}" }]; @endif window.serverErrors = []; diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php index 038e4812b..ddd7fed5a 100644 --- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php @@ -5,7 +5,7 @@ @stop @section('content') -
+

{{ __('admin::app.sales.invoices.title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/index.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/index.blade.php index 696d9c3c7..9fbbfe25a 100644 --- a/packages/Webkul/Admin/src/Resources/views/sales/orders/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/index.blade.php @@ -5,7 +5,7 @@ @stop @section('content') -
+

{{ __('admin::app.sales.orders.title') }}

diff --git a/packages/Webkul/Admin/src/Resources/views/sales/shipments/index.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/shipments/index.blade.php index 64e99c112..ccfb9aad7 100644 --- a/packages/Webkul/Admin/src/Resources/views/sales/shipments/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/shipments/index.blade.php @@ -5,7 +5,7 @@ @stop @section('content') -
+

{{ __('admin::app.sales.shipments.title') }}

diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php index d44c3c933..fbd0a5a48 100644 --- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php +++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php @@ -128,7 +128,7 @@ class AttributeController extends Controller public function destroy($id) { $attribute = $this->attribute->findOrFail($id); - + if(!$attribute->is_user_defined) { session()->flash('error', 'Can not delete system attribute.'); } else { @@ -143,4 +143,38 @@ class AttributeController extends Controller return redirect()->back(); } + + /** + * Remove the specified resources from database + * + * @return response \Illuminate\Http\Response + */ + public function massDestroy() { + $suppressFlash = false; + + if(request()->isMethod('delete')) { + $indexes = explode(',', request()->input('indexes')); + + foreach($indexes as $key => $value) { + try { + $this->attribute->delete($value); + } catch(\Exception $e) { + $suppressFlash = true; + + continue; + } + } + + if(!$suppressFlash) + session()->flash('success', trans('admin::app.datagrid.mass-ops.delete-success')); + else + session()->flash('info', trans('admin::app.datagrid.mass-ops.partial-action', ['resource' => 'attributes'])); + + return redirect()->back(); + } else { + session()->flash('error', trans('admin::app.datagrid.mass-ops.method-error')); + + return redirect()->back(); + } + } } \ No newline at end of file diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php index 8effe7125..d3a3f448a 100644 --- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php +++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php @@ -149,4 +149,38 @@ class AttributeFamilyController extends Controller return redirect()->back(); } + + /** + * Remove the specified resources from database + * + * @return response \Illuminate\Http\Response + */ + public function massDestroy() { + $suppressFlash = false; + + if(request()->isMethod('delete')) { + $indexes = explode(',', request()->input('indexes')); + + foreach($indexes as $key => $value) { + try { + $this->attributeFamily->delete($value); + } catch(\Exception $e) { + $suppressFlash = true; + + continue; + } + } + + if(!$suppressFlash) + session()->flash('success', trans('admin::app.datagrid.mass-ops.delete-success')); + else + session()->flash('info', trans('admin::app.datagrid.mass-ops.partial-action', ['resource' => 'Attribute Family'])); + + return redirect()->back(); + } else { + session()->flash('error', trans('admin::app.datagrid.mass-ops.method-error')); + + return redirect()->back(); + } + } } \ No newline at end of file diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php index 351be4f2b..27186ab17 100644 --- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php +++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php @@ -139,4 +139,38 @@ class CategoryController extends Controller return redirect()->back(); } + + /** + * Remove the specified resources from database + * + * @return response \Illuminate\Http\Response + */ + public function massDestroy() { + $suppressFlash = false; + + if(request()->isMethod('delete')) { + $indexes = explode(',', request()->input('indexes')); + + foreach($indexes as $key => $value) { + try { + $this->category->delete($value); + } catch(\Exception $e) { + $suppressFlash = true; + + continue; + } + } + + if(!$suppressFlash) + session()->flash('success', trans('admin::app.datagrid.mass-ops.delete-success')); + else + session()->flash('info', trans('admin::app.datagrid.mass-ops.partial-action', ['resource' => 'Attribute Family'])); + + return redirect()->back(); + } else { + session()->flash('error', trans('admin::app.datagrid.mass-ops.method-error')); + + return redirect()->back(); + } + } } \ No newline at end of file diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index 87645d105..aeca264d3 100644 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -409,12 +409,18 @@ class Cart { public function mergeCart() { if(session()->has('cart')) { - $cart = $this->cart->findOneByField('customer_id', auth()->guard('customer')->user()->id); + $cart = $this->cart->findWhere(['customer_id' => auth()->guard('customer')->user()->id, 'is_active' => 1]); + + if($cart->count()) { + $cart = $cart->first(); + } else { + $cart = false; + } $guestCart = session()->get('cart'); //when the logged in customer is not having any of the cart instance previously and are active. - if(!isset($cart)) { + if(!$cart) { $guestCart->update([ 'customer_id' => auth()->guard('customer')->user()->id, 'is_guest' => 0, diff --git a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php index a8c64f87b..65e0c3639 100644 --- a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php +++ b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php @@ -125,14 +125,47 @@ class CurrencyController extends Controller */ public function destroy($id) { - if($this->currency->count() == 1) { - session()->flash('error', 'At least one currency is required.'); - } else { - $this->currency->delete($id); + $result = $this->currency->delete($id); + if($result) session()->flash('success', 'Currency deleted successfully.'); - } + else + session()->flash('error', 'At least one currency is required.'); return redirect()->back(); } + + /** + * Remove the specified resources from database + * + * @return response \Illuminate\Http\Response + */ + public function massDestroy() { + $suppressFlash = false; + + if(request()->isMethod('delete')) { + $indexes = explode(',', request()->input('indexes')); + + foreach($indexes as $key => $value) { + try { + $this->currency->delete($value); + } catch(\Exception $e) { + $suppressFlash = true; + + continue; + } + } + + if(!$suppressFlash) + session()->flash('success', trans('admin::app.datagrid.mass-ops.delete-success', ['resource' => 'currencies'])); + else + session()->flash('info', trans('admin::app.datagrid.mass-ops.partial-action', ['resource' => 'currencies'])); + + return redirect()->back(); + } else { + session()->flash('error', trans('admin::app.datagrid.mass-ops.method-error')); + + return redirect()->back(); + } + } } \ No newline at end of file diff --git a/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php b/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php index db29ae70b..83bd98944 100644 --- a/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php +++ b/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php @@ -46,6 +46,41 @@ class SubscriptionController extends Controller return view($this->_config['view']); } + /** + * To unsubscribe the user without deleting the resource of the subscribed user + * + * @param integer $id + * + * @return mixed + */ + public function edit($id) { + $subscriber = $this->subscribers->findOneByField('id', $id); + + return view($this->_config['view'])->with('subscriber', $subscriber); + } + + /** + * To unsubscribe the user without deleting the resource of the subscribed user + * + * @param integer $id + * + * @return mixed + */ + public function update($id) { + $data = request()->all(); + + $subscriber = $this->subscribers->findOneByField('id', $id); + + $result = $subscriber->update($data); + + if($result) + session()->flash('success', trans('admin::app.settings.subscribers.update-success')); + else + session()->flash('error', trans('admin::app.settings.subscribers.update-failed')); + + return redirect()->route($this->_config['redirect']); + } + /** * Remove the specified resource from storage. * diff --git a/packages/Webkul/Core/src/Repositories/CurrencyRepository.php b/packages/Webkul/Core/src/Repositories/CurrencyRepository.php index a60a694bf..58ef2a171 100644 --- a/packages/Webkul/Core/src/Repositories/CurrencyRepository.php +++ b/packages/Webkul/Core/src/Repositories/CurrencyRepository.php @@ -1,7 +1,7 @@ -model->count() == 1) { + return false; + } else { + if($this->model->destroy($id)) { + return true; + } else { + return false; + } + + } + } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php index f8253d239..757bc1e6b 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php @@ -29,14 +29,16 @@ @php $image = $productImageHelper->getProductBaseImage($item->product); @endphp - - + {{-- + + --}}
- - {{$item->product->name}} - + {{$item->product->name}} + {{-- + + --}}
@inject ('reviewHelper', 'Webkul\Product\Helpers\Review') diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php index 98655561d..8bb061042 100644 --- a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php +++ b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php @@ -144,21 +144,22 @@ class TaxCategoryController extends Controller ]); $data = request()->input(); + + $taxCategory = $this->taxCategory->update($data, $id); - if($taxCategory = $this->taxCategory->update($data, $id)) { - $taxRates = $data['taxrates']; - - //attach the categories in the tax map table - $this->taxCategory->attachOrDetach($taxCategory, $taxRates); - - session()->flash('success', trans('admin::app.settings.tax-categories.update-success')); - - return redirect()->route($this->_config['redirect']); - } else { + if(!$taxCategory) { session()->flash('error', trans('admin::app.settings.tax-categories.update-error')); - return redirect()->back(); } + + $taxRates = $data['taxrates']; + + //attach the categories in the tax map table + $this->taxCategory->attachOrDetach($taxCategory, $taxRates); + + session()->flash('success', trans('admin::app.settings.tax-categories.update-success')); + + return redirect()->route($this->_config['redirect']); } /** @@ -179,4 +180,4 @@ class TaxCategoryController extends Controller return redirect()->back(); } -} \ No newline at end of file +} diff --git a/packages/Webkul/Ui/publishable/assets/css/ui.css b/packages/Webkul/Ui/publishable/assets/css/ui.css index 69cceda22..24f3aba08 100644 --- a/packages/Webkul/Ui/publishable/assets/css/ui.css +++ b/packages/Webkul/Ui/publishable/assets/css/ui.css @@ -1 +1 @@ -.active.configuration-icon,.catalog-icon,.configuration-icon,.customer-icon,.dashboard-icon,.sales-icon,.settings-icon{width:48px;height:48px;display:inline-block;background-size:cover}.icon{display:inline-block;background-size:cover}.dashboard-icon{background-image:url("../images/Icon-Dashboard.svg")}.sales-icon{background-image:url("../images/Icon-Sales.svg")}.catalog-icon{background-image:url("../images/Icon-Catalog.svg")}.customer-icon{background-image:url("../images/Icon-Customers.svg")}.configuration-icon{background-image:url("../images/Icon-Configure.svg")}.settings-icon{background-image:url("../images/Icon-Settings.svg")}.angle-right-icon{background-image:url("../images/Angle-Right.svg");width:17px;height:17px}.angle-left-icon{background-image:url("../images/Angle-Left.svg");width:17px;height:17px}.arrow-down-icon{background-image:url("../images/Arrow-Down-Light.svg");width:14px;height:8px}.arrow-right-icon{background-image:url("../images/Arrow-Right.svg");width:18px;height:18px}.white-cross-sm-icon{background-image:url("../images/Icon-Sm-Cross-White.svg");width:18px;height:18px}.accordian-up-icon{background-image:url("../images/Accordion-Arrow-Up.svg");width:24px;height:24px}.accordian-down-icon{background-image:url("../images/Accordion-Arrow-Down.svg");width:24px;height:24px}.cross-icon{background-image:url("../images/Icon-Crossed.svg");width:18px;height:18px}.trash-icon{background-image:url("../images/Icon-Trash.svg");width:24px;height:24px}.remove-icon{background-image:url("../images/Icon-remove.svg");width:24px;height:24px}.pencil-lg-icon{background-image:url("../images/Icon-Pencil-Large.svg");width:24px;height:24px}.search-icon{background-image:url("../images/icon-search.svg");width:24px;height:24px}.sortable-icon{background-image:url("../images/Icon-Sortable.svg");width:24px;height:24px}.sort-down-icon,.sort-up-icon{background-image:url("../images/Icon-Sort-Down.svg");width:18px;height:18px}.sort-up-icon{-webkit-transform:rotate(180deg);transform:rotate(180deg)}.primary-back-icon{background-image:url("../images/Icon-Back-Primary.svg");width:24px;height:24px}.checkbox-dash-icon{background-image:url("../images/Checkbox-Dash.svg");width:24px;height:24px}.account-icon{background-image:url("../images/icon-account.svg");width:24px;height:24px}.expand-icon{background-image:url("../images/Expand-Light.svg");width:18px;height:18px}.expand-on-icon{background-image:url("../images/Expand-Light-On.svg");width:18px;height:18px}.dark-left-icon{background-image:url("../images/arrow-left-dark.svg");width:18px;height:18px}.light-right-icon{background-image:url("../images/arrow-right-light.svg");width:18px;height:18px}.folder-icon{background-image:url("../images/Folder-Icon.svg");width:24px;height:24px}.star-icon{background-image:url("../images/Star-Icon.svg");width:24px;height:24px}.arrow-down-white-icon{background-image:url("../images/down-arrow-white.svg");width:17px;height:13px}.arrow-up-white-icon{background-image:url("../images/up-arrow-white.svg");width:17px;height:13px}.profile-pic-icon{background-image:url("../images/Profile-Pic.svg");width:60px;height:60px}.graph-up-icon{background-image:url("../images/Icon-Graph-Green.svg");width:24px;height:24px}.graph-down-icon{background-image:url("../images/Icon-Graph-Red.svg");width:24px;height:24px}.no-result-icon{background-image:url("../images/limited-icon.svg");width:52px;height:47px}.active .dashboard-icon{background-image:url("../images/Icon-Dashboard-Active.svg")}.active .sales-icon{background-image:url("../images/Icon-Sales-Active.svg")}.active .catalog-icon{background-image:url("../images/Icon-Catalog-Active.svg")}.active .customer-icon{background-image:url("../images/Icon-Customers-Active.svg")}.active .settings-icon{background-image:url("../images/Icon-Settings-Active.svg")}.active .configuration-icon{background-image:url("../images/Icon-Configure-Active.svg")}.active>.arrow-down-icon{background-image:url("../images/Arrow-Down.svg");width:14px;height:8px}.active>.expand-icon{background-image:url("../images/Expand-Light-On.svg")}.active.dashboard-icon{background-image:url("../images/Icon-Dashboard-Active.svg")}.active.customer-icon{background-image:url("../images/Icon-Customers-Active.svg")}.active.sales-icon{background-image:url("../images/Icon-Sales-Active.svg")}.active.settings-icon{background-image:url("../images/Icon-Settings-Active.svg")}.active.configuration-icon{background-image:url("../images/Icon-Configure-Active.svg")}.active.arrow-down-icon{background-image:url("../images/Arrow-Down.svg");width:14px;height:8px}.active.expand-icon{background-image:url("../images/Expand-Light-On.svg")}.icon-404{background-image:url("../images/404-image.svg");width:255px;height:255px}.grid-container{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.grid-container .filter-wrapper{display:block;-webkit-box-sizing:border-box;box-sizing:border-box}.grid-container .filter-wrapper .filter-row-one,.grid-container .filter-wrapper .filter-row-two{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.grid-container .filter-wrapper .filter-row-one{height:40px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.grid-container .filter-wrapper .filter-row-one .search-filter .control{font-family:montserrat,sans-serif;padding-left:10px;width:380px;height:36px;border:2px solid #c7c7c7;border-radius:3px;border-right:0;border-top-right-radius:0;border-bottom-right-radius:0;font-size:14px}.grid-container .filter-wrapper .filter-row-one .search-filter .ic-wrapper{display:block;height:36px;width:36px;border:2px solid #c7c7c7;border-left:none;border-radius:2px}.grid-container .filter-wrapper .filter-row-one .search-filter .ic-wrapper .search-icon{margin-left:4px;margin-top:4px;height:24px;width:24px}.grid-container .filter-wrapper .filter-row-one .dropdown-filters{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex}.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters{margin-right:5px}.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-toggle{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;font-family:montserrat,sans-serif;padding-left:5px;height:36px;width:150px;border:2px solid #c7c7c7;border-radius:2px;background-color:#fff;color:#8e8e8e;font-size:14px}.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-toggle,.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-toggle .dropdown-header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-toggle .dropdown-header{width:100%;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-toggle .dropdown-header .arrow-down-icon{margin-right:5px}.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul li.filter-column-dropdown .filter-column-select{width:100%;background:#fff;border:2px solid #c7c7c7;border-radius:3px;height:36px;display:inline-block;vertical-align:middle;-webkit-transition:.2s cubic-bezier(.4,0,.2,1);transition:.2s cubic-bezier(.4,0,.2,1);padding:0 5px;font-family:montserrat,sans-serif;margin-top:10px;margin-bottom:5px}.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul li input,.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul li select{background:#fff;border:2px solid #c7c7c7;border-radius:3px;height:36px;max-width:100%;display:inline-block;vertical-align:middle;-webkit-transition:.2s cubic-bezier(.4,0,.2,1);transition:.2s cubic-bezier(.4,0,.2,1);padding:0 5px;font-family:montserrat,sans-serif;margin-top:10px;margin-bottom:5px}.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul .filter-condition-dropdown-datetime,.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul .filter-condition-dropdown-number,.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul .filter-condition-dropdown-string,.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul .filter-response-boolean,.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul .filter-response-datetime,.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul .filter-response-number,.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul .filter-response-string{display:none}.grid-container .filter-wrapper .filter-row-two{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-top:6px;margin-bottom:6px}.grid-container .filter-wrapper .filter-row-two .filter-one{margin-right:10px}.grid-container .filter-wrapper .filter-row-two .filter-one .filter-name{margin-right:5px}.grid-container .filter-wrapper .filter-row-two .filter-one .filter-value{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;background:#e7e7e7;padding-left:5px;color:#000311;vertical-align:middle}.grid-container .filter-wrapper .filter-row-two .filter-one .filter-value .f-value{margin:auto}.grid-container .filter-wrapper .filter-row-two .filter-one .filter-value .cross-icon{margin:5px;height:18px!important;width:18px!important;cursor:pointer}.grid-container .table thead .mass-action-wrapper{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.grid-container .table thead .mass-action-wrapper .massaction-remove{margin-top:10px;margin-right:10px}.grid-container .table thead .mass-action-wrapper form{margin-top:8px}.grid-container .table thead .mass-action-wrapper .selected-items{margin-right:15px}.grid-container .table thead tr th.grid_head .sort-down-icon,.grid-container .table thead tr th.grid_head .sort-up-icon{margin-left:5px;margin-top:-3px;vertical-align:middle}.grid-container .table thead tr th.grid_head.sortable{cursor:pointer}.grid-container .table thead tr th{text-transform:capitalize}.grid-container .table tbody td.action a:first-child{margin-right:10px}.grid-container .table .pagination{margin-top:20px}@-webkit-keyframes jelly{0%{-webkit-transform:translateY(0) scale(.7);transform:translateY(0) scale(.7);opacity:0}70%{-webkit-transform:translateY(5px) scale(1.05);transform:translateY(5px) scale(1.05);opacity:1}to{-webkit-transform:translateY(0) scale(1);transform:translateY(0) scale(1);opacity:1}}@keyframes jelly{0%{-webkit-transform:translateY(0) scale(.7);transform:translateY(0) scale(.7);opacity:0}70%{-webkit-transform:translateY(5px) scale(1.05);transform:translateY(5px) scale(1.05);opacity:1}to{-webkit-transform:translateY(0) scale(1);transform:translateY(0) scale(1);opacity:1}}@-webkit-keyframes jelly-out{0%{-webkit-transform:translateY(0) scale(1);transform:translateY(0) scale(1);opacity:1}30%{-webkit-transform:translateY(-5px) scale(1.05);transform:translateY(-5px) scale(1.05);opacity:1}to{-webkit-transform:translateY(0) scale(.7);transform:translateY(0) scale(.7);opacity:0}}@keyframes jelly-out{0%{-webkit-transform:translateY(0) scale(1);transform:translateY(0) scale(1);opacity:1}30%{-webkit-transform:translateY(-5px) scale(1.05);transform:translateY(-5px) scale(1.05);opacity:1}to{-webkit-transform:translateY(0) scale(.7);transform:translateY(0) scale(.7);opacity:0}}*{-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}:focus{outline:none}a:active,a:focus,a:hover,a:link,a:visited{text-decoration:none;color:#0041ff}ul{margin:0;padding:0;list-style:none}h1{font-size:28px;margin-top:0}h1,h2{color:#3a3a3a}h2{font-size:18px}.tooltip{position:relative;border-bottom:1px solid #000}.tooltip .tooltiptext{visibility:hidden;width:120px;background-color:#000;color:#fff;text-align:center;border-radius:6px;padding:5px 0;position:absolute;z-index:1}.tooltip:hover .tooltiptext{visibility:visible}.hide{display:none!important}.btn{-webkit-box-shadow:0 1px 4px 0 rgba(0,0,0,.2),0 0 8px 0 rgba(0,0,0,.1);box-shadow:0 1px 4px 0 rgba(0,0,0,.2),0 0 8px 0 rgba(0,0,0,.1);border-radius:3px;border:none;color:#fff;cursor:pointer;-webkit-transition:.2s cubic-bezier(.4,0,.2,1);transition:.2s cubic-bezier(.4,0,.2,1);font:inherit;display:inline-block}.btn:active,.btn:focus,.btn:hover{opacity:.75;border:none}.btn.btn-sm{padding:6px 12px}.btn.btn-md{padding:8px 16px}.btn.btn-lg{padding:10px 20px}.btn.btn-xl{padding:12px 24px;font-size:16px}.btn.btn-primary{background:#0041ff;color:#fff}.btn:disabled,.btn[disabled=disabled],.btn[disabled=disabled]:active,.btn[disabled=disabled]:hover{cursor:not-allowed;background:#b1b1ae;-webkit-box-shadow:none;box-shadow:none;opacity:1}.dropdown-open{position:relative}.dropdown-list{width:200px;margin-bottom:20px;-webkit-box-shadow:0 2px 4px 0 rgba(0,0,0,.16),0 0 9px 0 rgba(0,0,0,.16);box-shadow:0 2px 4px 0 rgba(0,0,0,.16),0 0 9px 0 rgba(0,0,0,.16);border-radius:3px;background-color:#fff;position:absolute;display:none;z-index:10;text-align:left}.dropdown-list.bottom-left{top:42px;left:0}.dropdown-list.bottom-right{top:42px;right:0}.dropdown-list.top-left{bottom:42px;left:0}.dropdown-list.top-right{bottom:42px;right:0}.dropdown-list .search-box{padding:20px;border-bottom:1px solid hsla(0,0%,64%,.2)}.dropdown-list .search-box .control{background:#fff;border:2px solid #c7c7c7;border-radius:3px;width:100%;height:36px;display:inline-block;vertical-align:middle;-webkit-transition:.2s cubic-bezier(.4,0,.2,1);transition:.2s cubic-bezier(.4,0,.2,1);padding:0 10px;font-size:15px}.dropdown-list .search-box .control:focus{border-color:#0041ff}.dropdown-list .dropdown-container{padding:20px;overflow-y:auto;max-height:280px}.dropdown-list .dropdown-container label{font-size:15px;display:inline-block;text-transform:uppercase;color:#9e9e9e;font-weight:700;padding-bottom:5px}.dropdown-list .dropdown-container ul{margin:0;list-style-type:none;padding:0}.dropdown-list .dropdown-container ul li{padding:5px 0}.dropdown-list .dropdown-container ul li a:active,.dropdown-list .dropdown-container ul li a:focus,.dropdown-list .dropdown-container ul li a:link,.dropdown-list .dropdown-container ul li a:visited{color:#333;display:block}.dropdown-list .dropdown-container ul li a:hover{color:#0041ff}.dropdown-list .dropdown-container ul li .checkbox{margin:0}.dropdown-list .dropdown-container ul li .control-group label{color:#3a3a3a;font-size:15px;font-weight:500;text-transform:capitalize;width:100%}.dropdown-list .dropdown-container .btn{width:100%;margin-top:10px}.table{width:100%;overflow-x:auto}.table table{width:100%;border-collapse:collapse;text-align:left}.table table thead th{font-weight:700;padding:12px 10px;background:#f8f9fa;color:#3a3a3a}.table table tbody td{padding:10px;border-bottom:1px solid #d3d3d3;color:#3a3a3a;vertical-align:middle}.table table tbody td.actions{text-align:right}.table table tbody td.actions .icon{cursor:pointer;vertical-align:middle}.table table tbody td.empty{text-align:center}.table table tbody tr:last-child td{border-bottom:none}.table .control-group{width:100%;margin-bottom:0}.table .control-group .control{width:100%;margin:0}.dropdown-btn{min-width:150px;text-align:left;background:#fff;border:2px solid #c7c7c7;border-radius:3px;font-size:14px;padding:8px 35px 8px 10px;cursor:pointer;position:relative}.dropdown-btn:active,.dropdown-btn:focus,.dropdown-btn:hover{opacity:.75;border:2px solid #c7c7c7}.dropdown-btn .icon{position:absolute;right:10px;top:50%;margin-top:-4px}.pagination .page-item{background:#fff;border:2px solid #c7c7c7;border-radius:3px;padding:7px 14px;margin-right:5px;font-size:16px;display:inline-block;color:#8e8e8e;vertical-align:middle;text-decoration:none}.pagination .page-item.next,.pagination .page-item.previous{padding:6px 9px}.pagination .page-item.active{background:#0041ff;color:#fff;border-color:#0041ff}.pagination .page-item .icon{vertical-align:middle;margin-bottom:3px}.checkbox{position:relative;display:block;vertical-align:middle;margin:10px 5px 5px 0}.checkbox input{left:0;opacity:0;position:absolute;top:0;z-index:100}.checkbox .checkbox-view{background-image:url("../images/Checkbox.svg");height:24px;width:24px;margin:0;display:inline-block!important;vertical-align:middle;margin-right:5px}.checkbox input:checked+.checkbox-view{background-image:url("../images/Checkbox-Checked.svg")}.checkbox input:disabled+.checkbox-view{opacity:.5;cursor:not-allowed}.radio{position:relative;display:block;margin:10px 5px 5px 0}.radio input{left:0;opacity:0;position:absolute;top:0;z-index:100}.radio .radio-view{background-image:url("../images/controls.svg");background-position:-21px 0;height:20px;width:20px;margin:0;display:inline-block!important;vertical-align:middle;margin-right:5px}.radio input:checked+.radio-view{background-position:-21px -21px}.radio input:disabled+.radio-view{opacity:.5;cursor:not-allowed}.control-group{display:block;margin-bottom:25px;font-size:15px;color:#333;width:750px;max-width:100%;position:relative}.control-group label{display:block;color:#3a3a3a}.control-group label.required:after{content:"*";color:#fc6868;font-weight:700;display:inline-block}.control-group textarea.control{height:100px;padding:10px}.control-group .control{background:#fff;border:2px solid #c7c7c7;border-radius:3px;width:70%;height:36px;display:inline-block;vertical-align:middle;-webkit-transition:.2s cubic-bezier(.4,0,.2,1);transition:.2s cubic-bezier(.4,0,.2,1);padding:0 10px;font-size:15px;margin-top:10px;margin-bottom:5px}.control-group .control:focus{border-color:#0041ff}.control-group .control[disabled=disabled]{border-color:#d3d3d3;background-color:#d3d3d3;cursor:not-allowed}.control-group .control[multiple]{height:100px}.control-group.date:after,.control-group.datetime:after{background-image:url("../images/Icon-Calendar.svg");width:24px;height:24px;content:"";display:inline-block;vertical-align:middle;margin-left:-34px;margin-top:2px}.control-group .control-info{display:block;font-style:italic;color:#6f6f6f}.control-group .control-error{display:none;color:#ff5656;margin-top:5px}.control-group.has-error .control{border-color:#fc6868}.control-group.has-error .control-error{display:block}.control-group.price .currency-code{vertical-align:middle;display:inline-block}.button-group{margin-top:20px;margin-bottom:20px}.alert-wrapper{width:300px;top:10px;right:10px;position:fixed;z-index:6;text-align:left}.alert-wrapper .alert{width:300px;padding:15px;border-radius:3px;display:inline-block;-webkit-box-shadow:0 4px 15.36px .64px rgba(0,0,0,.1),0 2px 6px 0 rgba(0,0,0,.12);box-shadow:0 4px 15.36px .64px rgba(0,0,0,.1),0 2px 6px 0 rgba(0,0,0,.12);position:relative;-webkit-animation:jelly .5s ease-in-out;animation:jelly .5s ease-in-out;-webkit-transform-origin:center top;transform-origin:center top;z-index:500;margin-bottom:10px}.alert-wrapper .alert.alert-error{background:#fc6868}.alert-wrapper .alert.alert-info{background:#204d74}.alert-wrapper .alert.alert-success{background:#4caf50}.alert-wrapper .alert.alert-warning{background:#ffc107}.alert-wrapper .alert .icon{position:absolute;right:10px;top:10px;cursor:pointer}.alert-wrapper .alert p{color:#fff;margin:0;padding:0;font-size:15px}.tabs ul{border-bottom:1px solid hsla(0,0%,64%,.2)}.tabs ul li{display:inline-block}.tabs ul li a{padding:15px 20px;cursor:pointer;margin:0 2px;text-align:center;color:#000311;display:block}.tabs ul li.active a{border-bottom:3px solid #0041ff}.accordian,accordian{display:inline-block;width:100%}.accordian .accordian-header,.accordian div[slot*=header],accordian .accordian-header,accordian div[slot*=header]{width:100%;display:inline-block;font-size:18px;color:#3a3a3a;border-bottom:1px solid hsla(0,0%,64%,.2);padding:20px 15px;cursor:pointer}.accordian .accordian-header .expand-icon,.accordian div[slot*=header] .expand-icon,accordian .accordian-header .expand-icon,accordian div[slot*=header] .expand-icon{background-image:url("../images/Expand-Light.svg");margin-right:10px;margin-top:3px}.accordian .accordian-header h1,.accordian div[slot*=header] h1,accordian .accordian-header h1,accordian div[slot*=header] h1{margin:0;font-size:20px;display:inline-block}.accordian .accordian-header .icon,.accordian div[slot*=header] .icon,accordian .accordian-header .icon,accordian div[slot*=header] .icon{float:right}.accordian .accordian-header .icon.left,.accordian div[slot*=header] .icon.left,accordian .accordian-header .icon.left,accordian div[slot*=header] .icon.left{float:left}.accordian .accordian-content,.accordian div[slot*=body],accordian .accordian-content,accordian div[slot*=body]{width:100%;padding:20px 15px;display:none;-webkit-transition:all .3s ease;transition:all .3s ease}.accordian.active>.accordian-content,accordian.active>.accordian-content{display:inline-block}.accordian.active>.accordian-header .expand-icon,accordian.active>.accordian-header .expand-icon{background-image:url("../images/Expand-Light-On.svg")}.tree-container .tree-item{padding-left:30px;display:inline-block;margin-top:10px;width:100%}.tree-container .tree-item>.tree-item{display:none}.tree-container .tree-item.active>.tree-item{display:inline-block}.tree-container .tree-item .checkbox,.tree-container .tree-item .radio{margin:0;display:inline-block}.tree-container .tree-item .expand-icon{display:inline-block;margin-right:10px;cursor:pointer;background-image:url("../images/Expand-Light.svg");width:18px;height:18px;vertical-align:middle}.tree-container .tree-item .folder-icon{vertical-align:middle;margin-right:10px}.tree-container .tree-item.active>.expand-icon{background-image:url("../images/Expand-Light-On.svg")}.tree-container>.tree-item{padding-left:0}.panel{-webkit-box-shadow:0 2px 25px 0 rgba(0,0,0,.15);box-shadow:0 2px 25px 0 rgba(0,0,0,.15);border-radius:5px;background:#fff}.panel .panel-content{padding:20px}.modal-open{overflow:hidden}.modal-overlay{display:none;overflow-y:auto;z-index:10;top:0;right:0;bottom:0;left:0;position:fixed;background:#000;opacity:.75}.modal-open .modal-overlay{display:block}.modal-container{-webkit-animation:fade-in-white .3s ease-in-out;animation:fade-in-white .3s ease-in-out;z-index:11;margin-left:-350px;width:600px;max-width:80%;background:#fff;position:fixed;left:50%;top:100px;margin-bottom:100px;-webkit-box-shadow:0 15px 25px 0 rgba(0,0,0,.03),0 20px 45px 5px rgba(0,0,0,.2);box-shadow:0 15px 25px 0 rgba(0,0,0,.03),0 20px 45px 5px rgba(0,0,0,.2);-webkit-animation:jelly .5s ease-in-out;animation:jelly .5s ease-in-out;border-radius:5px}.modal-container .modal-header{padding:20px}.modal-container .modal-header h3{display:inline-block;font-size:20px;color:#3a3a3a;margin:0}.modal-container .modal-header .icon{float:right;cursor:pointer}.modal-container .modal-body{padding:20px}.modal-container .modal-body .control-group .control{width:100%}.label{background:#e7e7e7;border-radius:2px;padding:8px;color:#000311;display:inline-block}.label.label-sm{padding:5px}.label.label-md{padding:8px}.label.label-lg{padding:11px}.label.label-xl{padding:14px}.badge{border-radius:50px;color:#fff;padding:8px}.badge.badge-sm{padding:5px}.badge.badge-md{padding:3px 10px}.badge.badge-lg{padding:11px}.badge.badge-xl{padding:14px}.badge.badge-success{background-color:#4caf50}.badge.badge-info{background-color:#0041ff}.badge.badge-danger{background-color:#fc6868}.badge.badge-warning{background-color:#ffc107}.image-wrapper{margin-bottom:20px;display:inline-block;width:100%}.image-wrapper .image-item{width:200px;height:200px;margin-right:20px;background:#f8f9fa;border-radius:3px;display:inline-block;position:relative;background-image:url("../images/placeholder-icon.svg");background-repeat:no-repeat;background-position:50%;margin-bottom:20px}.image-wrapper .image-item img.preview{width:100%;height:100%}.image-wrapper .image-item input{display:none}.image-wrapper .image-item .remove-image{background-image:-webkit-gradient(linear,left top,left bottom,from(rgba(0,0,0,.08)),to(rgba(0,0,0,.24)));background-image:linear-gradient(-180deg,rgba(0,0,0,.08),rgba(0,0,0,.24));border-radius:0 0 4px 4px;position:absolute;bottom:0;width:100%;padding:10px;text-align:center;color:#fff;text-shadow:0 1px 2px rgba(0,0,0,.24);margin-right:20px;cursor:pointer}.image-wrapper .image-item:hover .remove-image{display:block}.image-wrapper .image-item.has-image{background-image:none}.cp-spinner{width:48px;height:48px;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box}.cp-round:before{border-radius:50%;border:6px solid #bababa}.cp-round:after,.cp-round:before{content:" ";width:48px;height:48px;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;position:absolute;top:0;left:0}.cp-round:after{border-radius:50%;border-top:6px solid #0041ff;border-right:6px solid transparent;border-bottom:6px solid transparent;border-left:6px solid transparent;-webkit-animation:spin 1s ease-in-out infinite;animation:spin 1s ease-in-out infinite}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}} \ No newline at end of file +.active.configuration-icon,.catalog-icon,.configuration-icon,.customer-icon,.dashboard-icon,.sales-icon,.settings-icon{width:48px;height:48px;display:inline-block;background-size:cover}.icon{display:inline-block;background-size:cover}.dashboard-icon{background-image:url("../images/Icon-Dashboard.svg")}.sales-icon{background-image:url("../images/Icon-Sales.svg")}.catalog-icon{background-image:url("../images/Icon-Catalog.svg")}.customer-icon{background-image:url("../images/Icon-Customers.svg")}.configuration-icon{background-image:url("../images/Icon-Configure.svg")}.settings-icon{background-image:url("../images/Icon-Settings.svg")}.angle-right-icon{background-image:url("../images/Angle-Right.svg");width:17px;height:17px}.angle-left-icon{background-image:url("../images/Angle-Left.svg");width:17px;height:17px}.arrow-down-icon{background-image:url("../images/Arrow-Down-Light.svg");width:14px;height:8px}.arrow-right-icon{background-image:url("../images/Arrow-Right.svg");width:18px;height:18px}.white-cross-sm-icon{background-image:url("../images/Icon-Sm-Cross-White.svg");width:18px;height:18px}.accordian-up-icon{background-image:url("../images/Accordion-Arrow-Up.svg");width:24px;height:24px}.accordian-down-icon{background-image:url("../images/Accordion-Arrow-Down.svg");width:24px;height:24px}.cross-icon{background-image:url("../images/Icon-Crossed.svg");width:18px;height:18px}.trash-icon{background-image:url("../images/Icon-Trash.svg");width:24px;height:24px}.remove-icon{background-image:url("../images/Icon-remove.svg");width:24px;height:24px}.pencil-lg-icon{background-image:url("../images/Icon-Pencil-Large.svg");width:24px;height:24px}.eye-icon{background-image:url("../images/Icon-eye.svg");width:24px;height:24px}.search-icon{background-image:url("../images/icon-search.svg");width:24px;height:24px}.sortable-icon{background-image:url("../images/Icon-Sortable.svg");width:24px;height:24px}.sort-down-icon,.sort-up-icon{background-image:url("../images/Icon-Sort-Down.svg");width:18px;height:18px}.sort-up-icon{-webkit-transform:rotate(180deg);transform:rotate(180deg)}.primary-back-icon{background-image:url("../images/Icon-Back-Primary.svg");width:24px;height:24px}.checkbox-dash-icon{background-image:url("../images/Checkbox-Dash.svg");width:24px;height:24px}.account-icon{background-image:url("../images/icon-account.svg");width:24px;height:24px}.expand-icon{background-image:url("../images/Expand-Light.svg");width:18px;height:18px}.expand-on-icon{background-image:url("../images/Expand-Light-On.svg");width:18px;height:18px}.dark-left-icon{background-image:url("../images/arrow-left-dark.svg");width:18px;height:18px}.light-right-icon{background-image:url("../images/arrow-right-light.svg");width:18px;height:18px}.folder-icon{background-image:url("../images/Folder-Icon.svg");width:24px;height:24px}.star-icon{background-image:url("../images/Star-Icon.svg");width:24px;height:24px}.arrow-down-white-icon{background-image:url("../images/down-arrow-white.svg");width:17px;height:13px}.arrow-up-white-icon{background-image:url("../images/up-arrow-white.svg");width:17px;height:13px}.profile-pic-icon{background-image:url("../images/Profile-Pic.svg");width:60px;height:60px}.graph-up-icon{background-image:url("../images/Icon-Graph-Green.svg");width:24px;height:24px}.graph-down-icon{background-image:url("../images/Icon-Graph-Red.svg");width:24px;height:24px}.no-result-icon{background-image:url("../images/limited-icon.svg");width:52px;height:47px}.active .dashboard-icon{background-image:url("../images/Icon-Dashboard-Active.svg")}.active .sales-icon{background-image:url("../images/Icon-Sales-Active.svg")}.active .catalog-icon{background-image:url("../images/Icon-Catalog-Active.svg")}.active .customer-icon{background-image:url("../images/Icon-Customers-Active.svg")}.active .settings-icon{background-image:url("../images/Icon-Settings-Active.svg")}.active .configuration-icon{background-image:url("../images/Icon-Configure-Active.svg")}.active>.arrow-down-icon{background-image:url("../images/Arrow-Down.svg");width:14px;height:8px}.active>.expand-icon{background-image:url("../images/Expand-Light-On.svg")}.active.dashboard-icon{background-image:url("../images/Icon-Dashboard-Active.svg")}.active.customer-icon{background-image:url("../images/Icon-Customers-Active.svg")}.active.sales-icon{background-image:url("../images/Icon-Sales-Active.svg")}.active.settings-icon{background-image:url("../images/Icon-Settings-Active.svg")}.active.configuration-icon{background-image:url("../images/Icon-Configure-Active.svg")}.active.arrow-down-icon{background-image:url("../images/Arrow-Down.svg");width:14px;height:8px}.active.expand-icon{background-image:url("../images/Expand-Light-On.svg")}.icon-404{background-image:url("../images/404-image.svg");width:255px;height:255px}.grid-container{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.grid-container .filter-wrapper{display:block;-webkit-box-sizing:border-box;box-sizing:border-box}.grid-container .filter-wrapper .filter-row-one,.grid-container .filter-wrapper .filter-row-two{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.grid-container .filter-wrapper .filter-row-one{height:40px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.grid-container .filter-wrapper .filter-row-one .search-filter .control{font-family:montserrat,sans-serif;padding-left:10px;width:380px;height:36px;border:2px solid #c7c7c7;border-radius:3px;border-right:0;border-top-right-radius:0;border-bottom-right-radius:0;font-size:14px}.grid-container .filter-wrapper .filter-row-one .search-filter .ic-wrapper{display:block;height:36px;width:36px;border:2px solid #c7c7c7;border-left:none;border-radius:2px}.grid-container .filter-wrapper .filter-row-one .search-filter .ic-wrapper .search-icon{margin-left:4px;margin-top:4px;height:24px;width:24px}.grid-container .filter-wrapper .filter-row-one .dropdown-filters{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex}.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters{margin-right:5px}.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-toggle{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;font-family:montserrat,sans-serif;padding-left:5px;height:36px;width:150px;border:2px solid #c7c7c7;border-radius:2px;background-color:#fff;color:#8e8e8e;font-size:14px}.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-toggle,.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-toggle .dropdown-header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-toggle .dropdown-header{width:100%;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-toggle .dropdown-header .arrow-down-icon{margin-right:5px}.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul li.filter-column-dropdown .filter-column-select{width:100%;background:#fff;border:2px solid #c7c7c7;border-radius:3px;height:36px;display:inline-block;vertical-align:middle;-webkit-transition:.2s cubic-bezier(.4,0,.2,1);transition:.2s cubic-bezier(.4,0,.2,1);padding:0 5px;font-family:montserrat,sans-serif;margin-top:10px;margin-bottom:5px}.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul li input,.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul li select{background:#fff;border:2px solid #c7c7c7;border-radius:3px;height:36px;max-width:100%;display:inline-block;vertical-align:middle;-webkit-transition:.2s cubic-bezier(.4,0,.2,1);transition:.2s cubic-bezier(.4,0,.2,1);padding:0 5px;font-family:montserrat,sans-serif;margin-top:10px;margin-bottom:5px}.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul .filter-condition-dropdown-datetime,.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul .filter-condition-dropdown-number,.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul .filter-condition-dropdown-string,.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul .filter-response-boolean,.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul .filter-response-datetime,.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul .filter-response-number,.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-list .dropdown-container ul .filter-response-string{display:none}.grid-container .filter-wrapper .filter-row-two{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-top:6px;margin-bottom:6px}.grid-container .filter-wrapper .filter-row-two .filter-one{margin-right:10px}.grid-container .filter-wrapper .filter-row-two .filter-one .filter-name{margin-right:5px}.grid-container .filter-wrapper .filter-row-two .filter-one .filter-value{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;background:#e7e7e7;padding-left:5px;color:#000311;vertical-align:middle}.grid-container .filter-wrapper .filter-row-two .filter-one .filter-value .f-value{margin:auto}.grid-container .filter-wrapper .filter-row-two .filter-one .filter-value .cross-icon{margin:5px;height:18px!important;width:18px!important;cursor:pointer}.grid-container .table thead .mass-action-wrapper{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.grid-container .table thead .mass-action-wrapper .massaction-remove{margin-top:4px;margin-right:10px}.grid-container .table thead .mass-action-wrapper .selected-items{margin-right:15px}.grid-container .table thead tr th.grid_head .sort-down-icon,.grid-container .table thead tr th.grid_head .sort-up-icon{margin-left:5px;margin-top:-3px;vertical-align:middle}.grid-container .table thead tr th.grid_head.sortable{cursor:pointer}.grid-container .table thead tr th{text-transform:capitalize}.grid-container .table tbody td.action a:first-child{margin-right:10px}.grid-container .table .pagination{margin-top:20px}@-webkit-keyframes jelly{0%{-webkit-transform:translateY(0) scale(.7);transform:translateY(0) scale(.7);opacity:0}70%{-webkit-transform:translateY(5px) scale(1.05);transform:translateY(5px) scale(1.05);opacity:1}to{-webkit-transform:translateY(0) scale(1);transform:translateY(0) scale(1);opacity:1}}@keyframes jelly{0%{-webkit-transform:translateY(0) scale(.7);transform:translateY(0) scale(.7);opacity:0}70%{-webkit-transform:translateY(5px) scale(1.05);transform:translateY(5px) scale(1.05);opacity:1}to{-webkit-transform:translateY(0) scale(1);transform:translateY(0) scale(1);opacity:1}}@-webkit-keyframes jelly-out{0%{-webkit-transform:translateY(0) scale(1);transform:translateY(0) scale(1);opacity:1}30%{-webkit-transform:translateY(-5px) scale(1.05);transform:translateY(-5px) scale(1.05);opacity:1}to{-webkit-transform:translateY(0) scale(.7);transform:translateY(0) scale(.7);opacity:0}}@keyframes jelly-out{0%{-webkit-transform:translateY(0) scale(1);transform:translateY(0) scale(1);opacity:1}30%{-webkit-transform:translateY(-5px) scale(1.05);transform:translateY(-5px) scale(1.05);opacity:1}to{-webkit-transform:translateY(0) scale(.7);transform:translateY(0) scale(.7);opacity:0}}*{-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}:focus{outline:none}a:active,a:focus,a:hover,a:link,a:visited{text-decoration:none;color:#0041ff}ul{margin:0;padding:0;list-style:none}h1{font-size:28px;margin-top:0}h1,h2{color:#3a3a3a}h2{font-size:18px}.tooltip{position:relative;border-bottom:1px solid #000}.tooltip .tooltiptext{visibility:hidden;width:120px;background-color:#000;color:#fff;text-align:center;border-radius:6px;padding:5px 0;position:absolute;z-index:1}.tooltip:hover .tooltiptext{visibility:visible}.hide{display:none!important}.btn{-webkit-box-shadow:0 1px 4px 0 rgba(0,0,0,.2),0 0 8px 0 rgba(0,0,0,.1);box-shadow:0 1px 4px 0 rgba(0,0,0,.2),0 0 8px 0 rgba(0,0,0,.1);border-radius:3px;border:none;color:#fff;cursor:pointer;-webkit-transition:.2s cubic-bezier(.4,0,.2,1);transition:.2s cubic-bezier(.4,0,.2,1);font:inherit;display:inline-block}.btn:active,.btn:focus,.btn:hover{opacity:.75;border:none}.btn.btn-sm{padding:6px 12px}.btn.btn-md{padding:8px 16px}.btn.btn-lg{padding:10px 20px}.btn.btn-xl{padding:12px 24px;font-size:16px}.btn.btn-primary{background:#0041ff;color:#fff}.btn:disabled,.btn[disabled=disabled],.btn[disabled=disabled]:active,.btn[disabled=disabled]:hover{cursor:not-allowed;background:#b1b1ae;-webkit-box-shadow:none;box-shadow:none;opacity:1}.dropdown-open{position:relative}.dropdown-list{width:200px;margin-bottom:20px;-webkit-box-shadow:0 2px 4px 0 rgba(0,0,0,.16),0 0 9px 0 rgba(0,0,0,.16);box-shadow:0 2px 4px 0 rgba(0,0,0,.16),0 0 9px 0 rgba(0,0,0,.16);border-radius:3px;background-color:#fff;position:absolute;display:none;z-index:10;text-align:left}.dropdown-list.bottom-left{top:42px;left:0}.dropdown-list.bottom-right{top:42px;right:0}.dropdown-list.top-left{bottom:42px;left:0}.dropdown-list.top-right{bottom:42px;right:0}.dropdown-list .search-box{padding:20px;border-bottom:1px solid hsla(0,0%,64%,.2)}.dropdown-list .search-box .control{background:#fff;border:2px solid #c7c7c7;border-radius:3px;width:100%;height:36px;display:inline-block;vertical-align:middle;-webkit-transition:.2s cubic-bezier(.4,0,.2,1);transition:.2s cubic-bezier(.4,0,.2,1);padding:0 10px;font-size:15px}.dropdown-list .search-box .control:focus{border-color:#0041ff}.dropdown-list .dropdown-container{padding:20px;overflow-y:auto;max-height:280px}.dropdown-list .dropdown-container label{font-size:15px;display:inline-block;text-transform:uppercase;color:#9e9e9e;font-weight:700;padding-bottom:5px}.dropdown-list .dropdown-container ul{margin:0;list-style-type:none;padding:0}.dropdown-list .dropdown-container ul li{padding:5px 0}.dropdown-list .dropdown-container ul li a:active,.dropdown-list .dropdown-container ul li a:focus,.dropdown-list .dropdown-container ul li a:link,.dropdown-list .dropdown-container ul li a:visited{color:#333;display:block}.dropdown-list .dropdown-container ul li a:hover{color:#0041ff}.dropdown-list .dropdown-container ul li .checkbox{margin:0}.dropdown-list .dropdown-container ul li .control-group label{color:#3a3a3a;font-size:15px;font-weight:500;text-transform:capitalize;width:100%}.dropdown-list .dropdown-container .btn{width:100%;margin-top:10px}.table{width:100%;overflow-x:auto}.table table{width:100%;border-collapse:collapse;text-align:left}.table table thead th{font-weight:700;padding:12px 10px;background:#f8f9fa;color:#3a3a3a}.table table tbody td{padding:10px;border-bottom:1px solid #d3d3d3;color:#3a3a3a;vertical-align:middle}.table table tbody td.actions{text-align:right}.table table tbody td.actions .icon{cursor:pointer;vertical-align:middle}.table table tbody td.empty{text-align:center}.table table tbody tr:last-child td{border-bottom:none}.table .control-group{width:100%;margin-bottom:0}.table .control-group .control{width:100%;margin:0}.dropdown-btn{min-width:150px;text-align:left;background:#fff;border:2px solid #c7c7c7;border-radius:3px;font-size:14px;padding:8px 35px 8px 10px;cursor:pointer;position:relative}.dropdown-btn:active,.dropdown-btn:focus,.dropdown-btn:hover{opacity:.75;border:2px solid #c7c7c7}.dropdown-btn .icon{position:absolute;right:10px;top:50%;margin-top:-4px}.pagination .page-item{background:#fff;border:2px solid #c7c7c7;border-radius:3px;padding:7px 14px;margin-right:5px;font-size:16px;display:inline-block;color:#8e8e8e;vertical-align:middle;text-decoration:none}.pagination .page-item.next,.pagination .page-item.previous{padding:6px 9px}.pagination .page-item.active{background:#0041ff;color:#fff;border-color:#0041ff}.pagination .page-item .icon{vertical-align:middle;margin-bottom:3px}.checkbox{position:relative;display:block;vertical-align:middle;margin:10px 5px 5px 0}.checkbox input{left:0;opacity:0;position:absolute;top:0;height:24px;width:24px;z-index:100}.checkbox .checkbox-view{background-image:url("../images/Checkbox.svg");height:24px;width:24px;margin:0;display:inline-block!important;vertical-align:middle;margin-right:5px}.checkbox input:checked+.checkbox-view{background-image:url("../images/Checkbox-Checked.svg")}.checkbox input:disabled+.checkbox-view{opacity:.5;cursor:not-allowed}.radio{position:relative;display:block;margin:10px 5px 5px 0}.radio input{left:0;opacity:0;position:absolute;top:0;z-index:100}.radio .radio-view{background-image:url("../images/controls.svg");background-position:-21px 0;height:20px;width:20px;margin:0;display:inline-block!important;vertical-align:middle;margin-right:5px}.radio input:checked+.radio-view{background-position:-21px -21px}.radio input:disabled+.radio-view{opacity:.5;cursor:not-allowed}.control-group{display:block;margin-bottom:25px;font-size:15px;color:#333;width:750px;max-width:100%;position:relative}.control-group label{display:block;color:#3a3a3a}.control-group label.required:after{content:"*";color:#fc6868;font-weight:700;display:inline-block}.control-group textarea.control{height:100px;padding:10px}.control-group .control{background:#fff;border:2px solid #c7c7c7;border-radius:3px;width:70%;height:36px;display:inline-block;vertical-align:middle;-webkit-transition:.2s cubic-bezier(.4,0,.2,1);transition:.2s cubic-bezier(.4,0,.2,1);padding:0 10px;font-size:15px;margin-top:10px;margin-bottom:5px}.control-group .control:focus{border-color:#0041ff}.control-group .control[disabled=disabled]{border-color:#d3d3d3;background-color:#d3d3d3;cursor:not-allowed}.control-group .control[multiple]{height:100px}.control-group.date:after,.control-group.datetime:after{background-image:url("../images/Icon-Calendar.svg");width:24px;height:24px;content:"";display:inline-block;vertical-align:middle;margin-left:-34px;margin-top:2px}.control-group .control-info{display:block;font-style:italic;color:#6f6f6f}.control-group .control-error{display:none;color:#ff5656;margin-top:5px}.control-group.has-error .control{border-color:#fc6868}.control-group.has-error .control-error{display:block}.control-group.price .currency-code{vertical-align:middle;display:inline-block}.button-group{margin-top:20px;margin-bottom:20px}.alert-wrapper{width:300px;top:10px;right:10px;position:fixed;z-index:6;text-align:left}.alert-wrapper .alert{width:300px;padding:15px;border-radius:3px;display:inline-block;-webkit-box-shadow:0 4px 15.36px .64px rgba(0,0,0,.1),0 2px 6px 0 rgba(0,0,0,.12);box-shadow:0 4px 15.36px .64px rgba(0,0,0,.1),0 2px 6px 0 rgba(0,0,0,.12);position:relative;-webkit-animation:jelly .5s ease-in-out;animation:jelly .5s ease-in-out;-webkit-transform-origin:center top;transform-origin:center top;z-index:500;margin-bottom:10px}.alert-wrapper .alert.alert-error{background:#fc6868}.alert-wrapper .alert.alert-info{background:#204d74}.alert-wrapper .alert.alert-success{background:#4caf50}.alert-wrapper .alert.alert-warning{background:#ffc107}.alert-wrapper .alert .icon{position:absolute;right:10px;top:10px;cursor:pointer}.alert-wrapper .alert p{color:#fff;margin:0;padding:0;font-size:15px}.tabs ul{border-bottom:1px solid hsla(0,0%,64%,.2)}.tabs ul li{display:inline-block}.tabs ul li a{padding:15px 20px;cursor:pointer;margin:0 2px;text-align:center;color:#000311;display:block}.tabs ul li.active a{border-bottom:3px solid #0041ff}.accordian,accordian{display:inline-block;width:100%}.accordian .accordian-header,.accordian div[slot*=header],accordian .accordian-header,accordian div[slot*=header]{width:100%;display:inline-block;font-size:18px;color:#3a3a3a;border-bottom:1px solid hsla(0,0%,64%,.2);padding:20px 15px;cursor:pointer}.accordian .accordian-header .expand-icon,.accordian div[slot*=header] .expand-icon,accordian .accordian-header .expand-icon,accordian div[slot*=header] .expand-icon{background-image:url("../images/Expand-Light.svg");margin-right:10px;margin-top:3px}.accordian .accordian-header h1,.accordian div[slot*=header] h1,accordian .accordian-header h1,accordian div[slot*=header] h1{margin:0;font-size:20px;display:inline-block}.accordian .accordian-header .icon,.accordian div[slot*=header] .icon,accordian .accordian-header .icon,accordian div[slot*=header] .icon{float:right}.accordian .accordian-header .icon.left,.accordian div[slot*=header] .icon.left,accordian .accordian-header .icon.left,accordian div[slot*=header] .icon.left{float:left}.accordian .accordian-content,.accordian div[slot*=body],accordian .accordian-content,accordian div[slot*=body]{width:100%;padding:20px 15px;display:none;-webkit-transition:all .3s ease;transition:all .3s ease}.accordian.active>.accordian-content,accordian.active>.accordian-content{display:inline-block}.accordian.active>.accordian-header .expand-icon,accordian.active>.accordian-header .expand-icon{background-image:url("../images/Expand-Light-On.svg")}.tree-container .tree-item{padding-left:30px;display:inline-block;margin-top:10px;width:100%}.tree-container .tree-item>.tree-item{display:none}.tree-container .tree-item.active>.tree-item{display:inline-block}.tree-container .tree-item .checkbox,.tree-container .tree-item .radio{margin:0;display:inline-block}.tree-container .tree-item .expand-icon{display:inline-block;margin-right:10px;cursor:pointer;background-image:url("../images/Expand-Light.svg");width:18px;height:18px;vertical-align:middle}.tree-container .tree-item .folder-icon{vertical-align:middle;margin-right:10px}.tree-container .tree-item.active>.expand-icon{background-image:url("../images/Expand-Light-On.svg")}.tree-container>.tree-item{padding-left:0}.panel{-webkit-box-shadow:0 2px 25px 0 rgba(0,0,0,.15);box-shadow:0 2px 25px 0 rgba(0,0,0,.15);border-radius:5px;background:#fff}.panel .panel-content{padding:20px}.modal-open{overflow:hidden}.modal-overlay{display:none;overflow-y:auto;z-index:10;top:0;right:0;bottom:0;left:0;position:fixed;background:#000;opacity:.75}.modal-open .modal-overlay{display:block}.modal-container{-webkit-animation:fade-in-white .3s ease-in-out;animation:fade-in-white .3s ease-in-out;z-index:11;margin-left:-350px;width:600px;max-width:80%;background:#fff;position:fixed;left:50%;top:100px;margin-bottom:100px;-webkit-box-shadow:0 15px 25px 0 rgba(0,0,0,.03),0 20px 45px 5px rgba(0,0,0,.2);box-shadow:0 15px 25px 0 rgba(0,0,0,.03),0 20px 45px 5px rgba(0,0,0,.2);-webkit-animation:jelly .5s ease-in-out;animation:jelly .5s ease-in-out;border-radius:5px}.modal-container .modal-header{padding:20px}.modal-container .modal-header h3{display:inline-block;font-size:20px;color:#3a3a3a;margin:0}.modal-container .modal-header .icon{float:right;cursor:pointer}.modal-container .modal-body{padding:20px}.modal-container .modal-body .control-group .control{width:100%}.label{background:#e7e7e7;border-radius:2px;padding:8px;color:#000311;display:inline-block}.label.label-sm{padding:5px}.label.label-md{padding:8px}.label.label-lg{padding:11px}.label.label-xl{padding:14px}.badge{border-radius:50px;color:#fff;padding:8px}.badge.badge-sm{padding:5px}.badge.badge-md{padding:3px 10px}.badge.badge-lg{padding:11px}.badge.badge-xl{padding:14px}.badge.badge-success{background-color:#4caf50}.badge.badge-info{background-color:#0041ff}.badge.badge-danger{background-color:#fc6868}.badge.badge-warning{background-color:#ffc107}.image-wrapper{margin-bottom:20px;display:inline-block;width:100%}.image-wrapper .image-item{width:200px;height:200px;margin-right:20px;background:#f8f9fa;border-radius:3px;display:inline-block;position:relative;background-image:url("../images/placeholder-icon.svg");background-repeat:no-repeat;background-position:50%;margin-bottom:20px}.image-wrapper .image-item img.preview{width:100%;height:100%}.image-wrapper .image-item input{display:none}.image-wrapper .image-item .remove-image{background-image:-webkit-gradient(linear,left top,left bottom,from(rgba(0,0,0,.08)),to(rgba(0,0,0,.24)));background-image:linear-gradient(-180deg,rgba(0,0,0,.08),rgba(0,0,0,.24));border-radius:0 0 4px 4px;position:absolute;bottom:0;width:100%;padding:10px;text-align:center;color:#fff;text-shadow:0 1px 2px rgba(0,0,0,.24);margin-right:20px;cursor:pointer}.image-wrapper .image-item:hover .remove-image{display:block}.image-wrapper .image-item.has-image{background-image:none}.cp-spinner{width:48px;height:48px;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box}.cp-round:before{border-radius:50%;border:6px solid #bababa}.cp-round:after,.cp-round:before{content:" ";width:48px;height:48px;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;position:absolute;top:0;left:0}.cp-round:after{border-radius:50%;border-top:6px solid #0041ff;border-right:6px solid transparent;border-bottom:6px solid transparent;border-left:6px solid transparent;-webkit-animation:spin 1s ease-in-out infinite;animation:spin 1s ease-in-out infinite}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}} \ No newline at end of file diff --git a/packages/Webkul/Ui/publishable/assets/images/Icon-eye.svg b/packages/Webkul/Ui/publishable/assets/images/Icon-eye.svg new file mode 100644 index 000000000..04b228c94 --- /dev/null +++ b/packages/Webkul/Ui/publishable/assets/images/Icon-eye.svg @@ -0,0 +1,11 @@ + + + + Icon-Delete + Created with Sketch. + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Ui/publishable/assets/mix-manifest.json b/packages/Webkul/Ui/publishable/assets/mix-manifest.json index 0c588cdd3..1ad0308d9 100644 --- a/packages/Webkul/Ui/publishable/assets/mix-manifest.json +++ b/packages/Webkul/Ui/publishable/assets/mix-manifest.json @@ -1,4 +1,4 @@ { "/js/ui.js": "/js/ui.js?id=b25a07d206dd0b89048f", - "/css/ui.css": "/css/ui.css?id=856413ffffbe95f7b91d" + "/css/ui.css": "/css/ui.css?id=8d70cfd8a1966fa0e9f8" } \ No newline at end of file diff --git a/packages/Webkul/Ui/src/DataGrid/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/DataGrid.php index 722e2900e..66df075dd 100644 --- a/packages/Webkul/Ui/src/DataGrid/DataGrid.php +++ b/packages/Webkul/Ui/src/DataGrid/DataGrid.php @@ -749,8 +749,6 @@ class DataGrid $this->getQueryWithFilters(); } - $this->results = $this->query->get(); - $this->results = $this->query->paginate($this->perpage)->appends(request()->except('page')); return $this->results; @@ -767,8 +765,6 @@ class DataGrid $this->getQueryWithFilters(); } - $this->results = $this->query->get(); - $this->results = $this->query->paginate($this->perpage)->appends(request()->except('page')); return $this->results; @@ -782,13 +778,14 @@ class DataGrid * * @return view */ - public function render() { $this->getDbQueryResults(); return view('ui::datagrid.index', [ 'css' => $this->css, + 'table' => $this->table, + 'name' => $this->name, 'results' => $this->results, 'columns' => $this->columns, 'filterable' =>$this->filterable, diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-eye.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-eye.svg new file mode 100644 index 000000000..04b228c94 --- /dev/null +++ b/packages/Webkul/Ui/src/Resources/assets/images/Icon-eye.svg @@ -0,0 +1,11 @@ + + + + Icon-Delete + Created with Sketch. + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index c5a4f57a5..96d26d713 100644 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -353,6 +353,8 @@ h2 { opacity: 0; position: absolute; top: 0; + height: 24px; + width: 24px; z-index: 100; } diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/components.scss b/packages/Webkul/Ui/src/Resources/assets/sass/components.scss index c06dfab97..d2332b164 100644 --- a/packages/Webkul/Ui/src/Resources/assets/sass/components.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/components.scss @@ -209,14 +209,10 @@ align-items: center; .massaction-remove { - margin-top: 10px; + margin-top: 4px; margin-right: 10px; } - form { - margin-top: 8px; - } - .selected-items { margin-right: 15px; } diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss b/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss index 16bce6270..d8e5e0a60 100644 --- a/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss @@ -99,6 +99,12 @@ height: 24px; } +.eye-icon { + background-image: url("../images/Icon-eye.svg"); + width: 24px; + height: 24px; +} + .search-icon { background-image: url("../images/icon-search.svg"); width: 24px; diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table/body.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table/body.blade.php index 2bfdfca77..c32fff7f5 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table/body.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table/body.blade.php @@ -8,26 +8,39 @@ @endif @foreach ($results as $result) - {{-- + @if(count($massoperations)) + - --}} + + @endif @foreach ($columns as $column) @if(isset($column->closure)) @if($column->closure == true) - {!! $column->render($result) !!} + {!! $column->render($result) !!} @endif @else - {{ $column->render($result) }} + {{ $column->render($result) }} @endif @endforeach @if(count($actions)) @foreach($actions as $action) - - + + @endforeach diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table/head.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table/head.blade.php index 7025fdd24..c553dc07a 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table/head.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table/head.blade.php @@ -1,6 +1,7 @@ - {{-- - + @if(count($massoperations)) + +
@@ -11,8 +12,8 @@ @if($massoperation['type'] == "button")
+ @@ -67,14 +70,17 @@ @endforeach
- --}} + + @endif - {{-- + @if(count($massoperations)) + - --}} + + @endif @foreach ($columns as $column) @if($column->sortable == "true") >>>>>> a60ca52eb69bf055764c4f182e32adc54b39a2a3 class Bouncer {