From 806ffb460fa23b26ee1050746e71ccf081acb36e Mon Sep 17 00:00:00 2001 From: prashant-webkul Date: Thu, 18 Oct 2018 16:34:55 +0530 Subject: [PATCH] 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;