From 930cba94360d15c17daac6389d220d26b78085cd Mon Sep 17 00:00:00 2001 From: jitendra Date: Thu, 25 Oct 2018 13:16:45 +0530 Subject: [PATCH] Issues fixed --- config/auth.php | 2 +- packages/Webkul/Admin/src/Config/auth.php | 2 +- .../Admin/src/DataGrids/CustomerDataGrid.php | 4 +- .../Admin/src/DataGrids/UserDataGrid.php | 4 +- .../Webkul/Admin/src/Exceptions/Handler.php | 14 ++--- .../Http/Controllers/DataGridController.php | 4 +- packages/Webkul/Admin/src/Http/routes.php | 1 - .../Admin/src/Resources/lang/en/app.php | 42 ------------- packages/Webkul/Checkout/src/Cart.php | 2 - ...018_07_20_064849_create_channels_table.php | 2 +- .../src/Http/Controllers/LocaleController.php | 2 +- ...09_11_064045_customer_password_resets.php} | 6 +- .../Controllers/RegistrationController.php | 2 +- .../Webkul/Customer/src/Models/Customer.php | 16 +++-- .../Notifications/CustomerResetPassword.php | 4 +- .../Controllers/InventorySourceController.php | 2 + .../Criteria/ActiveProductCriteria.php | 56 +++++++++++++++++ .../src/Repositories/ProductRepository.php | 9 ++- packages/Webkul/Shop/src/Http/routes.php | 48 +++++--------- .../Shop/src/Resources/assets/sass/app.scss | 16 ++--- .../Webkul/Shop/src/Resources/lang/en/app.php | 62 +++++++++++++++++-- .../views/customers/account/index.blade.php | 2 + .../customers/account/profile/index.blade.php | 4 +- .../views/customers/session/index.blade.php | 4 +- .../signup/forgot-password.blade.php | 26 +++++++- .../customers/signup/reset-password.blade.php | 14 +++-- .../emails/admin/forget-password.blade.php | 12 ++-- .../emails/customer/forget-password.blade.php | 12 ++-- .../views/emails/sales/new-invoice.blade.php | 38 ++++++------ .../views/emails/sales/new-order.blade.php | 40 ++++++------ .../views/emails/sales/new-shipment.blade.php | 34 +++++----- .../views/layouts/header/index.blade.php | 12 ---- .../src/Notifications/AdminResetPassword.php | 2 +- public/themes/default/assets/css/shop.css | 13 +--- 34 files changed, 290 insertions(+), 223 deletions(-) rename packages/Webkul/Customer/src/Database/migrations/{2018_09_11_064045_customers_password_resets.php => 2018_09_11_064045_customer_password_resets.php} (72%) create mode 100644 packages/Webkul/Product/src/Contracts/Criteria/ActiveProductCriteria.php diff --git a/config/auth.php b/config/auth.php index 90efd519a..e9909741d 100644 --- a/config/auth.php +++ b/config/auth.php @@ -53,7 +53,7 @@ return [ ], 'customers' => [ 'provider' => 'customers', - 'table' => 'customers_password_resets', + 'table' => 'customer_password_resets', 'expire' => 60, ], ], diff --git a/packages/Webkul/Admin/src/Config/auth.php b/packages/Webkul/Admin/src/Config/auth.php index 21c43f718..021b99787 100644 --- a/packages/Webkul/Admin/src/Config/auth.php +++ b/packages/Webkul/Admin/src/Config/auth.php @@ -54,7 +54,7 @@ return [ ], 'customers' => [ 'provider' => 'customers', - 'table' => 'customers_password_resets', + 'table' => 'customer_password_resets', 'expire' => 60, ], ], diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php index 98e8568f5..7108b1f69 100644 --- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -79,7 +79,7 @@ class CustomerDataGrid 'name' => 'email', 'alias' => 'Email', 'type' => 'string', - 'label' => 'E-Mail', + 'label' => 'Email', 'sortable' => false, ], [ @@ -127,7 +127,7 @@ class CustomerDataGrid [ 'column' => 'email', 'type' => 'string', - 'label' => 'E-Mail', + 'label' => 'Email', ], ], diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php index 0543693aa..bb42e8bba 100644 --- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php @@ -101,7 +101,7 @@ class UserDataGrid 'name' => 'u.email', 'alias' => 'Email', 'type' => 'string', - 'label' => 'E-Mail', + 'label' => 'Email', 'sortable' => true, ], [ @@ -134,7 +134,7 @@ class UserDataGrid [ 'column' => 'u.email', 'type' => 'string', - 'label' => 'E-Mail' + 'label' => 'Email' ], [ 'column' => 'u.name', 'type' => 'string', diff --git a/packages/Webkul/Admin/src/Exceptions/Handler.php b/packages/Webkul/Admin/src/Exceptions/Handler.php index 918aca539..fad745375 100644 --- a/packages/Webkul/Admin/src/Exceptions/Handler.php +++ b/packages/Webkul/Admin/src/Exceptions/Handler.php @@ -6,10 +6,10 @@ use Exception; use Illuminate\Auth\AuthenticationException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Symfony\Component\HttpKernel\Exception\HttpException; +use Illuminate\Database\Eloquent\ModelNotFoundException; class Handler extends ExceptionHandler { - /** * Render an exception into an HTTP response. * @@ -19,22 +19,20 @@ class Handler extends ExceptionHandler */ public function render($request, Exception $exception) { - if ($exception instanceof HttpException) { - $statusCode = $exception->getStatusCode(); + $statusCode = $exception->getCode(); - if(strpos($_SERVER['REQUEST_URI'], 'admin') !== false){ - return response(view('admin::errors.'.$statusCode, [ + if(strpos($_SERVER['REQUEST_URI'], 'admin') !== false) { + return response(view('admin::errors.' . $statusCode, [ 'msg' => $exception->getMessage(), 'code' => $statusCode ]), $statusCode); - }else { - return response(view('shop::errors.'.$statusCode, [ + } else { + return response(view('shop::errors.' . $statusCode, [ 'msg' => $exception->getMessage(), 'code' => $statusCode ]), $statusCode); } - } return parent::render($request, $exception); diff --git a/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php b/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php index de3fa9e8d..d0aa132f3 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php @@ -37,7 +37,7 @@ class DataGridController extends Controller ], [ 'column' => 'u.email', 'type' => 'string', - 'label' => 'Admin E-Mail', + 'label' => 'Admin Email', ], [ 'column' => 'u.name', 'type' => 'string', @@ -76,7 +76,7 @@ class DataGridController extends Controller [ 'name' => 'u.email', 'type' => 'string', - 'label' => 'Admin E-Mail', + 'label' => 'Admin Email', 'sortable' => true, 'filterable' => true ], diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index 15ca6dacc..8c9f69bb8 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -21,7 +21,6 @@ Route::group(['middleware' => ['web']], function () { Route::post('/forget-password', 'Webkul\User\Http\Controllers\ForgetPasswordController@store')->name('admin.forget-password.store'); - // Reset Password Routes Route::get('/reset-password/{token}', 'Webkul\User\Http\Controllers\ResetPasswordController@create')->defaults('_config', [ 'view' => 'admin::users.reset-password.create' diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 6a66e69ad..234d4c8bb 100644 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -458,48 +458,6 @@ return [ 'comment' => 'Comment' ] ], - 'mail' => [ - 'order' => [ - 'subject' => 'New Order Confirmation', - 'heading' => 'Order Confirmation!', - 'dear' => 'Dear :customer_name', - 'greeting' => 'Thanks for your Order :order_id placed on :created_at', - 'summary' => 'Summary of Order', - 'shipping-address' => 'Shipping Address', - 'billing-address' => 'Billing Address', - 'contact' => 'Contact', - 'shipping' => 'Shipping', - 'payment' => 'Payment', - 'price' => 'Price', - 'quantity' => 'Quantity', - 'subtotal' => 'Subtotal', - 'shipping-handling' => 'Shipping & Handling', - 'tax' => 'Tax', - 'grand-total' => 'Grand Total', - 'final-summary' => 'Thanks for showing your intrest in our store. we will send you track number once it shiped.', - 'help' => 'If you need any kind of help please contact us at :support_email', - 'thanks' => 'Thanks!' - ], - 'invoice' => [ - 'heading' => 'Your Invoice #:invoice_id for Order #:order_id', - 'subject' => 'Invoice for your order #:order_id', - 'summary' => 'Summary of Invoice', - ], - 'shipment' => [ - 'heading' => 'Your Shipment #:shipment_id for Order #:order_id', - 'subject' => 'Shipment for your order #:order_id', - 'summary' => 'Summary of Shipment', - 'carrier' => 'Carrier', - 'tracking-number' => 'Tracking Number' - ], - 'forget-password' => [ - 'dear' => 'Dear :name', - 'info' => 'You are receiving this email because we received a password reset request for your account.', - 'reset-password' => 'Reset Password', - 'final-summary' => 'If you did not request a password reset, no further action is required.', - 'thanks' => 'Thanks!' - ] - ], 'error' => [ 'go-to-home' => 'GO TO HOME', diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index 0f1761bdb..9fa624860 100644 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -236,8 +236,6 @@ class Cart { 'base_total' => $parentPrice * ($prevQty + $newQty) ]); - $this->collectTotals(); - session()->flash('success', trans('shop::app.checkout.cart.quantity.success')); return true; diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_07_20_064849_create_channels_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_07_20_064849_create_channels_table.php index 010f2d22f..1d3cd323b 100644 --- a/packages/Webkul/Core/src/Database/Migrations/2018_07_20_064849_create_channels_table.php +++ b/packages/Webkul/Core/src/Database/Migrations/2018_07_20_064849_create_channels_table.php @@ -58,4 +58,4 @@ class CreateChannelsTable extends Migration Schema::dropIfExists('channel_currencies'); } -} +} \ No newline at end of file diff --git a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php index bdc77fdee..d8b1a1a6a 100644 --- a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php +++ b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php @@ -72,7 +72,7 @@ class LocaleController extends Controller public function store(Request $request) { $this->validate(request(), [ - 'code' => 'required|unique:locales,code', + 'code' => ['required', 'unique:locales,code', new \Webkul\Core\Contracts\Validations\Code], 'name' => 'required' ]); diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_09_11_064045_customers_password_resets.php b/packages/Webkul/Customer/src/Database/migrations/2018_09_11_064045_customer_password_resets.php similarity index 72% rename from packages/Webkul/Customer/src/Database/migrations/2018_09_11_064045_customers_password_resets.php rename to packages/Webkul/Customer/src/Database/migrations/2018_09_11_064045_customer_password_resets.php index 3312a7865..9ea751001 100644 --- a/packages/Webkul/Customer/src/Database/migrations/2018_09_11_064045_customers_password_resets.php +++ b/packages/Webkul/Customer/src/Database/migrations/2018_09_11_064045_customer_password_resets.php @@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema; use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Migrations\Migration; -class CustomersPasswordResets extends Migration +class CustomerPasswordResets extends Migration { /** * Run the migrations. @@ -13,7 +13,7 @@ class CustomersPasswordResets extends Migration */ public function up() { - Schema::create('customers_password_resets', function (Blueprint $table) { + Schema::create('customer_password_resets', function (Blueprint $table) { $table->string('email')->index(); $table->string('token'); $table->timestamp('created_at')->nullable(); @@ -27,6 +27,6 @@ class CustomersPasswordResets extends Migration */ public function down() { - Schema::dropIfExists('customers_password_resets'); + Schema::dropIfExists('customer_password_resets'); } } \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php index 53b389bd1..67197fec6 100644 --- a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php @@ -54,7 +54,7 @@ class RegistrationController extends Controller $request->validate([ 'first_name' => 'string|required', 'last_name' => 'string|required', - 'email' => 'email|required', + 'email' => 'email|required|unique:customers,email', 'password' => 'confirmed|min:6|required', 'agreement' => 'required' ]); diff --git a/packages/Webkul/Customer/src/Models/Customer.php b/packages/Webkul/Customer/src/Models/Customer.php index 912086883..7a8ce11be 100644 --- a/packages/Webkul/Customer/src/Models/Customer.php +++ b/packages/Webkul/Customer/src/Models/Customer.php @@ -6,10 +6,7 @@ use Illuminate\Notifications\Notifiable; use Illuminate\Foundation\Auth\User as Authenticatable; use Webkul\Customer\Models\CustomerGroup; use Webkul\Sales\Models\Order; - -// use Webkul\User\Notifications\AdminResetPassword; - -// use Webkul\User\Notifications\AdminResetPassword; +use Webkul\Customer\Notifications\CustomerResetPassword; class Customer extends Authenticatable @@ -38,4 +35,15 @@ class Customer extends Authenticatable { return $this->belongsTo(CustomerGroup::class); } + + /** + * Send the password reset notification. + * + * @param string $token + * @return void + */ + public function sendPasswordResetNotification($token) + { + $this->notify(new CustomerResetPassword($token)); + } } diff --git a/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php b/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php index 9db9e27ae..148bd4b96 100644 --- a/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php +++ b/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php @@ -1,6 +1,6 @@ view('shop::emails.customer.forget-password')->with([ + ->view('shop::emails.customer.forget-password', [ 'user_name' => $notifiable->name, 'token' => $this->token ]); diff --git a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php index 60c1bdd7e..be70c4ec0 100644 --- a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php +++ b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php @@ -69,6 +69,7 @@ class InventorySourceController extends Controller public function store() { $this->validate(request(), [ + 'code' => ['required', 'unique:inventory_sources,code', new \Webkul\Core\Contracts\Validations\Code], 'name' => 'required' ]); @@ -102,6 +103,7 @@ class InventorySourceController extends Controller public function update(Request $request, $id) { $this->validate(request(), [ + 'code' => ['required', 'unique:inventory_sources,code,' . $id, new \Webkul\Core\Contracts\Validations\Code], 'name' => 'required', ]); diff --git a/packages/Webkul/Product/src/Contracts/Criteria/ActiveProductCriteria.php b/packages/Webkul/Product/src/Contracts/Criteria/ActiveProductCriteria.php new file mode 100644 index 000000000..211c34c8b --- /dev/null +++ b/packages/Webkul/Product/src/Contracts/Criteria/ActiveProductCriteria.php @@ -0,0 +1,56 @@ +attribute = $attribute; + } + + /** + * Apply criteria in query repository + * + * @param string $model + * @param RepositoryInterface $repository + * + * @return mixed + */ + public function apply($model, RepositoryInterface $repository) + { + foreach(['status', 'visible_individually'] as $code) { + $attribute = $this->attribute->findOneByField('code', $code); + + $alias = 'filter_' . $attribute->code; + + $model = $model->leftJoin('product_attribute_values as ' . $alias, 'products.id', '=', $alias . '.product_id'); + + $model = $this->applyChannelLocaleFilter($attribute, $model, $alias); + + $model->where($alias . '.boolean_value', 1) + ->where($alias . '.attribute_id', $attribute->id); + } + + return $model; + } +} diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php index beb6a2cb0..b49f9dbc5 100644 --- a/packages/Webkul/Product/src/Repositories/ProductRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php @@ -11,6 +11,7 @@ use Webkul\Product\Repositories\ProductInventoryRepository; use Webkul\Product\Repositories\ProductImageRepository; use Webkul\Product\Models\ProductAttributeValue; use Webkul\Product\Contracts\Criteria\SortCriteria; +use Webkul\Product\Contracts\Criteria\ActiveProductCriteria; use Webkul\Product\Contracts\Criteria\AttributeToSelectCriteria; use Webkul\Product\Contracts\Criteria\FilterByAttributesCriteria; use Webkul\Product\Contracts\Criteria\FilterByCategoryCriteria; @@ -383,6 +384,7 @@ class ProductRepository extends Repository */ public function findAllByCategory($categoryId = null) { + $this->pushCriteria(app(ActiveProductCriteria::class)); $this->pushCriteria(app(SortCriteria::class)); $this->pushCriteria(app(FilterByAttributesCriteria::class)); $this->pushCriteria(new FilterByCategoryCriteria($categoryId)); @@ -419,9 +421,12 @@ class ProductRepository extends Repository ], ['product_id']); if($attributeValue && $attributeValue->product_id) { + $this->pushCriteria(app(ActiveProductCriteria::class)); $this->pushCriteria(app(AttributeToSelectCriteria::class)->addAttribueToSelect($columns)); - return $this->find($attributeValue->product_id); + $product = $this->findOrFail($attributeValue->product_id); + + return $product; } throw (new ModelNotFoundException)->setModel( @@ -436,6 +441,7 @@ class ProductRepository extends Repository */ public function getNewProducts() { + $this->pushCriteria(app(ActiveProductCriteria::class)); $this->pushCriteria(app(NewProductsCriteria::class)); $this->pushCriteria(app(AttributeToSelectCriteria::class)); @@ -453,6 +459,7 @@ class ProductRepository extends Repository */ public function getFeaturedProducts() { + $this->pushCriteria(app(ActiveProductCriteria::class)); $this->pushCriteria(app(FeaturedProductsCriteria::class)); $this->pushCriteria(app(AttributeToSelectCriteria::class)); diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index 73eae21d7..9b8586aa1 100644 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -66,24 +66,24 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function 'redirect' => 'customer.reviews.index' ])->name('shop.reviews.store'); - // forgot Password Routes - Route::get('/forgot-password', 'Webkul\Customer\Http\Controllers\ForgotPasswordController@create')->defaults('_config', [ - 'view' => 'shop::customers.signup.forgot-password' - ])->name('customer.forgot-password.create'); - - Route::post('/forgot-password', 'Webkul\Customer\Http\Controllers\ForgotPasswordController@store')->name('customer.forgot-password.store'); - - //Reset Password create - Route::get('/reset-password/{token}', 'Webkul\Customer\Http\Controllers\ResetPasswordController@create')->defaults('_config', [ - 'view' => 'shop::customers.signup.reset-password' - ])->name('customer.reset-password.create'); - - Route::post('/reset-password', 'Webkul\Customer\Http\Controllers\ResetPasswordController@store')->defaults('_config', [ - 'redirect' => 'customer.session.index' - ])->name('customer.reset-password.store'); //customer routes starts here Route::prefix('customer')->group(function () { + // forgot Password Routes + Route::get('/forgot-password', 'Webkul\Customer\Http\Controllers\ForgotPasswordController@create')->defaults('_config', [ + 'view' => 'shop::customers.signup.forgot-password' + ])->name('customer.forgot-password.create'); + + Route::post('/forgot-password', 'Webkul\Customer\Http\Controllers\ForgotPasswordController@store')->name('customer.forgot-password.store'); + + //Reset Password create + Route::get('/reset-password/{token}', 'Webkul\Customer\Http\Controllers\ResetPasswordController@create')->defaults('_config', [ + 'view' => 'shop::customers.signup.reset-password' + ])->name('customer.reset-password.create'); + + Route::post('/reset-password', 'Webkul\Customer\Http\Controllers\ResetPasswordController@store')->defaults('_config', [ + 'redirect' => 'customer.session.index' + ])->name('customer.reset-password.store'); // Login Routes Route::get('login', 'Webkul\Customer\Http\Controllers\SessionController@show')->defaults('_config', [ @@ -91,7 +91,7 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function ])->name('customer.session.index'); Route::post('login', 'Webkul\Customer\Http\Controllers\SessionController@create')->defaults('_config', [ - 'redirect' => 'customer.account.index' + 'redirect' => 'customer.profile.index' ])->name('customer.session.create'); // Registration Routes @@ -120,22 +120,6 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function Route::get('wishlist/moveall', 'Webkul\Customer\Http\Controllers\WishlistController@moveAll')->name('customer.wishlist.moveall'); - // Forget Password Routes - Route::get('/forget-password', 'Webkul\Customer\Http\Controllers\ForgetPasswordController@create')->defaults('_config', [ - 'view' => 'shop::customers.signup.forget-password' - ])->name('customer.forget-password.create'); - - Route::post('/forget-password', 'Webkul\Customer\Http\Controllers\ForgetPasswordController@store')->name('customer.forget-password.store'); - - //Reset Password create - Route::get('/reset-password/{token}', 'Webkul\Customer\Http\Controllers\ResetPasswordController@create')->defaults('_config', [ - 'view' => 'shop::customers.signup.reset-password' - ])->name('password.reset'); - - Route::post('/reset-password', 'Webkul\Customer\Http\Controllers\ResetPasswordController@store')->defaults('_config', [ - 'redirect' => 'customer.session.index' - ])->name('customer.reset-password.store'); - //customer account Route::prefix('account')->group(function () { diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 8d94a5f22..e5ec7b44f 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -2137,17 +2137,12 @@ section.review { flex-direction: column; max-width: 530px; min-width: 380px; - min-height: 345px; - padding-left: 25px; - padding-right: 25px; + padding: 25px; .login-text { font-size: 24px; - font-weight: bold; - color: $font-color; - - margin-top: 5%; - margin-bottom: 3%; + font-weight: 600; + margin-bottom: 30px; } .control-group { @@ -2164,17 +2159,14 @@ section.review { margin-bottom: 5%; } - .signup-confirm { + .signup-confirm { margin-bottom: 5%; } .btn-primary { width: 100%; text-transform: uppercase; - border-radius: 0px; - height: 45px; - margin-bottom: 4%; } } } diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index b43e2a085..1f29ab4ed 100644 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -45,13 +45,13 @@ return [ 'login-text' => [ 'no_account' => 'Don\'t have account', - 'title' => 'Sign In', + 'title' => 'Sign Up', ], 'login-form' => [ 'page-title' => 'Customer - Login', 'title' => 'Sign In', - 'email' => 'E-Mail', + 'email' => 'Email', 'password' => 'Password', 'forgot_pass' => 'Forgot Password?', 'button_title' => 'Sign In', @@ -61,11 +61,20 @@ return [ 'forgot-password' => [ 'title' => 'Recover Password', - 'email' => 'E-Mail', + 'email' => 'Email', 'submit' => 'Submit', 'page_title' => 'Customer - Forgot Password Form' ], + 'reset-password' => [ + 'title' => 'Reset Password', + 'email' => 'Registered Email', + 'password' => 'Password', + 'confirm-password' => 'Confirm Password', + 'back-link-title' => 'Back to Sign In', + 'submit-btn-title' => 'Reset Password' + ], + 'account' => [ 'dashboard' => 'Customer - Edit Profile', @@ -81,7 +90,7 @@ return [ 'gender' => 'Gender', 'dob' => 'Date Of Birth', 'phone' => 'Phone', - 'email' => 'E-Mail', + 'email' => 'Email', 'opassword' => 'Old Password', 'password' => 'Password', 'cpassword' => 'Confirm Password', @@ -301,5 +310,48 @@ return [ 'order-id-info' => 'Your order id is #:order_id', 'info' => 'We will email you, your order details and tracking information.' ] - ] + ], + + 'mail' => [ + 'order' => [ + 'subject' => 'New Order Confirmation', + 'heading' => 'Order Confirmation!', + 'dear' => 'Dear :customer_name', + 'greeting' => 'Thanks for your Order :order_id placed on :created_at', + 'summary' => 'Summary of Order', + 'shipping-address' => 'Shipping Address', + 'billing-address' => 'Billing Address', + 'contact' => 'Contact', + 'shipping' => 'Shipping', + 'payment' => 'Payment', + 'price' => 'Price', + 'quantity' => 'Quantity', + 'subtotal' => 'Subtotal', + 'shipping-handling' => 'Shipping & Handling', + 'tax' => 'Tax', + 'grand-total' => 'Grand Total', + 'final-summary' => 'Thanks for showing your intrest in our store. we will send you track number once it shiped.', + 'help' => 'If you need any kind of help please contact us at :support_email', + 'thanks' => 'Thanks!' + ], + 'invoice' => [ + 'heading' => 'Your Invoice #:invoice_id for Order #:order_id', + 'subject' => 'Invoice for your order #:order_id', + 'summary' => 'Summary of Invoice', + ], + 'shipment' => [ + 'heading' => 'Your Shipment #:shipment_id for Order #:order_id', + 'subject' => 'Shipment for your order #:order_id', + 'summary' => 'Summary of Shipment', + 'carrier' => 'Carrier', + 'tracking-number' => 'Tracking Number' + ], + 'forget-password' => [ + 'dear' => 'Dear :name', + 'info' => 'You are receiving this email because we received a password reset request for your account.', + 'reset-password' => 'Reset Password', + 'final-summary' => 'If you did not request a password reset, no further action is required.', + 'thanks' => 'Thanks!' + ] + ], ]; \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/index.blade.php index efd7966d1..4097e93df 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/index.blade.php @@ -1,7 +1,9 @@ @extends('shop::layouts.master') + @section('content-wrapper')
@include('shop::customers.account.partials.sidemenu')

Account Index Page

+ @endsection 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 291c18213..02e1cdfc1 100644 --- 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 @@ -1,7 +1,9 @@ @extends('shop::layouts.master') + @section('page_title') - {{ __('shop::app.order.page-title') }} + {{ __('shop::app.customer.account.profile.index.title') }} @endsection + @section('content-wrapper')
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 3095dabbc..24dd341c3 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php @@ -1,13 +1,15 @@ @extends('shop::layouts.master') + @section('page_title') {{ __('shop::app.customer.login-form.page-title') }} @endsection + @section('content-wrapper')
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/signup/forgot-password.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/signup/forgot-password.blade.php index b58c355bc..96b7937dc 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/signup/forgot-password.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/signup/forgot-password.blade.php @@ -1,7 +1,20 @@ @extends('shop::layouts.master') + @section('page_title') {{ __('shop::app.customer.forgot-password.page_title') }} -@endsection +@stop + +@section('css') + +@stop + @section('content-wrapper')
@@ -20,7 +33,16 @@ @{{ errors.first('email') }}
- +
+ +
+ +
+ + + Back to Sign In + +
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/signup/reset-password.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/signup/reset-password.blade.php index 2aeca6df9..b912c2cb2 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/signup/reset-password.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/signup/reset-password.blade.php @@ -1,5 +1,9 @@ @extends('shop::layouts.master') +@section('page_title') + {{ __('shop::app.customer.reset-password.title') }} +@endsection + @section('content-wrapper')
@@ -10,29 +14,29 @@ diff --git a/packages/Webkul/Shop/src/Resources/views/emails/admin/forget-password.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/admin/forget-password.blade.php index c49b5d23b..e0cb8787b 100644 --- a/packages/Webkul/Shop/src/Resources/views/emails/admin/forget-password.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/admin/forget-password.blade.php @@ -1,4 +1,4 @@ -@component('admin::emails.layouts.master') +@component('shop::emails.layouts.master')
@@ -8,25 +8,25 @@
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/customer/forget-password.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/customer/forget-password.blade.php index df29b6c93..4c145c691 100644 --- a/packages/Webkul/Shop/src/Resources/views/emails/customer/forget-password.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/customer/forget-password.blade.php @@ -1,4 +1,4 @@ -@component('admin::emails.layouts.master') +@component('shop::emails.layouts.master')
@@ -8,25 +8,25 @@
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php index 36065036d..7ea441fc1 100644 --- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php @@ -1,4 +1,4 @@ -@component('admin::emails.layouts.master') +@component('shop::emails.layouts.master')
@@ -10,15 +10,15 @@
- {{ __('admin::app.mail.invoice.summary') }} + {{ __('shop::app.mail.invoice.summary') }}
- {{ __('admin::app.mail.order.shipping-address') }} + {{ __('shop::app.mail.order.shipping-address') }}
@@ -51,11 +51,11 @@
---
- {{ __('admin::app.mail.order.contact') }} : {{ $order->shipping_address->phone }} + {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
- {{ __('admin::app.mail.order.shipping') }} + {{ __('shop::app.mail.order.shipping') }}
@@ -65,7 +65,7 @@
- {{ __('admin::app.mail.order.billing-address') }} + {{ __('shop::app.mail.order.billing-address') }}
@@ -83,11 +83,11 @@
---
- {{ __('admin::app.mail.order.contact') }} : {{ $order->billing_address->phone }} + {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
- {{ __('admin::app.mail.order.payment') }} + {{ __('shop::app.mail.order.payment') }}
@@ -104,7 +104,7 @@
{{ core()->formatPrice($item->price, $invoice->order_currency_code) }} @@ -113,7 +113,7 @@
{{ $item->qty }} @@ -130,28 +130,28 @@
- {{ __('admin::app.mail.order.subtotal') }} + {{ __('shop::app.mail.order.subtotal') }} {{ core()->formatPrice($invoice->sub_total, $invoice->order_currency_code) }}
- {{ __('admin::app.mail.order.shipping-handling') }} + {{ __('shop::app.mail.order.shipping-handling') }} {{ core()->formatPrice($invoice->shipping_amount, $invoice->order_currency_code) }}
- {{ __('admin::app.mail.order.tax') }} + {{ __('shop::app.mail.order.tax') }} {{ core()->formatPrice($invoice->tax_amount, $invoice->order_currency_code) }}
- {{ __('admin::app.mail.order.grand-total') }} + {{ __('shop::app.mail.order.grand-total') }} {{ core()->formatPrice($invoice->grand_total, $invoice->order_currency_code) }} @@ -161,14 +161,14 @@

{!! - __('admin::app.mail.order.help', [ + __('shop::app.mail.order.help', [ 'support_email' => '' . config('mail.from.address'). '' ]) !!}

- {{ __('admin::app.mail.order.thanks') }} + {{ __('shop::app.mail.order.thanks') }}

diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php index b308e930f..e23539d93 100644 --- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php @@ -1,4 +1,4 @@ -@component('admin::emails.layouts.master') +@component('shop::emails.layouts.master')
@@ -8,15 +8,15 @@
- {{ __('admin::app.mail.order.summary') }} + {{ __('shop::app.mail.order.summary') }}
- {{ __('admin::app.mail.order.shipping-address') }} + {{ __('shop::app.mail.order.shipping-address') }}
@@ -49,11 +49,11 @@
---
- {{ __('admin::app.mail.order.contact') }} : {{ $order->shipping_address->phone }} + {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
- {{ __('admin::app.mail.order.shipping') }} + {{ __('shop::app.mail.order.shipping') }}
@@ -63,7 +63,7 @@
- {{ __('admin::app.mail.order.billing-address') }} + {{ __('shop::app.mail.order.billing-address') }}
@@ -81,11 +81,11 @@
---
- {{ __('admin::app.mail.order.contact') }} : {{ $order->billing_address->phone }} + {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
- {{ __('admin::app.mail.order.payment') }} + {{ __('shop::app.mail.order.payment') }}
@@ -102,7 +102,7 @@
{{ core()->formatPrice($item->price, $order->order_currency_code) }} @@ -111,7 +111,7 @@
{{ $item->qty_ordered }} @@ -128,28 +128,28 @@
- {{ __('admin::app.mail.order.subtotal') }} + {{ __('shop::app.mail.order.subtotal') }} {{ core()->formatPrice($order->sub_total, $order->order_currency_code) }}
- {{ __('admin::app.mail.order.shipping-handling') }} + {{ __('shop::app.mail.order.shipping-handling') }} {{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}
- {{ __('admin::app.mail.order.tax') }} + {{ __('shop::app.mail.order.tax') }} {{ core()->formatPrice($order->tax_amount, $order->order_currency_code) }}
- {{ __('admin::app.mail.order.grand-total') }} + {{ __('shop::app.mail.order.grand-total') }} {{ core()->formatPrice($order->grand_total, $order->order_currency_code) }} @@ -158,19 +158,19 @@

- {{ __('admin::app.mail.order.final-summary') }} + {{ __('shop::app.mail.order.final-summary') }}

{!! - __('admin::app.mail.order.help', [ + __('shop::app.mail.order.help', [ 'support_email' => '' . config('mail.from.address'). '' ]) !!}

- {{ __('admin::app.mail.order.thanks') }} + {{ __('shop::app.mail.order.thanks') }}

diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php index e0c8a77a6..ddaa25cfa 100644 --- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php @@ -1,4 +1,4 @@ -@component('admin::emails.layouts.master') +@component('shop::emails.layouts.master')
@@ -10,15 +10,15 @@
- {{ __('admin::app.mail.shipment.summary') }} + {{ __('shop::app.mail.shipment.summary') }}
- {{ __('admin::app.mail.order.shipping-address') }} + {{ __('shop::app.mail.order.shipping-address') }}
@@ -51,11 +51,11 @@
---
- {{ __('admin::app.mail.order.contact') }} : {{ $order->shipping_address->phone }} + {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
- {{ __('admin::app.mail.order.shipping') }} + {{ __('shop::app.mail.order.shipping') }}
@@ -64,18 +64,18 @@
- {{ __('admin::app.mail.shipment.carrier') }} : {{ $shipment->carrier_title }} + {{ __('shop::app.mail.shipment.carrier') }} : {{ $shipment->carrier_title }}
- {{ __('admin::app.mail.shipment.tracking-number') }} : {{ $shipment->track_number }} + {{ __('shop::app.mail.shipment.tracking-number') }} : {{ $shipment->track_number }}
- {{ __('admin::app.mail.order.billing-address') }} + {{ __('shop::app.mail.order.billing-address') }}
@@ -93,11 +93,11 @@
---
- {{ __('admin::app.mail.order.contact') }} : {{ $order->billing_address->phone }} + {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
- {{ __('admin::app.mail.order.payment') }} + {{ __('shop::app.mail.order.payment') }}
@@ -114,7 +114,7 @@
{{ core()->formatPrice($item->price, $order->order_currency_code) }} @@ -123,7 +123,7 @@
{{ $item->qty }} @@ -141,14 +141,14 @@

{!! - __('admin::app.mail.order.help', [ + __('shop::app.mail.order.help', [ 'support_email' => '' . config('mail.from.address'). '' ]) !!}

- {{ __('admin::app.mail.order.thanks') }} + {{ __('shop::app.mail.order.thanks') }}

diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php index a41834f69..49799a87a 100644 --- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php @@ -76,18 +76,12 @@
@@ -143,18 +137,12 @@ diff --git a/packages/Webkul/User/src/Notifications/AdminResetPassword.php b/packages/Webkul/User/src/Notifications/AdminResetPassword.php index 38fdf556b..3209b1249 100644 --- a/packages/Webkul/User/src/Notifications/AdminResetPassword.php +++ b/packages/Webkul/User/src/Notifications/AdminResetPassword.php @@ -20,7 +20,7 @@ class AdminResetPassword extends ResetPassword } return (new MailMessage) - ->view('shop::emails.admin.forget-password')->with([ + ->view('shop::emails.admin.forget-password', [ 'user_name' => $notifiable->name, 'token' => $this->token ]); diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css index 8e8d73929..f0645a7f7 100644 --- a/public/themes/default/assets/css/shop.css +++ b/public/themes/default/assets/css/shop.css @@ -2588,17 +2588,13 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l flex-direction: column; max-width: 530px; min-width: 380px; - min-height: 345px; - padding-left: 25px; - padding-right: 25px; + padding: 25px; } .auth-content .login-form .login-text { font-size: 24px; - font-weight: bold; - color: #242424; - margin-top: 5%; - margin-bottom: 3%; + font-weight: 600; + margin-bottom: 30px; } .auth-content .login-form .control-group { @@ -2622,9 +2618,6 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l .auth-content .login-form .btn-primary { width: 100%; text-transform: uppercase; - border-radius: 0px; - height: 45px; - margin-bottom: 4%; } .account-content {