From 7f3b71c0c0e6bd871fe4802c8190ec765082ff44 Mon Sep 17 00:00:00 2001 From: Deepak Singh Gusain Date: Fri, 31 Dec 2021 18:27:34 +0530 Subject: [PATCH] work on ui part --- packages/Webkul/Admin/package.json | 1 + .../Admin/src/Resources/assets/js/app.js | 4 +- .../js/components/navigation/notification.vue | 1 + .../Resources/assets/sass/partials/_dark.scss | 32 +- .../assets/sass/partials/_default.scss | 62 +- .../assets/sass/partials/_sales.scss | 88 +- .../Admin/src/Resources/lang/en/app.php | 9 + .../views/catalog/categories/create.blade.php | 2 + .../products/accordians/images.blade.php | 2 + .../Resources/views/layouts/nav-top.blade.php | 46 +- .../views/sales/invoices/create.blade.php | 341 ++--- .../views/sales/invoices/view.blade.php | 309 ++--- .../views/sales/orders/view.blade.php | 464 ++++--- .../views/sales/refunds/create.blade.php | 430 +++--- .../views/sales/refunds/view.blade.php | 368 ++--- .../views/sales/shipments/create.blade.php | 476 +++---- .../views/sales/shipments/view.blade.php | 385 +++--- .../views/sales/transactions/view.blade.php | 179 +-- .../views/settings/channels/create.blade.php | 4 + .../views/settings/channels/edit.blade.php | 4 + .../views/settings/sliders/create.blade.php | 3 +- .../views/settings/sliders/edit.blade.php | 3 +- .../Admin/NotificationController.php | 2 +- .../Notification/src/Listeners/Order.php | 3 +- .../Repositories/NotificationRepository.php | 8 +- .../src/Repositories/OrderRepository.php | 4 + .../Webkul/Ui/src/Resources/assets/js/app.js | 2 + .../js/components/datagrid/datagrid-plus.vue | 1222 +++++++++-------- .../assets/js/components/default-image.vue | 13 + .../Ui/src/Resources/assets/sass/app.scss | 8 + .../assets/sass/includes/components.scss | 204 ++- .../Resources/views/datagrid/table.blade.php | 46 +- .../Velocity/src/Resources/lang/en/app.php | 22 +- .../categories/category-icon.blade.php | 2 + .../views/admin/meta-info/meta-data.blade.php | 21 +- .../settings/locales/locale-logo.blade.php | 2 + 36 files changed, 2506 insertions(+), 2266 deletions(-) create mode 100644 packages/Webkul/Ui/src/Resources/assets/js/components/default-image.vue diff --git a/packages/Webkul/Admin/package.json b/packages/Webkul/Admin/package.json index b309718fe..cf718983c 100755 --- a/packages/Webkul/Admin/package.json +++ b/packages/Webkul/Admin/package.json @@ -23,6 +23,7 @@ "dependencies": { "laravel-echo": "^1.11.3", "laravel-vue-pagination": "^2.3.1", + "moment": "^2.29.1", "pusher-js": "^7.0.3", "vee-validate": "^2.2.15" } diff --git a/packages/Webkul/Admin/src/Resources/assets/js/app.js b/packages/Webkul/Admin/src/Resources/assets/js/app.js index be714c297..11406d5a1 100755 --- a/packages/Webkul/Admin/src/Resources/assets/js/app.js +++ b/packages/Webkul/Admin/src/Resources/assets/js/app.js @@ -5,7 +5,8 @@ import Vue from 'vue'; import VeeValidate from 'vee-validate'; import './bootstrap'; import Echo from 'laravel-echo'; -import pagination from 'laravel-vue-pagination' +import pagination from 'laravel-vue-pagination'; +import moment from 'moment'; /** * Lang imports. @@ -45,6 +46,7 @@ window.eventBus = new Vue(); window.VeeValidate = VeeValidate; window.Pusher = require('pusher-js'); window.Echo = Echo; +Vue.prototype.moment = moment; /** * Global components. diff --git a/packages/Webkul/Admin/src/Resources/assets/js/components/navigation/notification.vue b/packages/Webkul/Admin/src/Resources/assets/js/components/navigation/notification.vue index 9e32c2018..3e6e494bc 100644 --- a/packages/Webkul/Admin/src/Resources/assets/js/components/navigation/notification.vue +++ b/packages/Webkul/Admin/src/Resources/assets/js/components/navigation/notification.vue @@ -147,6 +147,7 @@ export default { }); Echo.channel('notification').listen('.update-notification', (e) => { + console.log(e); this.notifications.forEach((notification)=>{ if(notification.order_id == e.id){ notification.order.status = e.status; diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_dark.scss b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_dark.scss index 3be915dbe..e729e255e 100644 --- a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_dark.scss +++ b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_dark.scss @@ -261,7 +261,7 @@ } tbody td { color: rgba(255, 255, 255, 0.8); - + border-bottom: 1px solid $seprator; } } } @@ -316,10 +316,10 @@ } ul{ li{ - a:link{ + a{ color: rgba(255,255,255,.8); &:hover{ - color: #0041FF; + color: #fff; } } @@ -461,18 +461,20 @@ } .sale-container { - .sale-section { - .secton-title { - color: rgba(255,255,255,.8); - border-bottom: 1px solid #24384c; - } - .section-content { - .row { - .title { - color: rgba(255,255,255,.8); - } - .value { - color: rgba(255,255,255,.8); + .sale{ + .sale-section { + .secton-title { + color: rgba(255,255,255,.8); + border-bottom: 1px solid #24384c; + } + .section-content { + .row { + .title { + color: rgba(255,255,255,.8); + } + .value { + color: rgba(255,255,255,.8); + } } } } diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss index c90b658e7..fd5ba8ddc 100644 --- a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss +++ b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss @@ -760,7 +760,7 @@ body { margin-bottom: 0; margin-left: 0px; padding: 0px; - margin-top: 35px; + margin-top: 16px; } .page-title { @@ -813,3 +813,63 @@ body { width: 100%; } } + +@media only screen and (max-width: 411px){ + .content-container { + + .content { + + .page-header { + + .control-group { + width: 385px; + display: block; + margin-bottom: 0; + margin-left: 0px; + padding: 0px; + margin-top: 16px; + } + } + } + } +} + +@media only screen and (max-width: 385px){ + .content-container { + + .content { + + .page-header { + + .control-group { + width: 350px; + display: block; + margin-bottom: 0; + margin-left: 0px; + padding: 0px; + margin-top: 16px; + } + } + } + } +} + +@media only screen and (max-width: 320px){ + .content-container { + + .content { + + .page-header { + + .control-group { + width: 295px; + display: block; + margin-bottom: 0; + margin-left: 0px; + padding: 0px; + margin-top: 16px; + } + } + } + } +} diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_sales.scss b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_sales.scss index daab4efeb..5bcde19a6 100644 --- a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_sales.scss +++ b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_sales.scss @@ -1,38 +1,45 @@ .sale-container { - .sale-section { - font-size: 16px; - .secton-title { - font-size: 18px; - color: #8e8e8e; - padding: 15px 0; - border-bottom: 1px solid $border-color; - } + .sale{ + display: flex; + column-gap: 20px; - .section-content { - display: block; - padding: 20px 0; - - .row { + .sale-section { + font-size: 16px; + width: 50%; + + .secton-title { + font-size: 18px; + color: #8e8e8e; + padding: 15px 0; + border-bottom: 1px solid $border-color; + } + + .section-content { display: block; - padding: 7px 0; - - .title { - width: 200px; - color: $font-color; - letter-spacing: -0.26px; - display: inline-block; - } - - .value { - color: $font-color; - letter-spacing: -0.26px; - display: inline-block; + padding: 20px 0; + + .row { + display: block; + padding: 7px 0; + + .title { + width: 200px; + color: $font-color; + letter-spacing: -0.26px; + display: inline-block; + } + + .value { + color: $font-color; + letter-spacing: -0.26px; + display: inline-block; + } } } - } + } } - + .table { .qty-row { display: block; @@ -119,4 +126,29 @@ span { margin-left: 2px; } +} + + +@media only screen and (max-width: 768px){ + .sale-container { + + .sale{ + display: block; + + .sale-section { + width: 100%; + } + } + + .summary-comment-container{ + .comment-container{ + width: 100%; + form{ + .control-group{ + width: 100%; + } + } + } + } + } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 619d33604..50c08e6ae 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -598,6 +598,7 @@ return [ 'save' => 'Save', 'cancel' => 'Cancel', 'saved-inventory-message' => 'Product inventory saved successfully.', + 'image-size' => 'Image resolution should be like 640px X 640px' ], 'attributes' => [ @@ -700,6 +701,8 @@ return [ 'image' => 'Image', 'filterable-attributes' => 'Filterable Attributes', 'attributes' => 'Attributes', + 'image-size' => 'Image resolution should be like 300px X 168px', + 'image-size-logo' => 'Image resolution should be like 20px X 20px' ], ], @@ -878,6 +881,8 @@ return [ 'maintenance-mode' => 'Maintenance Mode', 'maintenance-mode-text' => 'Message', 'allowed-ips' => 'Allowed IPs', + 'logo-size' => 'Image resolution should be like 192px X 50px', + 'favicon-size' => 'Image resolution should be like 16px X 16px' ], 'sliders' => [ @@ -898,6 +903,7 @@ return [ 'delete-fail' => 'Slider item successfully deleted', 'expired-at' => 'Expire Date', 'sort-order' => 'Sort Order', + 'image-size' => 'Image resolution should be like 1920px X 550px' ], 'tax-categories' => [ @@ -1558,6 +1564,9 @@ return [ 'set-order-status' => 'Set the order status after creating the invoice to', 'generate-invoice-applicable' => 'Applicable if automatic generate invoice is enabled', 'records-found' => 'Record(s) found', + 'logo-size' => 'Image resolution should be like 112px X 41px', + 'favicon-size' => 'Image resolution should be like 16px X 16px', + 'invoice-logo-size' => 'Image resolution should be like 192px X 50px' ], ], diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php index 3773ec5ba..f19a4dde9 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php @@ -100,6 +100,8 @@ @php echo str_replace($key, 'Image', $message[0]); @endphp @endforeach + + {{ __('admin::app.catalog.categories.image-size') }} {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.description_images.controls.after') !!} diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/images.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/images.blade.php index b4faaae41..ddfc20fd0 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/images.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/images.blade.php @@ -20,6 +20,8 @@ @endphp @endforeach + + {{ __('admin::app.catalog.products.image-size') }} {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.images.controls.after', ['product' => $product]) !!} diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php index a6304f94d..61943821c 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php @@ -7,7 +7,10 @@ @if (core()->getConfigData('general.design.admin_logo.logo_image', core()->getCurrentChannelCode())) {{ config('app.name') }} @else - {{ config('app.name') }} + @endif @@ -36,43 +39,7 @@ view-all-title="{{ __('admin::app.notification.view-all') }}" get-read-all-url="{{ route('admin.notification.read-all') }}" read-all-title="{{ __('admin::app.notification.read-all') }}"> - - -
- @php - $allLocales = core()->getAllLocales()->pluck('name', 'code'); - - $currentLocaleCode = core()->getRequestedLocaleCode('admin_locale'); - @endphp - -
-
- - {{ __('admin::app.datagrid.locale') }} - - - - {{ $allLocales[$currentLocaleCode] }} - -
- - -
- -
-
- -
-
-
+
@@ -94,9 +61,6 @@
    -
  • - {{ __('admin::app.layouts.visit-shop') }} -
  • {{ __('admin::app.layouts.my-account') }}
    • diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php index 75662dc6f..9a549dd37 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php @@ -31,191 +31,193 @@
    -
    -
    - {{ __('admin::app.sales.orders.order-info') }} -
    - -
    -
    - - {{ __('admin::app.sales.invoices.order-id') }} - - - - #{{ $order->increment_id }} - +
    +
    +
    + {{ __('admin::app.sales.orders.order-info') }}
    -
    - - {{ __('admin::app.sales.orders.order-date') }} - +
    +
    + + {{ __('admin::app.sales.invoices.order-id') }} + - - {{ $order->created_at }} - -
    + + #{{ $order->increment_id }} + +
    -
    - - {{ __('admin::app.sales.orders.order-status') }} - +
    + + {{ __('admin::app.sales.orders.order-date') }} + - - {{ $order->status_label }} - -
    + + {{ $order->created_at }} + +
    -
    - - {{ __('admin::app.sales.orders.channel') }} - +
    + + {{ __('admin::app.sales.orders.order-status') }} + - - {{ $order->channel_name }} - + + {{ $order->status_label }} + +
    + +
    + + {{ __('admin::app.sales.orders.channel') }} + + + + {{ $order->channel_name }} + +
    -
    -
    -
    - {{ __('admin::app.sales.orders.account-info') }} -
    - -
    -
    - - {{ __('admin::app.sales.orders.customer-name') }} - - - - {{ $order->customer_full_name }} - +
    +
    + {{ __('admin::app.sales.orders.account-info') }}
    -
    - - {{ __('admin::app.sales.orders.email') }} - +
    +
    + + {{ __('admin::app.sales.orders.customer-name') }} + - - {{ $order->customer_email }} - + + {{ $order->customer_full_name }} + +
    + +
    + + {{ __('admin::app.sales.orders.email') }} + + + + {{ $order->customer_email }} + +
    -
    - +
    - -
    -
    - {{ __('admin::app.sales.orders.billing-address') }} -
    - -
    - - @include ('admin::sales.address', ['address' => $order->billing_address]) - -
    -
    - - @if ($order->shipping_address) +
    - {{ __('admin::app.sales.orders.shipping-address') }} + {{ __('admin::app.sales.orders.billing-address') }}
    - @include ('admin::sales.address', ['address' => $order->shipping_address]) + @include ('admin::sales.address', ['address' => $order->billing_address])
    - @endif + @if ($order->shipping_address) +
    +
    + {{ __('admin::app.sales.orders.shipping-address') }} +
    + +
    + + @include ('admin::sales.address', ['address' => $order->shipping_address]) + +
    +
    + @endif +
    - -
    -
    - {{ __('admin::app.sales.orders.payment-info') }} -
    - -
    -
    - - {{ __('admin::app.sales.orders.payment-method') }} - - - - {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }} - -
    - -
    - - {{ __('admin::app.sales.orders.currency') }} - - - - {{ $order->order_currency_code }} - -
    - - @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp - - @if (! empty($additionalDetails)) -
    - - {{ $additionalDetails['title'] }} - - - - {{ $additionalDetails['value'] }} - -
    - @endif -
    -
    - - @if ($order->shipping_address) +
    - {{ __('admin::app.sales.orders.shipping-info') }} + {{ __('admin::app.sales.orders.payment-info') }}
    - {{ __('admin::app.sales.orders.shipping-method') }} + {{ __('admin::app.sales.orders.payment-method') }} - {{ $order->shipping_title }} + {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
    - {{ __('admin::app.sales.orders.shipping-price') }} + {{ __('admin::app.sales.orders.currency') }} - {{ core()->formatBasePrice($order->base_shipping_amount) }} + {{ $order->order_currency_code }}
    + + @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp + + @if (! empty($additionalDetails)) +
    + + {{ $additionalDetails['title'] }} + + + + {{ $additionalDetails['value'] }} + +
    + @endif
    - @endif + + @if ($order->shipping_address) +
    +
    + {{ __('admin::app.sales.orders.shipping-info') }} +
    + +
    +
    + + {{ __('admin::app.sales.orders.shipping-method') }} + + + + {{ $order->shipping_title }} + +
    + +
    + + {{ __('admin::app.sales.orders.shipping-price') }} + + + + {{ core()->formatBasePrice($order->base_shipping_amount) }} + +
    +
    +
    + @endif +
    @@ -223,55 +225,56 @@
    - - - - - - - - - +
    +
    {{ __('admin::app.sales.orders.SKU') }}{{ __('admin::app.sales.orders.product-name') }}{{ __('admin::app.sales.invoices.qty-ordered') }}{{ __('admin::app.sales.invoices.qty-to-invoice') }}
    + + + + + + + + - + - @foreach ($order->items as $item) - @if ($item->qty_to_invoice > 0) - - - + + + + - - + + @endif + @endforeach - - @verbatim - {{ errors.first('invoice[items][id ?>]') }} - @endverbatim - - - - - @endif - @endforeach - - -
    {{ __('admin::app.sales.orders.SKU') }}{{ __('admin::app.sales.orders.product-name') }}{{ __('admin::app.sales.invoices.qty-ordered') }}{{ __('admin::app.sales.invoices.qty-to-invoice') }}
    {{ $item->getTypeInstance()->getOrderedItem($item)->sku }} - {{ $item->name }} + @foreach ($order->items as $item) + @if ($item->qty_to_invoice > 0) +
    {{ $item->getTypeInstance()->getOrderedItem($item)->sku }} + {{ $item->name }} - @if (isset($item->additional['attributes'])) -
    + @if (isset($item->additional['attributes'])) +
    - @foreach ($item->additional['attributes'] as $attribute) - {{ $attribute['attribute_name'] }} : {{ $attribute['option_label'] }}
    - @endforeach + @foreach ($item->additional['attributes'] as $attribute) + {{ $attribute['attribute_name'] }} : {{ $attribute['option_label'] }}
    + @endforeach +
    + @endif +
    		{{ $item->qty_ordered }} +
    + + + + @verbatim + {{ errors.first('invoice[items][id ?>]') }} + @endverbatim +
    - @endif -     		{{ $item->qty_ordered }} -
    - +
    + + +
    -
    diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php index 1157b9f6d..cfc54f8ef 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php @@ -40,130 +40,131 @@
    +
    +
    +
    + {{ __('admin::app.sales.orders.order-info') }} +
    -
    -
    - {{ __('admin::app.sales.orders.order-info') }} +
    +
    + + {{ __('admin::app.sales.invoices.order-id') }} + + + + #{{ $order->increment_id }} + +
    + + {!! view_render_event('sales.invoice.increment_id.after', ['order' => $order]) !!} + +
    + + {{ __('admin::app.sales.orders.order-date') }} + + + + {{ $order->created_at }} + +
    + + {!! view_render_event('sales.invoice.created_at.after', ['order' => $order]) !!} + +
    + + {{ __('admin::app.sales.orders.order-status') }} + + + + {{ $order->status_label }} + +
    + + {!! view_render_event('sales.invoice.status_label.after', ['order' => $order]) !!} + +
    + + {{ __('admin::app.sales.invoices.status') }} + + + + {{ $invoice->status_label }} + +
    + +
    + + {{ __('admin::app.sales.orders.channel') }} + + + + {{ $order->channel_name }} + +
    + + {!! view_render_event('sales.invoice.channel_name.after', ['order' => $order]) !!} +
    -
    -
    - - {{ __('admin::app.sales.invoices.order-id') }} - - - - #{{ $order->increment_id }} - +
    +
    + {{ __('admin::app.sales.orders.account-info') }}
    - {!! view_render_event('sales.invoice.increment_id.after', ['order' => $order]) !!} +
    +
    + {{ __('admin::app.sales.orders.customer-name') }} + {{ $invoice->order->customer_full_name }} +
    -
    - - {{ __('admin::app.sales.orders.order-date') }} - + {!! view_render_event('sales.invoice.customer_name.after', ['order' => $order]) !!} - - {{ $order->created_at }} - +
    + {{ __('admin::app.sales.orders.email') }} + {{ $invoice->order->customer_email }} +
    + + {!! view_render_event('sales.invoice.customer_email.after', ['order' => $order]) !!}
    - - {!! view_render_event('sales.invoice.created_at.after', ['order' => $order]) !!} - -
    - - {{ __('admin::app.sales.orders.order-status') }} - - - - {{ $order->status_label }} - -
    - - {!! view_render_event('sales.invoice.status_label.after', ['order' => $order]) !!} - -
    - - {{ __('admin::app.sales.invoices.status') }} - - - - {{ $invoice->status_label }} - -
    - -
    - - {{ __('admin::app.sales.orders.channel') }} - - - - {{ $order->channel_name }} - -
    - - {!! view_render_event('sales.invoice.channel_name.after', ['order' => $order]) !!}
    -
    - -
    -
    - {{ __('admin::app.sales.orders.account-info') }} -
    - -
    -
    - {{ __('admin::app.sales.orders.customer-name') }} - {{ $invoice->order->customer_full_name }} -
    - - {!! view_render_event('sales.invoice.customer_name.after', ['order' => $order]) !!} - -
    - {{ __('admin::app.sales.orders.email') }} - {{ $invoice->order->customer_email }} -
    - - {!! view_render_event('sales.invoice.customer_email.after', ['order' => $order]) !!} -
    -
    - +
    @if ($order->billing_address || $order->shipping_address) -
    +
    +
    + @if ($order->billing_address) +
    +
    + {{ __('admin::app.sales.orders.billing-address') }} +
    - @if ($order->billing_address) -
    -
    - {{ __('admin::app.sales.orders.billing-address') }} +
    + @include ('admin::sales.address', ['address' => $order->billing_address]) + + {!! view_render_event('sales.invoice.billing_address.after', ['order' => $order]) !!} +
    + @endif -
    - @include ('admin::sales.address', ['address' => $order->billing_address]) + @if ($order->shipping_address) +
    +
    + {{ __('admin::app.sales.orders.shipping-address') }} +
    - {!! view_render_event('sales.invoice.billing_address.after', ['order' => $order]) !!} +
    + @include ('admin::sales.address', ['address' => $order->shipping_address]) + + {!! view_render_event('sales.invoice.shipping_address.after', ['order' => $order]) !!} +
    -
    - @endif - - @if ($order->shipping_address) -
    -
    - {{ __('admin::app.sales.orders.shipping-address') }} -
    - -
    - @include ('admin::sales.address', ['address' => $order->shipping_address]) - - {!! view_render_event('sales.invoice.shipping_address.after', ['order' => $order]) !!} -
    -
    - @endif + @endif +
    @endif @@ -172,60 +173,62 @@
    - - - - - - - - - - @if ($invoice->base_discount_amount > 0) - - @endif - - - - - - - @foreach ($invoice->items as $item) +
    +
    {{ __('admin::app.sales.orders.SKU') }}{{ __('admin::app.sales.orders.product-name') }}{{ __('admin::app.sales.orders.price') }}{{ __('admin::app.sales.orders.qty') }}{{ __('admin::app.sales.orders.subtotal') }}{{ __('admin::app.sales.orders.tax-amount') }}{{ __('admin::app.sales.orders.discount-amount') }}{{ __('admin::app.sales.orders.grand-total') }}
    + - - - - - - - - - - - - + + + + + + @if ($invoice->base_discount_amount > 0) - + @endif - - + - @endforeach + - -
    {{ $item->getTypeInstance()->getOrderedItem($item)->sku }} - {{ $item->name }} - - @if (isset($item->additional['attributes'])) -
    - - @foreach ($item->additional['attributes'] as $attribute) - {{ $attribute['attribute_name'] }} : {{ $attribute['option_label'] }}
    - @endforeach - -
    - @endif -     		{{ core()->formatBasePrice($item->base_price) }}{{ $item->qty }}{{ core()->formatBasePrice($item->base_total) }}{{ core()->formatBasePrice($item->base_tax_amount) }}{{ __('admin::app.sales.orders.SKU') }}{{ __('admin::app.sales.orders.product-name') }}{{ __('admin::app.sales.orders.price') }}{{ __('admin::app.sales.orders.qty') }}{{ __('admin::app.sales.orders.subtotal') }}{{ __('admin::app.sales.orders.tax-amount') }}{{ core()->formatBasePrice($item->base_discount_amount) }}{{ __('admin::app.sales.orders.discount-amount') }}{{ core()->formatBasePrice($item->base_total + $item->base_tax_amount - $item->base_discount_amount) }}{{ __('admin::app.sales.orders.grand-total') }}
    + + + @foreach ($invoice->items as $item) + + {{ $item->getTypeInstance()->getOrderedItem($item)->sku }} + + + {{ $item->name }} + + @if (isset($item->additional['attributes'])) +
    + + @foreach ($item->additional['attributes'] as $attribute) + {{ $attribute['attribute_name'] }} : {{ $attribute['option_label'] }}
    + @endforeach + +
    + @endif + + + {{ core()->formatBasePrice($item->base_price) }} + + {{ $item->qty }} + + {{ core()->formatBasePrice($item->base_total) }} + + {{ core()->formatBasePrice($item->base_tax_amount) }} + + @if ($invoice->base_discount_amount > 0) + {{ core()->formatBasePrice($item->base_discount_amount) }} + @endif + + {{ core()->formatBasePrice($item->base_total + $item->base_tax_amount - $item->base_discount_amount) }} + + @endforeach + + + +
    diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php index 0368c0f1b..d0136dbc2 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php @@ -64,95 +64,97 @@
    -
    -
    - {{ __('admin::app.sales.orders.order-info') }} -
    - -
    -
    - - {{ __('admin::app.sales.orders.order-date') }} - - - - {{ $order->created_at }} - +
    +
    +
    + {{ __('admin::app.sales.orders.order-info') }}
    - {!! view_render_event('sales.order.created_at.after', ['order' => $order]) !!} - -
    - - {{ __('admin::app.sales.orders.order-status') }} - - - - {{ $order->status_label }} - -
    - - {!! view_render_event('sales.order.status_label.after', ['order' => $order]) !!} - -
    - - {{ __('admin::app.sales.orders.channel') }} - - - - {{ $order->channel_name }} - -
    - - {!! view_render_event('sales.order.channel_name.after', ['order' => $order]) !!} -
    -
    - -
    -
    - {{ __('admin::app.sales.orders.account-info') }} -
    - -
    -
    - - {{ __('admin::app.sales.orders.customer-name') }} - - - - {{ $order->customer_full_name }} - -
    - - {!! view_render_event('sales.order.customer_full_name.after', ['order' => $order]) !!} - -
    - - {{ __('admin::app.sales.orders.email') }} - - - - {{ $order->customer_email }} - -
    - - {!! view_render_event('sales.order.customer_email.after', ['order' => $order]) !!} - - @if (! is_null($order->customer) && ! is_null($order->customer->group)) +
    - {{ __('admin::app.customers.customers.customer_group') }} + {{ __('admin::app.sales.orders.order-date') }} - {{ $order->customer->group->name }} + {{ $order->created_at }}
    - @endif - {!! view_render_event('sales.order.customer_group.after', ['order' => $order]) !!} + {!! view_render_event('sales.order.created_at.after', ['order' => $order]) !!} + +
    + + {{ __('admin::app.sales.orders.order-status') }} + + + + {{ $order->status_label }} + +
    + + {!! view_render_event('sales.order.status_label.after', ['order' => $order]) !!} + +
    + + {{ __('admin::app.sales.orders.channel') }} + + + + {{ $order->channel_name }} + +
    + + {!! view_render_event('sales.order.channel_name.after', ['order' => $order]) !!} +
    -
    + +
    +
    + {{ __('admin::app.sales.orders.account-info') }} +
    + +
    +
    + + {{ __('admin::app.sales.orders.customer-name') }} + + + + {{ $order->customer_full_name }} + +
    + + {!! view_render_event('sales.order.customer_full_name.after', ['order' => $order]) !!} + +
    + + {{ __('admin::app.sales.orders.email') }} + + + + {{ $order->customer_email }} + +
    + + {!! view_render_event('sales.order.customer_email.after', ['order' => $order]) !!} + + @if (! is_null($order->customer) && ! is_null($order->customer->group)) +
    + + {{ __('admin::app.customers.customers.customer_group') }} + + + + {{ $order->customer->group->name }} + +
    + @endif + + {!! view_render_event('sales.order.customer_group.after', ['order' => $order]) !!} +
    +
    +
    @@ -160,35 +162,35 @@ @if ($order->billing_address || $order->shipping_address)
    +
    + @if($order->billing_address) +
    +
    + {{ __('admin::app.sales.orders.billing-address') }} +
    - @if($order->billing_address) -
    -
    - {{ __('admin::app.sales.orders.billing-address') }} +
    + @include ('admin::sales.address', ['address' => $order->billing_address]) + + {!! view_render_event('sales.order.billing_address.after', ['order' => $order]) !!} +
    + @endif -
    - @include ('admin::sales.address', ['address' => $order->billing_address]) + @if ($order->shipping_address) +
    +
    + {{ __('admin::app.sales.orders.shipping-address') }} +
    - {!! view_render_event('sales.order.billing_address.after', ['order' => $order]) !!} +
    + @include ('admin::sales.address', ['address' => $order->shipping_address]) + + {!! view_render_event('sales.order.shipping_address.after', ['order' => $order]) !!} +
    -
    - @endif - - @if ($order->shipping_address) -
    -
    - {{ __('admin::app.sales.orders.shipping-address') }} -
    - -
    - @include ('admin::sales.address', ['address' => $order->shipping_address]) - - {!! view_render_event('sales.order.shipping_address.after', ['order' => $order]) !!} -
    -
    - @endif - + @endif +
    @endif @@ -196,167 +198,171 @@
    -
    -
    - {{ __('admin::app.sales.orders.payment-info') }} -
    - -
    -
    - - {{ __('admin::app.sales.orders.payment-method') }} - - - - {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }} - -
    - -
    - - {{ __('admin::app.sales.orders.currency') }} - - - - {{ $order->order_currency_code }} - -
    - - @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp - - @if (! empty($additionalDetails)) -
    - - {{ $additionalDetails['title'] }} - - - - {{ $additionalDetails['value'] }} - -
    - @endif - - {!! view_render_event('sales.order.payment-method.after', ['order' => $order]) !!} -
    -
    - - @if ($order->shipping_address) +
    - {{ __('admin::app.sales.orders.shipping-info') }} + {{ __('admin::app.sales.orders.payment-info') }}
    - {{ __('admin::app.sales.orders.shipping-method') }} + {{ __('admin::app.sales.orders.payment-method') }} - {{ $order->shipping_title }} + {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
    - {{ __('admin::app.sales.orders.shipping-price') }} + {{ __('admin::app.sales.orders.currency') }} - {{ core()->formatBasePrice($order->base_shipping_amount) }} + {{ $order->order_currency_code }}
    - {!! view_render_event('sales.order.shipping-method.after', ['order' => $order]) !!} + @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp + + @if (! empty($additionalDetails)) +
    + + {{ $additionalDetails['title'] }} + + + + {{ $additionalDetails['value'] }} + +
    + @endif + + {!! view_render_event('sales.order.payment-method.after', ['order' => $order]) !!}
    - @endif + + @if ($order->shipping_address) +
    +
    + {{ __('admin::app.sales.orders.shipping-info') }} +
    + +
    +
    + + {{ __('admin::app.sales.orders.shipping-method') }} + + + + {{ $order->shipping_title }} + +
    + +
    + + {{ __('admin::app.sales.orders.shipping-price') }} + + + + {{ core()->formatBasePrice($order->base_shipping_amount) }} + +
    + + {!! view_render_event('sales.order.shipping-method.after', ['order' => $order]) !!} +
    +
    + @endif +
    -
    -
    - - - - - - - - - - @if ($order->base_discount_amount > 0) - - @endif - - - - - - - @foreach ($order->items as $item) - +
    +
    {{ __('admin::app.sales.orders.SKU') }}{{ __('admin::app.sales.orders.product-name') }}{{ __('admin::app.sales.orders.price') }}{{ __('admin::app.sales.orders.item-status') }}{{ __('admin::app.sales.orders.subtotal') }}{{ __('admin::app.sales.orders.tax-percent') }}{{ __('admin::app.sales.orders.tax-amount') }}{{ __('admin::app.sales.orders.discount-amount') }}{{ __('admin::app.sales.orders.grand-total') }}
    + - - - - - - - - - - - - - - + + + + + + + @if ($order->base_discount_amount > 0) - + @endif - - + - @endforeach -
    - {{ $item->getTypeInstance()->getOrderedItem($item)->sku }} - - {{ $item->name }} - - @if (isset($item->additional['attributes'])) -
    - - @foreach ($item->additional['attributes'] as $attribute) - {{ $attribute['attribute_name'] }} : {{ $attribute['option_label'] }}
    - @endforeach - -
    - @endif -     		{{ core()->formatBasePrice($item->base_price) }} - - {{ $item->qty_ordered ? __('admin::app.sales.orders.item-ordered', ['qty_ordered' => $item->qty_ordered]) : '' }} - - - - {{ $item->qty_invoiced ? __('admin::app.sales.orders.item-invoice', ['qty_invoiced' => $item->qty_invoiced]) : '' }} - - - - {{ $item->qty_shipped ? __('admin::app.sales.orders.item-shipped', ['qty_shipped' => $item->qty_shipped]) : '' }} - - - - {{ $item->qty_refunded ? __('admin::app.sales.orders.item-refunded', ['qty_refunded' => $item->qty_refunded]) : '' }} - - - - {{ $item->qty_canceled ? __('admin::app.sales.orders.item-canceled', ['qty_canceled' => $item->qty_canceled]) : '' }} - - {{ core()->formatBasePrice($item->base_total) }}{{ $item->tax_percent }}%{{ core()->formatBasePrice($item->base_tax_amount) }}{{ __('admin::app.sales.orders.SKU') }}{{ __('admin::app.sales.orders.product-name') }}{{ __('admin::app.sales.orders.price') }}{{ __('admin::app.sales.orders.item-status') }}{{ __('admin::app.sales.orders.subtotal') }}{{ __('admin::app.sales.orders.tax-percent') }}{{ __('admin::app.sales.orders.tax-amount') }}{{ core()->formatBasePrice($item->base_discount_amount) }}{{ __('admin::app.sales.orders.discount-amount') }}{{ core()->formatBasePrice($item->base_total + $item->base_tax_amount - $item->base_discount_amount) }}{{ __('admin::app.sales.orders.grand-total') }}
    + + + + + @foreach ($order->items as $item) + + + + {{ $item->getTypeInstance()->getOrderedItem($item)->sku }} + + + + {{ $item->name }} + + @if (isset($item->additional['attributes'])) +
    + + @foreach ($item->additional['attributes'] as $attribute) + {{ $attribute['attribute_name'] }} : {{ $attribute['option_label'] }}
    + @endforeach + +
    + @endif + + + {{ core()->formatBasePrice($item->base_price) }} + + + + {{ $item->qty_ordered ? __('admin::app.sales.orders.item-ordered', ['qty_ordered' => $item->qty_ordered]) : '' }} + + + + {{ $item->qty_invoiced ? __('admin::app.sales.orders.item-invoice', ['qty_invoiced' => $item->qty_invoiced]) : '' }} + + + + {{ $item->qty_shipped ? __('admin::app.sales.orders.item-shipped', ['qty_shipped' => $item->qty_shipped]) : '' }} + + + + {{ $item->qty_refunded ? __('admin::app.sales.orders.item-refunded', ['qty_refunded' => $item->qty_refunded]) : '' }} + + + + {{ $item->qty_canceled ? __('admin::app.sales.orders.item-canceled', ['qty_canceled' => $item->qty_canceled]) : '' }} + + + + {{ core()->formatBasePrice($item->base_total) }} + + {{ $item->tax_percent }}% + + {{ core()->formatBasePrice($item->base_tax_amount) }} + + @if ($order->base_discount_amount > 0) + {{ core()->formatBasePrice($item->base_discount_amount) }} + @endif + + {{ core()->formatBasePrice($item->base_total + $item->base_tax_amount - $item->base_discount_amount) }} + + @endforeach + +
    +
    diff --git a/packages/Webkul/Admin/src/Resources/views/sales/refunds/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/refunds/create.blade.php index f9f082e09..dccaaec4e 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/refunds/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/refunds/create.blade.php @@ -30,83 +30,83 @@
    - -
    -
    - {{ __('admin::app.sales.orders.order-info') }} -
    - -
    -
    - - {{ __('admin::app.sales.refunds.order-id') }} - - - - #{{ $order->increment_id }} - +
    +
    +
    + {{ __('admin::app.sales.orders.order-info') }}
    -
    - - {{ __('admin::app.sales.orders.order-date') }} - +
    +
    + + {{ __('admin::app.sales.refunds.order-id') }} + - - {{ $order->created_at }} - -
    + + #{{ $order->increment_id }} + +
    -
    - - {{ __('admin::app.sales.orders.order-status') }} - +
    + + {{ __('admin::app.sales.orders.order-date') }} + - - {{ $order->status_label }} - -
    + + {{ $order->created_at }} + +
    -
    - - {{ __('admin::app.sales.orders.channel') }} - +
    + + {{ __('admin::app.sales.orders.order-status') }} + - - {{ $order->channel_name }} - + + {{ $order->status_label }} + +
    + +
    + + {{ __('admin::app.sales.orders.channel') }} + + + + {{ $order->channel_name }} + +
    -
    -
    -
    - {{ __('admin::app.sales.orders.account-info') }} -
    - -
    -
    - - {{ __('admin::app.sales.orders.customer-name') }} - - - - {{ $order->customer_full_name }} - +
    +
    + {{ __('admin::app.sales.orders.account-info') }}
    -
    - - {{ __('admin::app.sales.orders.email') }} - +
    +
    + + {{ __('admin::app.sales.orders.customer-name') }} + - - {{ $order->customer_email }} - + + {{ $order->customer_full_name }} + +
    + +
    + + {{ __('admin::app.sales.orders.email') }} + + + + {{ $order->customer_email }} + +
    -
    - +
    @@ -114,93 +114,95 @@
    - @if ($order->billing_address) -
    -
    - {{ __('admin::app.sales.orders.billing-address') }} +
    + @if ($order->billing_address) +
    +
    + {{ __('admin::app.sales.orders.billing-address') }} +
    + +
    + + @include ('admin::sales.address', ['address' => $order->billing_address]) + +
    + @endif -
    + @if ($order->shipping_address) +
    +
    + {{ __('admin::app.sales.orders.shipping-address') }} +
    - @include ('admin::sales.address', ['address' => $order->billing_address]) +
    + @include ('admin::sales.address', ['address' => $order->shipping_address]) + +
    -
    - @endif - - @if ($order->shipping_address) -
    -
    - {{ __('admin::app.sales.orders.shipping-address') }} -
    - -
    - - @include ('admin::sales.address', ['address' => $order->shipping_address]) - -
    -
    - @endif - + @endif +
    @endif
    - -
    -
    - {{ __('admin::app.sales.orders.payment-info') }} -
    - -
    -
    - - {{ __('admin::app.sales.orders.payment-method') }} - - - - {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }} - +
    +
    +
    + {{ __('admin::app.sales.orders.payment-info') }}
    -
    - - {{ __('admin::app.sales.orders.currency') }} - +
    +
    + + {{ __('admin::app.sales.orders.payment-method') }} + - - {{ $order->order_currency_code }} - + + {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }} + +
    + +
    + + {{ __('admin::app.sales.orders.currency') }} + + + + {{ $order->order_currency_code }} + +
    -
    -
    -
    - {{ __('admin::app.sales.orders.shipping-info') }} -
    - -
    -
    - - {{ __('admin::app.sales.orders.shipping-method') }} - - - - {{ $order->shipping_title }} - +
    +
    + {{ __('admin::app.sales.orders.shipping-info') }}
    -
    - - {{ __('admin::app.sales.orders.shipping-price') }} - +
    +
    + + {{ __('admin::app.sales.orders.shipping-method') }} + - - {{ core()->formatBasePrice($order->base_shipping_amount) }} - + + {{ $order->shipping_title }} + +
    + +
    + + {{ __('admin::app.sales.orders.shipping-price') }} + + + + {{ core()->formatBasePrice($order->base_shipping_amount) }} + +
    @@ -225,94 +227,96 @@ diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index 96b60e4e9..f92ce6de2 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -1243,6 +1243,14 @@ modal { left: 10%; margin-left: 0px; } + + .control-group { + width: 100%; + + .control { + width: 100%; + } + } } .label { diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/includes/components.scss b/packages/Webkul/Ui/src/Resources/assets/sass/includes/components.scss index 8c53296fb..22c74b4db 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/includes/components.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/includes/components.scss @@ -1,71 +1,70 @@ -@import 'main/mixins'; +@import "main/mixins"; .grid-container { display: block; width: 100%; -} -.datagrid-filters { - display: inline-flex; - width: 100%; - justify-content: space-between; - align-items: center; - margin-bottom: 20px; + .grid-top { + display: grid; + grid-template-rows: auto auto auto; + row-gap: 8px; + align-items: center; - .filter-left { - float: left; - } + .datagrid-filters { + display: grid; + grid-template-columns: auto auto; + column-gap: 10px; - .filter-right { - float: right; - } + .grid-right { + justify-self: end; + display: grid; + grid-template-columns: auto auto; + column-gap: 10px; + align-items: end; + } - .dropdown-filters { - display: inline-block; + .dropdown-filters { + display: inline-block; - &.per-page { - margin-right: 10px; + &.per-page { + + .control-group { + + label { + margin-top: 7px; + margin-right: 10px; + flex: auto; + } - .control-group { - label { - width: auto; - float: left; - margin-top: 7px; - margin-right: 10px; - } - - .control { - width: auto; - margin: 0; + .control { + width: 100%; + margin: 0; + flex: 1; + } + } } } } } -} -.records-count-container { - float: right; - padding: 10px; -} - -@media only screen and (max-width: 1192px) { .datagrid-filters { - margin-bottom: unset; - - .filter-left { - margin-bottom: 10px; - } + display: grid; + grid-template-columns: auto auto; + column-gap: 10px; + align-items: end; .filter-right { - margin-bottom: 10px; - } - } -} + justify-self: end; + display: grid; + grid-template-columns: auto auto; + column-gap: 10px; + align-items: end; -@media only screen and (max-width: 720px) { - .datagrid-filters { - .dropdown-filters { - margin-bottom: 5px; + .control-group{ + .control{ + margin-bottom: 0px; + } + } } } } @@ -78,51 +77,52 @@ } .search-filter { + border-radius: 3px; + height: 36px; + max-width: 300px; + .control { font-size: 15px; - border: 2px solid $control-border-color; + border: 1px solid $control-border-color; border-right: none; border-top-left-radius: 3px; border-bottom-left-radius: 3px; height: 36px; - width: 280px; + width: calc(100% - 36px); padding-left: 10px; -webkit-appearance: none; } + &:hover { + box-shadow: 0px 0px 0px 1px $selection-color; + } + .contorl:focus { border-color: $brand-color; } .icon-wrapper { - border: 2px solid $control-border-color; + border: 1px solid $control-border-color; border-radius: 3px; border-top-left-radius: 0px; border-bottom-left-radius: 0px; height: 36px; width: 36px; - padding: 3px; + padding: 5px; float: right; } } -@media only screen and (max-width: 720px) { - .search-filter { - .control { - width: 100px; - } - } -} - .grid-dropdown-header { display: inline-flex; justify-content: space-between; align-items: center; height: 36px; - width: 200px; - border: 2px solid $control-border-color; + width: 100%; + min-width: 200px; + border: 1px solid $control-border-color; border-radius: 3px; - color: #8e8e8e; + background-color: $white-color; padding: 0px 5px 0px 5px; .arrow-icon-down { @@ -139,7 +139,13 @@ li { .control-group { margin-bottom: 15px; + display: block; + + .control{ + margin-bottom: 15px; + } } + } } @@ -148,6 +154,11 @@ width: 100%; } } +.filter-advance{ + display: flex; + justify-content: space-between; +} + .filter-tag { display: flex; @@ -160,36 +171,44 @@ margin-right: 20px; .wrapper { - margin-left: 10px; - padding: 5px 10px 5px 10px; + margin-left: 4px; + padding: 5px 10px 5px 16px; display: flex; flex-direction: row; align-items: center; - background: #e7e7e7; + background: #E7E7E7; + border: 1px solid #E7E7E7; font-size: 14px; height: 40px; color: #000311; letter-spacing: -0.22px; - @include border-radius(2px); + @include border-radius(24px); .icon.cross-icon { margin-left: 10px; cursor: pointer; } + + &:hover { + background: $white-color; + border: 1px solid #E7E7E7; + } } } .rtl { .search-filter { + .control { padding-right: 10px; border-left: 0; - border-right: 2px solid #c7c7c7; + border-right: 1px solid #C7C7C7; border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-top-left-radius: 0; border-bottom-left-radius: 0; } + .icon-wrapper { float: left; border-top-right-radius: 0px; @@ -197,19 +216,26 @@ border-top-left-radius: 3px; border-bottom-left-radius: 3px; } + + &:hover { + box-shadow: 0px 0px 0px 1px $selection-color; + } } .dropdown-filters { display: inline-block; + &.per-page { margin-left: 10px; margin-right: 10px; } + } .filtered-tags { .filter-tag { + .wrapper, .cross-icon { margin-right: 10px; @@ -217,9 +243,39 @@ } } } - - .records-count-container { - float: left; - padding: 10px; - } } + + +@media only screen and (max-width: 1040px) { + .grid-container { + + .grid-top{ + .datagrid-filters { + grid-template-columns: 100%; + row-gap: 0px; + + .search-filter{ + max-width: 100% !important; + + } + + .filter-left { + display: grid; + grid-template-columns: 49.5% 49%; + column-gap: 5px; + } + + .filter-right { + display: grid; + grid-template-columns: 49.5% 49%; + column-gap: 5px; + width: 100%; + } + } + } + } + + .grid-dropdown-header { + min-width: 122px; + } +} \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php index d59447634..2c59d5dc1 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -31,8 +31,8 @@
    -
    +
    @if (isset($results['extraFilters']['channels']))
    @@ -93,15 +93,14 @@
    @endif
    -
    +
    -
    -
    +
    +
    -
    @@ -243,30 +242,31 @@
    -
    +
    +
    +
    +
    + + perPage + @{{ filter.label }} -
    - - perPage - @{{ filter.label }} - - - @{{ filter.prettyValue }} - - - - @{{ decodeURIComponent(filter.val) }} - - + + @{{ filter.prettyValue }} + -
    - -
    + + @{{ decodeURIComponent(filter.val) }} + + + +
    + +
    {{ $results['records']->total() }} {{ __('admin::app.admin.system.records-found') }}
    -
    +
    diff --git a/packages/Webkul/Velocity/src/Resources/lang/en/app.php b/packages/Webkul/Velocity/src/Resources/lang/en/app.php index f99390bba..8d7d8f7cd 100644 --- a/packages/Webkul/Velocity/src/Resources/lang/en/app.php +++ b/packages/Webkul/Velocity/src/Resources/lang/en/app.php @@ -103,7 +103,7 @@ return [ 'slider-path' => 'Slider Path', 'category-logo' => 'Category logo', 'product-policy' => 'Product Policy', - 'update-meta-data' => 'Update Meta Data', + 'update-meta-data' => 'Update', 'product-view-image' => 'Product View Image', 'advertisement-two' => 'Advertisement Two Images', 'advertisement-one' => 'Advertisement One Images', @@ -113,6 +113,16 @@ return [ 'images' => 'Images', 'general' => 'General', 'add-image-btn-title' => 'Add Image', + 'image-four-resolution' => 'First image resolutions should be like 427px X 410px , + Second images resolutions should be like 397px X 180px , + Third images resolutions should be like 397px X 180px , + Fouth image resolutions should be like 427px X 410px', + 'image-three-resolution' => 'First image resolution should be like 635px X 465px , + Second image resolutions should be like 620px X 225px, + Third image resolutions should be like 620px X 225px', + 'image-two-resolution' => 'First image resolution should be like 953px X 447px , + Second image resolution should be like 303px X 446px', + 'image-locale-resolution' => 'Image resolution should be like 20px X 20px', 'footer-middle' => [ 'about-us' => 'About Us', 'customer-service' => 'Customer Service', @@ -125,6 +135,16 @@ return [ ] ], 'category' => [ + 'image-four-resolution' => 'First image resolutions should be like 427px X 410px , + Second images resolutions should be like 397px X 180px , + Third images resolutions should be like 397px X 180px , + Fouth image resolutions should be like 427px X 410px', + 'image-three-resolution' => 'First image resolution should be like 635px X 465px , + Second image resolutions should be like 620px X 225px, + Third image resolutions should be like 620px X 225px', + 'image-two-resolution' => 'First image resolution should be like 953px X 447px , + Second image resolution should be like 303px X 446px', + 'image-locale-resolution' => 'Image resolution should be like 20px X 20px', 'save-btn-title' => 'Save Menu', 'title' => 'Category Menu List', 'add-title' => 'Add Menu Content', diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/catelog/categories/category-icon.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/catelog/categories/category-icon.blade.php index f8760ddee..2a6e7ee39 100644 --- a/packages/Webkul/Velocity/src/Resources/views/admin/catelog/categories/category-icon.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/admin/catelog/categories/category-icon.blade.php @@ -15,4 +15,6 @@ :button-label="'{{ __('admin::app.catalog.products.add-image-btn-title') }}'"> @endif + + {{ __('admin::app.catalog.categories.image-size-logo') }} \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php index da863f528..9d7b87341 100644 --- a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php @@ -10,6 +10,20 @@ $channelLocales = core()->getAllLocalesByRequestedChannel()['locales']; @endphp +@push('css') + + + +@endpush + @section('content')
    - - -
    @@ -258,6 +271,7 @@ :button-label="'{{ __('velocity::app.admin.meta-data.add-image-btn-title') }}'"> @endif + {{ __('velocity::app.admin.meta-data.image-three-resolution') }}
    @@ -296,6 +310,7 @@ :button-label="'{{ __('velocity::app.admin.meta-data.add-image-btn-title') }}'"> @endif + {{ __('velocity::app.admin.meta-data.image-two-resolution') }}
    diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/settings/locales/locale-logo.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/settings/locales/locale-logo.blade.php index 8f836fcb7..43bb0b7fb 100644 --- a/packages/Webkul/Velocity/src/Resources/views/admin/settings/locales/locale-logo.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/admin/settings/locales/locale-logo.blade.php @@ -14,4 +14,6 @@ :button-label="'{{ __('admin::app.catalog.products.add-image-btn-title') }}'"> @endif + + {{ __('velocity::app.admin.meta-data.image-locale-resolution') }} \ No newline at end of file