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

Issue Fixed

This commit is contained in:
Devansh 2020-08-04 18:30:37 +05:30
parent e6d11ed809
commit 262d72f4b6
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/Webkul/Admin/src/Listeners/Order.php
View File

@ -3,17 +3,35 @@
namespace Webkul\Admin\Listeners;
use Illuminate\Support\Facades\Mail;
use Webkul\Admin\Mail\NewOrderNotification;
use Webkul\Admin\Mail\NewAdminNotification;
use Webkul\Admin\Mail\NewInvoiceNotification;
use Webkul\Admin\Mail\NewShipmentNotification;
use Webkul\Admin\Mail\NewInventorySourceNotification;
use Webkul\Admin\Mail\CancelOrderNotification;
use Webkul\Admin\Mail\NewOrderNotification;
use Webkul\Admin\Mail\NewRefundNotification;
use Webkul\Admin\Mail\NewInvoiceNotification;
use Webkul\Admin\Mail\CancelOrderNotification;
use Webkul\Admin\Mail\NewShipmentNotification;
use Webkul\Admin\Mail\OrderCommentNotification;
use Webkul\Sales\Repositories\InvoiceRepository;
use Webkul\Admin\Mail\NewInventorySourceNotification;
class Order
{
/**
* InvoiceRepository object
*
* @var \Webkul\Sales\Repositories\InvoiceRepository
*/
protected $invoiceRepository;
/**
* Create a new repository instance using reflection api.
*
* @param \Webkul\Sales\Repositories\InvoiceRepository
*/
public function __construct(InvoiceRepository $invoiceRepository)
{
$this->invoiceRepository = $invoiceRepository;
}
/**
* Send new order Mail to the customer and admin
*
@ -47,6 +65,8 @@ class Order
*/
public function sendNewInvoiceMail($invoice)
{
$invoiceLocale = $this->invoiceRepository->getLocaleOfTheInvoice($invoice);
try {
if ($invoice->email_sent) {
return;
@ -55,6 +75,7 @@ class Order
$configKey = 'emails.general.notifications.emails.general.notifications.new-invoice';
if (core()->getConfigData($configKey)) {
app()->setLocale($invoiceLocale);
Mail::queue(new NewInvoiceNotification($invoice));
}
} catch (\Exception $e) {

15
packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
View File

@ -106,7 +106,7 @@ class InvoiceRepository extends Repository
foreach ($data['invoice']['items'] as $itemId => $qty) {
if (! $qty) {
continue;
continue;
}
$orderItem = $this->orderItemRepository->find($itemId);
@ -256,4 +256,17 @@ class InvoiceRepository extends Repository
return $invoice;
}
/**
* Get the locale of the invoice if somehow item name changes then the english locale will pe provided.
*
* @param \Webkul\Sales\Contracts\Invoice $invoice
* @return string
*/
public function getLocaleOfTheInvoice($invoice)
{
$invoiceFirstItem = $invoice->items->first();
$invoiceFlatProduct = $invoiceFirstItem->product->product_flats->where('name', $invoiceFirstItem->name)->first();
return $invoiceFlatProduct ? $invoiceFlatProduct->locale : 'en';
}
}