From 9d505a27c5898abebc36099a8355fbc500acc283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 7 Oct 2022 15:57:56 +0200 Subject: [PATCH 1/4] Typo fixes --- lang/en/texts.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/en/texts.php b/lang/en/texts.php index eda88d5f99..334cedf0a8 100644 --- a/lang/en/texts.php +++ b/lang/en/texts.php @@ -3414,7 +3414,7 @@ $LANG = array( 'credit_number_counter' => 'Credit Number Counter', 'reset_counter_date' => 'Reset Counter Date', 'counter_padding' => 'Counter Padding', - 'shared_invoice_quote_counter' => 'Shared Invoice Quote Counter', + 'shared_invoice_quote_counter' => 'Share Invoice Quote Counter', 'default_tax_name_1' => 'Default Tax Name 1', 'default_tax_rate_1' => 'Default Tax Rate 1', 'default_tax_name_2' => 'Default Tax Name 2', @@ -4199,7 +4199,7 @@ $LANG = array( 'client_id_number' => 'Client ID Number', 'count_minutes' => ':count Minutes', 'password_timeout' => 'Password Timeout', - 'shared_invoice_credit_counter' => 'Shared Invoice/Credit Counter', + 'shared_invoice_credit_counter' => 'Share Invoice/Credit Counter', 'activity_80' => ':user created subscription :subscription', 'activity_81' => ':user updated subscription :subscription', From 82d08ed60d89646df9e5de5db756349ad8b4da0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 7 Oct 2022 16:07:24 +0200 Subject: [PATCH 2/4] Add `Bulk Action` --- lang/en/texts.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lang/en/texts.php b/lang/en/texts.php index 334cedf0a8..e8d3de5448 100644 --- a/lang/en/texts.php +++ b/lang/en/texts.php @@ -4776,7 +4776,8 @@ $LANG = array( 'client_email' => 'Client Email', 'invoice_task_project' => 'Invoice Task Project', 'invoice_task_project_help' => 'Add the project to the invoice line items', - + 'bulk_action' => 'Bulk Action', + ); return $LANG; From dfe66559dc595a4eee1b58fea79507277a9b962b Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 9 Oct 2022 12:32:27 +1100 Subject: [PATCH 3/4] Fixes for Forte --- app/PaymentDrivers/Forte/CreditCard.php | 2 +- .../views/portal/ninja2020/gateways/forte/ach/pay.blade.php | 6 +++--- .../ninja2020/gateways/forte/credit_card/pay.blade.php | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/PaymentDrivers/Forte/CreditCard.php b/app/PaymentDrivers/Forte/CreditCard.php index 88d8007780..6558d2fe59 100644 --- a/app/PaymentDrivers/Forte/CreditCard.php +++ b/app/PaymentDrivers/Forte/CreditCard.php @@ -82,7 +82,7 @@ class CreditCard $this->forte->payment_hash->data = array_merge((array) $this->forte->payment_hash->data, $data); $this->forte->payment_hash->save(); - $data['gateway'] = $this; + $data['gateway'] = $this->forte; return render('gateways.forte.credit_card.pay', $data); } diff --git a/resources/views/portal/ninja2020/gateways/forte/ach/pay.blade.php b/resources/views/portal/ninja2020/gateways/forte/ach/pay.blade.php index 5dbb93fbd2..88b2097982 100644 --- a/resources/views/portal/ninja2020/gateways/forte/ach/pay.blade.php +++ b/resources/views/portal/ninja2020/gateways/forte/ach/pay.blade.php @@ -1,14 +1,14 @@ @extends('portal.ninja2020.layout.payments', ['gateway_title' => 'Bank Transfer', 'card_title' => 'Bank Transfer']) @section('gateway_head') - + @endsection @section('gateway_content')
@csrf - + @@ -43,7 +43,7 @@ @endsection @section('gateway_footer') - @if($gateway->forte->company_gateway->getConfigField('testMode')) + @if($gateway->company_gateway->getConfigField('testMode')) @else diff --git a/resources/views/portal/ninja2020/gateways/forte/credit_card/pay.blade.php b/resources/views/portal/ninja2020/gateways/forte/credit_card/pay.blade.php index 1cceb137f3..1e20311e7c 100644 --- a/resources/views/portal/ninja2020/gateways/forte/credit_card/pay.blade.php +++ b/resources/views/portal/ninja2020/gateways/forte/credit_card/pay.blade.php @@ -1,7 +1,7 @@ @extends('portal.ninja2020.layout.payments', ['gateway_title' => ctrans('texts.payment_type_credit_card'), 'card_title' => ctrans('texts.payment_type_credit_card')]) @section('gateway_head') - + @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@ @endsection @section('gateway_footer') - @if($gateway->forte->company_gateway->getConfigField('testMode')) + @if($gateway->company_gateway->getConfigField('testMode')) @else From e24bb1598bf0d9341f1dbd147eb1b7a1fd2fdd2e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 9 Oct 2022 12:32:54 +1100 Subject: [PATCH 4/4] V5.5.30 --- VERSION.txt | 2 +- config/ninja.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index ee46351da4..4c04b5719d 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.5.29 \ No newline at end of file +5.5.30 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index de1fd38ad0..8abbc7510b 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.5.29', - 'app_tag' => '5.5.29', + 'app_version' => '5.5.30', + 'app_tag' => '5.5.30', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),