From 80a5d8a37d00545cca9e11e22c8a9fddd97a75b2 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 12 Jan 2023 14:21:54 +1100
Subject: [PATCH] Fixes for pro rata invoicing

---
 .../Ninja/RenewalFailureNotification.php      | 79 +++++++++++++++++++
 .../Subscription/SubscriptionService.php      |  5 +-
 2 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 app/Notifications/Ninja/RenewalFailureNotification.php

diff --git a/app/Notifications/Ninja/RenewalFailureNotification.php b/app/Notifications/Ninja/RenewalFailureNotification.php
new file mode 100644
index 000000000000..f9cf87f18afd
--- /dev/null
+++ b/app/Notifications/Ninja/RenewalFailureNotification.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Notifications\Ninja;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Messages\SlackMessage;
+use Illuminate\Notifications\Notification;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class RenewalFailureNotification extends Notification 
+{
+
+    /**
+     * Create a new notification instance.
+     *
+     * @return void
+     */
+
+    public function __construct(protected string $notification_message){}
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function via($notifiable)
+    {
+        return ['slack'];
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return MailMessage
+     */
+    public function toMail($notifiable)
+    {
+    }
+
+    /**
+     * Get the array representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function toArray($notifiable)
+    {
+        return [
+            //
+        ];
+    }
+
+    public function toSlack($notifiable)
+    {
+        $content = "Plan paid, account not updated\n";
+        $content .= "Contact: {$this->notification_message}";
+        
+        return (new SlackMessage)
+                ->success()
+                ->from(ctrans('texts.notification_bot'))
+                ->image('https://app.invoiceninja.com/favicon.png')
+                ->content($content);
+    }
+}
diff --git a/app/Services/Subscription/SubscriptionService.php b/app/Services/Subscription/SubscriptionService.php
index ba5fe331a5ad..fd517f04d169 100644
--- a/app/Services/Subscription/SubscriptionService.php
+++ b/app/Services/Subscription/SubscriptionService.php
@@ -679,8 +679,9 @@ class SubscriptionService
         }
         else if($last_invoice->balance > 0)
         {
-            $pro_rata_charge_amount = $this->calculateProRataCharge($last_invoice, $old_subscription);
-            nlog("pro rata charge = {$pro_rata_charge_amount}");
+            $last_invoice = null;
+            // $pro_rata_charge_amount = $this->calculateProRataCharge($last_invoice, $old_subscription);
+            // nlog("pro rata charge = {$pro_rata_charge_amount}");
         }
         else
         {