diff --git a/app/Http/Controllers/SubscriptionsController.php b/app/Http/Controllers/SubscriptionsController.php index 3f83e9e..7acd077 100755 --- a/app/Http/Controllers/SubscriptionsController.php +++ b/app/Http/Controllers/SubscriptionsController.php @@ -51,8 +51,7 @@ class SubscriptionsController extends Controller */ public function store(FormRequest $subscriptionCreateRequest) { - $subscriptionCreateRequest->approveFor(new Subscription()); - + $subscriptionCreateRequest->approveToCreate(new Subscription()); flash(trans('subscription.created'), 'success'); return redirect()->route('subscriptions.index'); @@ -96,8 +95,7 @@ class SubscriptionsController extends Controller */ public function update(FormRequest $subscriptionUpdateRequest, Subscription $subscription) { - $subscriptionUpdateRequest->approveFor($subscription); - + $subscriptionUpdateRequest->approveToUpdate($subscription); flash(trans('subscription.updated'), 'success'); return redirect()->route('subscriptions.edit', $subscription->id); @@ -113,7 +111,6 @@ class SubscriptionsController extends Controller public function destroy(FormRequest $subscriptionDeleteRequest, Subscription $subscription) { $subscriptionDeleteRequest->approveToDelete($subscription); - flash(trans('subscription.deleted'), 'success'); return redirect()->route('subscriptions.index'); diff --git a/app/Http/Requests/SubscriptionRequest.php b/app/Http/Requests/SubscriptionRequest.php index 8d0695c..848607a 100644 --- a/app/Http/Requests/SubscriptionRequest.php +++ b/app/Http/Requests/SubscriptionRequest.php @@ -79,28 +79,33 @@ class SubscriptionRequest extends Request ]; } - public function approveFor(Subscription $subscription) + public function approveToCreate(Subscription $subscription) { $project = Project::findOrFail($this->get('project_id')); - if ($subscription->exists) { - $subscriptionData = $this->except(['_method', '_token']); - $subscriptionData['customer_id'] = $project->customer_id; - - $subscription->update($subscriptionData); - } else { - $subscription->project_id = $project->id; - $subscription->vendor_id = $this->get('vendor_id'); - $subscription->customer_id = $project->customer_id; - $subscription->name = $this->get('name'); - $subscription->price = $this->get('price'); - $subscription->start_date = $this->get('start_date'); - $subscription->due_date = $this->get('due_date'); - $subscription->type_id = $this->get('type_id'); - $subscription->notes = $this->get('notes'); - - $subscription->save(); - } + $subscription->project_id = $project->id; + $subscription->vendor_id = $this->get('vendor_id'); + $subscription->customer_id = $project->customer_id; + $subscription->name = $this->get('name'); + $subscription->price = $this->get('price'); + $subscription->start_date = $this->get('start_date'); + $subscription->due_date = $this->get('due_date'); + $subscription->type_id = $this->get('type_id'); + $subscription->notes = $this->get('notes'); + + $subscription->save(); + + return $subscription; + } + + public function approveToUpdate(Subscription $subscription) + { + $project = Project::findOrFail($this->get('project_id')); + + $subscriptionData = $this->except(['_method', '_token']); + $subscriptionData['customer_id'] = $project->customer_id; + + $subscription->update($subscriptionData); return $subscription; }