diff --git a/app/Notifications/Portal/PaymentReceived.php b/app/Notifications/Portal/PaymentReceived.php
index cd07d7ff4..60ea927b4 100644
--- a/app/Notifications/Portal/PaymentReceived.php
+++ b/app/Notifications/Portal/PaymentReceived.php
@@ -28,7 +28,7 @@ class PaymentReceived extends Notification
     /**
      * The email template.
      *
-     * @var string
+     * @var \App\Models\Common\EmailTemplate
      */
     public $template;
 
diff --git a/app/Notifications/Purchase/Bill.php b/app/Notifications/Purchase/Bill.php
index b47a7758e..2f79f07f9 100644
--- a/app/Notifications/Purchase/Bill.php
+++ b/app/Notifications/Purchase/Bill.php
@@ -17,7 +17,7 @@ class Bill extends Notification
     /**
      * The email template.
      *
-     * @var string
+     * @var \App\Models\Common\EmailTemplate
      */
     public $template;
 
diff --git a/app/Notifications/Purchase/Payment.php b/app/Notifications/Purchase/Payment.php
index c325c97f6..84e6d5a0b 100644
--- a/app/Notifications/Purchase/Payment.php
+++ b/app/Notifications/Purchase/Payment.php
@@ -21,7 +21,7 @@ class Payment extends Notification
     /**
      * The email template.
      *
-     * @var string
+     * @var \App\Models\Common\EmailTemplate
      */
     public $template;
 
diff --git a/app/Notifications/Sale/Invoice.php b/app/Notifications/Sale/Invoice.php
index fd3364ff3..271219423 100644
--- a/app/Notifications/Sale/Invoice.php
+++ b/app/Notifications/Sale/Invoice.php
@@ -21,7 +21,7 @@ class Invoice extends Notification
     /**
      * The email template.
      *
-     * @var string
+     * @var \App\Models\Common\EmailTemplate
      */
     public $template;
 
diff --git a/app/Notifications/Sale/Revenue.php b/app/Notifications/Sale/Revenue.php
index c041cc16b..608feaf9a 100644
--- a/app/Notifications/Sale/Revenue.php
+++ b/app/Notifications/Sale/Revenue.php
@@ -21,7 +21,7 @@ class Revenue extends Notification
     /**
      * The email template.
      *
-     * @var string
+     * @var \App\Models\Common\EmailTemplate
      */
     public $template;
 
diff --git a/resources/views/settings/modules/edit.blade.php b/resources/views/settings/modules/edit.blade.php
old mode 100644
new mode 100755
index d9300adf4..07f28000e
--- a/resources/views/settings/modules/edit.blade.php
+++ b/resources/views/settings/modules/edit.blade.php
@@ -26,7 +26,7 @@
                         @elseif ($type == 'textareaGroup')
                             {{ Form::$type($field['name'], trans($field['title'])) }}
                         @elseif ($type == 'selectGroup')
-                            {{ Form::$type($field['name'], trans($field['title']), $field['icon'], $field['values'], $field['selected'], $field['attributes']) }}
+                            {{ Form::$type($field['name'], trans($field['title']), $field['icon'], $field['values'], isset($setting[$field['name']]) ? $setting[$field['name']] : $field['selected'], $field['attributes']) }}
                         @elseif ($type == 'radioGroup')
                             {{ Form::$type($field['name'], trans($field['title']), isset($setting[$field['name']]) ? $setting[$field['name']] : 1, trans($field['enable']), trans($field['disable']), $field['attributes']) }}
                         @elseif ($type == 'checkboxGroup')