From 51026b0dfd6b96529576b957c5bc1a7dc73ecfad Mon Sep 17 00:00:00 2001 From: prashant-webkul Date: Thu, 18 Oct 2018 12:45:32 +0530 Subject: [PATCH 1/8] Mergin --- .../Admin/src/DataGrids/OrderDataGrid.php | 169 +++++++++--------- .../src/Providers/AdminServiceProvider.php | 16 +- .../src/Providers/EventServiceProvider.php | 18 ++ .../views/sales/orders/index.blade.php | 3 +- .../account/wishlist/wishlist.blade.php | 2 +- 5 files changed, 114 insertions(+), 94 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php index 5324637a4..d61e4a429 100644 --- a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php @@ -6,7 +6,7 @@ use Illuminate\View\View; use Webkul\Ui\DataGrid\Facades\DataGrid; /** - * Order DataGrid + * orderDataGrid * * @author Prashant Singh @prashant-webkul * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) @@ -14,20 +14,20 @@ use Webkul\Ui\DataGrid\Facades\DataGrid; class OrderDataGrid { + /** * The Data Grid implementation. * - * @var AttributeDataGrid - * for countries + * @var orderDataGrid + * for orders */ - - public function createCategoryDataGrid() + public function createOrderDataGrid() { return DataGrid::make([ - 'name' => 'Orders', - 'table' => 'orders as ord', - 'select' => 'ord.id', + 'name' => 'orders', + 'table' => 'orders as or', + 'select' => 'or.id', 'perpage' => 5, 'aliased' => true, //use this with false as default and true in case of joins @@ -55,104 +55,105 @@ class OrderDataGrid ], 'join' => [ - [ - 'join' => 'leftjoin', - 'table' => 'category_translations as ct', - 'primaryKey' => 'cat.id', - 'condition' => '=', - 'secondaryKey' => 'ct.category_id', - ], [ - 'join' => 'leftjoin', - 'table' => 'category_translations as cta', - 'primaryKey' => 'cat.parent_id', - 'condition' => '=', - 'secondaryKey' => 'cta.category_id', - ], + // [ + // 'join' => 'leftjoin', + // 'table' => 'order_address as oa', + // 'primaryKey' => 'or.id', + // 'condition' => '=', + // 'secondaryKey' => 'oa.order_id', + // ], + // [ + // 'join' => 'leftjoin', + // 'table' => 'category_translations as cta', + // 'primaryKey' => 'cat.parent_id', + // 'condition' => '=', + // 'secondaryKey' => 'cta.category_id', + // ], ], //use aliasing on secodary columns if join is performed 'columns' => [ [ - 'name' => 'cat.id', - 'alias' => 'catID', + 'name' => 'or.id', + 'alias' => 'orderid', 'type' => 'number', - 'label' => 'Category ID', + 'label' => 'ID', 'sortable' => true, ], [ - 'name' => 'ct.name', - 'alias' => 'catName', + 'name' => 'or.status', + 'alias' => 'orstatus', 'type' => 'string', - 'label' => 'Category Name', - 'sortable' => false, - ], [ - 'name' => 'cat.position', - 'alias' => 'catPosition', - 'type' => 'string', - 'label' => 'Category Position', - 'sortable' => false, - ], [ - 'name' => 'cta.name', - 'alias' => 'parentName', - 'type' => 'string', - 'label' => 'Parent Name', + 'label' => 'Status', 'sortable' => true, + // 'wrapper' => function ($value) { + // if($value == 0) + // return "False"; + // else + // return "True"; + // }, ], [ - 'name' => 'cat.status', - 'alias' => 'catStatus', + 'name' => 'or.base_grand_total', + 'alias' => 'orbasegrandtotal', 'type' => 'string', - 'label' => 'Visible in Menu', + 'label' => 'Base Total', 'sortable' => true, - 'wrapper' => function ($value) { - if($value == 0) - return "False"; - else - return "True"; - }, ], - + // [ + // 'name' => 'or.customer_first_name', + // 'alias' => 'oafirstname', + // 'type' => 'string', + // 'label' => 'Billed To', + // 'sortable' => false, + // ], [ + // 'name' => 'oa.first_name', + // 'alias' => 'oafirstname', + // 'type' => 'string', + // 'label' => 'Shipped To', + // 'sortable' => false, + // ], ], 'filterable' => [ - [ - 'column' => 'cat.id', - 'alias' => 'catID', - 'type' => 'number', - 'label' => 'Category ID', - ], [ - 'column' => 'ct.name', - 'alias' => 'catName', - 'type' => 'string', - 'label' => 'Category Name', - ], [ - 'column' => 'cta.name', - 'alias' => 'parentName', - 'type' => 'string', - 'label' => 'Parent Name', - ], [ - 'column' => 'cat.status', - 'alias' => 'catStatus', - 'type' => 'string', - 'label' => 'Visible in Menu', - ], + // [ + // 'column' => 'cat.id', + // 'alias' => 'catID', + // 'type' => 'number', + // 'label' => 'Category ID', + // ], [ + // 'column' => 'ct.name', + // 'alias' => 'catName', + // 'type' => 'string', + // 'label' => 'Category Name', + // ], [ + // 'column' => 'cta.name', + // 'alias' => 'parentName', + // 'type' => 'string', + // 'label' => 'Parent Name', + // ], [ + // 'column' => 'cat.status', + // 'alias' => 'catStatus', + // 'type' => 'string', + // 'label' => 'Visible in Menu', + // ], ], //don't use aliasing in case of searchables 'searchable' => [ - [ - 'column' => 'cat.id', - 'type' => 'number', - 'label' => 'Category ID', - ], [ - 'column' => 'ct.name', - 'type' => 'string', - 'label' => 'Category Name', - ], [ - 'column' => 'cat.status', - 'type' => 'string', - 'label' => 'Visible in Menu', - ] + // [ + // 'column' => 'cat.id', + // 'type' => 'number', + // 'label' => 'Category ID', + // ], [ + // 'column' => 'ct.name', + // 'type' => 'string', + // 'label' => 'Category Name', + // ], [ + // 'column' => 'cat.status', + // 'type' => 'string', + // 'label' => 'Visible in Menu', + // ] ], //list of viable operators that will be used @@ -173,7 +174,7 @@ class OrderDataGrid public function render() { - return $this->createCategoryDataGrid()->render(); + return $this->createOrderDataGrid()->render(); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index 1fe463fbb..7e1c6936c 100644 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -58,17 +58,17 @@ class AdminServiceProvider extends ServiceProvider $subMenus = $tabs = []; if (count($keys) > 1) { $subMenus = [ - 'items' => $menu->sortItems(array_get($menu->items, current($keys) . '.children')), - 'current' => $menu->current, - 'currentKey' => $menu->currentKey - ]; + 'items' => $menu->sortItems(array_get($menu->items, current($keys) . '.children')), + 'current' => $menu->current, + 'currentKey' => $menu->currentKey + ]; if (count($keys) > 2) { $tabs = [ - 'items' => $menu->sortItems(array_get($menu->items, implode('.children.', array_slice($keys, 0, 2)) . '.children')), - 'current' => $menu->current, - 'currentKey' => $menu->currentKey - ]; + 'items' => $menu->sortItems(array_get($menu->items, implode('.children.', array_slice($keys, 0, 2)) . '.children')), + 'current' => $menu->current, + 'currentKey' => $menu->currentKey + ]; } } diff --git a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php index 0ed37ee12..8b5747b22 100644 --- a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php @@ -23,6 +23,24 @@ class EventServiceProvider extends ServiceProvider 'route' => 'admin.sales.orders.index', 'sort' => 2, 'icon-class' => 'sales-icon', + ], [ + 'key' => 'sales.orders', + 'name' => 'Orders', + 'route' => 'admin.sales.orders.index', + 'sort' => 1, + 'icon-class' => '', + ], [ + 'key' => 'sales.shipments', + 'name' => 'Shipments', + 'route' => 'admin.sales.orders.index', + 'sort' => 2, + 'icon-class' => '', + ], [ + 'key' => 'sales.invoices', + 'name' => 'Invoices', + 'route' => 'admin.sales.orders.index', + 'sort' => 3, + 'icon-class' => '', ], [ 'key' => 'catalog', 'name' => 'Catalog', 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 77b45387e..927a6334f 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 @@ -16,7 +16,8 @@
- + @inject('orderGrid', 'Webkul\Admin\DataGrids\OrderDataGrid') + {!! $orderGrid->render() !!}
@stop \ 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 bfb929133..0bcaffe0a 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 @@ -53,4 +53,4 @@ -@endsection +@endsection \ No newline at end of file From 806ffb460fa23b26ee1050746e71ccf081acb36e Mon Sep 17 00:00:00 2001 From: prashant-webkul Date: Thu, 18 Oct 2018 16:34:55 +0530 Subject: [PATCH 2/8] Order Datagrid, Datagrid Currency Capabilities via wrapper and UI fixes in storefront navigation bar, admin panel menu item, datagrid actions checks before rendering of datagrid --- .../src/DataGrids/ExchangeRatesDataGrid.php | 35 +++-- .../Admin/src/DataGrids/OrderDataGrid.php | 123 +++++++----------- .../Admin/src/DataGrids/UserDataGrid.php | 15 +-- .../src/Providers/EventServiceProvider.php | 28 ++-- .../views/sales/orders/index.blade.php | 4 +- ...2_create_currency_exchange_rates_table.php | 1 - .../Shop/src/Resources/assets/sass/app.scss | 4 +- .../views/products/buy-now.blade.php | 4 +- .../Ui/src/Resources/assets/sass/app.scss | 27 ++-- .../views/datagrid/table/body.blade.php | 4 +- .../views/datagrid/table/head.blade.php | 8 +- public/themes/default/assets/css/shop.css | 11 +- 12 files changed, 111 insertions(+), 153 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php index 9d4f085e0..9171064dd 100644 --- a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php @@ -27,10 +27,10 @@ class ExchangeRatesDataGrid return DataGrid::make([ 'name' => 'Exchange Rates', - 'table' => 'currency_exchange_rates', - 'select' => 'id', + 'table' => 'currency_exchange_rates as cer', + 'select' => 'cer.id', 'perpage' => 5, - 'aliased' => false, //use this with false as default and true in case of joins + 'aliased' => true, //use this with false as default and true in case of joins 'massoperations' =>[ [ @@ -56,13 +56,13 @@ class ExchangeRatesDataGrid ], 'join' => [ - // [ - // 'join' => 'leftjoin', - // 'table' => 'roles as r', - // 'primaryKey' => 'u.role_id', - // 'condition' => '=', - // 'secondaryKey' => 'r.id', - // ] + [ + 'join' => 'leftjoin', + 'table' => 'currencies as curr', + 'primaryKey' => 'cer.target_currency', + 'condition' => '=', + 'secondaryKey' => 'curr.id', + ] ], //use aliasing on secodary columns if join is performed @@ -70,39 +70,38 @@ class ExchangeRatesDataGrid 'columns' => [ [ - 'name' => 'id', + 'name' => 'cer.id', 'alias' => 'exchID', 'type' => 'number', 'label' => 'Rate ID', 'sortable' => true, ], [ - 'name' => 'target_currency', - 'alias' => 'exchTargetCurrency', + 'name' => 'curr.name', + 'alias' => 'currencyname', 'type' => 'string', - 'label' => 'Target Currency', + 'label' => 'Currency Name', 'sortable' => true, ], [ - 'name' => 'rate', + 'name' => 'cer.rate', 'alias' => 'exchRate', 'type' => 'string', 'label' => 'Exchange Rate', ], - ], //don't use aliasing in case of filters 'filterable' => [ [ - 'column' => 'id', + 'column' => 'cer.id', 'alias' => 'exchId', 'type' => 'number', 'label' => 'Rate ID', ], [ - 'column' => 'target_currency', + 'column' => 'curr.name', 'alias' => 'exchTargetCurrency', 'type' => 'string', 'label' => 'Target Currency', diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php index d61e4a429..9d5678b37 100644 --- a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php @@ -29,7 +29,8 @@ class OrderDataGrid 'table' => 'orders as or', 'select' => 'or.id', 'perpage' => 5, - 'aliased' => true, //use this with false as default and true in case of joins + 'aliased' => false, + //True in case of joins else aliasing key required on all cases 'massoperations' =>[ [ @@ -40,36 +41,9 @@ class OrderDataGrid ], ], - 'actions' => [ - [ - 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), - 'confirm_text' => 'Do you really want to do this?', - 'icon' => 'icon pencil-lg-icon', - ], [ - 'type' => 'Delete', - 'route' => route('admin.datagrid.delete'), - 'confirm_text' => 'Do you really want to do this?', - 'icon' => 'icon trash-icon', - ], - ], + 'actions' => [ ], - 'join' => [ - // [ - // 'join' => 'leftjoin', - // 'table' => 'order_address as oa', - // 'primaryKey' => 'or.id', - // 'condition' => '=', - // 'secondaryKey' => 'oa.order_id', - // ], - // [ - // 'join' => 'leftjoin', - // 'table' => 'category_translations as cta', - // 'primaryKey' => 'cat.parent_id', - // 'condition' => '=', - // 'secondaryKey' => 'cta.category_id', - // ], - ], + 'join' => [], //use aliasing on secodary columns if join is performed @@ -81,63 +55,62 @@ class OrderDataGrid 'label' => 'ID', 'sortable' => true, ], [ - 'name' => 'or.status', - 'alias' => 'orstatus', + 'name' => 'or.customer_first_name', + 'alias' => 'oafirstname', 'type' => 'string', - 'label' => 'Status', - 'sortable' => true, - // 'wrapper' => function ($value) { - // if($value == 0) - // return "False"; - // else - // return "True"; - // }, + 'label' => 'Billed To', + 'sortable' => false, ], [ 'name' => 'or.base_grand_total', 'alias' => 'orbasegrandtotal', 'type' => 'string', 'label' => 'Base Total', 'sortable' => true, + 'wrapper' => function ($value) { + return core()->currency($value); + } + ], [ + 'name' => 'or.grand_total', + 'alias' => 'oagrandtotal', + 'type' => 'string', + 'label' => 'Grand Total', + 'sortable' => false, + 'wrapper' => function ($value) { + return core()->currency($value); + } + ], [ + 'name' => 'or.status', + 'alias' => 'orstatus', + 'type' => 'string', + 'label' => 'Status', + 'sortable' => true, + 'wrapper' => function ($value) { + if($value == 'completed') + return 'Completed'; + else if($value == "cancelled") + return 'Completed'; + else if($value == "closed") + return 'Completed'; + else if($value == "pending") + return 'Pending'; + + }, ], - // [ - // 'name' => 'or.customer_first_name', - // 'alias' => 'oafirstname', - // 'type' => 'string', - // 'label' => 'Billed To', - // 'sortable' => false, - // ], [ - // 'name' => 'oa.first_name', - // 'alias' => 'oafirstname', - // 'type' => 'string', - // 'label' => 'Shipped To', - // 'sortable' => false, - // ], ], 'filterable' => [ - // [ - // 'column' => 'cat.id', - // 'alias' => 'catID', - // 'type' => 'number', - // 'label' => 'Category ID', - // ], [ - // 'column' => 'ct.name', - // 'alias' => 'catName', - // 'type' => 'string', - // 'label' => 'Category Name', - // ], [ - // 'column' => 'cta.name', - // 'alias' => 'parentName', - // 'type' => 'string', - // 'label' => 'Parent Name', - // ], [ - // 'column' => 'cat.status', - // 'alias' => 'catStatus', - // 'type' => 'string', - // 'label' => 'Visible in Menu', - // ], + [ + 'column' => 'or.id', + 'alias' => 'orderid', + 'type' => 'number', + 'label' => 'ID', + ], [ + 'name' => 'or.status', + 'alias' => 'orstatus', + 'type' => 'string', + 'label' => 'Status' + ] ], - //don't use aliasing in case of searchables 'searchable' => [ diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php index 85432930a..d639b1071 100644 --- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php @@ -111,13 +111,7 @@ class UserDataGrid 'label' => 'Role Name', 'sortable' => true, ], - [ - 'name' => 'r.id', - 'alias' => 'xc', - 'type' => 'string', - 'label' => 'Role ID', - 'sortable' => true, - ], + ], //don't use aliasing in case of filters 'filterable' => [ @@ -133,12 +127,7 @@ class UserDataGrid 'type' => 'number', 'label' => 'Admin ID' ], - [ - 'column' => 'r.id', - 'alias' => 'xc', - 'type' => 'number', - 'label' => 'Role ID' - ] + ], //don't use aliasing in case of searchables 'searchable' => [ diff --git a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php index 8b5747b22..6eb34a845 100644 --- a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php @@ -29,19 +29,21 @@ class EventServiceProvider extends ServiceProvider 'route' => 'admin.sales.orders.index', 'sort' => 1, 'icon-class' => '', - ], [ - 'key' => 'sales.shipments', - 'name' => 'Shipments', - 'route' => 'admin.sales.orders.index', - 'sort' => 2, - 'icon-class' => '', - ], [ - 'key' => 'sales.invoices', - 'name' => 'Invoices', - 'route' => 'admin.sales.orders.index', - 'sort' => 3, - 'icon-class' => '', - ], [ + ], + // [ + // 'key' => 'sales.shipments', + // 'name' => 'Shipments', + // 'route' => 'admin.sales.orders.index', + // 'sort' => 2, + // 'icon-class' => '', + // ], [ + // 'key' => 'sales.invoices', + // 'name' => 'Invoices', + // 'route' => 'admin.sales.orders.index', + // 'sort' => 3, + // 'icon-class' => '', + // ], + [ 'key' => 'catalog', 'name' => 'Catalog', 'route' => 'admin.catalog.products.index', 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 927a6334f..696d9c3c7 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 @@ -1,10 +1,10 @@ -@extends('admin::layouts.master') +@extends('admin::layouts.content') @section('page_title') {{ __('admin::app.sales.orders.title') }} @stop -@section('content-wrapper') +@section('content')
diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054542_create_currency_exchange_rates_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054542_create_currency_exchange_rates_table.php index 83764e3a9..e68558cd6 100644 --- a/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054542_create_currency_exchange_rates_table.php +++ b/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054542_create_currency_exchange_rates_table.php @@ -16,7 +16,6 @@ class CreateCurrencyExchangeRatesTable extends Migration Schema::create('currency_exchange_rates', function (Blueprint $table) { $table->increments('id'); $table->decimal('rate', 10, 5); - $table->integer('target_currency')->unique()->unsigned(); $table->foreign('target_currency')->references('id')->on('currencies')->onDelete('cascade'); $table->timestamps(); diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index db5b54694..db7231983 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -564,7 +564,7 @@ section.slider-block { } .header-bottom { - height: 48px; + height: 47px; margin-left: auto; margin-right: auto; border-top: 1px solid $border-color; @@ -574,7 +574,7 @@ section.slider-block { ul.nav { display: block; font-size:16px; - height: 48px; + // height: 48px; max-width: 100%; width: auto; margin-left: auto; diff --git a/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php b/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php index 115754deb..7b2cba68c 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php @@ -1,3 +1,3 @@ - \ No newline at end of file + \ 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 b29b258c2..b22a28ded 100644 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -773,37 +773,39 @@ h2 { } .badge { - background: #E7E7E7; - @include border-radius(2px); + @include border-radius(50px); + color: white; padding: 8px; - color: #000311; - display: inline-block; - &.label-sm { + &.badge-sm { padding: 5px; } - &.label-md { - padding: 8px; + &.badge-md { + padding: 3px 10px; } - &.label-lg { + &.badge-lg { padding: 11px; } - &.label-xl { + &.badge-xl { padding: 14px; } - &.success { + &.badge-success { background-color: $success-color; } - &.danger { + &.badge-info { + background-color: $brand-color; + } + + &.badge-danger { background-color: $danger-color; } - &.warning { + &.badge-warning { background-color: $warning-color; } } @@ -836,7 +838,6 @@ h2 { } .remove-image { - // display: none; background-image: linear-gradient(-180deg, rgba(0,0,0,0.08) 0%, rgba(0,0,0,0.24) 100%); @include border-radius(0 0 4px 4px); position: absolute; 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 b86a89991..ede3e4e42 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 @@ -18,7 +18,7 @@ @foreach ($columns as $column) {!! $column->render($result) !!} @endforeach - + @if(count($actions)) @foreach($actions as $action) @@ -26,7 +26,7 @@ @endforeach - + @endif @endforeach \ No newline at end of file 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 b22d3e54e..ef6f53ad3 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 @@ -98,8 +98,10 @@ @endif @endforeach - - {{ __('ui::app.datagrid.actions') }} - + @if(count($actions)) + + {{ __('ui::app.datagrid.actions') }} + + @endif \ No newline at end of file diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css index d41f65326..6731c3636 100644 --- a/public/themes/default/assets/css/shop.css +++ b/public/themes/default/assets/css/shop.css @@ -834,16 +834,10 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { -webkit-box-pack: justify; -ms-flex-pack: justify; justify-content: space-between; - bottom: 48%; + bottom: 46%; right: 0%; width: 100%; } - section.slider-block div.slider-content div.slider-control .dark-left-icon { - margin-left: 15px; - } - section.slider-block div.slider-content div.slider-control .light-right-icon { - margin-right: 15px; - } } .header { @@ -1174,7 +1168,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { } .header .header-bottom { - height: 48px; + height: 47px; margin-left: auto; margin-right: auto; border-top: 1px solid #C7C7C7; @@ -1186,7 +1180,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { .header .header-bottom ul.nav { display: block; font-size: 16px; - height: 48px; max-width: 100%; width: auto; margin-left: auto; From 371d2bb742fd502b5496db6fa90a8fa59cdaa5e8 Mon Sep 17 00:00:00 2001 From: prashant-webkul Date: Thu, 18 Oct 2018 17:42:41 +0530 Subject: [PATCH 3/8] Wrote the code for moving configurable product to the wishlist --- packages/Webkul/Checkout/src/Cart.php | 84 ++++++++++++++++--- .../Http/Controllers/WishlistController.php | 2 +- 2 files changed, 75 insertions(+), 11 deletions(-) diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index ae14b98ee..a117e0310 100644 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -159,9 +159,12 @@ class Cart { * * @return void */ - public function add($id, $data) + public function add($id, $data, $prepared = false, $preparedData = []) { - $itemData = $this->prepareItemData($id, $data); + if($prepared == false) + $itemData = $this->prepareItemData($id, $data); + else + $itemData = $preparedData; if(!$itemData) { return false; @@ -953,17 +956,78 @@ class Cart { * Move a wishlist item to cart */ public function moveToCart($productId) { - $data = [ - 'product' => $productId, - 'quantity' => 1, - ]; + $product = $this->product->find($productId); - $result = $this->add($productId, $data); + if($product->configurable == null) { + $data = [ + 'product' => $productId, + 'quantity' => 1, + ]; - if($result instanceof Collection || $result == true) { - return true; + $result = $this->add($productId, $data); + + if($result instanceof Collection || $result == true) { + return true; + } else { + return false; + } } else { - return false; + //in case the product added is a configurable product. + $result = $this->moveConfigurableFromWishlistToCart($product->parent_id, $product->id); + + if(is_array($result)) { + $data['quantity'] = 1; + + $data['selected_configurable_option'] = $product->parent_id; + + $moved = $this->add($data['selected_configurable_option'], $data, true, $result); + + if($moved) { + return true; + } else { + return false; + } + } } } + + /** + * Move a configurable product from wishlist to cart. + * + * @return mixed + */ + public function moveConfigurableFromWishlistToCart($configurableproductId, $productId) { + $product = $this->find($configurableproductId); + + $child = $childData = null; + if($product->type == 'configurable') { + $child = $this->product->findOneByField('id', $productId); + + $childData = [ + 'product_id' => $data['selected_configurable_option'], + 'sku' => $child->sku, + 'name' => $child->name, + 'type' => 'simple' + ]; + } + + $price = ($product->type == 'configurable' ? $child->price : $product->price); + + $parentData = [ + 'sku' => $product->sku, + 'product_id' => $productId, + 'quantity' => $data['quantity'], + 'type' => $product->type, + 'name' => $product->name, + 'price' => core()->convertPrice($price), + 'base_price' => $price, + 'total' => core()->convertPrice($price * $data['quantity']), + 'base_total' => $price * $data['quantity'], + 'weight' => $weight = ($product->type == 'configurable' ? $child->weight : $product->weight), + 'total_weight' => $weight * $data['quantity'], + 'base_total_weight' => $weight * $data['quantity'] + ]; + + return ['parent' => $parentData, 'child' => $childData]; + } } \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php index 600431d22..0aa2cab58 100644 --- a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php @@ -167,4 +167,4 @@ class WishlistController extends Controller return redirect()->back(); } } -} +} \ No newline at end of file From 1c781402725ebd19b74e257520e79d201f931288 Mon Sep 17 00:00:00 2001 From: prashant-webkul Date: Thu, 18 Oct 2018 18:13:45 +0530 Subject: [PATCH 4/8] Made the way to add configurable product to wishlist on the storefront. --- .../src/Http/Controllers/WishlistController.php | 16 +++++++++++----- .../products/view/configurable-options.blade.php | 15 +++++++++++++++ .../Resources/views/products/wishlist.blade.php | 2 +- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php index 0aa2cab58..53922464b 100644 --- a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php @@ -155,14 +155,20 @@ class WishlistController extends Controller public function move($productId) { $result = Cart::moveToCart($productId); - $wishlist = $this->wishlist->findWhere(['customer_id' => auth()->guard('customer')->user()->id, 'product_id' => $productId]); + if($result) { + $wishlist = $this->wishlist->findWhere(['customer_id' => auth()->guard('customer')->user()->id, 'product_id' => $productId]); - if($this->wishlist->delete($wishlist[0]->id)) { - session()->flash('success', 'Item Moved To Cart Successfully'); + if($this->wishlist->delete($wishlist[0]->id)) { + session()->flash('success', 'Item Moved To Cart Successfully'); - return redirect()->back(); + return redirect()->back(); + } else { + session()->flash('error', 'Item Cannot Be Moved To Cart Successfully'); + + return redirect()->back(); + } } else { - session()->flash('error', 'Item Cannot Be Moved To Cart Successfully'); + Session('error', 'Cannot Add The Product To Wishlist Due To Unknown Problems, Please Checkback Later'); return redirect()->back(); } diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php index d3c06fe6e..f3512894b 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php @@ -109,6 +109,21 @@ } else { this.selectedProductId = attribute.options[attribute.selectedIndex].allowedProducts[0]; } + + var prevLink = $('#wishlist-changer').attr('href'); + if(this.selectedProductId != '') { + var splitted = prevLink.split("/"); + + var lastItem = splitted.pop(); + + lastItem = this.selectedProductId; + + var joined = splitted.join('/'); + + var newWishlistUrl = joined+'/'+lastItem; + + $('#wishlist-changer').attr('href', newWishlistUrl); + } } else { attribute.selectedIndex = 0; diff --git a/packages/Webkul/Shop/src/Resources/views/products/wishlist.blade.php b/packages/Webkul/Shop/src/Resources/views/products/wishlist.blade.php index 4cb6e668a..5f198f070 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/wishlist.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/wishlist.blade.php @@ -1,5 +1,5 @@ @auth('customer') - + @endauth From 701c8e360235aa42be3c24e1b11b556661805b59 Mon Sep 17 00:00:00 2001 From: prashant-webkul Date: Mon, 22 Oct 2018 16:10:05 +0530 Subject: [PATCH 5/8] Wishlist move to cart code is tested and its working fine --- .../Admin/src/DataGrids/ProductDataGrid.php | 3 +- packages/Webkul/Checkout/src/Cart.php | 67 ++++++++++++++----- .../Http/Controllers/WishlistController.php | 2 + 3 files changed, 53 insertions(+), 19 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index 74e236511..59f279f0f 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -16,8 +16,7 @@ use Webkul\Product\Repositories\ProductRepository; class ProductDataGrid { /** - * The Data Grid implementation. - * @var ProductDataGrid + * The Data Grid implementation @var ProductDataGrid * for Products */ diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index a117e0310..0f1761bdb 100644 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -161,10 +161,12 @@ class Cart { */ public function add($id, $data, $prepared = false, $preparedData = []) { - if($prepared == false) + if($prepared == false) { $itemData = $this->prepareItemData($id, $data); - else + } + else { $itemData = $preparedData; + } if(!$itemData) { return false; @@ -175,7 +177,7 @@ class Cart { $cartItems = $cart->items; - //check the isset conditions as collection empty object will mislead the condition and errorhandling case. + //check the isset conditions as collection empty object will mislead the condition and error handling case. if(isset($cartItems) && $cartItems->count()) { foreach($cartItems as $cartItem) { if($product->type == "simple") { @@ -205,6 +207,12 @@ class Cart { } else if($product->type == "configurable") { if($cartItem->type == "configurable") { $temp = $this->cartItem->findOneByField('parent_id', $cartItem->id); + + if($prepared == true) { + $data['selected_configurable_option'] = $preparedData['parent']['product_id']; + } + + if($temp->product_id == $data['selected_configurable_option']) { $child = $temp->child; @@ -255,11 +263,23 @@ class Cart { if(isset($cart)) { $this->cart->delete($cart->id); } else { - return $this->createNewCart($id, $data); + if($prepared == false) { + return $this->createNewCart($id, $data); + } + else { + return $this->createNewCart($id, $data, true, $preparedData); + } + } } } else { - return $this->createNewCart($id, $data); + // return $this->createNewCart($id, $data); + if($prepared == false) { + return $this->createNewCart($id, $data); + } + else { + return $this->createNewCart($id, $data, true, $preparedData); + } } } @@ -271,9 +291,12 @@ class Cart { * * @return Booleans */ - public function createNewCart($id, $data) + public function createNewCart($id, $data, $prepared = false, $preparedData = []) { - $itemData = $this->prepareItemData($id, $data); + if($prepared == false) + $itemData = $this->prepareItemData($id, $data); + else + $itemData = $preparedData; //if the item data is not valid to be processed it will be returning false if($itemData == false) { @@ -300,7 +323,13 @@ class Cart { $cartData['cart_currency_code'] = core()->getCurrentCurrencyCode(); //set the cart items and quantity $cartData['items_count'] = 1; - $cartData['items_qty'] = $data['quantity']; + + if($prepared == false) { + $cartData['items_qty'] = $data['quantity']; + } else { + $cartData['items_qty'] = 1; + } + //create the cart instance in the database if($cart = $this->cart->create($cartData)) { @@ -309,7 +338,11 @@ class Cart { if ($product->type == "configurable") { //parent item entry - $itemData['parent']['additional'] = json_encode($data); + if($prepared == false) { + $itemData['parent']['additional'] = json_encode($data); + } else { + $itemData['parent']['additional'] = json_encode($preparedData); + } if($parent = $this->cartItem->create($itemData['parent'])) { //child item entry @@ -958,7 +991,7 @@ class Cart { public function moveToCart($productId) { $product = $this->product->find($productId); - if($product->configurable == null) { + if($product->parent_id == null ||$product->parent_id == 'null') { $data = [ 'product' => $productId, 'quantity' => 1, @@ -997,14 +1030,14 @@ class Cart { * @return mixed */ public function moveConfigurableFromWishlistToCart($configurableproductId, $productId) { - $product = $this->find($configurableproductId); + $product = $this->product->find($configurableproductId); $child = $childData = null; if($product->type == 'configurable') { $child = $this->product->findOneByField('id', $productId); $childData = [ - 'product_id' => $data['selected_configurable_option'], + 'product_id' => $configurableproductId, 'sku' => $child->sku, 'name' => $child->name, 'type' => 'simple' @@ -1016,16 +1049,16 @@ class Cart { $parentData = [ 'sku' => $product->sku, 'product_id' => $productId, - 'quantity' => $data['quantity'], + 'quantity' => 1, 'type' => $product->type, 'name' => $product->name, 'price' => core()->convertPrice($price), 'base_price' => $price, - 'total' => core()->convertPrice($price * $data['quantity']), - 'base_total' => $price * $data['quantity'], + 'total' => core()->convertPrice($price), + 'base_total' => $price, 'weight' => $weight = ($product->type == 'configurable' ? $child->weight : $product->weight), - 'total_weight' => $weight * $data['quantity'], - 'base_total_weight' => $weight * $data['quantity'] + 'total_weight' => $weight, + 'base_total_weight' => $weight ]; return ['parent' => $parentData, 'child' => $childData]; diff --git a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php index 53922464b..6225f6a1c 100644 --- a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php @@ -159,6 +159,8 @@ class WishlistController extends Controller $wishlist = $this->wishlist->findWhere(['customer_id' => auth()->guard('customer')->user()->id, 'product_id' => $productId]); if($this->wishlist->delete($wishlist[0]->id)) { + Cart::collectTotals(); + session()->flash('success', 'Item Moved To Cart Successfully'); return redirect()->back(); From 5016e03b1ccf274a8d48dc8886ac0e55e76e5f94 Mon Sep 17 00:00:00 2001 From: prashant-webkul Date: Mon, 22 Oct 2018 18:48:46 +0530 Subject: [PATCH 6/8] Products datagrid mechanism is normailized to single table due to greate overhead in fetching total attributes for products. --- .../Admin/src/DataGrids/ProductDataGrid.php | 143 ++++++------------ packages/Webkul/Admin/src/Http/routes.php | 5 +- ...2018_10_22_111807_create_products_grid.php | 39 +++++ .../Http/Controllers/ProductController.php | 74 ++++++++- .../Webkul/Product/src/Models/ProductGrid.php | 19 +++ .../src/Providers/ProductServiceProvider.php | 13 +- .../Repositories/ProductGridRepository.php | 20 +++ 7 files changed, 215 insertions(+), 98 deletions(-) create mode 100644 packages/Webkul/Product/src/Database/Migrations/2018_10_22_111807_create_products_grid.php create mode 100644 packages/Webkul/Product/src/Models/ProductGrid.php create mode 100644 packages/Webkul/Product/src/Repositories/ProductGridRepository.php diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index 59f279f0f..ba712cc2c 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -3,7 +3,7 @@ namespace Webkul\Admin\DataGrids; use Illuminate\View\View; -use Webkul\Ui\DataGrid\Facades\ProductGrid; +use Webkul\Ui\DataGrid\Facades\DataGrid; use Webkul\Channel\Repositories\ChannelRepository; use Webkul\Product\Repositories\ProductRepository; /** @@ -22,9 +22,9 @@ class ProductDataGrid public function createProductDataGrid() { - return ProductGrid::make([ + return DataGrid::make([ 'name' => 'Products', - 'table' => 'products as prods', + 'table' => 'products_grid as prods', 'select' => 'prods.id', 'perpage' => 10, 'aliased' => true, //use this with false as default and true in case of joins @@ -52,43 +52,7 @@ class ProductDataGrid ], ], - 'attributeColumns' => [ - 'name', 'price' - ], - 'join' => [ - [ - 'join' => 'leftjoin', - 'table' => 'attribute_families as attfam', - 'primaryKey' => 'prods.attribute_family_id', - 'condition' => '=', - 'secondaryKey' => 'attfam.id', - ], - - //for getting the attribute values. - // [ - // 'join' => 'leftjoin', - // 'table' => 'product_attribute_values as pav', - // 'primaryKey' => 'prods.id', - // 'condition' => '=', - // 'secondaryKey' => 'pav.product_id', - // 'withAttributes' => [ - // 'condition' => [ - // 'attribute_id' => 2, - // 'select' => 'name', - // ] - // ] - // ], - - // for getting the inventory quantity of a product - [ - 'join' => 'leftjoin', - 'table' => 'product_inventories as pi', - 'primaryKey' => 'prods.id', - 'condition' => '=', - 'secondaryKey' => 'pi.product_id', - ], - ], //use aliasing on secodary columns if join is performed @@ -96,7 +60,7 @@ class ProductDataGrid 'columns' => [ //name, alias, type, label, sortable [ - 'name' => 'prods.id', + 'name' => 'prods.product_id', 'alias' => 'productID', 'type' => 'number', 'label' => 'ID', @@ -104,20 +68,13 @@ class ProductDataGrid ], [ 'name' => 'prods.sku', - 'alias' => 'productCode', + 'alias' => 'productSku', 'type' => 'string', 'label' => 'SKU', 'sortable' => true, ], [ - 'name' => 'attfam.name', - 'alias' => 'FamilyName', - 'type' => 'string', - 'label' => 'Family Name', - 'sortable' => true, - ], - [ - 'name' => 'pi.qty', + 'name' => 'prods.quantity', 'alias' => 'ProductQuantity', 'type' => 'string', 'label' => 'Product Quantity', @@ -127,56 +84,56 @@ class ProductDataGrid 'filterable' => [ //column, type, and label - [ - 'column' => 'prods.id', - 'alias' => 'productID', - 'type' => 'number', - 'label' => 'ID', - ], - [ - 'column' => 'prods.sku', - 'alias' => 'productCode', - 'type' => 'string', - 'label' => 'SKU', - ], - [ - 'column' => 'attfam.name', - 'alias' => 'FamilyName', - 'type' => 'string', - 'label' => 'Family Name', - ], - [ - 'column' => 'pi.qty', - 'alias' => 'ProductQuantity', - 'type' => 'number', - 'label' => 'Product Quatity', - ], + // [ + // 'column' => 'prods.id', + // 'alias' => 'productID', + // 'type' => 'number', + // 'label' => 'ID', + // ], + // [ + // 'column' => 'prods.sku', + // 'alias' => 'productCode', + // 'type' => 'string', + // 'label' => 'SKU', + // ], + // [ + // 'column' => 'attfam.name', + // 'alias' => 'FamilyName', + // 'type' => 'string', + // 'label' => 'Family Name', + // ], + // [ + // 'column' => 'pi.qty', + // 'alias' => 'ProductQuantity', + // 'type' => 'number', + // 'label' => 'Product Quatity', + // ], ], //don't use aliasing in case of searchables 'searchable' => [ //column, type and label - [ - 'column' => 'prods.id', - 'type' => 'number', - 'label' => 'ID', - ], - [ - 'column' => 'prods.sku', - 'type' => 'string', - 'label' => 'SKU', - ], - [ - 'column' => 'attfam.name', - 'type' => 'string', - 'label' => 'Family Name', - ], - [ - 'column' => 'pi.qty', - 'type' => 'string', - 'label' => 'Product Quatity', - ], + // [ + // 'column' => 'prods.id', + // 'type' => 'number', + // 'label' => 'ID', + // ], + // [ + // 'column' => 'prods.sku', + // 'type' => 'string', + // 'label' => 'SKU', + // ], + // [ + // 'column' => 'attfam.name', + // 'type' => 'string', + // 'label' => 'Family Name', + // ], + // [ + // 'column' => 'pi.qty', + // 'type' => 'string', + // 'label' => 'Product Quatity', + // ], ], //list of viable operators that will be used diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index 431a2e0e4..95a236a9e 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -2,6 +2,8 @@ Route::group(['middleware' => ['web']], function () { Route::prefix('admin')->group(function () { + Route::get('/grid', 'Webkul\Product\Http\Controllers\ProductController@test'); + // Login Routes Route::get('/login', 'Webkul\User\Http\Controllers\SessionController@create')->defaults('_config', [ 'view' => 'admin::users.sessions.create' @@ -380,7 +382,6 @@ Route::group(['middleware' => ['web']], function () { Route::get('/inventory_sources/delete/{id}', 'Webkul\Inventory\Http\Controllers\InventorySourceController@destroy')->name('admin.inventory_sources.delete'); - // Channel Routes Route::get('/channels', 'Webkul\Core\Http\Controllers\ChannelController@index')->defaults('_config', [ 'view' => 'admin::settings.channels.index' @@ -461,10 +462,8 @@ Route::group(['middleware' => ['web']], function () { Route::put('/tax-categories/edit/{id}', 'Webkul\Tax\Http\Controllers\TaxCategoryController@update')->defaults('_config', [ 'redirect' => 'admin.tax-categories.index' ])->name('admin.tax-categories.update'); - //tax category ends - //tax rate Route::get('tax-rates', 'Webkul\Tax\Http\Controllers\TaxRateController@index')->defaults('_config', [ 'view' => 'admin::tax.tax-rates.index' diff --git a/packages/Webkul/Product/src/Database/Migrations/2018_10_22_111807_create_products_grid.php b/packages/Webkul/Product/src/Database/Migrations/2018_10_22_111807_create_products_grid.php new file mode 100644 index 000000000..790131dd6 --- /dev/null +++ b/packages/Webkul/Product/src/Database/Migrations/2018_10_22_111807_create_products_grid.php @@ -0,0 +1,39 @@ +increments('id'); + $table->integer('product_id')->unsigned(); + $table->foreign('product_id')->references('id')->on('products'); + $table->string('sku')->nullable(); + $table->string('type')->nullable(); + $table->string('attribute_family_name')->nullable(); + $table->string('product_name')->nullable(); + $table->string('quantity')->default(0); + $table->string('cost')->default(0); + $table->string('price')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('products_grid'); + } +} diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php index 47e3fb0a1..576c1ad8e 100644 --- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php +++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php @@ -6,9 +6,12 @@ use Illuminate\Http\Request; use Illuminate\Http\Response; use Webkul\Product\Http\Requests\ProductForm; use Webkul\Product\Repositories\ProductRepository as Product; +use Webkul\Product\Repositories\ProductGridRepository as ProductGrid; use Webkul\Attribute\Repositories\AttributeFamilyRepository as AttributeFamily; use Webkul\Category\Repositories\CategoryRepository as Category; use Webkul\Inventory\Repositories\InventorySourceRepository as InventorySource; +use Webkul\Product\Helpers\Price; +use Event; /** * Product controller @@ -53,6 +56,20 @@ class ProductController extends Controller */ protected $product; + /** + * ProductGrid Repository object + * + * @var array + */ + protected $productGrid; + + /** + * Price Object + * + * @var array + */ + Protected $price; + /** * Create a new controller instance. * @@ -66,7 +83,9 @@ class ProductController extends Controller AttributeFamily $attributeFamily, Category $category, InventorySource $inventorySource, - Product $product) + Product $product, + ProductGrid $productGrid, + Price $price) { $this->attributeFamily = $attributeFamily; @@ -76,6 +95,10 @@ class ProductController extends Controller $this->product = $product; + $this->productGrid = $productGrid; + + $this->price = $price; + $this->_config = request('_config'); } @@ -112,6 +135,9 @@ class ProductController extends Controller */ public function store() { + //before store of the product + // Event::fire('product.save.before', false); + if(!request()->get('family') && request()->input('type') == 'configurable' && request()->input('sku') != '') { return redirect(url()->current() . '?family=' . request()->input('attribute_family_id') . '&sku=' . request()->input('sku')); } @@ -130,6 +156,9 @@ class ProductController extends Controller $product = $this->product->create(request()->all()); + //after store of the product + Event::fire('product.save.after', $product); + session()->flash('success', 'Product created successfully.'); return redirect()->route($this->_config['redirect'], ['id' => $product->id]); @@ -161,8 +190,14 @@ class ProductController extends Controller */ public function update(ProductForm $request, $id) { + //before update of product + // Event::fire('product.update.before', false); + $this->product->update(request()->all(), $id); + //after update of product + Event::fire('product.update.after', $this->product->find($id)); + session()->flash('success', 'Product updated successfully.'); return redirect()->route($this->_config['redirect']); @@ -178,8 +213,45 @@ class ProductController extends Controller { $this->product->delete($id); + //before update of product + Event::fire('product.delete.after', $id); + session()->flash('success', 'Product deleted successfully.'); return redirect()->back(); } + + public function test() { + $gridObject = []; + + foreach($this->product->all() as $product) { + $gridObject = [ + 'product_id' => $product->id, + 'sku' => $product->sku, + 'type' => $product->type, + 'product_name' => $product->sku, + 'attribute_family_name' => $product->toArray()['attribute_family']['name'], + 'price' => $this->price->getMinimalPrice($product) + ]; + + if($product->type == 'configurable') { + $gridObject['quantity'] = 0; + } else { + $qty = 0; + + foreach($product->toArray()['inventories'] as $inventorySource) { + $qty = $qty + $inventorySource['qty']; + } + + $gridObject['quantity'] = $qty; + + $qty = 0; + } + $this->productGrid->create($gridObject); + + $gridObject = []; + } + + return true; + } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Models/ProductGrid.php b/packages/Webkul/Product/src/Models/ProductGrid.php new file mode 100644 index 000000000..0fbfa307b --- /dev/null +++ b/packages/Webkul/Product/src/Models/ProductGrid.php @@ -0,0 +1,19 @@ +belongsTo(Product::class, 'product_id'); + } +} \ No newline at end of file diff --git a/packages/Webkul/Product/src/Providers/ProductServiceProvider.php b/packages/Webkul/Product/src/Providers/ProductServiceProvider.php index 5d9b4b613..262217b6e 100644 --- a/packages/Webkul/Product/src/Providers/ProductServiceProvider.php +++ b/packages/Webkul/Product/src/Providers/ProductServiceProvider.php @@ -6,6 +6,7 @@ use Illuminate\Support\ServiceProvider; use Illuminate\Routing\Router; use Webkul\Product\Models\Product; use Webkul\Product\Observers\ProductObserver; +use Event; class ProductServiceProvider extends ServiceProvider { @@ -18,6 +19,16 @@ class ProductServiceProvider extends ServiceProvider { $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); + // Event::listen('product.save.before', 'Webkul\Product\Listeners\ProductListener@beforeProductUpdate'); + + Event::listen('product.save.after', 'Webkul\Product\Listeners\ProductListener@afterProductSave'); + + // Event::listen('product.update.before', 'Webkul\Product\Listeners\ProductListener@beforeProductUpdate'); + + Event::listen('product.update.after', 'Webkul\Product\Listeners\ProductListener@beforeProductUpdate'); + + Event::listen('product.delete.after', 'Webkul\Product\Listeners\ProductListener@afterProductDelete'); + Product::observe(ProductObserver::class); } @@ -28,6 +39,6 @@ class ProductServiceProvider extends ServiceProvider */ public function register() { - + } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Repositories/ProductGridRepository.php b/packages/Webkul/Product/src/Repositories/ProductGridRepository.php new file mode 100644 index 000000000..373018e61 --- /dev/null +++ b/packages/Webkul/Product/src/Repositories/ProductGridRepository.php @@ -0,0 +1,20 @@ + @prashant-webkul + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class ProductGridRepository extends Repository +{ + public function model() { + return 'Webkul\Product\Models\ProductGrid'; + } +} \ No newline at end of file From 13ae5d58c0ea3f9a15380e98fc6d481d47ea0770 Mon Sep 17 00:00:00 2001 From: jitendra Date: Tue, 23 Oct 2018 17:15:44 +0530 Subject: [PATCH 7/8] Dashboard completed --- app/Http/Kernel.php | 13 +- config/database.php | 2 +- .../Customer/CustomerController.php | 2 +- .../Http/Controllers/DashboardController.php | 273 +++++- packages/Webkul/Admin/src/Http/routes.php | 9 +- .../Admin/src/Mail/NewInvoiceNotification.php | 2 +- .../Admin/src/Mail/NewOrderNotification.php | 2 +- .../src/Mail/NewShipmentNotification.php | 2 +- .../Resources/assets/js/components/date.vue | 10 +- .../assets/js/components/datetime.vue | 41 +- .../Admin/src/Resources/assets/sass/app.scss | 417 ++++----- .../Admin/src/Resources/lang/en/app.php | 29 +- .../Resources/views/dashboard/index.blade.php | 835 +++++++++--------- .../views/layouts/anonymous-master.blade.php | 2 + packages/Webkul/Core/src/Core.php | 73 ++ .../Webkul/Core/src/Eloquent/Repository.php | 36 +- .../Webkul/Customer/src/Models/Customer.php | 4 +- .../Notifications/CustomerResetPassword.php | 7 +- .../Product/src/Models/ProductInventory.php | 22 +- .../Webkul/Sales/src/Models/OrderItem.php | 1 + packages/Webkul/Shop/src/Http/routes.php | 2 +- .../emails/admin/forget-password.blade.php | 34 + .../emails/customer/forget-password.blade.php | 34 + .../views/emails/layouts/master.blade.php | 0 .../views/emails/sales/new-invoice.blade.php | 0 .../views/emails/sales/new-order.blade.php | 0 .../views/emails/sales/new-shipment.blade.php | 0 .../Resources/assets/images/Icon-Calendar.svg | 16 + .../assets/images/Icon-Graph-Green.svg | 14 + .../assets/images/Icon-Graph-Red.svg | 14 + .../Resources/assets/images/Profile-Pic.svg | 15 + .../Resources/assets/images/limited-icon.svg | 39 + .../Ui/src/Resources/assets/sass/app.scss | 13 + .../Ui/src/Resources/assets/sass/icons.scss | 24 + .../src/Notifications/AdminResetPassword.php | 8 +- 35 files changed, 1228 insertions(+), 767 deletions(-) create mode 100644 packages/Webkul/Shop/src/Resources/views/emails/admin/forget-password.blade.php create mode 100644 packages/Webkul/Shop/src/Resources/views/emails/customer/forget-password.blade.php rename packages/Webkul/{Admin => Shop}/src/Resources/views/emails/layouts/master.blade.php (100%) rename packages/Webkul/{Admin => Shop}/src/Resources/views/emails/sales/new-invoice.blade.php (100%) rename packages/Webkul/{Admin => Shop}/src/Resources/views/emails/sales/new-order.blade.php (100%) rename packages/Webkul/{Admin => Shop}/src/Resources/views/emails/sales/new-shipment.blade.php (100%) create mode 100644 packages/Webkul/Ui/src/Resources/assets/images/Icon-Calendar.svg create mode 100644 packages/Webkul/Ui/src/Resources/assets/images/Icon-Graph-Green.svg create mode 100644 packages/Webkul/Ui/src/Resources/assets/images/Icon-Graph-Red.svg create mode 100644 packages/Webkul/Ui/src/Resources/assets/images/Profile-Pic.svg create mode 100644 packages/Webkul/Ui/src/Resources/assets/images/limited-icon.svg diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 05992519f..6ca0cbdf5 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -14,12 +14,10 @@ class Kernel extends HttpKernel * @var array */ protected $middleware = [ - \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class, - \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, - \App\Http\Middleware\TrimStrings::class, - \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, - \App\Http\Middleware\TrustProxies::class, - // \Illuminate\Session\Middleware\StartSession::class, + \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class, + \App\Http\Middleware\EncryptCookies::class, + \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, + \Illuminate\Session\Middleware\StartSession::class, ]; /** @@ -29,9 +27,6 @@ class Kernel extends HttpKernel */ protected $middlewareGroups = [ 'web' => [ - \App\Http\Middleware\EncryptCookies::class, - \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, - \Illuminate\Session\Middleware\StartSession::class, \Illuminate\Session\Middleware\AuthenticateSession::class, \Illuminate\View\Middleware\ShareErrorsFromSession::class, \App\Http\Middleware\VerifyCsrfToken::class, diff --git a/config/database.php b/config/database.php index e486bd20d..71280b1b1 100644 --- a/config/database.php +++ b/config/database.php @@ -50,7 +50,7 @@ return [ 'charset' => 'utf8mb4', 'collation' => 'utf8mb4_unicode_ci', 'prefix' => '', - 'strict' => true, + 'strict' => false, 'engine' => 'InnoDB ROW_FORMAT=DYNAMIC', ], diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php index 0fbe05caa..01aeac0ae 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php @@ -73,7 +73,7 @@ class CustomerController extends Controller { $customerGroup = $this->customerGroup->all(); - return view($this->_config['view'],compact('customerGroup')); + return view($this->_config['view'], compact('customerGroup')); } /** diff --git a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php index 5bee6cde8..bee17a769 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php @@ -5,6 +5,12 @@ namespace Webkul\Admin\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Routing\Controller; +use Illuminate\Support\Facades\DB; +use Carbon\Carbon; +use Webkul\Sales\Repositories\OrderRepository as Order; +use Webkul\Sales\Repositories\OrderItemRepository as OrderItem; +use Webkul\Customer\Repositories\CustomerRepository as Customer; +use Webkul\Product\Repositories\ProductInventoryRepository as ProductInventory; /** * Dashboard controller @@ -21,14 +27,275 @@ class DashboardController extends Controller */ protected $_config; - public function __construct() + /** + * OrderRepository object + * + * @var array + */ + protected $order; + + /** + * OrderItemRepository object + * + * @var array + */ + protected $orderItem; + + /** + * CustomerRepository object + * + * @var array + */ + protected $customer; + + /** + * ProductInventoryRepository object + * + * @var array + */ + protected $productInventory; + + /** + * string object + * + * @var array + */ + protected $startDate; + + /** + * string object + * + * @var array + */ + protected $lastStartDate; + + /** + * string object + * + * @var array + */ + protected $endDate; + + /** + * string object + * + * @var array + */ + protected $lastEndDate; + + /** + * Create a new controller instance. + * + * @param Webkul\Sales\Repositories\OrderRepository $order + * @param Webkul\Sales\Repositories\OrderItemRepository $orderItem + * @param Webkul\Customer\Repositories\CustomerRepository $customer + * @param Webkul\Product\Repositories\ProductInventoryRepository $productInventory + * @return void + */ + public function __construct( + Order $order, + OrderItem $orderItem, + Customer $customer, + ProductInventory $productInventory + ) { $this->_config = request('_config'); $this->middleware('admin'); + + $this->order = $order; + + $this->orderItem = $orderItem; + + $this->customer = $customer; + + $this->productInventory = $productInventory; } + + public function getPercentageChange($previous, $current) + { + if(!$previous) + return $current ? 100 : 0; + + return ($current - $previous) / $previous * 100; + } + + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ public function index() { - return view('admin::dashboard.index'); + $this->setStartEndDate(); + + $statistics = [ + 'total_customers' => [ + 'previous' => $previous = $this->customer->scopeQuery(function($query) { + return $query->where('customers.created_at', '>=', $this->lastStartDate) + ->where('customers.created_at', '<=', $this->lastEndDate); + })->count(), + 'current' => $current = $this->customer->scopeQuery(function($query) { + return $query->where('customers.created_at', '>=', $this->startDate) + ->where('customers.created_at', '<=', $this->endDate); + })->count(), + 'progress' => $this->getPercentageChange($previous, $current) + ], + 'total_orders' => [ + 'previous' => $previous = $this->order->scopeQuery(function($query) { + return $query->where('orders.created_at', '>=', $this->lastStartDate) + ->where('orders.created_at', '<=', $this->lastEndDate); + })->count(), + 'current' => $current = $this->order->scopeQuery(function($query) { + return $query->where('orders.created_at', '>=', $this->startDate) + ->where('orders.created_at', '<=', $this->endDate); + })->count(), + 'progress' => $this->getPercentageChange($previous, $current) + ], + 'total_sales' => [ + 'previous' => $previous = $this->order->scopeQuery(function($query) { + return $query->where('orders.created_at', '>=', $this->lastStartDate) + ->where('orders.created_at', '<=', $this->lastEndDate); + })->sum('base_grand_total'), + 'current' => $current = $this->order->scopeQuery(function($query) { + return $query->where('orders.created_at', '>=', $this->startDate) + ->where('orders.created_at', '<=', $this->endDate); + })->sum('base_grand_total'), + 'progress' => $this->getPercentageChange($previous, $current) + ], + 'avg_sales' => [ + 'previous' => $previous = $this->order->scopeQuery(function($query) { + return $query->where('orders.created_at', '>=', $this->lastStartDate) + ->where('orders.created_at', '<=', $this->lastEndDate); + })->avg('base_grand_total'), + 'current' => $current = $this->order->scopeQuery(function($query) { + return $query->where('orders.created_at', '>=', $this->startDate) + ->where('orders.created_at', '<=', $this->endDate); + })->avg('base_grand_total'), + 'progress' => $this->getPercentageChange($previous, $current) + ], + 'top_selling_categories' => $this->getTopSellingCategories(), + 'top_selling_products' => $this->getTopSellingProducts(), + 'customer_with_most_sales' => $this->getCustomerWithMostSales(), + 'stock_threshold' => $this->getStockThreshold(), + ]; + + foreach (core()->getTimeInterval($this->startDate, $this->endDate) as $interval) { + $statistics['sale_graph']['label'][] = $interval['start']->format('d M'); + + $total = number_format($this->order->scopeQuery(function($query) use($interval) { + return $query->where('orders.created_at', '>=', $interval['start']) + ->where('orders.created_at', '<=', $interval['end']); + })->sum('base_grand_total'), 2); + + $statistics['sale_graph']['total'][] = $total; + $statistics['sale_graph']['formated_total'][] = core()->formatBasePrice($total); + } + + return view($this->_config['view'], compact('statistics'))->with(['startDate' => $this->startDate, 'endDate' => $this->endDate]); } -} + + /** + * Returns the list of top selling categories + * + * @return mixed + */ + public function getTopSellingCategories() + { + return $this->orderItem->getModel() + ->leftJoin('products', 'order_items.product_id', 'products.id') + ->leftJoin('product_categories', 'products.id', 'product_categories.product_id') + ->leftJoin('categories', 'product_categories.category_id', 'categories.id') + ->leftJoin('category_translations', 'categories.id', 'category_translations.category_id') + ->where('category_translations.locale', app()->getLocale()) + ->where('order_items.created_at', '>=', $this->startDate) + ->where('order_items.created_at', '<=', $this->endDate) + ->addSelect(DB::raw('SUM(qty_ordered) as total_qty_ordered')) + ->addSelect(DB::raw('COUNT(products.id) as total_products')) + ->addSelect('order_items.id', 'categories.id as category_id', 'category_translations.name') + ->groupBy('category_id') + ->orderBy('total_qty_ordered', 'DESC') + ->limit(5) + ->get(); + } + + /** + * Return stock threshold. + * + * @return mixed + */ + public function getStockThreshold() + { + return $this->productInventory->getModel() + ->leftJoin('products', 'product_inventories.product_id', 'products.id') + ->select(DB::raw('SUM(qty) as total_qty')) + ->addSelect('product_inventories.product_id') + ->where('products.type', '!=', 'configurable') + ->groupBy('product_id') + ->orderBy('total_qty', 'ASC') + ->limit(5) + ->get(); + } + + /** + * Returns top selling products + * @return mixed + */ + public function getTopSellingProducts() + { + return $this->orderItem->getModel() + ->select(DB::raw('SUM(qty_ordered) as total_qty_ordered')) + ->addSelect('id', 'product_id', 'product_type', 'name') + ->where('order_items.created_at', '>=', $this->startDate) + ->where('order_items.created_at', '<=', $this->endDate) + ->whereNull('parent_id') + ->groupBy('product_id') + ->orderBy('total_qty_ordered', 'DESC') + ->limit(5) + ->get(); + } + + /** + * Returns top selling products + * + * @return mixed + */ + public function getCustomerWithMostSales() + { + return $this->order->getModel() + ->select(DB::raw('SUM(base_grand_total) as total_base_grand_total')) + ->addSelect(DB::raw('COUNT(id) as total_orders')) + ->addSelect('id', 'customer_id', 'customer_email', 'customer_first_name', 'customer_last_name') + ->where('orders.created_at', '>=', $this->startDate) + ->where('orders.created_at', '<=', $this->endDate) + ->groupBy('customer_email') + ->orderBy('total_base_grand_total', 'DESC') + ->limit(5) + ->get(); + } + + /** + * Sets start and end date + * + * @return void + */ + public function setStartEndDate() + { + $this->startDate = request()->get('start') + ? Carbon::createFromTimeString(request()->get('start') . " 00:00:01") + : Carbon::createFromTimeString(Carbon::now()->subDays(30)->format('Y-m-d') . " 00:00:01"); + + $this->endDate = request()->get('end') + ? Carbon::createFromTimeString(request()->get('end') . " 23:59:59") + : Carbon::now(); + + if($this->endDate > Carbon::now()) + $this->endDate = Carbon::now(); + + $this->lastStartDate = clone $this->startDate; + $this->lastEndDate = clone $this->endDate; + + $this->lastStartDate->subDays($this->lastStartDate->diffInDays($this->lastEndDate)); + $this->lastEndDate->subDays($this->lastStartDate->diffInDays($this->lastEndDate)); + } +} \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index c3e8114de..f806753ac 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -37,17 +37,15 @@ Route::group(['middleware' => ['web']], function () { ])->name('admin.session.destroy'); // Dashboard Route - Route::get('dashboard', 'Webkul\Admin\Http\Controllers\DashboardController@index')->name('admin.dashboard.index'); + 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' ])->name('admin.customer.index'); - Route::get('customers/orders', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config',[ - 'view' => 'admin::customers.orders.index' - ])->name('admin.customer.orders.index'); - Route::get('customers/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@create')->defaults('_config',[ 'view' => 'admin::customers.create' ])->name('admin.customer.create'); @@ -448,7 +446,6 @@ Route::group(['middleware' => ['web']], function () { Route::put('/tax-categories/edit/{id}', 'Webkul\Tax\Http\Controllers\TaxCategoryController@update')->defaults('_config', [ 'redirect' => 'admin.tax-categories.index' ])->name('admin.tax-categories.update'); - //tax category ends diff --git a/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php b/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php index 9f760be4e..c1f2078ef 100644 --- a/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php @@ -46,6 +46,6 @@ class NewInvoiceNotification extends Mailable return $this->to($order->customer_email, $order->customer_full_name) ->subject(trans('admin::app.mail.invoice.subject', ['order_id' => $order->id])) - ->view('admin::emails.sales.new-invoice'); + ->view('shop::emails.sales.new-invoice'); } } diff --git a/packages/Webkul/Admin/src/Mail/NewOrderNotification.php b/packages/Webkul/Admin/src/Mail/NewOrderNotification.php index 51940d1a8..daa5c7a2d 100644 --- a/packages/Webkul/Admin/src/Mail/NewOrderNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewOrderNotification.php @@ -43,6 +43,6 @@ class NewOrderNotification extends Mailable { return $this->to($this->order->customer_email, $this->order->customer_full_name) ->subject(trans('admin::app.mail.order.subject')) - ->view('admin::emails.sales.new-order'); + ->view('shop::emails.sales.new-order'); } } diff --git a/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php b/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php index 5c8717581..34c89da2d 100644 --- a/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php @@ -46,6 +46,6 @@ class NewShipmentNotification extends Mailable return $this->to($order->customer_email, $order->customer_full_name) ->subject(trans('admin::app.mail.shipment.subject', ['order_id' => $order->id])) - ->view('admin::emails.sales.new-shipment'); + ->view('shop::emails.sales.new-shipment'); } } diff --git a/packages/Webkul/Admin/src/Resources/assets/js/components/date.vue b/packages/Webkul/Admin/src/Resources/assets/js/components/date.vue index 36c254218..25924a3d7 100644 --- a/packages/Webkul/Admin/src/Resources/assets/js/components/date.vue +++ b/packages/Webkul/Admin/src/Resources/assets/js/components/date.vue @@ -22,12 +22,16 @@ }, mounted () { + var this_this = this; + var element = this.$el.getElementsByTagName('input')[0]; this.datepicker = new Flatpickr( element, { - allowInput: true, - altFormat: 'Y-m-d H:i:s', - dateFormat: 'Y-m-d H:i:s' + altFormat: 'Y-m-d', + dateFormat: 'Y-m-d', + onChange: function(selectedDates, dateStr, instance) { + this_this.$emit('onChange', dateStr) + }, }); } }; diff --git a/packages/Webkul/Admin/src/Resources/assets/js/components/datetime.vue b/packages/Webkul/Admin/src/Resources/assets/js/components/datetime.vue index 772f04d09..d4e3f8f99 100644 --- a/packages/Webkul/Admin/src/Resources/assets/js/components/datetime.vue +++ b/packages/Webkul/Admin/src/Resources/assets/js/components/datetime.vue @@ -10,25 +10,30 @@ import Flatpickr from "flatpickr"; export default { - props: { - name: String, - value: String - }, + props: { + name: String, + value: String + }, - data() { - return { - datepicker: null - }; - }, + data() { + return { + datepicker: null + }; + }, - mounted() { - var element = this.$el.getElementsByTagName("input")[0]; - this.datepicker = new Flatpickr(element, { - allowInput: true, - altFormat: "Y-m-d H:i:s", - dateFormat: "Y-m-d H:i:s", - enableTime: true - }); - } + mounted() { + var this_this = this; + + var element = this.$el.getElementsByTagName("input")[0]; + this.datepicker = new Flatpickr(element, { + allowInput: true, + altFormat: "Y-m-d H:i:s", + dateFormat: "Y-m-d H:i:s", + enableTime: true, + onChange: function(selectedDates, dateStr, instance) { + this_this.$emit('onChange', dateStr) + }, + }); + } }; \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss index 43653f4a7..50054105a 100644 --- a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss @@ -258,273 +258,174 @@ body { // admin dashboard css -.dashboard-content { +.dashboard { - .dashboard-stats { - display: flex; - + .page-header { + margin-bottom: 0 !important; + padding-bottom: 15px; + border-bottom: 1px solid $border-color; } - .graph-category { - display: flex; - margin-top: 25px; + .page-content { + margin-top: 15px; + } + + .card { + height: 445px; + background: #FFFFFF; + border: 1px solid #E7E7E7; + box-shadow: 0 5px 10px 2px rgba(0,0,0,0.08); + border-radius: 2px; + padding: 20px 0px 0px 20px; + + .card-title { + font-size: 14px; + color: #A2A2A2; + letter-spacing: -0.26px; + text-transform: uppercase; + } + + .card-info { + width: 100%; + height: 100%; + display: inline-block; + + &.center { + text-align: center; + } + + ul { + li { + border-bottom: 1px solid $border-color; + width: 100%; + display: inline-block; + padding: 10px 0; + position: relative; + + .image { + height: 60px; + width: 60px; + float: left; + margin-right: 15px; + + &.product { + background: #F2F2F2; + } + + img { + width: 100%; + } + } + + .description { + margin-top: 10px; + + .name { + color: #0041FF; + } + + .info { + color: #3A3A3A; + margin-top: 5px; + } + } + + .icon.angle-right-icon { + position: absolute; + right: 30px; + top: 50%; + margin-top: -8px; + } + + &:last-child { + border-bottom: 0; + } + } + } + + .no-result-found { + margin-top: 146px; + + p { + margin: 0; + color: #A2A2A2; + } + } + } + } + + .dashboard-stats { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(320px, 1fr)); + grid-auto-rows: auto; + grid-column-gap: 30px; + grid-row-gap: 15px; + + .dashboard-card { + height: 100px; + background: #FFFFFF; + border: 1px solid #E7E7E7; + box-shadow: 0 5px 10px 2px rgba(0,0,0,0.08); + border-radius: 5px; + position: relative; + padding: 15px; + + + .title { + font-size: 14px; + color: #A2A2A2; + text-transform: uppercase; + } + + .data { + padding-top: 3px; + font-size: 32px; + color: #0041FF; + + .progress { + font-size: 14px; + color: #8E8E8E; + float: right; + margin-top: 9px; + + .icon { + vertical-align: middle; + } + } + } + } + } + + .graph-stats { + margin-top: 30px; + width: 100%; + display: inline-block; + + .left-card-container { + float: left; + width: 75%; + padding-right: 9px; + } + + .right-card-container { + float: left; + width: 25%; + padding-left: 21px; + } } .sale-stock { - display: flex; - margin-top: 25px; + width: 100%; + display: inline-block; + display: grid; + grid-template-columns: repeat(auto-fill, minmax(435px, 1fr)); + grid-auto-rows: auto; + grid-column-gap: 30px; + grid-row-gap: 15px; + margin-top: 30px; } - } - // admin dashboard css ends here - - -// admin dashboard component -.dashboard-card { - height: 100px; - width: 22%; - background: #FFFFFF; - border: 1px solid #E7E7E7; - box-shadow: 0 5px 10px 2px rgba(0,0,0,0.08); - border-radius: 5px; - - .visitor-content { - padding: 15px; - - .title { - - span { - padding-top:10px; - font-size: 14px; - color: #A2A2A2; - letter-spacing: -0.26px; - } - } - - .data { - padding-top: 3px; - - span { - font-size: 32px; - color: #0041FF; - letter-spacing: -0.6px; - - img { - margin-left: 75px; - height: 24px; - width:24px; - } - } - - span.right { - padding-top: 12px; - float: right; - font-size: 14px; - color: #8E8E8E; - letter-spacing: -0.7px; - } - } - } -} - -.dashboard-card:nth-last-child(1) { - margin-left: 30px; -} - -.dashboard-card:nth-last-child(2) { - margin-left: 30px; -} - -.dashboard-card:nth-last-child(3) { - margin-left: 30px; -} - - -.dashboard-graph { - height: 413px; - width: 70.5%; - background: #FFFFFF; - border: 1px solid #E7E7E7; - box-shadow: 0 5px 10px 2px rgba(0,0,0,0.08); - border-radius: 2px; -} - -.sale { - height: 465px; - width: 30.1%; - background: #FFFFFF; - border: 1px solid #E7E7E7; - box-shadow: 0 5px 10px 2px rgba(0,0,0,0.08); - border-radius: 2px; - - .top-sale { - margin-left: 20px; - margin-top: 27px; - - .title { - - span { - font-size: 14px; - color: #A2A2A2; - letter-spacing: -0.26px; - } - } - - .sale-info { - - ul { - - li { - - .pro-attribute{ - display: flex; - margin-top: 10px; - - .pro-img { - height: 60px; - width: 60px; - border: 1px solid green; - } - - .product-description { - margin-left: 15px; - margin-top: 8px; - width: 75%; - - .product-name { - - span { - font-size: 14px; - color: #0041FF; - letter-spacing: -0.26px; - } - - .right-side { - float: right; - margin-top: 10px; - height: 20px; - width: 20px; - } - } - - .product-info { - - span { - font-size: 14px; - color: #3A3A3A; - letter-spacing: -0.26px; - } - } - } - } - - .horizontal-rule { - border: .5px solid #A2A2A2; - opacity: 0.2; - margin-top: 10px; - } - } - - li:last-child { - .horizontal-rule { - display: none; - } - } - } - } - } -} - -.sale:nth-last-child(1) { - margin-left: 31px; -} - -.sale:nth-last-child(2) { - margin-left: 31px; -} -// admin dashboard css ends here - -.performing-category { - height: 413px; - width: 22%; - margin-left: 30px; - background: #FFFFFF; - border: 1px solid #E7E7E7; - box-shadow: 0 5px 10px 2px rgba(0,0,0,0.08); - border-radius: 2px; - - .category { - margin-left: 20px; - margin-top: 20px; - - .title { - - span { - font-size: 14px; - color: #A2A2A2; - letter-spacing: -0.26px; - } - } - - .category-info { - margin-top: 30px; - - - ul { - - li { - - .category-list { - margin-top: 10px; - - .cat-name { - - span { - font-size: 16px; - color: #0041FF; - letter-spacing: -0.3px; - - } - - .right-side { - float: right; - margin-right: 12px; - margin-top: 10px; - height: 20px; - width: 20px; - } - } - - .product-info { - margin-top: 5px; - - span { - font-size: 16px; - color: #3A3A3A; - letter-spacing: -0.3px; - } - } - - .horizon-rule { - margin-top: 8px; - border: .7px solid #D8D8D8; - } - } - } - - li:last-child { - - .category-list { - .horizon-rule { - display: none; - } - } - } - } - } - } -} // customer oder css for admin start here .sale-container { diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 5e4fd888e..41b26ad75 100644 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -7,7 +7,25 @@ return [ 'state' => 'State' ], 'dashboard' => [ - 'title' => 'Dashboard' + 'title' => 'Dashboard', + 'from' => 'From', + 'to' => 'To', + 'total-customers' => 'Total Customers', + 'total-orders' => 'Total Orders', + 'total-sale' => 'Total Sale', + 'average-sale' => 'Average Order Sale', + 'increased' => ':progress% Increased', + 'decreased' => ':progress% Decreased', + 'sales' => 'Sales', + 'top-performing-categories' => 'Top Performing Categories', + 'product-count' => ':count Products', + 'top-selling-products' => 'Top Selling Products', + 'sale-count' => ':count Sales', + 'customer-with-most-sales' => 'Customer With Most Sales', + 'order-count' => ':count Orders', + 'revenue' => 'Revenue :total', + 'stock-threshold' => 'Stock Threshold', + 'qty-left' => ':qty Left', ], 'account' => [ 'title' => 'My Account', @@ -32,6 +50,8 @@ return [ 'title' => 'Reset Password', 'title' => 'Reset Password', 'email' => 'Registered Email', + 'password' => 'Password', + 'confirm-password' => 'Confirm Password', 'back-link-title' => 'Back to Sign In', 'submit-btn-title' => 'Reset Password' ], @@ -457,6 +477,13 @@ return [ 'summary' => 'Summary of Shipment', 'carrier' => 'Carrier', 'tracking-number' => 'Tracking Number' + ], + 'forget-password' => [ + 'dear' => 'Dear :name', + 'info' => 'You are receiving this email because we received a password reset request for your account.', + 'reset-password' => 'Reset Password', + 'final-summary' => 'If you did not request a password reset, no further action is required.', + 'thanks' => 'Thanks!' ] ] ]; \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php b/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php index 59ae4e5ba..60be3a496 100644 --- a/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php @@ -5,497 +5,452 @@ @stop @section('content-wrapper') -
-

Dashboard

- -
+ +
+
+
+

{{ __('admin::app.dashboard.title') }}

+
+ +
+ +
+
+ +
-
-
- NEW VISITORS -
-
- 450 - - - - - 12.5% Increased - -
+
+ {{ __('admin::app.dashboard.total-customers') }} +
+ +
+ {{ $statistics['total_customers']['current'] }} + + + @if ($statistics['total_customers']['progress'] < 0) + + {{ __('admin::app.dashboard.decreased', [ + 'progress' => -number_format($statistics['total_customers']['progress'], 1) + ]) + }} + @else + + {{ __('admin::app.dashboard.increased', [ + 'progress' => number_format($statistics['total_customers']['progress'], 1) + ]) + }} + @endif +
-
-
- NEW VISITORS -
-
- 450 - - - - - 12.5% Increased - -
+
+ {{ __('admin::app.dashboard.total-orders') }} +
+ +
+ {{ $statistics['total_orders']['current'] }} + + + @if ($statistics['total_orders']['progress'] < 0) + + {{ __('admin::app.dashboard.decreased', [ + 'progress' => -number_format($statistics['total_orders']['progress'], 1) + ]) + }} + @else + + {{ __('admin::app.dashboard.increased', [ + 'progress' => number_format($statistics['total_orders']['progress'], 1) + ]) + }} + @endif +
-
-
- NEW VISITORS -
-
- 450 - - - - - 12.5% Increased - -
+
+ {{ __('admin::app.dashboard.total-sale') }} +
+ +
+ {{ core()->formatBasePrice($statistics['total_sales']['current']) }} + + + @if ($statistics['total_sales']['progress'] < 0) + + {{ __('admin::app.dashboard.decreased', [ + 'progress' => -number_format($statistics['total_sales']['progress'], 1) + ]) + }} + @else + + {{ __('admin::app.dashboard.increased', [ + 'progress' => number_format($statistics['total_sales']['progress'], 1) + ]) + }} + @endif +
-
-
- NEW VISITORS -
-
- 450 - - - - - 12.5% Increased - -
+
+ {{ __('admin::app.dashboard.average-sale') }} +
+ +
+ {{ core()->formatBasePrice($statistics['avg_sales']['current']) }} + + + @if ($statistics['avg_sales']['progress'] < 0) + + {{ __('admin::app.dashboard.decreased', [ + 'progress' => -number_format($statistics['avg_sales']['progress'], 1) + ]) + }} + @else + + {{ __('admin::app.dashboard.increased', [ + 'progress' => number_format($statistics['avg_sales']['progress'], 1) + ]) + }} + @endif +
- - - -
-
-
-
+
-
-
-
- TOP PERFORMING CATEGORIES +
+
+
+ {{ __('admin::app.dashboard.sales') }}
-
- -
    +
    -
  • -
    -
    - Men - -
    -
    - 250 Products . 290 Sales -
    -
    -
    -
    -
    • - -
  • -
    -
    - Women - -
    -
    - 375 Products . 350 Sales -
    -
    -
    -
    -
    • - -
  • -
    -
    - Electronics - -
    -
    - 200 Products . 214 Sales -
    -
    -
    -
    -
    • - -
  • -
    -
    - Accessories - -
    -
    - 180 Products . 180 Sales -
    -
    -
    -
    -
    • -
+ +
+ +
+
+
+ {{ __('admin::app.dashboard.top-performing-categories') }} +
+ +
+ + + @if (!count($statistics['top_selling_categories'])) + +
+ + +

{{ __('admin::app.common.no-result-found') }}

+ +
+ + @endif +
+
+
+
+ @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') +
-
-
-
- TOP SELLING PRODUCTS -
+
+
+ {{ __('admin::app.dashboard.top-selling-products') }} +
-
- + + @if (!count($statistics['top_selling_products'])) + +
+ + +

{{ __('admin::app.common.no-result-found') }}

+ +
+ + @endif
-
-
-
- CUSTOMERS WITH MOST SALES -
- -
-
    -
  • -
    -
    - -
    -
    -
    - Emma Wagner - -
    -
    - 24 Orders . Revenue $450.00 -
    -
    -
    -
    -
    -
    • - -
  • -
    -
    - -
    -
    -
    - Emma Wagner - -
    -
    - 24 Orders . Revenue $450.00 -
    -
    -
    -
    -
    -
    • - -
  • -
    -
    - -
    -
    -
    - Emma Wagner - -
    -
    - 24 Orders . Revenue $450.00 -
    -
    -
    -
    -
    -
    • - -
  • -
    -
    - -
    -
    -
    - Emma Wagner - -
    -
    - 24 Orders . Revenue $450.00 -
    -
    - -
    -
    -
    -
    • - -
  • -
    -
    - -
    -
    -
    - Emma Wagner - -
    -
    - 24 Orders . Revenue $450.00 -
    -
    - -
    -
    -
    -
    • -
-
+
+
+ {{ __('admin::app.dashboard.customer-with-most-sales') }}
+ +
+ + + @if (!count($statistics['customer_with_most_sales'])) + +
+ + +

{{ __('admin::app.common.no-result-found') }}

+ +
+ + @endif +
+
-
-
-
- TOP SELLING PRODUCTS -
- -
-
    -
  • -
    -
    - -
    -
    -
    - Men's Olive Denim Jacket - -
    -
    - 7 left -
    -
    -
    -
    -
    -
    • - -
  • -
    -
    - -
    -
    -
    - Apple iPhone 8 Plus - 64GB - - -
    -
    - 250 Sales . In Stock - 500 -
    -
    -
    -
    -
    -
    • - -
  • -
    -
    - -
    -
    -
    - Long Lenngth Printed Shrug - -
    -
    - 250 Products . In Stock - 500 -
    -
    - -
    -
    -
    -
    • - -
  • -
    -
    - -
    -
    -
    - Black Round Neck T-Shirt for Men - - -
    -
    - 250 Products . In Stock - 500 -
    -
    - -
    -
    -
    -
    • - -
  • -
    -
    - -
    -
    -
    - Men's Linnen Shirt -Regular Fit - -
    -
    - 250 Products . In Stock - 500 -
    -
    - -
    -
    -
    -
    • -
-
+
+
+ {{ __('admin::app.dashboard.stock-threshold') }}
+ +
+ + + @if (!count($statistics['stock_threshold'])) + +
+ + +

{{ __('admin::app.common.no-result-found') }}

+ +
+ + @endif +
+
- - -
- - @stop + +@push('scripts') + + + + + + + +@endpush \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php index 07e0c7e52..9fef717d7 100644 --- a/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php @@ -7,6 +7,8 @@ + + diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php index 26126db19..e4e0b21cb 100644 --- a/packages/Webkul/Core/src/Core.php +++ b/packages/Webkul/Core/src/Core.php @@ -512,4 +512,77 @@ class Core return $collection; } + + /** + * Returns time intervals + * + * @return array + */ + public function getTimeInterval($startDate, $endDate) { + $timeIntervals = []; + + $totalDays = $startDate->diffInDays($endDate); + $totalMonths = $startDate->diffInMonths($endDate); + + $startWeekDay = Carbon::createFromTimeString($this->xWeekRange($startDate, 0) . ' 00:00:01'); + $endWeekDay = Carbon::createFromTimeString($this->xWeekRange($endDate, 1) . ' 23:59:59'); + $totalWeeks = $startWeekDay->diffInWeeks($endWeekDay); + + if($totalMonths > 5) { + for ($i = 0; $i < $totalMonths; $i++) { + $date = clone $startDate; + $date->addMonths($i); + + $start = Carbon::createFromTimeString($date->format('Y-m-d') . ' 00:00:01'); + $end = $totalMonths - 1 == $i + ? $endDate + : Carbon::createFromTimeString($date->format('Y-m-d') . ' 23:59:59'); + + $timeIntervals[] = ['start' => $start, 'end' => $end, 'formatedDate' => $date->format('M')]; + } + } elseif($totalWeeks > 6) { + for ($i = 0; $i < $totalWeeks; $i++) { + $date = clone $startDate; + $date->addWeeks($i); + + $start = $i == 0 + ? $startDate + : Carbon::createFromTimeString($this->xWeekRange($date, 0) . ' 00:00:01'); + $end = $totalWeeks - 1 == $i + ? $endDate + : Carbon::createFromTimeString($this->xWeekRange($date, 1) . ' 23:59:59'); + + $timeIntervals[] = ['start' => $start, 'end' => $end, 'formatedDate' => $date->format('d M')]; + } + } else { + for ($i = 0; $i < $totalDays; $i++) { + $date = clone $startDate; + $date->addDays($i); + + $start = Carbon::createFromTimeString($date->format('Y-m-d') . ' 00:00:01'); + $end = Carbon::createFromTimeString($date->format('Y-m-d') . ' 23:59:59'); + + $timeIntervals[] = ['start' => $start, 'end' => $end, 'formatedDate' => $date->format('d M')]; + } + } + + return $timeIntervals; + } + + /** + * @return string + */ + public function xWeekRange($date, $day) { + $ts = strtotime($date); + + if(!$day) { + $start = (date('D', $ts) == 'Sun') ? $ts : strtotime('last sunday', $ts); + + return date('Y-m-d', $start); + } else { + $end = (date('D', $ts) == 'Sat') ? $ts : strtotime('next saturday', $ts); + + return date('Y-m-d', $end); + } + } } \ No newline at end of file diff --git a/packages/Webkul/Core/src/Eloquent/Repository.php b/packages/Webkul/Core/src/Eloquent/Repository.php index 07d2d7401..30add72fa 100644 --- a/packages/Webkul/Core/src/Eloquent/Repository.php +++ b/packages/Webkul/Core/src/Eloquent/Repository.php @@ -87,7 +87,41 @@ abstract class Repository extends BaseRepository { */ public function count() { - return $this->model->count(); + $this->applyCriteria(); + $this->applyScope(); + + $total = $this->model->count(); + $this->resetModel(); + + return $total; + } + + /** + * @return mixed + */ + public function sum($columns) + { + $this->applyCriteria(); + $this->applyScope(); + + $sum = $this->model->sum($columns); + $this->resetModel(); + + return $sum; + } + + /** + * @return mixed + */ + public function avg($columns) + { + $this->applyCriteria(); + $this->applyScope(); + + $avg = $this->model->avg($columns); + $this->resetModel(); + + return $avg; } /** diff --git a/packages/Webkul/Customer/src/Models/Customer.php b/packages/Webkul/Customer/src/Models/Customer.php index bb6589d57..5f9676bbb 100644 --- a/packages/Webkul/Customer/src/Models/Customer.php +++ b/packages/Webkul/Customer/src/Models/Customer.php @@ -18,9 +18,9 @@ class Customer extends Authenticatable protected $table = 'customers'; - protected $fillable = ['first_name', 'last_name', 'gender', 'date_of_birth','phone','email','password','customer_group_id','subscribed_to_news_letter']; + protected $fillable = ['first_name', 'last_name', 'gender', 'date_of_birth', 'phone', 'email', 'password', 'customer_group_id', 'subscribed_to_news_letter']; - protected $hidden = ['password','remember_token']; + protected $hidden = ['password', 'remember_token']; protected $with = ['customerGroup']; diff --git a/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php b/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php index 3c1517058..9db9e27ae 100644 --- a/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php +++ b/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php @@ -21,8 +21,9 @@ class CustomerResetPassword extends ResetPassword } return (new MailMessage) - ->line('You are receiving this email because we received a password reset request for your account.') - ->action('Reset Password', route('customer.reset-password.create', $this->token)) - ->line('If you did not request a password reset, no further action is required.'); + ->view('shop::emails.customer.forget-password')->with([ + 'user_name' => $notifiable->name, + 'token' => $this->token + ]); } } diff --git a/packages/Webkul/Product/src/Models/ProductInventory.php b/packages/Webkul/Product/src/Models/ProductInventory.php index 1bf30ebca..f76ba89a5 100644 --- a/packages/Webkul/Product/src/Models/ProductInventory.php +++ b/packages/Webkul/Product/src/Models/ProductInventory.php @@ -10,19 +10,7 @@ class ProductInventory extends Model public $timestamps = false; protected $fillable = ['qty', 'product_id', 'inventory_source_id']; - - /** - * Use by cart for - * checking the - * inventory source - * status - * - * @return Collection - */ - // public function checkInventoryStatus() { - // return $this->leftjoin('inventory_sources', 'inventory_sources.id', 'inventory_source_id')->select('status')->where('status', '=','1'); - // } - + /** * Get the product attribute family that owns the product. */ @@ -30,4 +18,12 @@ class ProductInventory extends Model { return $this->belongsTo(InventorySource::class); } + + /** + * Get the product that owns the product inventory. + */ + public function product() + { + return $this->belongsTo(Product::class); + } } \ No newline at end of file diff --git a/packages/Webkul/Sales/src/Models/OrderItem.php b/packages/Webkul/Sales/src/Models/OrderItem.php index 08ad131cb..ee4ca55b2 100644 --- a/packages/Webkul/Sales/src/Models/OrderItem.php +++ b/packages/Webkul/Sales/src/Models/OrderItem.php @@ -4,6 +4,7 @@ namespace Webkul\Sales\Models; use Illuminate\Database\Eloquent\Model; use Webkul\Sales\Contracts\OrderItem as OrderItemContract; +use Webkul\Product\Models\Product; class OrderItem extends Model implements OrderItemContract { diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index 2cdafeb71..5ee8b6e4d 100644 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -80,7 +80,7 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function //Reset Password create Route::get('/reset-password/{token}', 'Webkul\Customer\Http\Controllers\ResetPasswordController@create')->defaults('_config', [ 'view' => 'shop::customers.signup.reset-password' - ])->name('password.reset'); + ])->name('customer.reset-password.create'); Route::post('/reset-password', 'Webkul\Customer\Http\Controllers\ResetPasswordController@store')->defaults('_config', [ 'redirect' => 'customer.session.index' diff --git a/packages/Webkul/Shop/src/Resources/views/emails/admin/forget-password.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/admin/forget-password.blade.php new file mode 100644 index 000000000..c49b5d23b --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/views/emails/admin/forget-password.blade.php @@ -0,0 +1,34 @@ +@component('admin::emails.layouts.master') +
+ + + +
+ +
+
+

+ {{ __('admin::app.mail.forget-password.dear', ['name' => $user_name]) }}, +

+ +

+ {{ __('admin::app.mail.forget-password.info') }} +

+ +

+ + {{ __('admin::app.mail.forget-password.reset-password') }} + +

+ +

+ {{ __('admin::app.mail.forget-password.final-summary') }} +

+ +

+ {{ __('admin::app.mail.forget-password.thanks') }} +

+ +
+
+@endcomponent \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/emails/customer/forget-password.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/customer/forget-password.blade.php new file mode 100644 index 000000000..df29b6c93 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/views/emails/customer/forget-password.blade.php @@ -0,0 +1,34 @@ +@component('admin::emails.layouts.master') +
+ + + +
+ +
+
+

+ {{ __('admin::app.mail.forget-password.dear', ['name' => $user_name]) }}, +

+ +

+ {{ __('admin::app.mail.forget-password.info') }} +

+ +

+ + {{ __('admin::app.mail.forget-password.reset-password') }} + +

+ +

+ {{ __('admin::app.mail.forget-password.final-summary') }} +

+ +

+ {{ __('admin::app.mail.forget-password.thanks') }} +

+ +
+
+@endcomponent \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/emails/layouts/master.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/layouts/master.blade.php similarity index 100% rename from packages/Webkul/Admin/src/Resources/views/emails/layouts/master.blade.php rename to packages/Webkul/Shop/src/Resources/views/emails/layouts/master.blade.php diff --git a/packages/Webkul/Admin/src/Resources/views/emails/sales/new-invoice.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php similarity index 100% rename from packages/Webkul/Admin/src/Resources/views/emails/sales/new-invoice.blade.php rename to packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php diff --git a/packages/Webkul/Admin/src/Resources/views/emails/sales/new-order.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php similarity index 100% rename from packages/Webkul/Admin/src/Resources/views/emails/sales/new-order.blade.php rename to packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php diff --git a/packages/Webkul/Admin/src/Resources/views/emails/sales/new-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php similarity index 100% rename from packages/Webkul/Admin/src/Resources/views/emails/sales/new-shipment.blade.php rename to packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Calendar.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Calendar.svg new file mode 100644 index 000000000..1d5ab01f3 --- /dev/null +++ b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Calendar.svg @@ -0,0 +1,16 @@ + + + + Icon-Calendar + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Graph-Green.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Graph-Green.svg new file mode 100644 index 000000000..ba589b67d --- /dev/null +++ b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Graph-Green.svg @@ -0,0 +1,14 @@ + + + + Icon-Graph-Green + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Graph-Red.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Graph-Red.svg new file mode 100644 index 000000000..5458a660f --- /dev/null +++ b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Graph-Red.svg @@ -0,0 +1,14 @@ + + + + Icon-Graph-Red + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Profile-Pic.svg b/packages/Webkul/Ui/src/Resources/assets/images/Profile-Pic.svg new file mode 100644 index 000000000..737ae019a --- /dev/null +++ b/packages/Webkul/Ui/src/Resources/assets/images/Profile-Pic.svg @@ -0,0 +1,15 @@ + + + + Profile-Pic + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/assets/images/limited-icon.svg b/packages/Webkul/Ui/src/Resources/assets/images/limited-icon.svg new file mode 100644 index 000000000..f58960031 --- /dev/null +++ b/packages/Webkul/Ui/src/Resources/assets/images/limited-icon.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index b29b258c2..32ec03dbd 100644 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -462,6 +462,19 @@ h2 { } } + &.date, &.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-info { display: block; font-style: italic; diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss b/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss index ae5feb753..16bce6270 100644 --- a/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss @@ -190,6 +190,30 @@ 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"); diff --git a/packages/Webkul/User/src/Notifications/AdminResetPassword.php b/packages/Webkul/User/src/Notifications/AdminResetPassword.php index cd359c198..38fdf556b 100644 --- a/packages/Webkul/User/src/Notifications/AdminResetPassword.php +++ b/packages/Webkul/User/src/Notifications/AdminResetPassword.php @@ -7,7 +7,6 @@ use Illuminate\Auth\Notifications\ResetPassword; class AdminResetPassword extends ResetPassword { - /** * Build the mail representation of the notification. * @@ -21,8 +20,9 @@ class AdminResetPassword extends ResetPassword } return (new MailMessage) - ->line('You are receiving this email because we received a password reset request for your account.') - ->action('Reset Password', route('admin.reset-password.create', $this->token)) - ->line('If you did not request a password reset, no further action is required.'); + ->view('shop::emails.admin.forget-password')->with([ + 'user_name' => $notifiable->name, + 'token' => $this->token + ]); } } From 96b40bf2c3490c6185b5fc82e1db5fb863e1f45f Mon Sep 17 00:00:00 2001 From: prashant-webkul Date: Tue, 23 Oct 2018 17:16:00 +0530 Subject: [PATCH 8/8] Products DataGrid --- .../Admin/src/DataGrids/OrderDataGrid.php | 25 ++- .../Admin/src/DataGrids/ProductDataGrid.php | 139 +++++++++-------- .../Admin/src/DataGrids/RolesDataGrid.php | 17 +-- .../Admin/src/DataGrids/UserDataGrid.php | 3 +- packages/Webkul/Admin/src/Http/routes.php | 2 + .../Webkul/Admin/src/Listeners/Product.php | 143 ++++++++++++++++++ .../Controllers/RegistrationController.php | 8 +- .../Http/Controllers/WishlistController.php | 1 - .../Webkul/Customer/src/Models/Customer.php | 2 +- .../Customer/src/Resources/lang/en/app.php | 3 + ...2018_10_22_111807_create_products_grid.php | 7 +- .../Http/Controllers/ProductController.php | 51 +------ .../Webkul/Product/src/Models/ProductGrid.php | 2 +- .../src/Providers/ProductServiceProvider.php | 12 +- .../Repositories/ProductGridRepository.php | 98 +++++++++++- .../Shop/src/Resources/assets/sass/icons.scss | 11 +- .../Webkul/Shop/src/Resources/lang/en/app.php | 1 - .../customers/account/reviews/index.blade.php | 44 +++--- packages/Webkul/Ui/src/DataGrid/DataGrid.php | 1 - .../Webkul/Ui/src/DataGrid/ProductGrid.php | 1 - public/themes/default/assets/css/shop.css | 7 + 21 files changed, 398 insertions(+), 180 deletions(-) create mode 100644 packages/Webkul/Admin/src/Listeners/Product.php diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php index 9d5678b37..477d5dde3 100644 --- a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php @@ -14,7 +14,6 @@ use Webkul\Ui\DataGrid\Facades\DataGrid; class OrderDataGrid { - /** * The Data Grid implementation. * @@ -114,19 +113,17 @@ class OrderDataGrid //don't use aliasing in case of searchables 'searchable' => [ - // [ - // 'column' => 'cat.id', - // 'type' => 'number', - // 'label' => 'Category ID', - // ], [ - // 'column' => 'ct.name', - // 'type' => 'string', - // 'label' => 'Category Name', - // ], [ - // 'column' => 'cat.status', - // 'type' => 'string', - // 'label' => 'Visible in Menu', - // ] + [ + 'column' => 'or.id', + 'alias' => 'orderid', + 'type' => 'number', + 'label' => 'ID', + ], [ + 'name' => 'or.status', + 'alias' => 'orstatus', + 'type' => 'string', + 'label' => 'Status' + ] ], //list of viable operators that will be used diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index ba712cc2c..3f81843f0 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -25,17 +25,12 @@ class ProductDataGrid return DataGrid::make([ 'name' => 'Products', 'table' => 'products_grid as prods', - 'select' => 'prods.id', - 'perpage' => 10, + 'select' => 'prods.product_id', + 'perpage' => 5, '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', - // ], + //check other grid for configuration and make of your own ], 'actions' => [ @@ -61,19 +56,50 @@ class ProductDataGrid //name, alias, type, label, sortable [ 'name' => 'prods.product_id', - 'alias' => 'productID', - 'type' => 'number', + 'alias' => 'id', + 'type' => 'string', 'label' => 'ID', 'sortable' => true, - ], - [ + ], [ 'name' => 'prods.sku', 'alias' => 'productSku', 'type' => 'string', 'label' => 'SKU', 'sortable' => true, - ], - [ + ], [ + 'name' => 'prods.name', + 'alias' => 'ProductName', + 'type' => 'string', + 'label' => 'Product Name', + 'sortable' => false, + ], [ + 'name' => 'prods.type', + 'alias' => 'ProductType', + 'type' => 'string', + 'label' => 'Product Type', + 'sortable' => false, + ], [ + 'name' => 'prods.status', + 'alias' => 'ProductStatus', + 'type' => 'string', + 'label' => 'Product Status', + 'sortable' => false, + 'wrapper' => function ($value) { + if($value == 1) + return 'Active'; + else + return 'Inactive'; + }, + ], [ + 'name' => 'prods.price', + 'alias' => 'ProductPrice', + 'type' => 'string', + 'label' => 'Product Price', + 'sortable' => false, + 'wrapper' => function ($value) { + return core()->formatBasePrice($value); + }, + ], [ 'name' => 'prods.quantity', 'alias' => 'ProductQuantity', 'type' => 'string', @@ -83,57 +109,50 @@ class ProductDataGrid ], 'filterable' => [ - //column, type, and label - // [ - // 'column' => 'prods.id', - // 'alias' => 'productID', - // 'type' => 'number', - // 'label' => 'ID', - // ], - // [ - // 'column' => 'prods.sku', - // 'alias' => 'productCode', - // 'type' => 'string', - // 'label' => 'SKU', - // ], - // [ - // 'column' => 'attfam.name', - // 'alias' => 'FamilyName', - // 'type' => 'string', - // 'label' => 'Family Name', - // ], - // [ - // 'column' => 'pi.qty', - // 'alias' => 'ProductQuantity', - // 'type' => 'number', - // 'label' => 'Product Quatity', - // ], + //column, alias, type, and label + [ + 'column' => 'prods.product_id', + 'alias' => 'productID', + 'type' => 'number', + 'label' => 'ID', + ], [ + 'column' => 'prods.sku', + 'alias' => 'productSku', + 'type' => 'string', + 'label' => 'SKU', + ], [ + 'column' => 'prods.name', + 'alias' => 'ProductName', + 'type' => 'string', + 'label' => 'Product Name', + ], [ + 'column' => 'prods.type', + 'alias' => 'ProductType', + 'type' => 'string', + 'label' => 'Product Type', + ] ], - //don't use aliasing in case of searchables 'searchable' => [ //column, type and label - // [ - // 'column' => 'prods.id', - // 'type' => 'number', - // 'label' => 'ID', - // ], - // [ - // 'column' => 'prods.sku', - // 'type' => 'string', - // 'label' => 'SKU', - // ], - // [ - // 'column' => 'attfam.name', - // 'type' => 'string', - // 'label' => 'Family Name', - // ], - // [ - // 'column' => 'pi.qty', - // 'type' => 'string', - // 'label' => 'Product Quatity', - // ], + [ + 'column' => 'prods.product_id', + 'type' => 'number', + 'label' => 'ID', + ], [ + 'column' => 'prods.sku', + 'type' => 'string', + 'label' => 'SKU', + ], [ + 'column' => 'prods.name', + 'type' => 'string', + 'label' => 'Product Name', + ], [ + 'column' => 'prods.type', + 'type' => 'string', + 'label' => 'Product Type', + ] ], //list of viable operators that will be used diff --git a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php index ab8d08b8b..7bfeb06cc 100644 --- a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php @@ -68,29 +68,25 @@ class RolesDataGrid //use aliasing on secodary columns if join is performed 'columns' => [ - [ 'name' => 'id', 'alias' => 'roleId', 'type' => 'number', 'label' => 'ID', 'sortable' => true, - ], - [ + ], [ 'name' => 'name', 'alias' => 'roleName', 'type' => 'string', 'label' => 'Name', 'sortable' => true, - ], - [ + ], [ 'name' => 'permission_type', 'alias' => 'rolePermissionType', 'type' => 'string', 'label' => 'Permission Type', 'sortable' => true, ], - ], //don't use aliasing in case of filters @@ -101,14 +97,12 @@ class RolesDataGrid 'alias' => 'roleId', 'type' => 'number', 'label' => 'ID', - ], - [ + ], [ 'column' => 'name', 'alias' => 'roleName', 'type' => 'string', 'label' => 'Name', - ], - [ + ], [ 'column' => 'permission_type', 'alias' => 'rolePermissionType', 'type' => 'string', @@ -123,8 +117,7 @@ class RolesDataGrid 'column' => 'name', 'type' => 'string', 'label' => 'Name', - ], - [ + ], [ 'column' => 'permission_type', 'type' => 'string', 'label' => 'Permission Type', diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php index d639b1071..0543693aa 100644 --- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php @@ -135,8 +135,7 @@ class UserDataGrid 'column' => 'u.email', 'type' => 'string', 'label' => 'E-Mail' - ], - [ + ], [ 'column' => 'u.name', 'type' => 'string', 'label' => 'Name' diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index 95a236a9e..627d7d5fc 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -137,6 +137,8 @@ Route::group(['middleware' => ['web']], function () { // Catalog Routes Route::prefix('catalog')->group(function () { + Route::get('/sync', 'Webkul\Product\Http\Controllers\ProductController@sync'); + // Catalog Product Routes Route::get('/products', 'Webkul\Product\Http\Controllers\ProductController@index')->defaults('_config', [ 'view' => 'admin::catalog.products.index' diff --git a/packages/Webkul/Admin/src/Listeners/Product.php b/packages/Webkul/Admin/src/Listeners/Product.php new file mode 100644 index 000000000..59648f121 --- /dev/null +++ b/packages/Webkul/Admin/src/Listeners/Product.php @@ -0,0 +1,143 @@ + @prashant-webkul + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class Product { + + /** + * Product Repository Object + */ + protected $product; + + /** + * Price Object + * + * @var array + */ + Protected $price; + + + /** + * Product Grid Repository Object + */ + protected $productGrid; + + public function __construct(ProductRepository $product, ProductGridRepository $productGrid, Price $price) + { + $this->product = $product; + + $this->productGrid = $productGrid; + + $this->price = $price; + } + + /** + * Creates a new entry in the product grid whenever a new product is created. + * + * @return boolean + */ + public function afterProductCreated($product) { + $gridObject = []; + + $gridObject = [ + 'product_id' => $product->id, + 'sku' => $product->sku, + 'type' => $product->type, + 'attribute_family_name' => $product->toArray()['attribute_family']['name'], + ]; + + if($this->productGrid->create($gridObject)) { + return true; + } else { + return false; + } + } + + /** + * Event before the product update + * + * @return boolean + */ + public function beforeProductUpdate($productId) { + return true; + } + + /** + * Event after the product update + * + * @var collection product + * + * return boolean + */ + public function afterProductUpdate($product) { + //update product grid here + $this->productGrid->updateWhere($product); + + return true; + } + + /** + * Event after deletion of the product + * + * @return boolean + */ + public function afterProductDelete($productId) { + return true; + } + + /** + * Fill attributes for that product after the creation + * + * @return boolean + */ + public function fillAttribute() { + + } + + public function sync() { + $gridObject = []; + + foreach($this->product->all() as $product) { + $gridObject = [ + 'product_id' => $product->id, + 'sku' => $product->sku, + 'type' => $product->type, + 'name' => $product->name, + 'attribute_family_name' => $product->toArray()['attribute_family']['name'], + 'price' => $this->price->getMinimalPrice($product), + 'status' => $product->status + ]; + + if($product->type == 'configurable') { + $gridObject['quantity'] = 0; + } else { + $qty = 0; + + foreach($product->toArray()['inventories'] as $inventorySource) { + $qty = $qty + $inventorySource['qty']; + } + + $gridObject['quantity'] = $qty; + + $qty = 0; + } + $this->productGrid->create($gridObject); + + $gridObject = []; + } + + return true; + } +} \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php index fa9ac1f22..53b389bd1 100644 --- a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php @@ -51,20 +51,20 @@ class RegistrationController extends Controller */ public function create(Request $request) { - // dd(request()->input()); $request->validate([ - 'first_name' => 'string|required', 'last_name' => 'string|required', 'email' => 'email|required', 'password' => 'confirmed|min:6|required', - 'agreement' => 'confirmed' + 'agreement' => 'required' ]); $data = request()->input(); $data['password'] = bcrypt($data['password']); + $data['channel_id'] = core()->getCurrentChannel()->id; + if ($this->customer->create($data)) { session()->flash('success', 'Account created successfully.'); @@ -72,11 +72,9 @@ class RegistrationController extends Controller return redirect()->route($this->_config['redirect']); } else { - session()->flash('error', 'Cannot Create Your Account.'); return redirect()->back(); - } } } diff --git a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php index 6225f6a1c..646230d1c 100644 --- a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php @@ -133,7 +133,6 @@ class WishlistController extends Controller * @return response */ public function addconfigurable($urlkey) { - dd($urlkey); session()->flash('warning', trans('Select options before adding to wishlist')); return redirect()->route('shop.products.index', $urlkey); } diff --git a/packages/Webkul/Customer/src/Models/Customer.php b/packages/Webkul/Customer/src/Models/Customer.php index bb6589d57..5105f9953 100644 --- a/packages/Webkul/Customer/src/Models/Customer.php +++ b/packages/Webkul/Customer/src/Models/Customer.php @@ -18,7 +18,7 @@ class Customer extends Authenticatable protected $table = 'customers'; - protected $fillable = ['first_name', 'last_name', 'gender', 'date_of_birth','phone','email','password','customer_group_id','subscribed_to_news_letter']; + protected $fillable = ['first_name', 'channel_id', 'last_name', 'gender', 'date_of_birth','phone','email','password','customer_group_id','subscribed_to_news_letter']; protected $hidden = ['password','remember_token']; diff --git a/packages/Webkul/Customer/src/Resources/lang/en/app.php b/packages/Webkul/Customer/src/Resources/lang/en/app.php index 30f59002c..cbd32f946 100644 --- a/packages/Webkul/Customer/src/Resources/lang/en/app.php +++ b/packages/Webkul/Customer/src/Resources/lang/en/app.php @@ -10,4 +10,7 @@ return [ 'empty' => 'You Don\'t Have Any Items In Your Wishlist', 'select-options' => 'Need To Select Options Before Adding To Wishlist' ], + 'reviews' => [ + 'empty' => 'You Haven\'t Reviewed Any Product Yet' + ] ]; \ No newline at end of file diff --git a/packages/Webkul/Product/src/Database/Migrations/2018_10_22_111807_create_products_grid.php b/packages/Webkul/Product/src/Database/Migrations/2018_10_22_111807_create_products_grid.php index 790131dd6..46130304f 100644 --- a/packages/Webkul/Product/src/Database/Migrations/2018_10_22_111807_create_products_grid.php +++ b/packages/Webkul/Product/src/Database/Migrations/2018_10_22_111807_create_products_grid.php @@ -16,14 +16,15 @@ class CreateProductsGrid extends Migration Schema::create('products_grid', function (Blueprint $table) { $table->increments('id'); $table->integer('product_id')->unsigned(); - $table->foreign('product_id')->references('id')->on('products'); + $table->foreign('product_id')->references('id')->on('products')->onDelete('cascade'); $table->string('sku')->nullable(); $table->string('type')->nullable(); - $table->string('attribute_family_name')->nullable(); - $table->string('product_name')->nullable(); + $table->string('name')->nullable(); $table->string('quantity')->default(0); $table->string('cost')->default(0); $table->string('price')->nullable(); + $table->string('status')->nullable(); + $table->string('attribute_family_name')->nullable(); }); } diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php index 576c1ad8e..44a88fd5b 100644 --- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php +++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php @@ -10,7 +10,6 @@ use Webkul\Product\Repositories\ProductGridRepository as ProductGrid; use Webkul\Attribute\Repositories\AttributeFamilyRepository as AttributeFamily; use Webkul\Category\Repositories\CategoryRepository as Category; use Webkul\Inventory\Repositories\InventorySourceRepository as InventorySource; -use Webkul\Product\Helpers\Price; use Event; /** @@ -63,13 +62,6 @@ class ProductController extends Controller */ protected $productGrid; - /** - * Price Object - * - * @var array - */ - Protected $price; - /** * Create a new controller instance. * @@ -84,8 +76,7 @@ class ProductController extends Controller Category $category, InventorySource $inventorySource, Product $product, - ProductGrid $productGrid, - Price $price) + ProductGrid $productGrid) { $this->attributeFamily = $attributeFamily; @@ -97,8 +88,6 @@ class ProductController extends Controller $this->productGrid = $productGrid; - $this->price = $price; - $this->_config = request('_config'); } @@ -190,8 +179,8 @@ class ProductController extends Controller */ public function update(ProductForm $request, $id) { - //before update of product - // Event::fire('product.update.before', false); + // before update of product + // Event::fire('product.update.before', $id); $this->product->update(request()->all(), $id); @@ -221,37 +210,7 @@ class ProductController extends Controller return redirect()->back(); } - public function test() { - $gridObject = []; - - foreach($this->product->all() as $product) { - $gridObject = [ - 'product_id' => $product->id, - 'sku' => $product->sku, - 'type' => $product->type, - 'product_name' => $product->sku, - 'attribute_family_name' => $product->toArray()['attribute_family']['name'], - 'price' => $this->price->getMinimalPrice($product) - ]; - - if($product->type == 'configurable') { - $gridObject['quantity'] = 0; - } else { - $qty = 0; - - foreach($product->toArray()['inventories'] as $inventorySource) { - $qty = $qty + $inventorySource['qty']; - } - - $gridObject['quantity'] = $qty; - - $qty = 0; - } - $this->productGrid->create($gridObject); - - $gridObject = []; - } - - return true; + public function sync() { + Event::fire('products.datagrid.create', true); } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Models/ProductGrid.php b/packages/Webkul/Product/src/Models/ProductGrid.php index 0fbfa307b..4b5779ba8 100644 --- a/packages/Webkul/Product/src/Models/ProductGrid.php +++ b/packages/Webkul/Product/src/Models/ProductGrid.php @@ -9,7 +9,7 @@ class ProductGrid extends Model { protected $table = 'products_grid'; - protected $fillable = ['product_id', 'sku', 'type', 'attribute_family_name', 'product_name', 'quantity', 'cost', 'price']; + protected $fillable = ['product_id', 'sku', 'type', 'attribute_family_name', 'name', 'quantity', 'cost', 'price', 'status']; public $timestamps = false; diff --git a/packages/Webkul/Product/src/Providers/ProductServiceProvider.php b/packages/Webkul/Product/src/Providers/ProductServiceProvider.php index 262217b6e..73c99bb38 100644 --- a/packages/Webkul/Product/src/Providers/ProductServiceProvider.php +++ b/packages/Webkul/Product/src/Providers/ProductServiceProvider.php @@ -19,15 +19,17 @@ class ProductServiceProvider extends ServiceProvider { $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); - // Event::listen('product.save.before', 'Webkul\Product\Listeners\ProductListener@beforeProductUpdate'); + Event::listen('products.datagrid.create', 'Webkul\Admin\Listeners\Product@sync'); - Event::listen('product.save.after', 'Webkul\Product\Listeners\ProductListener@afterProductSave'); + Event::listen('product.save.after', 'Webkul\Admin\Listeners\Product@afterProductCreated'); - // Event::listen('product.update.before', 'Webkul\Product\Listeners\ProductListener@beforeProductUpdate'); + Event::listen('product.update.before', + 'Webkul\Admin\Listeners\Product@beforeProductUpdate'); - Event::listen('product.update.after', 'Webkul\Product\Listeners\ProductListener@beforeProductUpdate'); + Event::listen('product.update.after', + 'Webkul\Admin\Listeners\Product@afterProductUpdate'); - Event::listen('product.delete.after', 'Webkul\Product\Listeners\ProductListener@afterProductDelete'); + Event::listen('product.delete.after', 'Webkul\Admin\Listeners\Product@afterProductDelete'); Product::observe(ProductObserver::class); } diff --git a/packages/Webkul/Product/src/Repositories/ProductGridRepository.php b/packages/Webkul/Product/src/Repositories/ProductGridRepository.php index 373018e61..c11180504 100644 --- a/packages/Webkul/Product/src/Repositories/ProductGridRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductGridRepository.php @@ -4,17 +4,111 @@ namespace Webkul\Product\Repositories; use Illuminate\Container\Container as App; use Webkul\Core\Eloquent\Repository; -use Webkul\Product\Repositories\ProductRepository; +use Webkul\Product\Repositories\ProductRepository as Product; +use Webkul\Product\Helpers\Price; /** * Product Repository * - * @author Prashant Singh @prashant-webkul + * @author Prashant Singh @prashant-webkul * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) */ class ProductGridRepository extends Repository { + protected $product; + + /** + * Price Object + * + * @var array + */ + Protected $price; + + + public function __construct( + Product $product, + Price $price, + App $app + ) + { + $this->product = $product; + + $this->price = $price; + + parent::__construct($app); + } + public function model() { return 'Webkul\Product\Models\ProductGrid'; } + + public function updateWhere($product) { + if($product->type == "simple") { + $gridObject = [ + 'sku' => $product->sku, + 'name' => $product->name, + 'attribute_family_name' => $product->toArray()['attribute_family']['name'], + 'price' => $this->price->getMinimalPrice($product), + 'status' => $product->status + ]; + + $qty = 0; + + if($product->parent_id == 'null') { + $gridObject['type'] = $product->type; + } + + foreach($product->toArray()['inventories'] as $inventorySource) { + $qty = $qty + $inventorySource['qty']; + } + + $gridObject['quantity'] = $qty; + + return $this->getModel()->where('product_id', $product->id)->update($gridObject); + + } else if($product->type == "configurable") { + $gridObject = [ + 'sku' => $product->sku, + 'type' => $product->type, + 'name' => $product->name, + 'attribute_family_name' => $product->toArray()['attribute_family']['name'], + 'price' => $this->price->getMinimalPrice($product), + 'status' => $product->status + ]; + $qty = 0; + + $gridObject['quantity'] = $qty; + + $this->getModel()->where('product_id', $product->id)->update($gridObject); + + $variants = $product->variants; + + foreach($variants as $variant) { + $gridObject = []; + + $gridObject = [ + 'sku' => $variant->sku, + 'name' => $variant->name, + 'attribute_family_name' => $variant->toArray()['attribute_family']['name'], + 'price' => $this->price->getMinimalPrice($variant), + 'status' => $variant->status + ]; + + if($variant->type == 'configurable') { + $gridObject['quantity'] = 0; + } else { + $qty = 0; + + foreach($variant->toArray()['inventories'] as $inventorySource) { + $qty = $qty + $inventorySource['qty']; + } + + $gridObject['quantity'] = $qty; + } + + return $this->getModel()->where('product_id', $product->id)->update($gridObject); + } + } + return false; + } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss index e1757818f..a45e8ed46 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss @@ -7,7 +7,7 @@ background-image:URL('../images/icon-dropdown-left.svg'); width: 8px; height: 8px; - margin-left:auto; + margin-left: auto; margin-bottom: 2px; } @@ -15,7 +15,14 @@ background-image:URL('../images/icon-menu-close.svg'); width: 24px; height: 24px; - margin-left:auto; + margin-left: auto; +} + +.icon-menu-close-adj { + background-image:URL('../images/cross-icon-adj.svg'); + width: 32px; + height: 32px; + margin-left: auto; } .grid-view-icon { diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index 973b47420..926dfdd17 100644 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -17,7 +17,6 @@ return [ 'add-review-page-title' => 'Add Review', 'write-review' => 'Write a review', 'review-title' => 'Give Your Review a Title', - 'empty' => 'You Haven\'t Reviewed Any Product Yet' ], 'customer' => [ diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php index a81ab1a9a..693d185fb 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php @@ -16,39 +16,37 @@