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

Merge pull request #6764 from turbo124/v5-develop

Browse Source 
v5.3.19
This commit is contained in:
David Bomba 2021-10-04 21:13:14 +11:00 committed by GitHub
commit 77bac77df3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.3.18 5.3.19

2
app/PaymentDrivers/BasePaymentDriver.php
View File

@ -56,7 +56,7 @@ class BasePaymentDriver
protected $refundable = false; protected $refundable = false;
/* Token billing */ /* Token billing */
protected $token_billing = false; public $token_billing = false;
/* Authorise payment methods */ /* Authorise payment methods */
protected $can_authorise_credit_card = false; protected $can_authorise_credit_card = false;

14
app/Services/Invoice/AutoBillInvoice.php
View File

@ -291,23 +291,13 @@ class AutoBillInvoice extends AbstractService
* @param float $amount The amount to charge * @param float $amount The amount to charge
* @return ClientGatewayToken The client gateway token * @return ClientGatewayToken The client gateway token
*/ */
// private function
// {
// $gateway_tokens = $this->client->gateway_tokens()->orderBy('is_default', 'DESC')->get();
// foreach ($gateway_tokens as $gateway_token) {
// if ($this->validGatewayLimits($gateway_token, $amount)) {
// return $gateway_token;
// }
// }
// }
public function getGateway($amount) public function getGateway($amount)
{ {
//get all client gateway tokens and set the is_default one to the first record //get all client gateway tokens and set the is_default one to the first record
//$gateway_tokens = $this->client->gateway_tokens()->orderBy('is_default', 'DESC'); $gateway_tokens = $this->client->gateway_tokens()->orderBy('is_default', 'DESC');
$gateway_tokens = $this->client->gateway_tokens; // $gateway_tokens = $this->client->gateway_tokens;
$filtered_gateways = $gateway_tokens->filter(function ($gateway_token) use($amount) { $filtered_gateways = $gateway_tokens->filter(function ($gateway_token) use($amount) {

3
app/Services/Payment/RefundPayment.php
View File

@ -242,7 +242,8 @@ class RefundPayment
$invoice->service()->updateBalance($refunded_invoice['amount'])->save(); $invoice->service()->updateBalance($refunded_invoice['amount'])->save();
$invoice->ledger()->updateInvoiceBalance($refunded_invoice['amount'], "Refund of payment # {$this->payment->number}")->save(); $invoice->ledger()->updateInvoiceBalance($refunded_invoice['amount'], "Refund of payment # {$this->payment->number}")->save();
$invoice->paid_to_date -= $refunded_invoice['amount'];
if ($invoice->amount == $invoice->balance) { if ($invoice->amount == $invoice->balance) {
$invoice->service()->setStatus(Invoice::STATUS_SENT); $invoice->service()->setStatus(Invoice::STATUS_SENT);
} else { } else {

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.18', 'app_version' => '5.3.19',
'app_tag' => '5.3.18', 'app_tag' => '5.3.19',
'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', ''),

5
resources/views/errors/guest.blade.php Normal file
View File

@ -0,0 +1,5 @@
@extends('portal.ninja2020.layout.error')
@section('title', __('Server Error'))
@section('code', '500')
@section('message', __($message) ?: 'System Error')