From 893564977fbac6ceeeec3cfbd6b91517b2f2bb0b Mon Sep 17 00:00:00 2001 From: Jitendra Singh Date: Wed, 18 Mar 2020 17:15:44 +0530 Subject: [PATCH] Issue #2518 fixed --- packages/Webkul/Admin/src/Listeners/Order.php | 9 +++++++-- .../Core/src/Database/Seeders/CurrencyTableSeeder.php | 4 +++- .../Core/src/Database/Seeders/LocalesTableSeeder.php | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/Admin/src/Listeners/Order.php b/packages/Webkul/Admin/src/Listeners/Order.php index 41385ddab..6ea512b86 100755 --- a/packages/Webkul/Admin/src/Listeners/Order.php +++ b/packages/Webkul/Admin/src/Listeners/Order.php @@ -13,7 +13,6 @@ use Webkul\Admin\Mail\NewRefundNotification; class Order { - /** * Send new order Mail to the customer and admin * @@ -24,11 +23,13 @@ class Order { try { $configKey = 'emails.general.notifications.emails.general.notifications.new-order'; + if (core()->getConfigData($configKey)) { Mail::queue(new NewOrderNotification($order)); } $configKey = 'emails.general.notifications.emails.general.notifications.new-admin'; + if (core()->getConfigData($configKey)) { Mail::queue(new NewAdminNotification($order)); } @@ -51,6 +52,7 @@ class Order } $configKey = 'emails.general.notifications.emails.general.notifications.new-invoice'; + if (core()->getConfigData($configKey)) { Mail::queue(new NewInvoiceNotification($invoice)); } @@ -69,6 +71,7 @@ class Order { try { $configKey = 'emails.general.notifications.emails.general.notifications.new-refund'; + if (core()->getConfigData($configKey)) { Mail::queue(new NewRefundNotification($refund)); } @@ -80,7 +83,7 @@ class Order /** * Send new shipment mail to the customer * - * @param \Webkul\Sales\Contracts\Shipment $refund + * @param \Webkul\Sales\Contracts\Shipment $shipment * @return void */ public function sendNewShipmentMail($shipment) @@ -91,11 +94,13 @@ class Order } $configKey = 'emails.general.notifications.emails.general.notifications.new-shipment'; + if (core()->getConfigData($configKey)) { Mail::queue(new NewShipmentNotification($shipment)); } $configKey = 'emails.general.notifications.emails.general.notifications.new-inventory-source'; + if (core()->getConfigData($configKey)) { Mail::queue(new NewInventorySourceNotification($shipment)); } diff --git a/packages/Webkul/Core/src/Database/Seeders/CurrencyTableSeeder.php b/packages/Webkul/Core/src/Database/Seeders/CurrencyTableSeeder.php index 42523354e..81631af86 100755 --- a/packages/Webkul/Core/src/Database/Seeders/CurrencyTableSeeder.php +++ b/packages/Webkul/Core/src/Database/Seeders/CurrencyTableSeeder.php @@ -14,15 +14,17 @@ class CurrencyTableSeeder extends Seeder DB::table('currencies')->delete(); DB::table('currencies')->insert([ + [ 'id' => 1, 'code' => 'USD', 'name' => 'US Dollar', + 'symbol' => '$', ], [ 'id' => 2, 'code' => 'EUR', 'name' => 'Euro', 'symbol' => '€', ] - ); + ]); } } diff --git a/packages/Webkul/Core/src/Database/Seeders/LocalesTableSeeder.php b/packages/Webkul/Core/src/Database/Seeders/LocalesTableSeeder.php index 74a0d61f3..d7357b02a 100755 --- a/packages/Webkul/Core/src/Database/Seeders/LocalesTableSeeder.php +++ b/packages/Webkul/Core/src/Database/Seeders/LocalesTableSeeder.php @@ -14,6 +14,7 @@ class LocalesTableSeeder extends Seeder DB::table('locales')->delete(); DB::table('locales')->insert([ + [ 'id' => 1, 'code' => 'en', 'name' => 'English', @@ -22,6 +23,6 @@ class LocalesTableSeeder extends Seeder 'code' => 'fr', 'name' => 'French', ] - ); + ]); } } \ No newline at end of file