diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG for v1.x.x.md index 22893ab88..ef6004129 100644 --- a/CHANGELOG for v1.x.x.md +++ b/CHANGELOG for v1.x.x.md @@ -12,6 +12,12 @@ * #2329 [fixed] - Getting exception on frontend after updating meta data. +* #2354 [fixed] - possible integrate this payment + +* #2543 [fixed] - Sliders Text should be translatable + +* #2558 [fixed] - Sliders Text should be translatable + * #2619 [fixed] - Issue when category slug & product slug are same * #2684 [fixed] - API checkout/cart returns null for guest user @@ -52,6 +58,8 @@ * #2781 [fixed] - Mobile menu is not showing correct sub-menu +* #2784 [fixed] - One booking for many days slot time issue + * #2785 [fixed] - missing address details in checkout page * #2786 [fixed] - Getting error message on adding product to compare product from search page. @@ -112,10 +120,20 @@ * #2849 [fixed] - Can not add my stylesheet to Velocity theme +* #2850 [fixed] - admin crash on save configration + * #2851 [fixed] - Fix date picker icon layout at dashboard * #2856 [fixed] - Issue with Sort by functionality, when open any category it by defaults show Newest First but after changing sort by when again select newest first it shows different product. +* #2865 [fixed] - Save order taking so long time 30s + +* #2866 [fixed] - ayout issue when customer save addresses form + +* #2871 [fixed] - Refund throws "Undefined index: shipping" error + +* #2876 [fixed] - Place order is disable at checkout when select shipping address + ## **v1.1.0 (24th of March 2020)** - *Release* diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php index 257d3c8a8..3c66b9a11 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php @@ -117,9 +117,9 @@ class CustomerReviewDataGrid extends DataGrid 'action' => route('admin.customer.review.massupdate'), 'method' => 'PUT', 'options' => [ - 'Pending' => 0, - 'Approve' => 1, - 'Disapprove' => 2, + trans('admin::app.customers.reviews.pending') => 0, + trans('admin::app.customers.reviews.approved') => 1, + trans('admin::app.customers.reviews.disapproved') => 2, ], ]); } diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php index f0fa7fd78..6d5b6009a 100755 --- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php @@ -11,11 +11,31 @@ class SliderDataGrid extends DataGrid protected $sortOrder = 'desc'; + protected $locale = 'all'; + + protected $channel = 'all'; + + public function __construct() + { + parent::__construct(); + + $this->locale = request()->get('locale') ?? 'all'; + $this->channel = request()->get('channel') ?? 'all'; + } + public function prepareQueryBuilder() { $queryBuilder = DB::table('sliders as sl') - ->addSelect('sl.id as slider_id', 'sl.title', 'ch.name') - ->leftJoin('channels as ch', 'sl.channel_id', '=', 'ch.id'); + ->addSelect('sl.id as slider_id', 'sl.title', 'sl.locale', 'ch.name', 'ch.code') + ->leftJoin('channels as ch', 'sl.channel_id', '=', 'ch.id'); + + if ($this->locale !== 'all') { + $queryBuilder->where('locale', $this->locale); + } + + if ($this->channel !== 'all') { + $queryBuilder->where('ch.code', $this->channel); + } $this->addFilter('slider_id', 'sl.id'); $this->addFilter('channel_name', 'ch.name'); @@ -51,6 +71,15 @@ class SliderDataGrid extends DataGrid 'sortable' => true, 'filterable' => true, ]); + + $this->addColumn([ + 'index' => 'locale', + 'label' => trans('admin::app.datagrid.locale'), + 'type' => 'string', + 'searchable' => true, + 'sortable' => true, + 'filterable' => true + ]); } public function prepareActions() diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/RefundController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/RefundController.php index 48a23125b..a41566f35 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/RefundController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/RefundController.php @@ -107,6 +107,10 @@ class RefundController extends Controller $data = request()->all(); + if (! $data['refund']['shipping']) { + $data['refund']['shipping'] = 0; + } + $totals = $this->refundRepository->getOrderItemsRefundSummary($data['refund']['items'], $orderId); $maxRefundAmount = $totals['grand_total']['price'] - $order->refunds()->sum('base_adjustment_refund'); 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 c0ba24c98..e6ec8ce36 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 @@ -20,7 +20,7 @@
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php index 087a84a4c..caeef7f04 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php @@ -447,10 +447,10 @@ 'operator': '<=', 'label': '{{ __('admin::app.promotions.cart-rules.equals-or-less-than') }}' }, { - 'operator': '<=', + 'operator': '>', 'label': '{{ __('admin::app.promotions.cart-rules.greater-than') }}' }, { - 'operator': '<=', + 'operator': '<', 'label': '{{ __('admin::app.promotions.cart-rules.less-than') }}' }], 'decimal': [{ diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php index 1decb83af..82c45f2c8 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php @@ -535,10 +535,10 @@ 'operator': '<=', 'label': '{{ __('admin::app.promotions.cart-rules.equals-or-less-than') }}' }, { - 'operator': '<=', + 'operator': '>', 'label': '{{ __('admin::app.promotions.cart-rules.greater-than') }}' }, { - 'operator': '<=', + 'operator': '<', 'label': '{{ __('admin::app.promotions.cart-rules.less-than') }}' }], 'decimal': [{ 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 d46a2a43e..95a0a1a15 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 @@ -12,16 +12,24 @@ @@ -47,6 +55,8 @@ + {!! view_render_event('sales.invoice.increment_id.after', ['order' => $order]) !!} +
{{ __('admin::app.sales.orders.order-date') }} @@ -57,6 +67,8 @@
+ {!! view_render_event('sales.invoice.created_at.after', ['order' => $order]) !!} +
{{ __('admin::app.sales.orders.order-status') }} @@ -67,6 +79,8 @@
+ {!! view_render_event('sales.invoice.status_label.after', ['order' => $order]) !!} +
{{ __('admin::app.sales.orders.channel') }} @@ -76,6 +90,8 @@ {{ $order->channel_name }}
+ + {!! view_render_event('sales.invoice.channel_name.after', ['order' => $order]) !!} @@ -95,6 +111,8 @@ + {!! view_render_event('sales.invoice.customer_name.after', ['order' => $order]) !!} +
{{ __('admin::app.sales.orders.email') }} @@ -104,6 +122,8 @@ {{ $invoice->address->email }}
+ + {!! view_render_event('sales.invoice.customer_email.after', ['order' => $order]) !!} @@ -119,9 +139,9 @@
- @include ('admin::sales.address', ['address' => $order->billing_address]) + {!! view_render_event('sales.invoice.billing_address.after', ['order' => $order]) !!}
@@ -132,9 +152,9 @@
- @include ('admin::sales.address', ['address' => $order->shipping_address]) + {!! view_render_event('sales.invoice.shipping_address.after', ['order' => $order]) !!}
@endif @@ -170,6 +190,8 @@ {{ $order->order_currency_code }} + + {!! view_render_event('sales.invoice.payment-method.after', ['order' => $order]) !!} @@ -199,6 +221,8 @@ {{ core()->formatBasePrice($order->base_shipping_amount) }} + + {!! view_render_event('sales.invoice.shipping-method.after', ['order' => $order]) !!} @endif @@ -236,7 +260,7 @@ @if (isset($item->additional['attributes']))
- + @foreach ($item->additional['attributes'] as $attribute) {{ $attribute['attribute_name'] }} : {{ $attribute['option_label'] }}
@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 24eee8937..e0d986c37 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 @@ -12,13 +12,19 @@

+ {!! view_render_event('sales.order.title.before', ['order' => $order]) !!} + {{ __('admin::app.sales.orders.view-title', ['order_id' => $order->increment_id]) }} + + {!! view_render_event('sales.order.title.after', ['order' => $order]) !!}

+ {!! view_render_event('sales.order.page_action.before', ['order' => $order]) !!} + @if ($order->canCancel()) {{ __('admin::app.sales.orders.cancel-btn-title') }} @@ -42,6 +48,8 @@ {{ __('admin::app.sales.orders.shipment-btn-title') }} @endif + + {!! view_render_event('sales.order.page_action.after', ['order' => $order]) !!}
@@ -72,6 +80,8 @@ + {!! view_render_event('sales.order.created_at.after', ['order' => $order]) !!} +
{{ __('admin::app.sales.orders.order-status') }} @@ -82,6 +92,8 @@
+ {!! view_render_event('sales.order.status_label.after', ['order' => $order]) !!} +
{{ __('admin::app.sales.orders.channel') }} @@ -91,6 +103,8 @@ {{ $order->channel_name }}
+ + {!! view_render_event('sales.order.channel_name.after', ['order' => $order]) !!} @@ -110,6 +124,8 @@ + {!! view_render_event('sales.order.customer_full_name.after', ['order' => $order]) !!} +
{{ __('admin::app.sales.orders.email') }} @@ -120,6 +136,8 @@
+ {!! view_render_event('sales.order.customer_email.after', ['order' => $order]) !!} + @if (! is_null($order->customer))
@@ -131,6 +149,8 @@
@endif + + {!! view_render_event('sales.order.customer_group.after', ['order' => $order]) !!} @@ -146,9 +166,9 @@
- @include ('admin::sales.address', ['address' => $order->billing_address]) + {!! view_render_event('sales.order.billing_address.after', ['order' => $order]) !!}
@@ -159,9 +179,9 @@
- @include ('admin::sales.address', ['address' => $order->shipping_address]) + {!! view_render_event('sales.order.shipping_address.after', ['order' => $order]) !!}
@endif @@ -197,6 +217,8 @@ {{ $order->order_currency_code }} + + {!! view_render_event('sales.order.payment-method.after', ['order' => $order]) !!} @@ -226,6 +248,8 @@ {{ core()->formatBasePrice($order->base_shipping_amount) }} + + {!! view_render_event('sales.order.shipping-method.after', ['order' => $order]) !!} @endif diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php index f67421151..51aa1266c 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php @@ -34,6 +34,20 @@ {!! view_render_event('bagisto.admin.settings.slider.create.before') !!} +
+ + + +
+
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php index af5e28126..ae15896e9 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php @@ -6,6 +6,8 @@ @section('content')
+ get('locale') ?: app()->getLocale(); ?> +
@@ -476,9 +476,9 @@
- @include ('admin::sales.address', ['address' => $order->shipping_address]) + {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-address.after', ['order' => $order]) !!}
@@ -488,9 +488,9 @@
- {{ $order->shipping_title }} + {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-method.after', ['order' => $order]) !!}
@endif @@ -502,6 +502,8 @@
{{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }} + + {!! view_render_event('bagisto.shop.customers.account.orders.view.payment-method.after', ['order' => $order]) !!}
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php index a824509a3..64ed2bf50 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php @@ -35,6 +35,8 @@ @{{ errors.first('first_name') }} + {!! view_render_event('bagisto.shop.customers.account.profile.edit.first_name.after') !!} +
@@ -42,6 +44,8 @@ @{{ errors.first('last_name') }}
+ {!! view_render_event('bagisto.shop.customers.account.profile.edit.last_name.after') !!} +
@@ -54,24 +58,32 @@ @{{ errors.first('gender') }}
+ {!! view_render_event('bagisto.shop.customers.account.profile.edit.gender.after') !!} +
@{{ errors.first('date_of_birth') }}
+ {!! view_render_event('bagisto.shop.customers.account.profile.edit.date_of_birth.after') !!} +
@{{ errors.first('email') }}
+ {!! view_render_event('bagisto.shop.customers.account.profile.edit.email.after') !!} +
@{{ errors.first('oldpassword') }}
+ {!! view_render_event('bagisto.shop.customers.account.profile.edit.oldpassword.after') !!} +
@@ -79,6 +91,8 @@ @{{ errors.first('password') }}
+ {!! view_render_event('bagisto.shop.customers.account.profile.edit.password.after') !!} +
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php index 02abd9341..8cdc148ed 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php @@ -38,21 +38,29 @@ {{ $customer->first_name }} + {!! view_render_event('bagisto.shop.customers.account.profile.view.table.first_name.after') !!} + {{ __('shop::app.customer.account.profile.lname') }} {{ $customer->last_name }} + {!! view_render_event('bagisto.shop.customers.account.profile.view.table.last_name.after') !!} + {{ __('shop::app.customer.account.profile.gender') }} {{ $customer->gender }} + {!! view_render_event('bagisto.shop.customers.account.profile.view.table.gender.after') !!} + {{ __('shop::app.customer.account.profile.dob') }} {{ $customer->date_of_birth }} + {!! view_render_event('bagisto.shop.customers.account.profile.view.table.date_of_birth.after') !!} + {{ __('shop::app.customer.account.profile.email') }} {{ $customer->email }} diff --git a/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php index 60e774254..9f4fc1b53 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php @@ -27,24 +27,32 @@ @{{ errors.first('first_name') }}
+ {!! view_render_event('bagisto.shop.customers.signup_form_controls.firstname.after') !!} +
@{{ errors.first('last_name') }}
+ {!! view_render_event('bagisto.shop.customers.signup_form_controls.lastname.after') !!} +
@{{ errors.first('email') }}
+ {!! view_render_event('bagisto.shop.customers.signup_form_controls.email.after') !!} +
@{{ errors.first('password') }}
+ {!! view_render_event('bagisto.shop.customers.signup_form_controls.password.after') !!} +
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php index e35d3d737..7330d22b8 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php @@ -26,18 +26,24 @@ @{{ errors.first('company_name') }}
+ {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.company_name.after') !!} +
@{{ errors.first('first_name') }}
+ {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.first_name.after') !!} +
@{{ errors.first('last_name') }}
+ {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.last_name.after') !!} +
+ {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.vat_id.after') !!} + @php $addresses = explode(PHP_EOL, (old('address1') ?? '')); @endphp @@ -64,20 +72,28 @@ @endfor @endif + {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.street-address.after') !!} + @include ('shop::customers.account.address.country-state', ['countryCode' => old('country'), 'stateCode' => old('state')]) + {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.country-state.after') !!} +
@{{ errors.first('city') }}
+ {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.city.after') !!} +
@{{ errors.first('postcode') }}
+ {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.postcode.after') !!} +
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php index b82de5902..d08718025 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php @@ -21,7 +21,6 @@ {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.before', ['address' => $address]) !!} - address1)); ?>
@@ -30,18 +29,24 @@ @{{ errors.first('company_name') }}
+ {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.company_name.after') !!} +
@{{ errors.first('first_name') }}
+ {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.first_name.after') !!} +
@{{ errors.first('last_name') }}
+ {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.last_name.after') !!} +
+ {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.vat_id.after') !!} +
@@ -64,20 +71,28 @@ @endfor @endif + {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.street-addres.after') !!} + @include ('shop::customers.account.address.country-state', ['countryCode' => old('country') ?? $address->country, 'stateCode' => old('state') ?? $address->state]) + {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.country-state.after') !!} +
@{{ errors.first('city') }}
+ {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.create.after') !!} +
@{{ errors.first('postcode') }}
+ {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.postcode.after') !!} +
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php index b30980d7c..91746b66e 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php @@ -489,9 +489,9 @@
- @include ('admin::sales.address', ['address' => $order->billing_address]) + {!! view_render_event('bagisto.shop.customers.account.orders.view.billing-address.after', ['order' => $order]) !!}
@@ -502,9 +502,9 @@
- @include ('admin::sales.address', ['address' => $order->shipping_address]) + {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-address.after', ['order' => $order]) !!}
@@ -514,9 +514,9 @@
- {{ $order->shipping_title }} + {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-method.after', ['order' => $order]) !!}
@endif @@ -528,6 +528,8 @@
{{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }} + + {!! view_render_event('bagisto.shop.customers.account.orders.view.payment-method.after', ['order' => $order]) !!}
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php index ba66a4bec..b5f33f26d 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php @@ -15,7 +15,7 @@ - {!! view_render_event('bagisto.shop.customers.account.profile.view.before', ['customer' => $customer]) !!} + {!! view_render_event('bagisto.shop.customers.account.profile.edit.before', ['customer' => $customer]) !!}
- @csrf + {!! view_render_event('bagisto.shop.customers.account.profile.edit.before', ['customer' => $customer]) !!} +
+ {!! view_render_event('bagisto.shop.customers.account.profile.edit.first_name.after') !!} +
+ {!! view_render_event('bagisto.shop.customers.account.profile.edit.last_name.after') !!} +
+ {!! view_render_event('bagisto.shop.customers.account.profile.edit.gender.after') !!} +
+ {!! view_render_event('bagisto.shop.customers.account.profile.edit.date_of_birth.after') !!} +
+ {!! view_render_event('bagisto.shop.customers.account.profile.edit.email.after') !!} +
+ {!! view_render_event('bagisto.shop.customers.account.profile.edit.oldpassword.after') !!} +
+ {!! view_render_event('bagisto.shop.customers.account.profile.edit.password.after') !!} +
+ {!! view_render_event('bagisto.shop.customers.account.profile.edit_form_controls.after', ['customer' => $customer]) !!} +