Refactor for how we deal with delete payments and client paid to dates

app/PaymentDrivers/MolliePaymentDriver.php

@@ -351,7 +351,7 @@ class MolliePaymentDriver extends BaseDriver
 
             if ($record) {
                 if (in_array($payment->status, ['canceled', 'expired', 'failed'])) {
-                    $record->service()->deletePayment();
+                    $record->service()->deletePayment(false); //sometimes mollie does not return but we still decrement the paid to date, this is incorrect.
                 }
 
                 $record->status_id = $codes[$payment->status];

app/Services/Payment/DeletePayment.php

@@ -17,20 +17,22 @@ use App\Models\Invoice;
 use App\Models\Payment;
 use App\Models\TransactionEvent;
 use App\Repositories\ActivityRepository;
+use Illuminate\Contracts\Container\BindingResolutionException;
 
 class DeletePayment
 {
-    public $payment;
+    private float $_paid_to_date_deleted = 0;
 
-    private $activity_repository;
+    /**
-
+     * @param mixed $payment 
-    public function __construct($payment)
+     * @return void 
-    {
+     */
-        $this->payment = $payment;
+    public function __construct(public Payment $payment, private bool $update_client_paid_to_date) {}
-
-        $this->activity_repository = new ActivityRepository();
-    }
 
+    /**
+     * @return mixed 
+     * @throws BindingResolutionException 
+     */
     public function run()
     {
 
@@ -46,7 +48,6 @@ class DeletePayment
             $this->setStatus(Payment::STATUS_CANCELLED) //sets status of payment
                 ->updateCreditables() //return the credits first
                 ->adjustInvoices()
-                ->updateClient()
                 ->deletePaymentables()
                 ->cleanupPayment()
                 ->save();
@@ -58,6 +59,7 @@ class DeletePayment
     
     }
 
+    /** @return $this  */
     private function cleanupPayment()
     {
         $this->payment->is_deleted = true;
@@ -66,6 +68,7 @@ class DeletePayment
         return $this;
     }
 
+    /** @return $this  */
     private function deletePaymentables()
     {
         $this->payment->paymentables()->update(['deleted_at' => now()]);
@@ -73,20 +76,16 @@ class DeletePayment
         return $this;
     }
 
-    private function updateClient()
+    /** @return $this  */
-    {
-        //$this->payment->client->service()->updatePaidToDate(-1 * $this->payment->amount)->save();
-
-        return $this;
-    }
-
     private function adjustInvoices()
     {
+        $this->_paid_to_date_deleted = 0;
+        
         if ($this->payment->invoices()->exists()) {
             $this->payment->invoices()->each(function ($paymentable_invoice) {
                 $net_deletable = $paymentable_invoice->pivot->amount - $paymentable_invoice->pivot->refunded;
 
-                $client = $this->payment->client->fresh();
+                $this->_paid_to_date_deleted += $net_deletable;
 
                 nlog("net deletable amount - refunded = {$net_deletable}");
 
@@ -105,7 +104,7 @@ class DeletePayment
                     $client = $this->payment
                                    ->client
                                    ->service()
-                                   ->updateBalance($net_deletable)
+                                   ->updateBalanceAndPaidToDate($net_deletable, $net_deletable*-1)
                                    ->save();
 
                     if ($paymentable_invoice->balance == $paymentable_invoice->amount) {
@@ -114,46 +113,30 @@ class DeletePayment
                         $paymentable_invoice->service()->setStatus(Invoice::STATUS_PARTIAL)->save();
                     }
                 } else {
-                    $paymentable_invoice->restore();
 
-                    //If the invoice is deleted we only update the meta data on the invoice
+                    $paymentable_invoice->restore();
-                    //and reduce the clients paid to date
                     $paymentable_invoice->service()
                                         ->updatePaidToDate($net_deletable * -1)
                                         ->save();
                 }
 
-                $transaction = [
-                    'invoice' => $paymentable_invoice->transaction_event(),
-                    'payment' => $this->payment->transaction_event(),
-                    'client' => $client->transaction_event(),
-                    'credit' => [],
-                    'metadata' => [],
-                ];
-
-                // TransactionLog::dispatch(TransactionEvent::PAYMENT_DELETED, $transaction, $paymentable_invoice->company->db);
             });
         }
 
+        //sometimes the payment is NOT created properly, this catches the payment and prevents the paid to date reducing inappropriately.
+        if($this->update_client_paid_to_date)
+        {
             $this->payment
             ->client
             ->service()
-        ->updatePaidToDate(($this->payment->amount - $this->payment->refunded) * -1)
+            ->updatePaidToDate(min(0, ($this->payment->amount - $this->payment->refunded - $this->_paid_to_date_deleted) * -1))
             ->save();
-
+        }
-        $transaction = [
-            'invoice' => [],
-            'payment' => [],
-            'client' => $this->payment->client->transaction_event(),
-            'credit' => [],
-            'metadata' => [],
-        ];
-
-        // TransactionLog::dispatch(TransactionEvent::CLIENT_STATUS, $transaction, $this->payment->company->db);
     
         return $this;
     }
 
+    /** @return $this  */
     private function updateCreditables()
     {
         if ($this->payment->credits()->exists()) {
@@ -183,6 +166,10 @@ class DeletePayment
         return $this;
     }
 
+    /**
+     * @param mixed $status 
+     * @return $this 
+     */
     private function setStatus($status)
     {
         $this->payment->status_id = Payment::STATUS_CANCELLED;

app/Services/Payment/PaymentService.php

@@ -87,9 +87,9 @@ class PaymentService
         return ((new RefundPayment($this->payment, $data)))->run();
     }
 
-    public function deletePayment() :?Payment
+    public function deletePayment($update_client_paid_to_date = true) :?Payment
     {
-        return (new DeletePayment($this->payment))->run();
+        return (new DeletePayment($this->payment, $update_client_paid_to_date))->run();
     }
 
     public function updateInvoicePayment(PaymentHash $payment_hash) :?Payment