diff --git a/VERSION.txt b/VERSION.txt index 2eb4062f45..6d00630e87 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.3.68 \ No newline at end of file +5.3.69 \ No newline at end of file diff --git a/app/PaymentDrivers/StripePaymentDriver.php b/app/PaymentDrivers/StripePaymentDriver.php index 037a1397b2..f693459e7a 100644 --- a/app/PaymentDrivers/StripePaymentDriver.php +++ b/app/PaymentDrivers/StripePaymentDriver.php @@ -169,7 +169,7 @@ class StripePaymentDriver extends BaseDriver && $this->client->currency() && ($this->client->currency()->code == 'EUR') && isset($this->client->country) - && in_array($this->client->country->iso_3166_3, ['AUS', 'FRA','DNK', 'DEU', 'ITA', 'LUX', 'NOR', 'SVN', 'GBR', 'EST', 'GRC', 'JPN', 'PRT', 'ESP', 'USA', 'BEL', 'FIN'])) { // TODO: More has to be added https://stripe.com/docs/payments/sepa-debit + && in_array($this->client->country->iso_3166_3, ['AUT', 'BEL', 'CHE', 'CYP', 'CZE', 'BGR', 'DNK', 'DEU', 'ESP', 'FIN', 'FRA', 'HUN', 'IRL', 'ITA', 'LVA', 'LUX', 'LTA', 'MLT', 'NLD', 'NOR', 'POL', 'ROU', 'SVK', 'SVN', 'SWE', 'GBR', 'EST', 'GRC', 'PRT' ])) { // TODO: More has to be added https://stripe.com/docs/payments/sepa-debit $types[] = GatewayType::SEPA; } diff --git a/config/ninja.php b/config/ninja.php index 8ed165ce9c..c611199a95 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -14,8 +14,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => '5.3.68', - 'app_tag' => '5.3.68', + 'app_version' => '5.3.69', + 'app_tag' => '5.3.69', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''), diff --git a/tests/Feature/CompanyGatewayTest.php b/tests/Feature/CompanyGatewayTest.php index d8fdd7f8f1..bff96fbf9b 100644 --- a/tests/Feature/CompanyGatewayTest.php +++ b/tests/Feature/CompanyGatewayTest.php @@ -127,7 +127,7 @@ class CompanyGatewayTest extends TestCase $data[1]['fee_tax_rate2'] = 0; $data[1]['fee_tax_name3'] = ''; $data[1]['fee_tax_rate3'] = 0; - $data[1]['adjust_fee_percent'] = true; + $data[1]['adjust_fee_percent'] = false; $data[1]['fee_cap'] = 0; $data[1]['is_enabled'] = true; @@ -166,7 +166,7 @@ class CompanyGatewayTest extends TestCase $data[1]['fee_tax_rate2'] = 10; $data[1]['fee_tax_name3'] = 'GST'; $data[1]['fee_tax_rate3'] = 10; - $data[1]['adjust_fee_percent'] = true; + $data[1]['adjust_fee_percent'] = false; $data[1]['fee_cap'] = 0; $data[1]['is_enabled'] = true;