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/CustomerGroupDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php index c2254f226..d0c877f5d 100644 --- a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php @@ -84,7 +84,7 @@ class CustomerGroupDataGrid 'sortable' => true, ], [ - 'name' => 'cg.group_name', + 'name' => 'cg.name', 'alias' => 'Name', 'type' => 'string', 'label' => 'Name', @@ -107,7 +107,7 @@ class CustomerGroupDataGrid //don't use aliasing in case of filters 'filterable' => [ [ - 'column' => 'cg.group_name', + 'column' => 'cg.name', 'alias' => 'Name', 'type' => 'string', 'label' => 'Name' 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/Database/Seeders/DatabaseSeeder.php b/packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php index d865fcf1e..a0015124a 100644 --- a/packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php +++ b/packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php @@ -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); } } 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/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php index 3d3759235..68c9ac975 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php @@ -70,7 +70,7 @@ class CustomerGroupController extends Controller public function store() { $this->validate(request(), [ - 'group_name' => 'string|required', + 'name' => 'string|required', ]); $this->customerGroup->create(request()->all()); @@ -103,7 +103,7 @@ class CustomerGroupController extends Controller public function update(Request $request, $id) { $this->validate(request(), [ - 'group_name' => 'string|required', + 'name' => 'string|required', ]); $this->customerGroup->update(request()->all(),$id); 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/Admin/src/Resources/views/customers/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php index d4bcddbf1..a7089e869 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php @@ -71,7 +71,7 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php index e9aa664b2..0e4c97079 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php @@ -82,7 +82,7 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/customers/group/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/group/create.blade.php index 79fca7fa3..13765f46a 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/group/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/group/create.blade.php @@ -27,12 +27,12 @@
@csrf() -
-