Testing Autobill

app/Repositories/BaseRepository.php

@@ -322,6 +322,8 @@ class BaseRepository
         if ($class->name == Credit::class) {
             $model = $model->calc()->getCredit();
 
+            $model->ledger()->updateCreditBalance(($state['finished_amount'] - $state['starting_amount']));
+
             if (! $model->design_id) {
                 $model->design_id = $this->decodePrimaryKey($client->getSetting('credit_design_id'));
             }

app/Services/Credit/MarkSent.php

@@ -45,6 +45,7 @@ class MarkSent
              ->applyNumber()
              ->save();
 
+
         return $this->credit;
     }
 }

app/Services/Invoice/AutoBillInvoice.php

@@ -21,6 +21,7 @@ use App\Models\PaymentHash;
 use App\Services\AbstractService;
 use App\Services\Client\ClientService;
 use App\Services\Payment\PaymentService;
+use App\Utils\Ninja;
 use App\Utils\Traits\GeneratesCounter;
 use Illuminate\Support\Str;
 
@@ -94,12 +95,18 @@ class AutoBillInvoice extends AbstractService
      */
     private function finalizePaymentUsingCredits()
     {
+        info("finalizing");
+        info(print_r($this->used_credit,1));
         $amount = array_sum(array_column($this->used_credit, 'amount'));
+     info("amount {$amount}");
 
         $payment = PaymentFactory::create($this->invoice->company_id, $this->invoice->user_id);
         $payment->amount = $amount;
+        $payment->client_id = $this->invoice->client_id;
+        $payment->currency_id = $this->invoice->client->getSetting('currency_id');
         $payment->date = now();
-        $payment->save();
+        $payment->status_id = Payment::STATUS_COMPLETED;
+        $payment->service()->applyNumber()->save();
 
         $payment->invoices()->attach($this->invoice->id, ['amount' => $amount]);
 
@@ -107,7 +114,7 @@ class AutoBillInvoice extends AbstractService
 
         foreach($this->used_credit as $credit)
         {
-            $payment->credits()->attach($credit['credit_id'], ['amount' => $credit['amount']);
+            $payment->credits()->attach($credit['credit_id'], ['amount' => $credit['amount']]);
         }
 
             $payment->ledger()
@@ -122,9 +129,11 @@ class AutoBillInvoice extends AbstractService
 
             $this->invoice->ledger()
                           ->updateInvoiceBalance($amount * -1, 'Invoice payment using Credit')
-                          ->updateCreditBalance($amount * -1, 'Credits used to pay down Invoice ' . $invoice->number)
+                          ->updateCreditBalance($amount * -1, 'Credits used to pay down Invoice ' . $this->invoice->number)
                           ->save();
 
+        event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
+
         return $this->invoice->service()->setStatus(Invoice::STATUS_PAID)->save();
     }
 
@@ -154,7 +163,7 @@ class AutoBillInvoice extends AbstractService
             $is_partial_amount = true;
         }
 
-        $this->used_credit = []
+        $this->used_credit = [];
 
         foreach($available_credits as $key => $credit) {
 
@@ -179,14 +188,14 @@ class AutoBillInvoice extends AbstractService
 
                 //more credit than needed
                 if($credit->balance >= $this->invoice->balance) {
-                    $used_credit[$key]['credit_id'] = $credit->id;
-                    $used_credit[$key]['amount'] = $this->invoice->balance;
+                    $this->used_credit[$key]['credit_id'] = $credit->id;
+                    $this->used_credit[$key]['amount'] = $this->invoice->balance;
                     $this->invoice->balance = 0;
                     break;
                 }
                 else {
-                    $used_credit[$key]['credit_id'] = $credit->id;
-                    $used_credit[$key]['amount'] = $credit->balance;
+                    $this->used_credit[$key]['credit_id'] = $credit->id;
+                    $this->used_credit[$key]['amount'] = $credit->balance;
                     $this->invoice->balance -= $credit->balance;
                 }
 

app/Services/Ledger/LedgerService.php

@@ -66,6 +66,8 @@ class LedgerService
         $company_ledger->save();
 
         $this->entity->company_ledger()->save($company_ledger);
+
+        return $this;
     }
 
     public function updateCreditBalance($adjustment, $notes = '')

tests/MockAccountData.php

@@ -227,12 +227,6 @@ trait MockAccountData
         $this->invoice = InvoiceFactory::create($this->company->id, $this->user->id); //stub the company and user_id
         $this->invoice->client_id = $this->client->id;
 
-        // $this->invoice = Invoice::factory()->create([
-        //         'user_id' => $this->user->id,
-        //         'client_id' => $this->client->id,
-        //         'company_id' => $this->company->id,
-        //     ]);
-
         $this->invoice->line_items = $this->buildLineItems();
         $this->invoice->uses_inclusive_taxes = false;
 
@@ -316,7 +310,6 @@ trait MockAccountData
         $this->credit->uses_inclusive_taxes = false;
 
         $this->credit->save();
-
         $this->credit->service()->createInvitations()->markSent();
 
         $this->credit_calc = new InvoiceSum($this->credit);
@@ -325,6 +318,9 @@ trait MockAccountData
         $this->credit = $this->credit_calc->getCredit();
         $this->credit->service()->markSent();
 
+        $this->client->service()->adjustCreditBalance($this->credit->balance)->save();
+        $this->credit->ledger()->updateCreditBalance($this->credit->balance)->save();
+        
         $contacts = $this->invoice->client->contacts;
 
         $contacts->each(function ($contact) {

tests/Unit/AutoBillInvoiceTest.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+namespace Tests\Unit;
+
+use App\Models\Invoice;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\MockAccountData;
+use Tests\TestCase;
+
+/**
+ * @test
+ * @covers App\Services\Invoice\AutoBillInvoice
+ */
+class AutoBillInvoiceTest extends TestCase
+{
+    use MockAccountData;
+    use DatabaseTransactions;
+
+    public function setUp() :void
+    {
+        parent::setUp();
+
+        $this->makeTestData();
+    }
+
+    public function testAutoBillFunctionality()
+    {
+
+        // info("client balance = {$this->client->balance}");
+        // info("invoice balance = {$this->invoice->balance}");
+
+
+        $this->assertEquals($this->client->balance, 10);
+        $this->assertEquals($this->client->paid_to_date, 0);
+        $this->assertEquals($this->client->credit_balance, 10);
+
+        $this->invoice->service()->markSent()->autoBill()->save();
+
+        // info(print_r($this->invoice->payments()->first()->toArray(),1));
+        $this->assertNotNull($this->invoice->payments());
+        $this->assertEquals(10, $this->invoice->payments()->sum('payments.amount'));
+
+        //info(print_r($this->invoice->payments()->get(),1));
+        $this->assertEquals($this->client->balance, 0);
+        $this->assertEquals($this->client->paid_to_date, 10);
+        $this->assertEquals($this->client->credit_balance, 0);
+    }
+
+}