diff --git a/.env.example b/.env.example index 16e00691a..39dc29756 100644 --- a/.env.example +++ b/.env.example @@ -30,6 +30,8 @@ MAIL_PORT=2525 MAIL_USERNAME=null MAIL_PASSWORD=null MAIL_ENCRYPTION=null +SHOP_MAIL_FROM=shop@bagsaas.com +ADMIN_MAIL_TO=admin@bagsaas.com PUSHER_APP_ID= PUSHER_APP_KEY= diff --git a/packages/Webkul/Admin/src/Listeners/Order.php b/packages/Webkul/Admin/src/Listeners/Order.php index 4f86b938a..f7f9cdc12 100755 --- a/packages/Webkul/Admin/src/Listeners/Order.php +++ b/packages/Webkul/Admin/src/Listeners/Order.php @@ -20,12 +20,13 @@ class Order { /** * @param mixed $order * - * Send new shipment mail to the customer and inventory source + * Send new order Mail to the customer and admin */ public function sendNewOrderMail($order) { try { Mail::send(new NewOrderNotification($order)); + Mail::send(new NewAdminNotification($order)); } catch (\Exception $e) { } diff --git a/packages/Webkul/Admin/src/Mail/NewAdminNotification.php b/packages/Webkul/Admin/src/Mail/NewAdminNotification.php new file mode 100644 index 000000000..fa9d5d199 --- /dev/null +++ b/packages/Webkul/Admin/src/Mail/NewAdminNotification.php @@ -0,0 +1,49 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class NewAdminNotification extends Mailable +{ + use Queueable, SerializesModels; + + /** + * The order instance. + * + * @var Order + */ + public $order; + + + /** + * Create a new message instance. + * + * @return void + */ + public function __construct($order) + { + $this->order = $order; + } + + /** + * Build the message. + * + * @return $this + */ + public function build() + { + return $this->to(env('ADMIN_MAIL_TO')) + ->subject(trans('shop::app.mail.order.subject')) + ->view('shop::emails.sales.new-admin-order'); + } +} \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index 17b70d77c..a5a3fcdec 100755 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -457,7 +457,9 @@ return [ 'subject' => 'New Order Confirmation', 'heading' => 'Order Confirmation!', 'dear' => 'Dear :customer_name', + 'dear-admin' => 'Dear :admin_name', 'greeting' => 'Thanks for your Order :order_id placed on :created_at', + 'greeting-admin' => 'Order Id :order_id placed on :created_at', 'summary' => 'Summary of Order', 'shipping-address' => 'Shipping Address', 'billing-address' => 'Billing Address', diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php new file mode 100644 index 000000000..3b194db5d --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php @@ -0,0 +1,175 @@ +@component('shop::emails.layouts.master') +
+ + + +
+ +
+
+ + {{ __('shop::app.mail.order.heading') }} +
+ +

+ {{ __('shop::app.mail.order.dear-admin', ['admin_name' => config('mail.from.name')]) }}, +

+ +

+ {!! __('shop::app.mail.order.greeting-admin', [ + 'order_id' => '#' . $order->id . '', + 'created_at' => $order->created_at + ]) + !!} +

+
+ +
+ {{ __('shop::app.mail.order.summary') }} +
+ +
+
+
+ {{ __('shop::app.mail.order.shipping-address') }} +
+ +
+ {{ $order->shipping_address->name }} +
+ +
+ {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }} +
+ +
+ {{ country()->name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }} +
+ +
---
+ +
+ {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }} +
+ +
+ {{ __('shop::app.mail.order.shipping') }} +
+ +
+ {{ $order->shipping_title }} +
+
+ +
+
+ {{ __('shop::app.mail.order.billing-address') }} +
+ +
+ {{ $order->billing_address->name }} +
+ +
+ {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }} +
+ +
+ {{ country()->name($order->billing_address->country) }} {{ $order->billing_address->postcode }} +
+ +
---
+ +
+ {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }} +
+ +
+ {{ __('shop::app.mail.order.payment') }} +
+ +
+ {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }} +
+
+
+ + @foreach ($order->items as $item) +
+

+ {{ $item->name }} +

+ +
+ + + {{ core()->formatPrice($item->price, $order->order_currency_code) }} + +
+ +
+ + + {{ $item->qty_ordered }} + +
+ + @if ($html = $item->getOptionDetailHtml()) +
+ +
+ @endif +
+ @endforeach + +
+
+ {{ __('shop::app.mail.order.subtotal') }} + + {{ core()->formatPrice($order->sub_total, $order->order_currency_code) }} + +
+ +
+ {{ __('shop::app.mail.order.shipping-handling') }} + + {{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }} + +
+ +
+ {{ __('shop::app.mail.order.tax') }} + + {{ core()->formatPrice($order->tax_amount, $order->order_currency_code) }} + +
+ +
+ {{ __('shop::app.mail.order.grand-total') }} + + {{ core()->formatPrice($order->grand_total, $order->order_currency_code) }} + +
+
+ +
+

+ {!! + __('shop::app.mail.order.help', [ + 'support_email' => '' . env('ADMIN_MAIL_TO'). '' + ]) + !!} +

+ +

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

+
+
+@endcomponent diff --git a/packages/Webkul/Shop/src/Resources/views/products/review-price.blade.php b/packages/Webkul/Shop/src/Resources/views/products/review-price.blade.php new file mode 100644 index 000000000..4a69f26af --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/views/products/review-price.blade.php @@ -0,0 +1,13 @@ +
+ @inject ('priceHelper', 'Webkul\Product\Helpers\Price') + + @if ($product->type == 'configurable') + {{ core()->currency($priceHelper->getMinimalPrice($product)) }} + @else + @if ($priceHelper->haveSpecialPrice($product)) + {{ core()->currency($priceHelper->getSpecialPrice($product)) }} + @else + {{ core()->currency($product->price) }} + @endif + @endif +
\ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php b/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php index 29983069b..b258bc1d8 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php @@ -26,19 +26,8 @@ -
- @inject ('priceHelper', 'Webkul\Product\Helpers\Price') + @include('shop::products.review-price') - @if ($product->type == 'configurable') - {{ core()->currency($priceHelper->getMinimalPrice($product)) }} - @else - @if ($priceHelper->haveSpecialPrice($product)) - {{ core()->currency($priceHelper->getSpecialPrice($product)) }} - @else - {{ core()->currency($product->price) }} - @endif - @endif -