diff --git a/.env.example b/.env.example index c12561de2..bfb76ce72 100644 --- a/.env.example +++ b/.env.example @@ -4,6 +4,7 @@ APP_VERSION=1.1.2 APP_KEY= APP_DEBUG=true APP_URL=http://localhost +APP_ADMIN_URL=admin APP_TIMEZONE=Asia/Kolkata APP_LOCALE=en LOG_CHANNEL=stack diff --git a/.env.testing b/.env.testing index f872c6bfe..845e4d42e 100644 --- a/.env.testing +++ b/.env.testing @@ -4,6 +4,7 @@ APP_VERSION=1.1.2 APP_KEY=base64:G4KY3tUsTaY9ONo1n/QyJvVLQZdJDgbIkSJswFK01HE= APP_DEBUG=true APP_URL=http://localhost +APP_ADMIN_URL=admin LOG_CHANNEL=stack diff --git a/config/app.php b/config/app.php index 83a642e1d..40f4c99bc 100755 --- a/config/app.php +++ b/config/app.php @@ -54,6 +54,18 @@ return [ 'url' => env('APP_URL', 'http://localhost'), + /* + |-------------------------------------------------------------------------- + | Application Admin URL + |-------------------------------------------------------------------------- + | + | This URL suffix is used to define the admin url for example + | admin/ or backend/ + | + */ + + 'admin_url' => env('APP_ADMIN_URL', 'admin'), + /* |-------------------------------------------------------------------------- | Application Timezone diff --git a/package.json b/package.json index cf99f33f7..ea372d68a 100755 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "cross-env": "^5.1", "jquery": "^3.2", "laravel-mix": "^5.0.1", - "lodash": "^4.17.4", + "lodash": "^4.17.19", "popper.js": "^1.12", "resolve-url-loader": "^3.1.0", "sass": "^1.24.5", diff --git a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php index 830591f6b..a2a7cc12d 100644 --- a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php @@ -15,6 +15,12 @@ class CartRuleDataGrid extends DataGrid protected $channel = 'all'; + /** @var string[] contains the keys for which extra filters to show */ + protected $extraFilters = [ + 'channels', + 'customer_groups', + ]; + public function __construct() { parent::__construct(); diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index 434020623..57c65fc4d 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -17,6 +17,12 @@ class ProductDataGrid extends DataGrid protected $channel = 'all'; + /** @var string[] contains the keys for which extra filters to render */ + protected $extraFilters = [ + 'channels', + 'locales', + ]; + public function __construct() { parent::__construct(); @@ -44,15 +50,11 @@ class ProductDataGrid extends DataGrid ); if ($this->locale !== 'all') { - $queryBuilder->where('locale', $this->locale); + $queryBuilder->where('product_flat.locale', $this->locale); } if ($this->channel !== 'all') { - $queryBuilder->where('channel', $this->channel); - } - - if ($currentLocale = app()->getLocale()) { - $queryBuilder->where('product_flat.locale', $currentLocale); + $queryBuilder->where('product_flat.channel', $this->channel); } $queryBuilder->groupBy('product_flat.product_id'); diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php index 6d5b6009a..6e47b373e 100755 --- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php @@ -15,6 +15,12 @@ class SliderDataGrid extends DataGrid protected $channel = 'all'; + /** @var string[] contains the keys for which extra filters to render */ + protected $extraFilters = [ + 'channels', + 'locales', + ]; + public function __construct() { parent::__construct(); diff --git a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php index 70717e83c..7a9415c33 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php @@ -241,6 +241,8 @@ class DashboardController extends Controller ->addSelect('id', 'customer_id', 'customer_email', 'customer_first_name', 'customer_last_name') ->where('orders.created_at', '>=', $this->startDate) ->where('orders.created_at', '<=', $this->endDate) + ->where('orders.status', '<>', 'closed') + ->where('orders.status', '<>', 'canceled') ->groupBy('customer_email') ->orderBy('total_base_grand_total', 'DESC') ->limit(5) diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php index 42239458b..df7479293 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php @@ -108,8 +108,6 @@ class ShipmentController extends Controller } $this->validate(request(), [ - 'shipment.carrier_title' => 'required', - 'shipment.track_number' => 'required', 'shipment.source' => 'required', 'shipment.items.*.*' => 'required|numeric|min:0', ]); diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index f9fa5a75b..b4f9cce62 100755 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -1,7 +1,7 @@ ['web']], function () { - Route::prefix('admin')->group(function () { + Route::prefix(config('app.admin_url'))->group(function () { Route::get('/', 'Webkul\Admin\Http\Controllers\Controller@redirectToLogin'); @@ -673,7 +673,7 @@ Route::group(['middleware' => ['web']], function () { //tax rate ends //DataGrid Export - Route::post('admin/export', 'Webkul\Admin\Http\Controllers\ExportController@export')->name('admin.datagrid.export'); + Route::post(config('app.admin_url') . '/export', 'Webkul\Admin\Http\Controllers\ExportController@export')->name('admin.datagrid.export'); Route::prefix('promotions')->group(function () { Route::get('cart-rules', 'Webkul\CartRule\Http\Controllers\CartRuleController@index')->defaults('_config', [ diff --git a/packages/Webkul/Admin/src/Listeners/Order.php b/packages/Webkul/Admin/src/Listeners/Order.php index 95398c5b0..f2e1c06c5 100755 --- a/packages/Webkul/Admin/src/Listeners/Order.php +++ b/packages/Webkul/Admin/src/Listeners/Order.php @@ -16,22 +16,22 @@ class Order { /** * Send new order Mail to the customer and admin - * + * * @param \Webkul\Sales\Contracts\Order $order * @return void */ public function sendNewOrderMail($order) { try { + /* email to customer */ $configKey = 'emails.general.notifications.emails.general.notifications.new-order'; - - if (core()->getConfigData($configKey)) { + if (core()->getConfigData($configKey)) Mail::queue(new NewOrderNotification($order)); - } + /* email to admin */ $configKey = 'emails.general.notifications.emails.general.notifications.new-admin'; - if (core()->getConfigData($configKey)) { + app()->setLocale(env('APP_LOCALE')); Mail::queue(new NewAdminNotification($order)); } } catch (\Exception $e) { @@ -41,7 +41,7 @@ class Order /** * Send new invoice mail to the customer - * + * * @param \Webkul\Sales\Contracts\Invoice $invoice * @return void */ @@ -64,7 +64,7 @@ class Order /** * Send new refund mail to the customer - * + * * @param \Webkul\Sales\Contracts\Refund $refund * @return void */ @@ -83,7 +83,7 @@ class Order /** * Send new shipment mail to the customer - * + * * @param \Webkul\Sales\Contracts\Shipment $shipment * @return void */ diff --git a/packages/Webkul/Admin/src/Mail/OrderCommentNotification.php b/packages/Webkul/Admin/src/Mail/OrderCommentNotification.php index c76361e7c..09ffdaa16 100644 --- a/packages/Webkul/Admin/src/Mail/OrderCommentNotification.php +++ b/packages/Webkul/Admin/src/Mail/OrderCommentNotification.php @@ -38,7 +38,7 @@ class OrderCommentNotification extends Mailable { return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name']) ->to($this->comment->order->customer_email, $this->comment->order->customer_full_name) - ->subject(trans('shop::app.mail.order.comment.subject')) + ->subject(trans('shop::app.mail.order.comment.subject', ['order_id' => $this->comment->order->increment_id])) ->view('shop::emails.sales.new-order-comment'); } } diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php index 7626ffdd2..3f4905832 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php @@ -11,7 +11,7 @@