From 9f67e46ef82b0775c639c4b66e81a4f72cd50a08 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Mon, 18 Jan 2021 20:13:46 +0530 Subject: [PATCH] added missed condition in marketing --- .../Core/src/Http/Controllers/SubscriptionController.php | 8 +++++++- packages/Webkul/Core/src/Models/SubscribersList.php | 9 +++++++++ .../src/Http/Controllers/RegistrationController.php | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php b/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php index e40c1a2e2..f019d40ce 100755 --- a/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php +++ b/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php @@ -70,6 +70,12 @@ class SubscriptionController extends Controller $subscriber = $this->subscribersListRepository->findOrFail($id); + $customer = $subscriber->customer; + + $customer->subscribed_to_news_letter = $data['is_subscribed']; + + $customer->save(); + $result = $subscriber->update($data); if ($result) { @@ -99,7 +105,7 @@ class SubscriptionController extends Controller return response()->json(['message' => true], 200); } catch (\Exception $e) { report($e); - + session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Subscriber'])); } diff --git a/packages/Webkul/Core/src/Models/SubscribersList.php b/packages/Webkul/Core/src/Models/SubscribersList.php index 1259e83a8..d016047f0 100755 --- a/packages/Webkul/Core/src/Models/SubscribersList.php +++ b/packages/Webkul/Core/src/Models/SubscribersList.php @@ -3,6 +3,7 @@ namespace Webkul\Core\Models; use Illuminate\Database\Eloquent\Model; +use Webkul\Customer\Models\CustomerProxy; use Webkul\Core\Contracts\SubscribersList as SubscribersListContract; class SubscribersList extends Model implements SubscribersListContract @@ -24,4 +25,12 @@ class SubscribersList extends Model implements SubscribersListContract ]; protected $hidden = ['token']; + + /** + * Get the customer associated with the subscription. + */ + public function customer() + { + return $this->belongsTo(CustomerProxy::modelClass()); + } } \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php index 3503ef018..a3b14395f 100755 --- a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php @@ -97,6 +97,7 @@ class RegistrationController extends Controller 'is_verified' => core()->getConfigData('customer.settings.email.verification') ? 0 : 1, 'customer_group_id' => $this->customerGroupRepository->findOneWhere(['code' => 'general'])->id, 'token' => md5(uniqid(rand(), true)), + 'subscribed_to_news_letter' => isset(request()->input()['is_subscribed']) ? 1 : 0, ]); Event::dispatch('customer.registration.before');