Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-02 19:04:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for payment validations (#3272)

Browse Source 
* Minor fixes

* fixes for tests
This commit is contained in:
David Bomba 2020-01-31 08:15:13 +11:00 committed by GitHub
parent cdf22f6a1f
commit a3b9dd67a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/ValidationRules/PaymentAmountsBalanceRule.php
View File

@ -52,7 +52,7 @@ class PaymentAmountsBalanceRule implements Rule
return true; return true;
if(request()->has('amount') && request()->input('amount') == 0) if(request()->has('amount') && request()->input('amount') == 0)
return true return true;
$payment_amounts = 0; $payment_amounts = 0;
$invoice_amounts = 0; $invoice_amounts = 0;

2
tests/Feature/PaymentTest.php
View File

@ -1068,7 +1068,7 @@ class PaymentTest extends TestCase
} }
$response->assertStatus(200);
} }
} }

49
tests/Feature/RefundTest.php
View File

@ -53,7 +53,10 @@ class RefundTest extends TestCase
} }
/**
* Test that a simple payment of $50
* is able to be refunded.
*/
public function testBasicRefundValidation() public function testBasicRefundValidation()
{ {
$client = ClientFactory::create($this->company->id, $this->user->id); $client = ClientFactory::create($this->company->id, $this->user->id);
@ -77,12 +80,6 @@ class RefundTest extends TestCase
$data = [ $data = [
'amount' => 50, 'amount' => 50,
'client_id' => $client->hashed_id, 'client_id' => $client->hashed_id,
// 'invoices' => [
// [
// 'invoice_id' => $this->invoice->hashed_id,
// 'amount' => $this->invoice->amount
// ],
// ],
'date' => '2020/12/12', 'date' => '2020/12/12',
]; ];
@ -107,12 +104,6 @@ class RefundTest extends TestCase
$data = [ $data = [
'id' => $this->encodePrimaryKey($payment->id), 'id' => $this->encodePrimaryKey($payment->id),
'amount' => 50, 'amount' => 50,
// 'invoices' => [
// [
// 'invoice_id' => $this->invoice->hashed_id,
// 'amount' => $this->invoice->amount
// ],
// ],
'date' => '2020/12/12', 'date' => '2020/12/12',
]; ];
@ -138,11 +129,15 @@ class RefundTest extends TestCase
$this->assertEquals(50, $arr['data']['refunded']); $this->assertEquals(50, $arr['data']['refunded']);
$this->assertEquals(Payment::STATUS_REFUNDED, $arr['data']['status_id']); $this->assertEquals(Payment::STATUS_REFUNDED, $arr['data']['status_id']);
// $activity = Activity::wherePaymentId($payment->id)->whereActivityTypeId(Activity::REFUNDED_PAYMENT)->first();
// $this->assertNotNull($activity);
} }
/**
* Test that a payment with Invoices
* requires a refund with invoices specified.
*
* Should produce a validation error if
* no invoices are specified in the refund
*/
public function testRefundValidationNoInvoicesProvided() public function testRefundValidationNoInvoicesProvided()
{ {
$client = ClientFactory::create($this->company->id, $this->user->id); $client = ClientFactory::create($this->company->id, $this->user->id);
@ -199,12 +194,6 @@ class RefundTest extends TestCase
$data = [ $data = [
'id' => $this->encodePrimaryKey($payment->id), 'id' => $this->encodePrimaryKey($payment->id),
'amount' => 50, 'amount' => 50,
// 'invoices' => [
// [
// 'invoice_id' => $this->invoice->hashed_id,
// 'amount' => $this->invoice->amount
// ],
// ],
'date' => '2020/12/12', 'date' => '2020/12/12',
]; ];
@ -230,7 +219,10 @@ class RefundTest extends TestCase
} }
/**
* Test that a refund with invoices provided
* passes.
*/
public function testRefundValidationWithValidInvoiceProvided() public function testRefundValidationWithValidInvoiceProvided()
{ {
$client = ClientFactory::create($this->company->id, $this->user->id); $client = ClientFactory::create($this->company->id, $this->user->id);
@ -307,6 +299,9 @@ class RefundTest extends TestCase
} }
/**
* Test Validation with incorrect invoice refund amounts
*/
public function testRefundValidationWithInValidInvoiceRefundedAmount() public function testRefundValidationWithInValidInvoiceRefundedAmount()
{ {
$client = ClientFactory::create($this->company->id, $this->user->id); $client = ClientFactory::create($this->company->id, $this->user->id);
@ -391,6 +386,10 @@ class RefundTest extends TestCase
} }
/**
* Tests refund when providing an invoice
* not related to the payment
*/
public function testRefundValidationWithInValidInvoiceProvided() public function testRefundValidationWithInValidInvoiceProvided()
{ {
$client = ClientFactory::create($this->company->id, $this->user->id); $client = ClientFactory::create($this->company->id, $this->user->id);
@ -489,4 +488,8 @@ class RefundTest extends TestCase
} }
/*Additional scenarios*/
/*Test refunds where payments include credits*/
} }