merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conflict resolve

This commit is contained in:
rahul shukla 2018-10-25 13:58:06 +05:30
parent c9037806b0 add7cd43f8
commit af5b9d9f06
46 changed files with 429 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/auth.php
View File

@ -53,7 +53,7 @@ return [
],
'customers' => [
'provider' => 'customers',
'table' => 'customers_password_resets',
'table' => 'customer_password_resets',
'expire' => 60,
],
],

2
packages/Webkul/Admin/src/Config/auth.php
View File

@ -54,7 +54,7 @@ return [
],
'customers' => [
'provider' => 'customers',
'table' => 'customers_password_resets',
'table' => 'customer_password_resets',
'expire' => 60,
],
],

4
packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php
View File

@ -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',
],
],

4
packages/Webkul/Admin/src/DataGrids/UserDataGrid.php
View File

@ -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',

6
packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php
View File

@ -6,6 +6,8 @@ use Illuminate\Database\Seeder;
use Webkul\Attribute\Database\Seeders\DatabaseSeeder as AttributeSeeder;
use Webkul\Core\Database\Seeders\DatabaseSeeder as CoreSeeder;
use Webkul\User\Database\Seeders\DatabaseSeeder as UserSeeder;
use Webkul\Customer\Database\Seeders\DatabaseSeeder as CustomerSeeder;
use Webkul\Inventory\Database\Seeders\DatabaseSeeder as InventorySeeder;
class DatabaseSeeder extends Seeder
{
@ -16,8 +18,10 @@ class DatabaseSeeder extends Seeder
*/
public function run()
{
$this->call(AttributeSeeder::class);
$this->call(CoreSeeder::class);
$this->call(InventorySeeder::class);
$this->call(AttributeSeeder::class);
$this->call(UserSeeder::class);
$this->call(CustomerSeeder::class);
}
}

35
packages/Webkul/Admin/src/Exceptions/Handler.php
View File

@ -22,37 +22,20 @@ class Handler extends ExceptionHandler
*/
public function render($request, Exception $exception)
{
if ($exception instanceof HttpException) {
$statusCode = $exception->getStatusCode();
if (strpos($_SERVER['REQUEST_URI'], 'admin') !== false) {
switch ($statusCode) {
case 404:
return response()->view('admin::errors.404', [], 404);
break;
case 403:
return response()->view('admin::errors.403', [], 403);
break;
case 401:
return response()->view('admin::errors.401', [], 401);
break;
default:
return response()->view('admin::errors.500', [], 500);
}
return response(view('admin::errors.'.$statusCode, [
'msg' => $exception->getMessage(),
'code' => $statusCode
]), $statusCode);
} else {
switch ($statusCode) {
case 404:
return response()->view('shop::errors.404', [], 404);
break;
case 403:
return response()->view('shop::errors.403', [], 403);
break;
case 401:
return response()->view('shop::errors.401', [], 401);
break;
default:
return response()->view('shop::errors.500', [], 500);
}
return response(view('shop::errors.'.$statusCode, [
'msg' => $exception->getMessage(),
'code' => $statusCode
]), $statusCode);
}
} else if ($exception instanceof ModelNotFoundException) {

4
packages/Webkul/Admin/src/Http/Controllers/DataGridController.php
View File

@ -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
],

1
packages/Webkul/Admin/src/Http/routes.php
View File

@ -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'

42
packages/Webkul/Admin/src/Resources/lang/en/app.php
View File

@ -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',

2
packages/Webkul/Checkout/src/Cart.php
View File

@ -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;

3
packages/Webkul/Core/src/Database/Migrations/2018_07_20_064849_create_channels_table.php
View File

@ -20,6 +20,7 @@ class CreateChannelsTable extends Migration
$table->text('description')->nullable();
$table->string('timezone')->nullable();
$table->string('theme')->nullable();
$table->string('hostname')->nullable();
$table->string('logo')->nullable();
$table->string('favicon')->nullable();
$table->integer('default_locale_id')->unsigned();
@ -57,4 +58,4 @@ class CreateChannelsTable extends Migration
Schema::dropIfExists('channel_currencies');
}
}
}

32
packages/Webkul/Core/src/Database/Seeders/ChannelTableSeeder.php Normal file
View File

@ -0,0 +1,32 @@
<?php
namespace Webkul\Core\Database\Seeders;
use Illuminate\Database\Seeder;
use DB;
class ChannelTableSeeder extends Seeder
{
public function run()
{
DB::table('channels')->delete();
DB::table('channels')->insert([
'id' => 1,
'code' => 'default',
'name' => 'Default',
'default_locale_id' => 1,
'base_currency_id' => 1
]);
DB::table('channel_currencies')->insert([
'channel_id' => 1,
'currency_id' => 1,
]);
DB::table('channel_locales')->insert([
'channel_id' => 1,
'locale_id' => 1,
]);
}
}

4
packages/Webkul/Core/src/Database/Seeders/CurrencyTableSeeder..php
View File

@ -12,9 +12,9 @@ class CurrencyTableSeeder extends Seeder
DB::table('currencies')->delete();
DB::table('currencies')->insert([
'id' => 1,
'code' => 'USD',
'name' => 'US Dollar',
'symbol' => '$',
'name' => 'US Dollar'
]);
}
}

3
packages/Webkul/Core/src/Database/Seeders/DatabaseSeeder.php
View File

@ -14,8 +14,9 @@ class DatabaseSeeder extends Seeder
public function run()
{
$this->call(LocalesTableSeeder::class);
$this->call(LocalesTableSeeder::class);
$this->call(CurrencyTableSeeder::class);
$this->call(CountriesTableSeeder::class);
$this->call(StatesTableSeeder::class);
$this->call(ChannelTableSeeder::class);
}
}

2
packages/Webkul/Core/src/Database/Seeders/LocalesTableSeeder.php
View File

@ -12,9 +12,11 @@ class LocalesTableSeeder extends Seeder
DB::table('locales')->delete();
DB::table('locales')->insert([
'id' => 1,
'code' => 'en',
'name' => 'English',
], [
'id' => 2,
'code' => 'fr',
'name' => 'French',
]);

2
packages/Webkul/Core/src/Http/Controllers/LocaleController.php
View File

@ -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'
]);

24
packages/Webkul/Customer/src/Database/Seeders/CustomerGroupTableSeeder.php Normal file
View File

@ -0,0 +1,24 @@
<?php
namespace Webkul\Customer\Database\Seeders;
use Illuminate\Database\Seeder;
use DB;
class CustomerGroupTableSeeder extends Seeder
{
public function run()
{
DB::table('customer_groups')->delete();
DB::table('customer_groups')->insert([
'id' => 1,
'name' => 'General',
'is_user_defined' => 0,
], [
'id' => 2,
'name' => 'Wholesale',
'is_user_defined' => 0,
]);
}
}

18
packages/Webkul/Customer/src/Database/Seeders/DatabaseSeeder.php Normal file
View File

@ -0,0 +1,18 @@
<?php
namespace Webkul\Customer\Database\Seeders;
use Illuminate\Database\Seeder;
class DatabaseSeeder extends Seeder
{
/**
* Seed the application's database.
*
* @return void
*/
public function run()
{
$this->call(CustomerGroupTableSeeder::class);
}
}

6
packages/Webkul/Customer/src/Database/migrations/2018_09_11_064045_customers_password_resets.php → packages/Webkul/Customer/src/Database/migrations/2018_09_11_064045_customer_password_resets.php
View File

@ -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');
}
}

2
packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
View File

@ -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'
]);

16
packages/Webkul/Customer/src/Models/Customer.php
View File

@ -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));
}
}

4
packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php
View File

@ -1,6 +1,6 @@
<?php
namespace Webkul\User\Notifications;
namespace Webkul\Customer\Notifications;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Auth\Notifications\ResetPassword;
@ -21,7 +21,7 @@ class CustomerResetPassword extends ResetPassword
}
return (new MailMessage)
->view('shop::emails.customer.forget-password')->with([
->view('shop::emails.customer.forget-password', [
'user_name' => $notifiable->name,
'token' => $this->token
]);

4
packages/Webkul/Inventory/src/Database/Migrations/2018_07_23_110040_create_inventory_sources_table.php
View File

@ -26,11 +26,11 @@ class CreateInventorySourcesTable extends Migration
$table->string('state')->nullable();
$table->string('city')->nullable();
$table->string('street')->nullable();
$table->string('postcode');
$table->string('postcode')->nullable();
$table->integer('priority')->default(0);
$table->decimal('latitude', 10, 5)->nullable();
$table->decimal('longitude', 10, 5)->nullable();
$table->boolean('status')->default(0);
$table->boolean('status')->default(1);
$table->timestamps();
});
}

18
packages/Webkul/Inventory/src/Database/Seeders/DatabaseSeeder.php Normal file
View File

@ -0,0 +1,18 @@
<?php
namespace Webkul\Inventory\Database\Seeders;
use Illuminate\Database\Seeder;
class DatabaseSeeder extends Seeder
{
/**
* Seed the application's database.
*
* @return void
*/
public function run()
{
$this->call(InventoryTableSeeder::class);
}
}

21
packages/Webkul/Inventory/src/Database/Seeders/InventoryTableSeeder.php Normal file
View File

@ -0,0 +1,21 @@
<?php
namespace Webkul\Inventory\Database\Seeders;
use Illuminate\Database\Seeder;
use DB;
class InventoryTableSeeder extends Seeder
{
public function run()
{
DB::table('inventory_sources')->delete();
DB::table('inventory_sources')->insert([
'id' => 1,
'code' => 'default',
'name' => 'Default',
'status' => 1,
]);
}
}

2
packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php
View File

@ -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',
]);

56
packages/Webkul/Product/src/Contracts/Criteria/ActiveProductCriteria.php Normal file
View File

@ -0,0 +1,56 @@
<?php
namespace Webkul\Product\Contracts\Criteria;
use Prettus\Repository\Contracts\CriteriaInterface;
use Prettus\Repository\Contracts\RepositoryInterface;
use Webkul\Attribute\Repositories\AttributeRepository;
use Webkul\Product\Helpers\AbstractProduct;
/**
* Class MyCriteria.
*
* @package namespace App\Criteria;
*/
class ActiveProductCriteria extends AbstractProduct implements CriteriaInterface
{
/**
* @var AttributeRepository
*/
protected $attribute;
/**
* @param Webkul\Attribute\Repositories\AttributeRepository $attribute
* @return void
*/
public function __construct(AttributeRepository $attribute)
{
$this->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;
}
}

9
packages/Webkul/Product/src/Repositories/ProductRepository.php
View File

@ -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));

48
packages/Webkul/Shop/src/Http/routes.php
View File

@ -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 () {

16
packages/Webkul/Shop/src/Resources/assets/sass/app.scss vendored
View File

@ -2142,17 +2142,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 {
@ -2169,17 +2164,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%;
}
}
}

62
packages/Webkul/Shop/src/Resources/lang/en/app.php
View File

@ -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!'
]
],
];

2
packages/Webkul/Shop/src/Resources/views/customers/account/index.blade.php
View File

@ -1,7 +1,9 @@
@extends('shop::layouts.master')
@section('content-wrapper')
<div class="account-content">
@include('shop::customers.account.partials.sidemenu')
<h1>Account Index Page</h1>
</div>
@endsection

4
packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
View File

@ -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')
<div class="account-content">

4
packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php
View File

@ -1,13 +1,15 @@
@extends('shop::layouts.master')
@section('page_title')
{{ __('shop::app.customer.login-form.page-title') }}
@endsection
@section('content-wrapper')
<div class="auth-content">
<div class="sign-up-text">
{{ __('shop::app.customer.login-text.no_account') }} - <a href="{{ route('customer.register.index') }}">{{ __('shop::app.customer.login-form.title') }}</a>
{{ __('shop::app.customer.login-text.no_account') }} - <a href="{{ route('customer.register.index') }}">{{ __('shop::app.customer.login-text.title') }}</a>
</div>

26
packages/Webkul/Shop/src/Resources/views/customers/signup/forgot-password.blade.php
View File

@ -1,7 +1,20 @@
@extends('shop::layouts.master')
@section('page_title')
{{ __('shop::app.customer.forgot-password.page_title') }}
@endsection
@stop
@section('css')
<style>
.button-group {
margin-bottom: 25px;
}
.primary-back-icon {
vertical-align: middle;
}
</style>
@stop
@section('content-wrapper')
<div class="auth-content">
@ -20,7 +33,16 @@
<span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
</div>
<input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.forgot-password.submit') }}">
<div class="button-group">
<input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.forgot-password.submit') }}">
</div>
<div class="control-group" style="margin-bottom: 0px;">
<a href="{{ route('customer.session.index') }}">
<i class="icon primary-back-icon"></i>
Back to Sign In
</a>
</div>
</div>
</form>

14
packages/Webkul/Shop/src/Resources/views/customers/signup/reset-password.blade.php
View File

@ -1,5 +1,9 @@
@extends('shop::layouts.master')
@section('page_title')
{{ __('shop::app.customer.reset-password.title') }}
@endsection
@section('content-wrapper')
<div class="auth-content">
@ -10,29 +14,29 @@
<div class="login-form">
<div class="login-text">{{ __('shop::app.customer.password-reset-form.title') }}</div>
<div class="login-text">{{ __('shop::app.customer.reset-password.title') }}</div>
<input type="hidden" name="token" value="{{ $token }}">
<div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
<label for="email">{{ __('shop::app.customer.password-reset-form.email') }}</label>
<label for="email">{{ __('shop::app.customer.reset-password.email') }}</label>
<input type="text" v-validate="'required|email'" class="control" id="email" name="email" value="{{ old('email') }}"/>
<span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
</div>
<div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
<label for="password">{{ __('shop::app.customer.password-reset-form.password') }}</label>
<label for="password">{{ __('shop::app.customer.reset-password.password') }}</label>
<input type="password" class="control" name="password" v-validate="'required|min:6'" ref="password">
<span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
</div>
<div class="control-group" :class="[errors.has('confirm_password') ? 'has-error' : '']">
<label for="confirm_password">{{ __('shop::app.customer.password-reset-form.confirm_pass') }}</label>
<label for="confirm_password">{{ __('shop::app.customer.reset-password.confirm-password') }}</label>
<input type="password" class="control" name="password_confirmation" v-validate="'required|min:6|confirmed:password'">
<span class="control-error" v-if="errors.has('confirm_password')">@{{ errors.first('confirm_password') }}</span>
</div>
<input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.password-reset-form.button_title') }}">
<input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.reset-password.submit-btn-title') }}">
</div>
</form>

12
packages/Webkul/Shop/src/Resources/views/emails/admin/forget-password.blade.php
View File

@ -1,4 +1,4 @@
@component('admin::emails.layouts.master')
@component('shop::emails.layouts.master')
<div style="text-align: center;">
<a href="{{ config('app.url') }}">
<img src="{{ bagisto_asset('vendor/webkul/shop/assets/images/logo.svg') }}">
@ -8,25 +8,25 @@
<div style="padding: 30px;">
<div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.forget-password.dear', ['name' => $user_name]) }},
{{ __('shop::app.mail.forget-password.dear', ['name' => $user_name]) }},
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.forget-password.info') }}
{{ __('shop::app.mail.forget-password.info') }}
</p>
<p style="text-align: center;padding: 20px 0;">
<a href="{{ route('admin.reset-password.create', $token) }}" style="padding: 10px 20px;background: #0041FF;color: #ffffff;text-transform: uppercase;text-decoration: none; font-size: 16px">
{{ __('admin::app.mail.forget-password.reset-password') }}
{{ __('shop::app.mail.forget-password.reset-password') }}
</a>
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.forget-password.final-summary') }}
{{ __('shop::app.mail.forget-password.final-summary') }}
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.forget-password.thanks') }}
{{ __('shop::app.mail.forget-password.thanks') }}
</p>
</div>

12
packages/Webkul/Shop/src/Resources/views/emails/customer/forget-password.blade.php
View File

@ -1,4 +1,4 @@
@component('admin::emails.layouts.master')
@component('shop::emails.layouts.master')
<div style="text-align: center;">
<a href="{{ config('app.url') }}">
<img src="{{ bagisto_asset('vendor/webkul/shop/assets/images/logo.svg') }}">
@ -8,25 +8,25 @@
<div style="padding: 30px;">
<div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.forget-password.dear', ['name' => $user_name]) }},
{{ __('shop::app.mail.forget-password.dear', ['name' => $user_name]) }},
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.forget-password.info') }}
{{ __('shop::app.mail.forget-password.info') }}
</p>
<p style="text-align: center;padding: 20px 0;">
<a href="{{ route('customer.reset-password.create', $token) }}" style="padding: 10px 20px;background: #0041FF;color: #ffffff;text-transform: uppercase;text-decoration: none; font-size: 16px">
{{ __('admin::app.mail.forget-password.reset-password') }}
{{ __('shop::app.mail.forget-password.reset-password') }}
</a>
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.forget-password.final-summary') }}
{{ __('shop::app.mail.forget-password.final-summary') }}
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.forget-password.thanks') }}
{{ __('shop::app.mail.forget-password.thanks') }}
</p>
</div>

38
packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php
View File

@ -1,4 +1,4 @@
@component('admin::emails.layouts.master')
@component('shop::emails.layouts.master')
<div style="text-align: center;">
<a href="{{ config('app.url') }}">
<img src="{{ bagisto_asset('vendor/webkul/shop/assets/images/logo.svg') }}">
@ -10,15 +10,15 @@
<div style="padding: 30px;">
<div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
<span style="font-weight: bold;">
{{ __('admin::app.mail.invoice.heading', ['order_id' => $order->id, 'invoice_id' => $invoice->id]) }}
{{ __('shop::app.mail.invoice.heading', ['order_id' => $order->id, 'invoice_id' => $invoice->id]) }}
</span> <br>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.order.dear', ['customer_name' => $order->customer_full_name]) }},
{{ __('shop::app.mail.order.dear', ['customer_name' => $order->customer_full_name]) }},
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{!! __('admin::app.mail.order.greeting', [
{!! __('shop::app.mail.order.greeting', [
'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->id . '</a>',
'created_at' => $order->created_at
])
@ -27,13 +27,13 @@
</div>
<div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
{{ __('admin::app.mail.invoice.summary') }}
{{ __('shop::app.mail.invoice.summary') }}
</div>
<div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
<div style="line-height: 25px;">
<div style="font-weight: bold;font-size: 16px;color: #242424;">
{{ __('admin::app.mail.order.shipping-address') }}
{{ __('shop::app.mail.order.shipping-address') }}
</div>
<div>
@ -51,11 +51,11 @@
<div>---</div>
<div style="margin-bottom: 40px;">
{{ __('admin::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
{{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
</div>
<div style="font-size: 16px;color: #242424;">
{{ __('admin::app.mail.order.shipping') }}
{{ __('shop::app.mail.order.shipping') }}
</div>
<div style="font-weight: bold;font-size: 16px;color: #242424;">
@ -65,7 +65,7 @@
<div style="line-height: 25px;">
<div style="font-weight: bold;font-size: 16px;color: #242424;">
{{ __('admin::app.mail.order.billing-address') }}
{{ __('shop::app.mail.order.billing-address') }}
</div>
<div>
@ -83,11 +83,11 @@
<div>---</div>
<div style="margin-bottom: 40px;">
{{ __('admin::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
{{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
</div>
<div style="font-size: 16px; color: #242424;">
{{ __('admin::app.mail.order.payment') }}
{{ __('shop::app.mail.order.payment') }}
</div>
<div style="font-weight: bold;font-size: 16px; color: #242424;">
@ -104,7 +104,7 @@
<div style="margin-bottom: 10px;">
<label style="font-size: 16px;color: #5E5E5E;">
{{ __('admin::app.mail.order.price') }}
{{ __('shop::app.mail.order.price') }}
</label>
<span style="font-size: 18px;color: #242424;margin-left: 40px;font-weight: bold;">
{{ core()->formatPrice($item->price, $invoice->order_currency_code) }}
@ -113,7 +113,7 @@
<div style="margin-bottom: 10px;">
<label style="font-size: 16px;color: #5E5E5E;">
{{ __('admin::app.mail.order.quantity') }}
{{ __('shop::app.mail.order.quantity') }}
</label>
<span style="font-size: 18px;color: #242424;margin-left: 40px;font-weight: bold;">
{{ $item->qty }}
@ -130,28 +130,28 @@
<div style="font-size: 16px;color: #242424;line-height: 30px;float: right;width: 40%;margin-top: 20px;">
<div>
<span>{{ __('admin::app.mail.order.subtotal') }}</span>
<span>{{ __('shop::app.mail.order.subtotal') }}</span>
<span style="float: right;">
{{ core()->formatPrice($invoice->sub_total, $invoice->order_currency_code) }}
</span>
</div>
<div>
<span>{{ __('admin::app.mail.order.shipping-handling') }}</span>
<span>{{ __('shop::app.mail.order.shipping-handling') }}</span>
<span style="float: right;">
{{ core()->formatPrice($invoice->shipping_amount, $invoice->order_currency_code) }}
</span>
</div>
<div>
<span>{{ __('admin::app.mail.order.tax') }}</span>
<span>{{ __('shop::app.mail.order.tax') }}</span>
<span style="float: right;">
{{ core()->formatPrice($invoice->tax_amount, $invoice->order_currency_code) }}
</span>
</div>
<div style="font-weight: bold">
<span>{{ __('admin::app.mail.order.grand-total') }}</span>
<span>{{ __('shop::app.mail.order.grand-total') }}</span>
<span style="float: right;">
{{ core()->formatPrice($invoice->grand_total, $invoice->order_currency_code) }}
</span>
@ -161,14 +161,14 @@
<div style="margin-top: 65px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block;width: 100%">
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{!!
__('admin::app.mail.order.help', [
__('shop::app.mail.order.help', [
'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
])
!!}
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.order.thanks') }}
{{ __('shop::app.mail.order.thanks') }}
</p>
</div>
</div>

40
packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php
View File

@ -1,4 +1,4 @@
@component('admin::emails.layouts.master')
@component('shop::emails.layouts.master')
<div style="text-align: center;">
<a href="{{ config('app.url') }}">
<img src="{{ bagisto_asset('vendor/webkul/shop/assets/images/logo.svg') }}">
@ -8,15 +8,15 @@
<div style="padding: 30px;">
<div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
<span style="font-weight: bold;">
{{ __('admin::app.mail.order.heading') }}
{{ __('shop::app.mail.order.heading') }}
</span> <br>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.order.dear', ['customer_name' => $order->customer_full_name]) }},
{{ __('shop::app.mail.order.dear', ['customer_name' => $order->customer_full_name]) }},
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{!! __('admin::app.mail.order.greeting', [
{!! __('shop::app.mail.order.greeting', [
'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->id . '</a>',
'created_at' => $order->created_at
])
@ -25,13 +25,13 @@
</div>
<div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
{{ __('admin::app.mail.order.summary') }}
{{ __('shop::app.mail.order.summary') }}
</div>
<div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
<div style="line-height: 25px;">
<div style="font-weight: bold;font-size: 16px;color: #242424;">
{{ __('admin::app.mail.order.shipping-address') }}
{{ __('shop::app.mail.order.shipping-address') }}
</div>
<div>
@ -49,11 +49,11 @@
<div>---</div>
<div style="margin-bottom: 40px;">
{{ __('admin::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
{{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
</div>
<div style="font-size: 16px;color: #242424;">
{{ __('admin::app.mail.order.shipping') }}
{{ __('shop::app.mail.order.shipping') }}
</div>
<div style="font-weight: bold;font-size: 16px;color: #242424;">
@ -63,7 +63,7 @@
<div style="line-height: 25px;">
<div style="font-weight: bold;font-size: 16px;color: #242424;">
{{ __('admin::app.mail.order.billing-address') }}
{{ __('shop::app.mail.order.billing-address') }}
</div>
<div>
@ -81,11 +81,11 @@
<div>---</div>
<div style="margin-bottom: 40px;">
{{ __('admin::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
{{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
</div>
<div style="font-size: 16px; color: #242424;">
{{ __('admin::app.mail.order.payment') }}
{{ __('shop::app.mail.order.payment') }}
</div>
<div style="font-weight: bold;font-size: 16px; color: #242424;">
@ -102,7 +102,7 @@
<div style="margin-bottom: 10px;">
<label style="font-size: 16px;color: #5E5E5E;">
{{ __('admin::app.mail.order.price') }}
{{ __('shop::app.mail.order.price') }}
</label>
<span style="font-size: 18px;color: #242424;margin-left: 40px;font-weight: bold;">
{{ core()->formatPrice($item->price, $order->order_currency_code) }}
@ -111,7 +111,7 @@
<div style="margin-bottom: 10px;">
<label style="font-size: 16px;color: #5E5E5E;">
{{ __('admin::app.mail.order.quantity') }}
{{ __('shop::app.mail.order.quantity') }}
</label>
<span style="font-size: 18px;color: #242424;margin-left: 40px;font-weight: bold;">
{{ $item->qty_ordered }}
@ -128,28 +128,28 @@
<div style="font-size: 16px;color: #242424;line-height: 30px;float: right;width: 40%;margin-top: 20px;">
<div>
<span>{{ __('admin::app.mail.order.subtotal') }}</span>
<span>{{ __('shop::app.mail.order.subtotal') }}</span>
<span style="float: right;">
{{ core()->formatPrice($order->sub_total, $order->order_currency_code) }}
</span>
</div>
<div>
<span>{{ __('admin::app.mail.order.shipping-handling') }}</span>
<span>{{ __('shop::app.mail.order.shipping-handling') }}</span>
<span style="float: right;">
{{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}
</span>
</div>
<div>
<span>{{ __('admin::app.mail.order.tax') }}</span>
<span>{{ __('shop::app.mail.order.tax') }}</span>
<span style="float: right;">
{{ core()->formatPrice($order->tax_amount, $order->order_currency_code) }}
</span>
</div>
<div style="font-weight: bold">
<span>{{ __('admin::app.mail.order.grand-total') }}</span>
<span>{{ __('shop::app.mail.order.grand-total') }}</span>
<span style="float: right;">
{{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}
</span>
@ -158,19 +158,19 @@
<div style="margin-top: 65px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block">
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.order.final-summary') }}
{{ __('shop::app.mail.order.final-summary') }}
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{!!
__('admin::app.mail.order.help', [
__('shop::app.mail.order.help', [
'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
])
!!}
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.order.thanks') }}
{{ __('shop::app.mail.order.thanks') }}
</p>
</div>
</div>

34
packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
View File

@ -1,4 +1,4 @@
@component('admin::emails.layouts.master')
@component('shop::emails.layouts.master')
<div style="text-align: center;">
<a href="{{ config('app.url') }}">
<img src="{{ bagisto_asset('vendor/webkul/shop/assets/images/logo.svg') }}">
@ -10,15 +10,15 @@
<div style="padding: 30px;">
<div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
<span style="font-weight: bold;">
{{ __('admin::app.mail.shipment.heading', ['order_id' => $order->id, 'shipment_id' => $shipment->id]) }}
{{ __('shop::app.mail.shipment.heading', ['order_id' => $order->id, 'shipment_id' => $shipment->id]) }}
</span> <br>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.order.dear', ['customer_name' => $order->customer_full_name]) }},
{{ __('shop::app.mail.order.dear', ['customer_name' => $order->customer_full_name]) }},
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{!! __('admin::app.mail.order.greeting', [
{!! __('shop::app.mail.order.greeting', [
'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->id . '</a>',
'created_at' => $order->created_at
])
@ -27,13 +27,13 @@
</div>
<div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
{{ __('admin::app.mail.shipment.summary') }}
{{ __('shop::app.mail.shipment.summary') }}
</div>
<div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
<div style="line-height: 25px;">
<div style="font-weight: bold;font-size: 16px;color: #242424;">
{{ __('admin::app.mail.order.shipping-address') }}
{{ __('shop::app.mail.order.shipping-address') }}
</div>
<div>
@ -51,11 +51,11 @@
<div>---</div>
<div style="margin-bottom: 40px;">
{{ __('admin::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
{{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
</div>
<div style="font-size: 16px;color: #242424;">
{{ __('admin::app.mail.order.shipping') }}
{{ __('shop::app.mail.order.shipping') }}
</div>
<div style="font-size: 16px;color: #242424;">
@ -64,18 +64,18 @@
</div>
<div style="margin-top: 5px;">
<span style="font-weight: bold;">{{ __('admin::app.mail.shipment.carrier') }} : </span>{{ $shipment->carrier_title }}
<span style="font-weight: bold;">{{ __('shop::app.mail.shipment.carrier') }} : </span>{{ $shipment->carrier_title }}
</div>
<div style="margin-top: 5px;">
<span style="font-weight: bold;">{{ __('admin::app.mail.shipment.tracking-number') }} : </span>{{ $shipment->track_number }}
<span style="font-weight: bold;">{{ __('shop::app.mail.shipment.tracking-number') }} : </span>{{ $shipment->track_number }}
</div>
</div>
</div>
<div style="line-height: 25px;">
<div style="font-weight: bold;font-size: 16px;color: #242424;">
{{ __('admin::app.mail.order.billing-address') }}
{{ __('shop::app.mail.order.billing-address') }}
</div>
<div>
@ -93,11 +93,11 @@
<div>---</div>
<div style="margin-bottom: 40px;">
{{ __('admin::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
{{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
</div>
<div style="font-size: 16px; color: #242424;">
{{ __('admin::app.mail.order.payment') }}
{{ __('shop::app.mail.order.payment') }}
</div>
<div style="font-weight: bold;font-size: 16px; color: #242424;">
@ -114,7 +114,7 @@
<div style="margin-bottom: 10px;">
<label style="font-size: 16px;color: #5E5E5E;">
{{ __('admin::app.mail.order.price') }}
{{ __('shop::app.mail.order.price') }}
</label>
<span style="font-size: 18px;color: #242424;margin-left: 40px;font-weight: bold;">
{{ core()->formatPrice($item->price, $order->order_currency_code) }}
@ -123,7 +123,7 @@
<div style="margin-bottom: 10px;">
<label style="font-size: 16px;color: #5E5E5E;">
{{ __('admin::app.mail.order.quantity') }}
{{ __('shop::app.mail.order.quantity') }}
</label>
<span style="font-size: 18px;color: #242424;margin-left: 40px;font-weight: bold;">
{{ $item->qty }}
@ -141,14 +141,14 @@
<div style="margin-top: 20px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block;width: 100%">
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{!!
__('admin::app.mail.order.help', [
__('shop::app.mail.order.help', [
'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
])
!!}
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.order.thanks') }}
{{ __('shop::app.mail.order.thanks') }}
</p>
</div>
</div>

12
packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
View File

@ -76,18 +76,12 @@
<div class="dropdown-container">
<label>Account</label>
<ul>
<li><a href="{{ route('customer.account.index') }}">Account</a></li>
<li><a href="{{ route('customer.profile.index') }}">Profile</a></li>
<li><a href="{{ route('customer.address.index') }}">Address</a></li>
<li><a href="{{ route('customer.wishlist.index') }}">Wishlist</a></li>
<li><a href="{{ route('shop.checkout.cart.index') }}">Cart</a></li>
<li><a href="{{ route('customer.orders.index') }}">Orders</a></li>
<li><a href="{{ route('customer.session.destroy') }}">Logout</a></li>
</ul>
@ -143,18 +137,12 @@
<label>Account</label>
<ul>
<li><a href="{{ route('customer.account.index') }}">Account</a></li>
<li><a href="{{ route('customer.profile.index') }}">Profile</a></li>
<li><a href="{{ route('customer.address.index') }}">Address</a></li>
<li><a href="{{ route('customer.wishlist.index') }}">Wishlist</a></li>
<li><a href="{{ route('shop.checkout.cart.index') }}">Cart</a></li>
<li><a href="{{ route('customer.orders.index') }}">Orders</a></li>
<li><a href="{{ route('customer.session.destroy') }}">Logout</a></li>
</ul>

26
packages/Webkul/User/src/Database/Seeders/AdminsTableSeeder.php
View File

@ -10,23 +10,13 @@ class AdminsTableSeeder extends Seeder
{
public function run()
{
// $characters = '0123456789abcdefghijklmnopqrstuvwxyz';
// $charactersLength = strlen($characters);
// $randomString = '';
// for ($i = 0; $i < $length; $i++) {
// $randomString .= $characters[rand(0, $charactersLength - 1)];
// }
$i=0;
for ($i=0;$i<10;$i++) {
$role = Role::first();
$admin = new Admin();
$admin->name = str_random(8);
$admin->email = str_random(10).'@example.com';
$admin->password = bcrypt('admin123');
$admin->status = 1;
$admin->role_id = $role->id;
$admin->save();
}
$role = Role::first();
$admin = new Admin();
$admin->name = str_random(8);
$admin->email = 'admin@example.com';
$admin->password = bcrypt('admin123');
$admin->status = 1;
$admin->role_id = $role->id;
$admin->save();
}
}

2
packages/Webkul/User/src/Notifications/AdminResetPassword.php
View File

@ -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
]);

13
public/themes/default/assets/css/shop.css vendored
View File

@ -2593,17 +2593,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 {
@ -2627,9 +2623,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 {

2
public/themes/default/assets/js/shop.js vendored
View File

File diff suppressed because one or more lines are too long