diff --git a/VERSION.txt b/VERSION.txt index ee46351da47b..4c04b5719d54 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 de1fd38ad08e..8abbc7510ba6 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', ''), diff --git a/lang/en/texts.php b/lang/en/texts.php index eda88d5f99a6..e8d3de54481c 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', @@ -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; 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 400c1833948d..88b209798220 100644 --- a/resources/views/portal/ninja2020/gateways/forte/ach/pay.blade.php +++ b/resources/views/portal/ninja2020/gateways/forte/ach/pay.blade.php @@ -43,7 +43,7 @@ @endsection @section('gateway_footer') - @if($gateway->forte->company_gateway->getConfigField('testMode')) + @if($gateway->company_gateway->getConfigField('testMode')) @else