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

Version bump for checkout refactor + dependency update

Browse Source
This commit is contained in:
David Bomba 2022-06-16 11:51:42 +10:00
parent 63468a1669
commit 6444ed02ae
4 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.3.100 5.4.0

3
app/Http/Requests/Gateways/Checkout3ds/Checkout3dsRequest.php
View File

@ -39,6 +39,7 @@ class Checkout3dsRequest extends FormRequest
public function getCompany() public function getCompany()
{ {
MultiDB::findAndSetDbByCompanyKey($this->company_key); MultiDB::findAndSetDbByCompanyKey($this->company_key);
return Company::where('company_key', $this->company_key)->first(); return Company::where('company_key', $this->company_key)->first();
} }
@ -58,6 +59,8 @@ class Checkout3dsRequest extends FormRequest
public function getClient() public function getClient()
{ {
MultiDB::findAndSetDbByCompanyKey($this->company_key);
return Client::withTrashed()->find($this->getPaymentHash()->data->client_id); return Client::withTrashed()->find($this->getPaymentHash()->data->client_id);
} }
} }

45
app/PaymentDrivers/CheckoutComPaymentDriver.php
View File

@ -255,44 +255,31 @@ class CheckoutComPaymentDriver extends BaseDriver
} catch (CheckoutApiException $e) { } catch (CheckoutApiException $e) {
// API error // API error
nlog($e);
$request_id = $e->request_id; $request_id = $e->request_id;
$http_status_code = $e->http_status_code; $http_status_code = $e->http_status_code;
$error_details = $e->error_details; $error_details = $e->error_details;
} catch (CheckoutArgumentException $e) { } catch (CheckoutArgumentException $e) {
// Bad arguments // Bad arguments
nlog($e);
return [
'transaction_reference' => null,
'transaction_response' => json_encode($e->getMessage()),
'success' => false,
'description' => $e->getMessage(),
'code' => $e->getCode(),
];
} catch (CheckoutAuthorizationException $e) { } catch (CheckoutAuthorizationException $e) {
// Bad Invalid authorization // Bad Invalid authorization
nlog($e);
return [
'transaction_reference' => null,
'transaction_response' => json_encode($e->getMessage()),
'success' => false,
'description' => $e->getMessage(),
'code' => $e->getCode(),
];
} }
// $checkout_payment = new Refund($payment->transaction_reference);
// // try {
// // $refund = $this->gateway->payments()->refund($checkout_payment);
// // $checkout_payment = $this->gateway->payments()->details($refund->id);
// // $response = ['refund_response' => $refund, 'checkout_payment_fetch' => $checkout_payment];
// // return [
// // 'transaction_reference' => $refund->action_id,
// // 'transaction_response' => json_encode($response),
// // 'success' => $checkout_payment->status == 'Refunded',
// // 'description' => $checkout_payment->status,
// // 'code' => $checkout_payment->http_code,
// // ];
// // } catch (CheckoutApiException $e) {
// // return [
// // 'transaction_reference' => null,
// // 'transaction_response' => json_encode($e->getMessage()),
// // 'success' => false,
// // 'description' => $e->getMessage(),
// // 'code' => $e->getCode(),
// // ];
// // }
} }
public function getCustomer() public function getCustomer()

4
config/ninja.php
View File

@ -14,8 +14,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.3.100', 'app_version' => '5.4.0',
'app_tag' => '5.3.100', 'app_tag' => '5.4.0',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''), 'api_secret' => env('API_SECRET', ''),