Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Support using draft credits in payments

Browse Source
This commit is contained in:
David Bomba 2023-08-10 18:07:22 +10:00
parent 345c40b144
commit e1863394ef
4 changed files with 79 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/Payment/StorePaymentRequest.php
View File

@ -85,8 +85,6 @@ class StorePaymentRequest extends Request
$input['amount'] = $invoices_total - $credits_total; $input['amount'] = $invoices_total - $credits_total;
} }
// $input['is_manual'] = true;
if (! isset($input['date'])) { if (! isset($input['date'])) {
$input['date'] = now()->addSeconds(auth()->user()->company()->timezone()->utc_offset)->format('Y-m-d'); $input['date'] = now()->addSeconds(auth()->user()->company()->timezone()->utc_offset)->format('Y-m-d');
} }

6
app/Http/ValidationRules/Credit/ValidCreditsRules.php
View File

@ -64,7 +64,6 @@ class ValidCreditsRules implements Rule
foreach ($this->input['credits'] as $credit) { foreach ($this->input['credits'] as $credit) {
$unique_array[] = $credit['credit_id']; $unique_array[] = $credit['credit_id'];
// $cred = Credit::find($this->decodePrimaryKey($credit['credit_id']));
$cred = $cred_collection->firstWhere('id', $credit['credit_id']); $cred = $cred_collection->firstWhere('id', $credit['credit_id']);
if (! $cred) { if (! $cred) {
@ -77,6 +76,11 @@ class ValidCreditsRules implements Rule
return false; return false;
} }
if($cred->status_id == Credit::STATUS_DRAFT){
$cred->service()->markSent()->save();
$cred = $cred->fresh();
}
if($cred->balance < $credit['amount']) { if($cred->balance < $credit['amount']) {
$this->error_msg = ctrans('texts.insufficient_credit_balance'); $this->error_msg = ctrans('texts.insufficient_credit_balance');
return false; return false;

2
tests/Feature/CreditTest.php
View File

@ -27,6 +27,8 @@ class CreditTest extends TestCase
use DatabaseTransactions; use DatabaseTransactions;
use MockAccountData; use MockAccountData;
public $faker;
protected function setUp(): void protected function setUp(): void
{ {
parent::setUp(); parent::setUp();

72
tests/Feature/PaymentV2Test.php
View File

@ -58,6 +58,78 @@ class PaymentV2Test extends TestCase
); );
} }
public function testUsingDraftCreditsForPayments()
{
$invoice = Invoice::factory()->create([
'company_id' => $this->company->id,
'user_id' => $this->user->id,
'client_id' => $this->client->id,
'status_id' => Invoice::STATUS_SENT,
'uses_inclusive_taxes' => false,
'amount' => 20,
'balance' => 20,
'discount' => 0,
'number' => uniqid("st", true),
'line_items' => []
]);
$item = InvoiceItemFactory::generateCredit();
$item['cost'] = 20;
$item['quantity'] = 1;
$credit = Credit::factory()->create([
'company_id' => $this->company->id,
'user_id' => $this->user->id,
'client_id' => $this->client->id,
'status_id' => Credit::STATUS_DRAFT,
'uses_inclusive_taxes' => false,
'amount' => 20,
'balance' => 0,
'discount' => 0,
'number' => uniqid("st", true),
'line_items' => [
$item
]
]);
$data = [
'client_id' => $this->client->hashed_id,
'invoices' => [
[
'invoice_id' => $invoice->hashed_id,
'amount' => 20,
],
],
'credits' => [
[
'credit_id' => $credit->hashed_id,
'amount' => 20,
],
],
'date' => '2020/12/12',
];
$response = null;
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->postJson('/api/v1/payments?include=invoices', $data);
$arr = $response->json();
$response->assertStatus(200);
$payment_id = $arr['data']['id'];
$this->assertEquals(Credit::STATUS_APPLIED, $credit->fresh()->status_id);
$this->assertEquals(Invoice::STATUS_PAID, $invoice->fresh()->status_id);
$this->assertEquals(0, $credit->fresh()->balance);
$this->assertEquals(0, $invoice->fresh()->balance);
}
public function testStorePaymentWithCreditsThenDeletingInvoices() public function testStorePaymentWithCreditsThenDeletingInvoices()
{ {
$client = Client::factory()->create(['company_id' =>$this->company->id, 'user_id' => $this->user->id, 'balance' => 20, 'paid_to_date' => 0]); $client = Client::factory()->create(['company_id' =>$this->company->id, 'user_id' => $this->user->id, 'balance' => 20, 'paid_to_date' => 0]);