Merge pull request #2080 from jitendra-webkul/1.0

Issue #2071 fixed

packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php

@@ -45,7 +45,6 @@ class NewInvoiceNotification extends Mailable
         $order = $this->invoice->order;
 
         return $this->to($order->customer_email, $order->customer_full_name)
-                ->from(config('mail.from'))
                 ->subject(trans('shop::app.mail.invoice.subject', ['order_id' => $order->increment_id]))
                 ->view('shop::emails.sales.new-invoice');
     }

packages/Webkul/Admin/src/Mail/NewOrderNotification.php

@@ -42,7 +42,6 @@ class NewOrderNotification extends Mailable
     public function build()
     {
         return $this->to($this->order->customer_email, $this->order->customer_full_name)
-                ->from(config('mail.from'))
                 ->subject(trans('shop::app.mail.order.subject'))
                 ->view('shop::emails.sales.new-order');
     }

packages/Webkul/Admin/src/Mail/NewRefundNotification.php

@@ -45,7 +45,6 @@ class NewRefundNotification extends Mailable
         $order = $this->refund->order;
 
         return $this->to($order->customer_email, $order->customer_full_name)
-                ->from(config('mail.from'))
                 ->subject(trans('shop::app.mail.refund.subject', ['order_id' => $order->increment_id]))
                 ->view('shop::emails.sales.new-refund');
     }

packages/Webkul/Admin/src/Mail/NewShipmentNotification.php

@@ -45,7 +45,6 @@ class NewShipmentNotification extends Mailable
         $order = $this->shipment->order;
 
         return $this->to($order->customer_email, $order->customer_full_name)
-                ->from(config('mail.from'))
                 ->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->increment_id]))
                 ->view('shop::emails.sales.new-shipment');
     }

packages/Webkul/Category/src/Http/Controllers/CategoryController.php

@@ -115,15 +115,15 @@ class CategoryController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  int  $id
+     * @param int $id
      * @return \Illuminate\View\View
      */
     public function edit($id)
     {
-        $categories = $this->categoryRepository->getCategoryTree($id);
-
         $category = $this->categoryRepository->findOrFail($id);
 
+        $categories = $this->categoryRepository->getCategoryTree($id);
+
         $attributes = $this->attributeRepository->findWhere(['is_filterable' =>  1]);
 
         return view($this->_config['view'], compact('category', 'categories', 'attributes'));

packages/Webkul/Category/src/Repositories/CategoryRepository.php

@@ -76,7 +76,6 @@ class CategoryRepository extends Repository
             : $this->model::orderBy('position', 'ASC')->get()->toTree();
     }
 
-
     /**
      * Get root categories
      *

packages/Webkul/Customer/src/Mail/RegistrationEmail.php

@@ -31,7 +31,6 @@ class RegistrationEmail extends Mailable
     public function build()
     {
        return $this->to($this->data['email'])
-                ->from(config('mail.from'))
                 ->subject(trans('shop::app.mail.customer.registration.customer-registration'))
                 ->view('shop::emails.customer.registration')->with('data', $this->data);
     }

packages/Webkul/Customer/src/Mail/VerificationEmail.php

@@ -31,7 +31,6 @@ class VerificationEmail extends Mailable
     public function build()
     {
         return $this->to($this->verificationData['email'])
-            ->from(config('mail.from'))
             ->subject(trans('shop::app.mail.customer.verification.subject'))
             ->view('shop::emails.customer.verification-email')->with('data', ['email' => $this->verificationData['email'], 'token' => $this->verificationData['token']]);
     }

packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php

@@ -21,7 +21,6 @@ class CustomerResetPassword extends ResetPassword
         }
 
         return (new MailMessage)
-            ->from(config('mail.from'))
             ->subject(__('shop::app.mail.forget-password.subject') )
             ->view('shop::emails.customer.forget-password', [
                 'user_name' => $notifiable->name,

packages/Webkul/Shop/src/Mail/SubscriptionEmail.php

@@ -30,8 +30,7 @@ class SubscriptionEmail extends Mailable
      */
     public function build()
     {
-      return $this->to($this->subscriptionData['email'])
-                ->from(config('mail.from.address'),config('mail.from.name'))
+        return $this->to($this->subscriptionData['email'])
                 ->subject(trans('shop::app.mail.customer.subscription.subject'))
                 ->view('shop::emails.customer.subscription-email')->with('data', ['content' => 'You Are Subscribed', 'token' => $this->subscriptionData['token']]);