diff --git a/packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php b/packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php index dbdaed761..74e764713 100755 --- a/packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php +++ b/packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php @@ -10,6 +10,7 @@ use Webkul\User\Database\Seeders\DatabaseSeeder as UserSeeder; use Webkul\Customer\Database\Seeders\DatabaseSeeder as CustomerSeeder; use Webkul\Inventory\Database\Seeders\DatabaseSeeder as InventorySeeder; use Webkul\CMS\Database\Seeders\DatabaseSeeder as CMSSeeder; +use Webkul\SocialLogin\Database\Seeders\DatabaseSeeder as SocialLoginSeeder; class DatabaseSeeder extends Seeder { @@ -27,5 +28,6 @@ class DatabaseSeeder extends Seeder $this->call(UserSeeder::class); $this->call(CustomerSeeder::class); $this->call(CMSSeeder::class); + $this->call(SocialLoginSeeder::class); } -} \ No newline at end of file +} 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/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/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php index a0009e1f4..3bf060fcb 100755 --- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php @@ -408,12 +408,12 @@ [@{{ channel_locale }}] - - @@ -436,12 +436,15 @@ return { isRequire: false, isVisible: false, + savedValue: "", } }, mounted: function () { var this_this = this; + this_this.savedValue = this_this.result; + if (this_this.validations || (this_this.validations.indexOf("required") != -1)) { this_this.isRequire = true; } diff --git a/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php index 5f7ac16b5..63561bc95 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php @@ -5,9 +5,9 @@ @stop -@section('content-wrapper') +@section('content') -
+
{!! view_render_event('admin.customer.addresses.create.before') !!}
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php index 3dc4b24b5..4c8851c65 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php @@ -5,9 +5,9 @@ @stop -@section('content-wrapper') +@section('content') -
+
{!! view_render_event('admin.customer.addresses.edit.before', ['address' => $address]) !!} diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php index caeef7f04..156a964ad 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php @@ -21,7 +21,8 @@