diff --git a/.env.example b/.env.example index ecc5f9cd9..acfbb809f 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,6 @@ APP_NAME=Bagisto APP_ENV=local -APP_VERSION=1.4.1 +APP_VERSION=1.4.2 APP_KEY= APP_DEBUG=true APP_URL=http://localhost diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG for v1.x.x.md index 27369efc6..57650ec5b 100644 --- a/CHANGELOG for v1.x.x.md +++ b/CHANGELOG for v1.x.x.md @@ -3,6 +3,71 @@ This changelog consists of the bug & security fixes and new features being included in the releases listed below. + +## **v1.4.2 (31st of March 2022)** - *Release* + +* #6164 [enhancement] - UI Enhancement - Please Add the separation Lines in the Heading section also in Orders and Downloadable Product Details. + +* #6162 [enhancement] -UI Enhancement - Please Make the Information Text Bold in the Compare Product Page. + +* #6119 [enhancement] -The locale dropdown should be in ascending order + +* #6117 ['enhancement] -The locale name should be shown instead of the locale code on the orders page + +* #5964 [enhancement] - The process to checkout button should be disabled if the product is out of stock. + +* #5399 [enhancement] - There should be a Back to Top Button in the user panel. + +* #5355 [enhancement] -There should be an option to upload user's picture + + +* #6186 [fixed] - The page should be redirected to the product-review page after submitting the review + +* #6181 [fixed] - There should not be any UI issue on the product-view page in the quantity field. + +* #6177 [fixed] - There is a UI issue on the product-view page in the Arabic locale + +* #6174 [fixed] - The sidebar should be disabled if the admin is trying to send the duplicate invoice. + +* #6167 [fixed] - In Reviews Section - Grammatical Mistake Found. + +* #6165 [fixed] - In Downloadable Product Section Unnecessary Column is present. + +* #6161 [fixed] - There should not be any UI issue on the orders page.if the user is trying to filter the orders + +* #6158 [fixed] - The quantity option should not be visible for booking products. + +* #6157 [fixed] - There is a UI issue on the product-edit page + +* #6156 [fixed] - LINT ERROR IN EDIT PRODUCTS BLADE + +* #6153 [fixed] - There should be an asterisk icon for the required fields. + +* #6144 [fixed] - Payment methods page is Blank if admin_locale=fr + +* #6134 [fixed] - The total amount of cart items should be correct. + +* #6132 [fixed] - The edit channel page should not be blank in the Chinese locale. + +* #6126 [fixed] - There is a UI issue on the cart section with Arabic locale + +* #6124 [fixed] - There is a UI issue on the header section + +* #6121 [fixed] - The warning message should be correct if the user is trying to delete the account + +* #6115 [fixed] - The Back to top button should be disabled when the user is placing the order + +* #6114 [fixed] - Edit channel page is Blank if admin_locale=fr + +* #6112 [fixed] - There should not be Error 500 if the admin is trying to edit the product. + +* #6109 [fixed] - The add to cart button should be blurred if the item is out of stock + +* #6103 [fixed] - The header section should be responsive in mobile view + +* #4959 [fixed] - getting exception when merge guest cart with customer cart with configurable item + + ## **v1.4.1 (17th of March 2022)** - *Release* * #6040 [enhancement] - The locale dropdown should be in ascending order diff --git a/README.md b/README.md index b4e37e94e..87ce8dc8a 100755 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ Take advantage of two of the hottest frameworks used in this project -- Laravel * **SERVER**: Apache 2 or NGINX. * **RAM**: 3 GB or higher. -* **PHP**: 7.4 or higher. +* **PHP**: 8.0 or higher. * **For MySQL users**: 5.7.23 or higher. * **For MariaDB users**: 10.2.7 or Higher. * **Node**: 8.11.3 LTS or higher. diff --git a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php index 1ce888a17..fe923d913 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php @@ -38,8 +38,6 @@ class ConfigurationController extends Controller */ public function __construct(CoreConfigRepository $coreConfigRepository) { - $this->middleware('admin'); - $this->coreConfigRepository = $coreConfigRepository; $this->_config = request('_config'); diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php index 8d5d30f4c..2f85e4f1c 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php @@ -66,8 +66,6 @@ class CustomerController extends Controller ) { $this->_config = request('_config'); - $this->middleware('admin'); - $this->customerRepository = $customerRepository; $this->customerAddressRepository = $customerAddressRepository; diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php index 98c44da4c..f3c43802e 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php @@ -32,8 +32,6 @@ class CustomerGroupController extends Controller { $this->_config = request('_config'); - $this->middleware('admin'); - $this->customerGroupRepository = $customerGroupRepository; } diff --git a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php index 25b2f0d54..7159d4809 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php @@ -100,8 +100,6 @@ class DashboardController extends Controller ) { $this->_config = request('_config'); - $this->middleware('admin'); - $this->orderRepository = $orderRepository; $this->orderItemRepository = $orderItemRepository; diff --git a/packages/Webkul/Admin/src/Http/Controllers/ExportController.php b/packages/Webkul/Admin/src/Http/Controllers/ExportController.php index b238b0b8f..a207ff302 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/ExportController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/ExportController.php @@ -7,16 +7,6 @@ use Webkul\Admin\Exports\DataGridExport; class ExportController extends Controller { - /** - * Create a new controller instance. - * - * @return void - */ - public function __construct() - { - $this->middleware('admin'); - } - /** * Export datagrid. * diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php index 883e1e894..41939d3bb 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php @@ -47,8 +47,6 @@ class InvoiceController extends Controller OrderRepository $orderRepository, InvoiceRepository $invoiceRepository ) { - $this->middleware('admin'); - $this->_config = request('_config'); $this->orderRepository = $orderRepository; diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php index e0dc2015a..24b194a65 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php @@ -43,8 +43,6 @@ class OrderController extends Controller OrderCommentRepository $orderCommentRepository ) { - $this->middleware('admin'); - $this->_config = request('_config'); $this->orderRepository = $orderRepository; diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/RefundController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/RefundController.php index 16a5fec33..6eac08f66 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/RefundController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/RefundController.php @@ -51,8 +51,6 @@ class RefundController extends Controller OrderItemRepository $orderItemRepository, RefundRepository $refundRepository ) { - $this->middleware('admin'); - $this->_config = request('_config'); $this->orderRepository = $orderRepository; diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php index d468ad326..04dbcae8c 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php @@ -51,8 +51,6 @@ class ShipmentController extends Controller OrderRepository $orderRepository, OrderItemRepository $orderItemRepository ) { - $this->middleware('admin'); - $this->_config = request('_config'); $this->orderRepository = $orderRepository; diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php index 033490ae8..589d6af29 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php @@ -52,8 +52,6 @@ class TransactionController extends Controller OrderRepository $orderRepository, OrderTransactionRepository $orderTransactionRepository, InvoiceRepository $invoiceRepository) { - $this->middleware('admin'); - $this->_config = request('_config'); $this->orderRepository = $orderRepository; diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 3a4f30ff8..87d64a872 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -309,7 +309,7 @@ return [ ], 'users' => [ - 'title' => 'User', + 'title' => 'Users', 'add-user-title' => 'Add User', 'edit-user-title' => 'Edit User', 'save-btn-title' => 'Save User', diff --git a/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php index 97b285612..159f69ac0 100644 --- a/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php @@ -68,7 +68,7 @@