From ab2d069ec7fa53d310eaeaa45451b4a918e0ef70 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Thu, 31 Oct 2019 17:07:49 +0530
Subject: [PATCH] Issue #1519 fixed

---
 .../Http/Controllers/Shop/SessionController.php |  2 +-
 .../src}/Listeners/CustomerEventsHandler.php    |  5 ++---
 .../src/Providers/CheckoutServiceProvider.php   |  3 ++-
 .../src/Providers/EventServiceProvider.php      | 17 +++++++++++++++++
 .../src/Http/Controllers/SessionController.php  |  5 -----
 5 files changed, 22 insertions(+), 10 deletions(-)
 rename packages/Webkul/{Customer/src/Http => Checkout/src}/Listeners/CustomerEventsHandler.php (81%)
 create mode 100644 packages/Webkul/Checkout/src/Providers/EventServiceProvider.php

diff --git a/packages/Webkul/API/Http/Controllers/Shop/SessionController.php b/packages/Webkul/API/Http/Controllers/Shop/SessionController.php
index dc837f70e..7451fe889 100644
--- a/packages/Webkul/API/Http/Controllers/Shop/SessionController.php
+++ b/packages/Webkul/API/Http/Controllers/Shop/SessionController.php
@@ -66,7 +66,7 @@ class SessionController extends Controller
             ], 401);
         }
 
-        Event::fire('customer.after.login', request()->input('email'));
+        Event::fire('customer.after.login', request('email'));
 
         $customer = auth($this->guard)->user();
 
diff --git a/packages/Webkul/Customer/src/Http/Listeners/CustomerEventsHandler.php b/packages/Webkul/Checkout/src/Listeners/CustomerEventsHandler.php
similarity index 81%
rename from packages/Webkul/Customer/src/Http/Listeners/CustomerEventsHandler.php
rename to packages/Webkul/Checkout/src/Listeners/CustomerEventsHandler.php
index f5b395c62..9aa1af366 100755
--- a/packages/Webkul/Customer/src/Http/Listeners/CustomerEventsHandler.php
+++ b/packages/Webkul/Checkout/src/Listeners/CustomerEventsHandler.php
@@ -1,7 +1,6 @@
 <?php
 
-namespace Webkul\Customer\Http\Listeners;
-use Cookie;
+namespace Webkul\Checkout\Listeners;
 use Cart;
 
 class CustomerEventsHandler {
@@ -28,6 +27,6 @@ class CustomerEventsHandler {
      */
     public function subscribe($events)
     {
-        $events->listen('customer.after.login', 'Webkul\Customer\Http\Listeners\CustomerEventsHandler@onCustomerLogin');
+        $events->listen('customer.after.login', 'Webkul\Checkout\Listeners\CustomerEventsHandler@onCustomerLogin');
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Checkout/src/Providers/CheckoutServiceProvider.php b/packages/Webkul/Checkout/src/Providers/CheckoutServiceProvider.php
index c2d44aa81..74be9bc20 100755
--- a/packages/Webkul/Checkout/src/Providers/CheckoutServiceProvider.php
+++ b/packages/Webkul/Checkout/src/Providers/CheckoutServiceProvider.php
@@ -8,7 +8,6 @@ use Webkul\Checkout\Facades\Cart;
 
 class CheckoutServiceProvider extends ServiceProvider
 {
-
     public function boot()
     {
         include __DIR__ . '/../Http/helpers.php';
@@ -16,6 +15,8 @@ class CheckoutServiceProvider extends ServiceProvider
         $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations');
 
         $this->app->register(ModuleServiceProvider::class);
+
+        $this->app->register(EventServiceProvider::class);
     }
 
     /**
diff --git a/packages/Webkul/Checkout/src/Providers/EventServiceProvider.php b/packages/Webkul/Checkout/src/Providers/EventServiceProvider.php
new file mode 100644
index 000000000..f34647dd5
--- /dev/null
+++ b/packages/Webkul/Checkout/src/Providers/EventServiceProvider.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Webkul\Checkout\Providers;
+
+use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+
+class EventServiceProvider extends ServiceProvider
+{
+    /**
+     * The subscriber classes to register.
+     *
+     * @var array
+     */
+    protected $subscribe = [
+        'Webkul\Checkout\Listeners\CustomerEventsHandler'
+    ];
+}
\ No newline at end of file
diff --git a/packages/Webkul/Customer/src/Http/Controllers/SessionController.php b/packages/Webkul/Customer/src/Http/Controllers/SessionController.php
index 5c5a65f7b..0c25bb54b 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/SessionController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/SessionController.php
@@ -3,7 +3,6 @@
 namespace Webkul\Customer\Http\Controllers;
 
 use Illuminate\Support\Facades\Event;
-use Webkul\Customer\Http\Listeners\CustomerEventsHandler;
 use Cookie;
 
 /**
@@ -31,10 +30,6 @@ class SessionController extends Controller
         $this->middleware('customer')->except(['show','create']);
 
         $this->_config = request('_config');
-
-        $subscriber = new CustomerEventsHandler;
-
-        Event::subscribe($subscriber);
     }
 
     /**