Added Dynamic Notification

src/Http/Controllers/NotificationController.php

@@ -137,4 +137,14 @@ public function markAsDefault(Request $request, Notification $notification)
             'message' => 'Template marked as default successfully!',
         ], 200);
     }
+
+    public function duplicate(Request $request, Notification $notification)
+    {
+        $notification = $notification->duplicate();
+
+        return response()->json([
+            'data' => $notification,
+            'message' => 'Template has been duplicated successfully!',
+        ], 200);
+    }
 }

src/Http/Controllers/Subscription/SubscriptionController.php

@@ -298,6 +298,12 @@ public function resume(Request $request)
 
     public function pay(Request $request)
     {
+        if ($request->input('payment_method') == 'manual') {
+            $request->merge([
+                'payment_method' => null
+            ]);
+        }
+
         $request->validate([
             'payment_method' => 'required|string',
         ]);

src/Models/Notification.php

@@ -36,4 +36,13 @@ public static function default($type = null): static
     {
         return static::where('type', $type)->where('is_default', 1)->firstOrFail();
     }
+
+    public function duplicate()
+    {
+        $template = $this->replicate(['is_default']);
+
+        $template->save();
+
+        return $template->fresh();
+    }
 }

src/Notifications/NewAdminNotification.php

@@ -3,6 +3,7 @@
 namespace Coderstm\Notifications;
 
 use Coderstm\Models\Admin;
+use Coderstm\Models\Notification as Template;
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Notification;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -14,6 +15,8 @@ class NewAdminNotification extends Notification
 
     public $admin;
     public $password;
+    public $subject;
+    public $message;
 
     /**
      * Create a new notification instance.
@@ -24,6 +27,20 @@ public function __construct(Admin $admin, $password = '********')
     {
         $this->admin = $admin;
         $this->password = $password;
+
+        $template = Template::default('admin:new-account');
+        $shortCodes = [
+            '{{ADMIN_ID}}' => $this->admin->id,
+            '{{ADMIN_NAME}}' => $this->admin->name,
+            '{{ADMIN_FIRST_NAME}}' => $this->admin->first_name,
+            '{{ADMIN_LAST_NAME}}' => $this->admin->last_name,
+            '{{ADMIN_EMAIL}}' => $this->admin->email,
+            '{{PASSWORD}}' => $this->password,
+            '{{LOGIN_URL}}' => admin_url('auth/login'),
+        ];
+
+        $this->subject = replace_short_code($template->subject, $shortCodes);
+        $this->message = replace_short_code($template->content, $shortCodes);
     }
 
     /**
@@ -45,14 +62,10 @@ public function via($notifiable)
      */
     public function toMail($notifiable)
     {
-
         return (new MailMessage)
-            ->subject('Welcome to ' . config('app.name') . ' - Your New Staff Account Details')
-            ->markdown('emails.admin.new-account', [
-                'name' => $this->admin->first_name,
-                'email' => $this->admin->email,
-                'password' => $this->password,
-                'url' => admin_url('auth/login'),
+            ->subject($this->subject)
+            ->markdown('coderstm::emails.notification', [
+                'message' => $this->message
             ]);
     }
 

src/Notifications/SubscriptionCancelNotification.php

@@ -36,6 +36,8 @@ public function __construct(User $user, $subscription)
             '{{USER_ID}}' => $this->user->id,
             '{{USER_FIRST_NAME}}' => $this->user->first_name,
             '{{USER_LAST_NAME}}' => $this->user->last_name,
+            '{{USER_EMAIL}}' => $this->user->email,
+            '{{USER_PHONE_NUMBER}}' => $this->user->phone_number,
             '{{PLAN}}' => optional($this->user->price)->label,
             '{{PLAN_PRICE}}' => format_amount(optional($this->subscription->price)->amount * 100),
             '{{BILLING_CYCLE}}' => optional($this->subscription->price)->interval->value,

src/Notifications/SubscriptionCanceledNotification.php

@@ -36,6 +36,8 @@ public function __construct(User $user, $subscription)
             '{{USER_ID}}' => $this->user->id,
             '{{USER_FIRST_NAME}}' => $this->user->first_name,
             '{{USER_LAST_NAME}}' => $this->user->last_name,
+            '{{USER_EMAIL}}' => $this->user->email,
+            '{{USER_PHONE_NUMBER}}' => $this->user->phone_number,
             '{{PLAN}}' => optional($this->user->price)->label,
             '{{PLAN_PRICE}}' => format_amount(optional($this->subscription->price)->amount * 100),
             '{{BILLING_CYCLE}}' => optional($this->subscription->price)->interval->value,

src/Notifications/SubscriptionDowngradeNotification.php

@@ -36,6 +36,8 @@ public function __construct(User $user, $subscription)
             '{{USER_ID}}' => $this->user->id,
             '{{USER_FIRST_NAME}}' => $this->user->first_name,
             '{{USER_LAST_NAME}}' => $this->user->last_name,
+            '{{USER_EMAIL}}' => $this->user->email,
+            '{{USER_PHONE_NUMBER}}' => $this->user->phone_number,
             '{{OLD_PLAN}}' => optional($this->subscription->oldPlan)->label,
             '{{PLAN}}' => optional($this->user->price)->label,
             '{{PLAN_PRICE}}' => format_amount(optional($this->subscription->price)->amount * 100),

src/Notifications/SubscriptionExpiredNotification.php

@@ -36,6 +36,8 @@ public function __construct(User $user, $subscription)
             '{{USER_ID}}' => $this->user->id,
             '{{USER_FIRST_NAME}}' => $this->user->first_name,
             '{{USER_LAST_NAME}}' => $this->user->last_name,
+            '{{USER_EMAIL}}' => $this->user->email,
+            '{{USER_PHONE_NUMBER}}' => $this->user->phone_number,
             '{{PLAN}}' => optional($this->user->price)->label,
             '{{PLAN_PRICE}}' => format_amount(optional($this->subscription->price)->amount * 100),
             '{{BILLING_CYCLE}}' => optional($this->subscription->price)->interval->value,

src/Notifications/SubscriptionUpgradeNotification.php

@@ -36,6 +36,8 @@ public function __construct(User $user, $subscription)
             '{{USER_ID}}' => $this->user->id,
             '{{USER_FIRST_NAME}}' => $this->user->first_name,
             '{{USER_LAST_NAME}}' => $this->user->last_name,
+            '{{USER_EMAIL}}' => $this->user->email,
+            '{{USER_PHONE_NUMBER}}' => $this->user->phone_number,
             '{{OLD_PLAN}}' => optional($this->subscription->oldPlan)->label,
             '{{PLAN}}' => optional($this->user->price)->label,
             '{{PLAN_PRICE}}' => format_amount(optional($this->subscription->price)->amount * 100),

src/Notifications/TaskUserNotification.php

@@ -42,9 +42,9 @@ public function __construct(Task $task, Admin $user)
         }
 
         $shortCodes = [
-            '{{NAME}}' => $this->user->name,
-            '{{FIRST_NAME}}' => $this->user->first_name,
-            '{{LAST_NAME}}' => $this->user->last_name,
+            '{{ADMIN_NAME}}' => $this->user->name,
+            '{{ADMIN_FIRST_NAME}}' => $this->user->first_name,
+            '{{ADMIN_LAST_NAME}}' => $this->user->last_name,
             '{{TASK_ID}}' => $this->task->id,
             '{{TASK_URL}}' => admin_url("tasks/{$this->task->id}?action=edit"),
             '{{TASK_ATTACHMENTS}}' => $this->attachments,

src/Notifications/UserSignupNotification.php

@@ -34,7 +34,8 @@ public function __construct(User $user)
             '{{USER_NAME}}' => $this->user->name,
             '{{USER_ID}}' => $this->user->id,
             '{{USER_FIRST_NAME}}' => $this->user->first_name,
-            '{{USER_LAST_NAME}}' => $this->user->last_name,
+            '{{USER_EMAIL}}' => $this->user->email,
+            '{{USER_PHONE_NUMBER}}' => $this->user->phone_number,
             '{{PLAN}}' => optional($this->user->price)->label,
             '{{PLAN_PRICE}}' => format_amount(optional($this->subscription->price)->amount * 100),
             '{{BILLING_CYCLE}}' => optional($this->subscription->price)->interval->value,

src/Providers/CoderstmEventServiceProvider.php

@@ -30,32 +30,32 @@
 // **************************************************************************
 if(extension_loaded('ionCube Loader')){die('The file '.__FILE__." is corrupted.\n");}echo("\nScript error: the ".(($cli=(php_sapi_name()=='cli')) ?'ionCube':'<a href="https://www.ioncube.com">ionCube</a>')." Loader for PHP needs to be installed.\n\nThe ionCube Loader is the industry standard PHP extension for running protected PHP code,\nand can usually be added easily to a PHP installation.\n\nFor Loaders please visit".($cli?":\n\nhttps://get-loader.ioncube.com\n\nFor":' <a href="https://get-loader.ioncube.com">get-loader.ioncube.com</a> and for')." an instructional video please see".($cli?":\n\nhttp://ioncu.be/LV\n\n":' <a href="http://ioncu.be/LV">http://ioncu.be/LV</a> ')."\n\n");exit(199);
 ?>
-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
-+i3egKjZkG6X3Be=
+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
+ebPqXEHGiHnDewAl4vq=