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

working on refactor of company gateway fees

Browse Source
This commit is contained in:
David Bomba 2020-10-12 22:02:02 +11:00
parent 65a1f150d5
commit 1eadbde544
4 changed files with 89 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ClientPortal/PaymentController.php
View File

@ -155,7 +155,7 @@ class PaymentController extends Controller
});
}
$payment_methods = auth()->user()->client->getPaymentMethods(array_sum(array_column($payable_invoices, 'amount_with_fee')));
//$payment_methods = auth()->user()->client->getPaymentMethods(array_sum(array_column($payable_invoices, 'amount_with_fee')));
$payment_method_id = request()->input('payment_method_id');

19
app/Models/Client.php
View File

@ -511,15 +511,18 @@ class Client extends BaseModel implements HasLocalePreference
foreach ($gateways as $gateway) {
foreach ($gateway->driver($this)->gatewayTypes() as $type) {
if(property_exists($gateway, 'fees_and_limits') && property_exists($gateway->fees_and_limits, $type)){
$fees_and_limits_for_payment_type = $gateway->fees_and_limits->{$type};
// info(print_r($gateway,1));
// info($type);
if(property_exists($gateway->fees_and_limits, $type))
{
if($this->validGatewayForAmount($gateway->fees_and_limits->{$type}, $amount)){
$payment_methods[] = [$gateway->id => $type];
}
}
else
continue;
if($this->validGatewayForAmount($fees_and_limits_for_payment_type, $amount))
else
{
$payment_methods[] = [$gateway->id => $type];
}
}
}
@ -548,7 +551,7 @@ class Client extends BaseModel implements HasLocalePreference
return $payment_urls;
}
private function validateFeesAndLimits($fees_and_limits_for_payment_type, $amount) :bool
public function validGatewayForAmount($fees_and_limits_for_payment_type, $amount) :bool
{
if (isset($fees_and_limits_for_payment_type)) {
$fees_and_limits = $fees_and_limits_for_payment_type;

9
app/Models/CompanyGateway.php
View File

@ -232,17 +232,8 @@ class CompanyGateway extends BaseModel
return false;
}
info(print_r($this->fees_and_limits,1));
return $this->fees_and_limits->{$gateway_type_id};
// $fees_and_limits = new \stdClass;
// foreach ($this->fees_and_limits as $key => $value) {
// $fees_and_limits = $this->fees_and_limits->{$key};
// }
// return $fees_and_limits;
}
/**

103
tests/Feature/CompanyGatewayResolutionTest.php
View File

@ -32,6 +32,7 @@ use Illuminate\Support\Carbon;
use Illuminate\Validation\ValidationException;
use Tests\MockAccountData;
use Tests\TestCase;
use Illuminate\Support\Facades\Crypt;
/**
* @test
@ -107,31 +108,31 @@ class CompanyGatewayResolutionTest extends TestCase
$this->cg->fees_and_limits = $data;
$this->cg->save();
$data = [];
$data[2]['min_limit'] = -1;
$data[2]['max_limit'] = -1;
$data[2]['fee_amount'] = 1.00;
$data[2]['fee_percent'] = 1;
$data[2]['fee_tax_name1'] = 'GST';
$data[2]['fee_tax_rate1'] = 10;
$data[2]['fee_tax_name2'] = 'GST';
$data[2]['fee_tax_rate2'] = 10;
$data[2]['fee_tax_name3'] = 'GST';
$data[2]['fee_tax_rate3'] = 10;
$data[2]['fee_cap'] = 0;
// $data = [];
// $data[2]['min_limit'] = -1;
// $data[2]['max_limit'] = -1;
// $data[2]['fee_amount'] = 1.00;
// $data[2]['fee_percent'] = 1;
// $data[2]['fee_tax_name1'] = 'GST';
// $data[2]['fee_tax_rate1'] = 10;
// $data[2]['fee_tax_name2'] = 'GST';
// $data[2]['fee_tax_rate2'] = 10;
// $data[2]['fee_tax_name3'] = 'GST';
// $data[2]['fee_tax_rate3'] = 10;
// $data[2]['fee_cap'] = 0;
//ensable ach here
$this->cg1 = new CompanyGateway;
$this->cg1->company_id = $this->company->id;
$this->cg1->user_id = $this->user->id;
$this->cg1->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23';
$this->cg1->require_cvv = true;
$this->cg1->show_billing_address = true;
$this->cg1->show_shipping_address = true;
$this->cg1->update_details = true;
$this->cg1->config = encrypt(config('ninja.testvars.stripe'));
$this->cg1->fees_and_limits = $data;
$this->cg1->save();
// //ensable ach here
// $this->cg1 = new CompanyGateway;
// $this->cg1->company_id = $this->company->id;
// $this->cg1->user_id = $this->user->id;
// $this->cg1->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23';
// $this->cg1->require_cvv = true;
// $this->cg1->show_billing_address = true;
// $this->cg1->show_shipping_address = true;
// $this->cg1->update_details = true;
// $this->cg1->config = encrypt(config('ninja.testvars.stripe'));
// $this->cg1->fees_and_limits = $data;
// $this->cg1->save();
}
/**
@ -140,8 +141,6 @@ class CompanyGatewayResolutionTest extends TestCase
public function testGatewayResolution()
{
//i want to test here resolution of bank_transfers inside and outside of fees and limits.
$fee = $this->cg->calcGatewayFee(10, false, GatewayType::CREDIT_CARD);
$this->assertEquals(0.2, $fee);
@ -151,4 +150,56 @@ class CompanyGatewayResolutionTest extends TestCase
$this->assertEquals(0.1, $fee);
}
/**
* @covers \App|Models\Client::validGatewayForAmount()
*/
public function testValidationForGatewayAmount()
{
$this->assertTrue($this->client->validGatewayForAmount($this->cg->fees_and_limits->{1}, 10));
$this->assertTrue($this->client->validGatewayForAmount($this->cg->fees_and_limits->{2}, 10));
}
public function testAvailablePaymentMethodsCount()
{
$amount = 10;
$payment_methods = [];
$this->assertInstanceOf("\\stdClass", $this->cg->fees_and_limits);
$this->assertObjectHasAttribute('min_limit',$this->cg->fees_and_limits->{1});
foreach ($this->cg->driver($this->client)->gatewayTypes() as $type)
{
if(property_exists($this->cg->fees_and_limits, $type))
{
if($this->client->validGatewayForAmount($this->cg->fees_and_limits->{$type}, $amount)){
info("valid gateways");
$payment_methods[] = [$this->cg->id => $type];
}
}
else
{
$payment_methods[] = [$this->cg->id => $type];
}
}
$this->assertEquals(3, count($payment_methods));
}
public function testAddAchBackIntoMethods()
{
$this->assertEquals(3, count($this->cg->driver($this->client)->gatewayTypes()));
$cg_config = json_decode(decrypt($this->cg->config));
$cg_config->enable_ach = "1";
$this->cg->config = encrypt(json_encode($cg_config));
$this->cg->save();
$this->assertEquals(4, count($this->cg->driver($this->client)->gatewayTypes()));
info(print_r($this->client->getPaymentMethods(10),1));
}
}