From d7213db2c9fdb4475bfee1e7f3e7a5f29e9ad435 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Fri, 15 Feb 2019 11:28:47 +0530 Subject: [PATCH] customer password --- packages/Webkul/Admin/src/Resources/lang/en/app.php | 4 ++-- packages/Webkul/Admin/webpack.mix.js | 4 ++-- .../src/Resources/views/customers/session/index.blade.php | 2 +- packages/Webkul/Shop/webpack.mix.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 1b9a39e6d..bef8fcb67 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -80,8 +80,8 @@ return [ 'total-orders' => 'Total Orders', 'total-sale' => 'Total Sale', 'average-sale' => 'Average Order Sale', - 'increased' => ':progress% Increased', - 'decreased' => ':progress% Decreased', + 'increased' => ':progress%', + 'decreased' => ':progress%', 'sales' => 'Sales', 'top-performing-categories' => 'Top Performing Categories', 'product-count' => ':count Products', diff --git a/packages/Webkul/Admin/webpack.mix.js b/packages/Webkul/Admin/webpack.mix.js index 92e3d593b..3f72c18c8 100755 --- a/packages/Webkul/Admin/webpack.mix.js +++ b/packages/Webkul/Admin/webpack.mix.js @@ -1,8 +1,8 @@ const { mix } = require("laravel-mix"); require("laravel-mix-merge-manifest"); -var publicPath = 'publishable/assets'; -// var publicPath = "../../../public/vendor/webkul/admin/assets"; +// var publicPath = 'publishable/assets'; +var publicPath = "../../../public/vendor/webkul/admin/assets"; mix.setPublicPath(publicPath).mergeManifest(); mix.disableNotifications(); diff --git a/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php index 92182f571..e24b7a24b 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php @@ -26,7 +26,7 @@
- + @{{ errors.first('password') }}
diff --git a/packages/Webkul/Shop/webpack.mix.js b/packages/Webkul/Shop/webpack.mix.js index acf0d5b90..cc2d629f2 100755 --- a/packages/Webkul/Shop/webpack.mix.js +++ b/packages/Webkul/Shop/webpack.mix.js @@ -1,8 +1,8 @@ const { mix } = require("laravel-mix"); require("laravel-mix-merge-manifest"); -var publicPath = 'publishable/assets'; -// var publicPath = "../../../public/themes/default/assets"; +// var publicPath = 'publishable/assets'; +var publicPath = "../../../public/themes/default/assets"; mix.setPublicPath(publicPath).mergeManifest(); mix.disableNotifications();