Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 20:07:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5-develop' into v5-stable

Browse Source
This commit is contained in:
David Bomba 2021-03-12 15:14:44 +11:00
commit 014945bcda
13 changed files with 33366 additions and 33314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.example
View File

@ -25,7 +25,7 @@ DEMO_MODE=false
BROADCAST_DRIVER=log
LOG_CHANNEL=stack
CACHE_DRIVER=file
QUEUE_CONNECTION=database
QUEUE_CONNECTION=sync
SESSION_DRIVER=file
SESSION_LIFETIME=120
@ -51,7 +51,7 @@ TRUSTED_PROXIES=
NINJA_ENVIRONMENT=selfhost
PHANTOMJS_PDF_GENERATION=false
PHANTOMJS_PDF_GENERATION=true
PHANTOMJS_KEY='a-demo-key-with-low-quota-per-ip-address'
PHANTOMJS_SECRET=secret

2
VERSION.txt
View File

@ -1 +1 @@
5.1.19
5.1.20

10
app/DataMapper/EmailTemplateDefaults.php
View File

@ -123,7 +123,7 @@ class EmailTemplateDefaults
public static function emailInvoiceTemplate()
{
$invoice_message = '<p>'.self::transformText('invoice_message').'</p><p>$view_link</p>';
$invoice_message = '<p>'.self::transformText('invoice_message').'</p><div class="center">$view_link</div>';
return $invoice_message;
}
@ -135,7 +135,7 @@ class EmailTemplateDefaults
public static function emailQuoteTemplate()
{
$quote_message = '<p>'.self::transformText('quote_message').'</p><p>$view_link</p>';
$quote_message = '<p>'.self::transformText('quote_message').'</p><div class="center">$view_link</div>';
return $quote_message;
}
@ -147,21 +147,21 @@ class EmailTemplateDefaults
public static function emailPaymentTemplate()
{
$payment_message = '<p>'.self::transformText('payment_message').'</p><p>$view_link</p>';
$payment_message = '<p>'.self::transformText('payment_message').'</p><div class="center">$view_link</div>';
return $payment_message;
}
public static function emailCreditTemplate()
{
$credit_message = '<p>'.self::transformText('credit_message').'</p><p>$view_link</p>';
$credit_message = '<p>'.self::transformText('credit_message').'</p><div class="center">$view_link</div>';
return $credit_message;
}
public static function emailPaymentPartialTemplate()
{
$payment_message = '<p>'.self::transformText('payment_message').'</p><p>$view_link</p>';
$payment_message = '<p>'.self::transformText('payment_message').'</p><div class="center">$view_link</div>';
return $payment_message;
}

24
app/Helpers/Invoice/InvoiceSum.php
View File

@ -157,21 +157,21 @@ class InvoiceSum
{
$this->total += $this->total_taxes;
if (is_numeric($this->invoice->custom_value1)) {
$this->total += $this->invoice->custom_value1;
}
// if (is_numeric($this->invoice->custom_value1)) {
// $this->total += $this->invoice->custom_value1;
// }
if (is_numeric($this->invoice->custom_value2)) {
$this->total += $this->invoice->custom_value2;
}
// if (is_numeric($this->invoice->custom_value2)) {
// $this->total += $this->invoice->custom_value2;
// }
if (is_numeric($this->invoice->custom_value3)) {
$this->total += $this->invoice->custom_value3;
}
// if (is_numeric($this->invoice->custom_value3)) {
// $this->total += $this->invoice->custom_value3;
// }
if (is_numeric($this->invoice->custom_value4)) {
$this->total += $this->invoice->custom_value4;
}
// if (is_numeric($this->invoice->custom_value4)) {
// $this->total += $this->invoice->custom_value4;
// }
return $this;
}

24
app/Helpers/Invoice/InvoiceSumInclusive.php
View File

@ -166,21 +166,21 @@ class InvoiceSumInclusive
{
//$this->total += $this->total_taxes;
if (is_numeric($this->invoice->custom_value1)) {
$this->total += $this->invoice->custom_value1;
}
// if (is_numeric($this->invoice->custom_value1)) {
// $this->total += $this->invoice->custom_value1;
// }
if (is_numeric($this->invoice->custom_value2)) {
$this->total += $this->invoice->custom_value2;
}
// if (is_numeric($this->invoice->custom_value2)) {
// $this->total += $this->invoice->custom_value2;
// }
if (is_numeric($this->invoice->custom_value3)) {
$this->total += $this->invoice->custom_value3;
}
// if (is_numeric($this->invoice->custom_value3)) {
// $this->total += $this->invoice->custom_value3;
// }
if (is_numeric($this->invoice->custom_value4)) {
$this->total += $this->invoice->custom_value4;
}
// if (is_numeric($this->invoice->custom_value4)) {
// $this->total += $this->invoice->custom_value4;
// }
return $this;
}

7
app/Http/Controllers/ConnectedAccountController.php
View File

@ -134,10 +134,9 @@ class ConnectedAccountController extends BaseController
auth()->user()->save();
//$ct = CompanyUser::whereUserId(auth()->user()->id);
$ct = CompanyUser::whereUserId(auth()->user()->id);
return $this->listResponse($ct);
// return $this->listResponse(auth()->user());
//return $this->listResponse($ct);
return $this->listResponse(auth()->user());
}
return response()

2
config/ninja.php
View File

@ -13,7 +13,7 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', ''),
'app_version' => '5.1.19',
'app_version' => '5.1.20',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false),

2
public/flutter_service_worker.js vendored
View File

@ -30,7 +30,7 @@ const RESOURCES = {
"assets/packages/material_design_icons_flutter/lib/fonts/materialdesignicons-webfont.ttf": "3e722fd57a6db80ee119f0e2c230ccff",
"assets/FontManifest.json": "cf3c681641169319e61b61bd0277378f",
"/": "23224b5e03519aaa87594403d54412cf",
"main.dart.js": "4f262274e979ed7c414d394fc5f0baea",
"main.dart.js": "e8bf48c946bec2ef549453166318a7be",
"version.json": "b7c8971e1ab5b627fd2a4317c52b843e",
"favicon.png": "dca91c54388f52eded692718d5a98b8b"
};

66580
public/main.dart.js vendored
View File

File diff suppressed because one or more lines are too long

2
resources/lang/en/texts.php
View File

@ -1976,7 +1976,7 @@ $LANG = array(
'require_invoice_signature_help' => 'Require client to provide their signature.',
'require_quote_signature' => 'Quote Signature',
'require_quote_signature_help' => 'Require client to provide their signature.',
'i_agree' => 'I Agree To The Terms',
'i_agree' => 'I Agree To',
'sign_here' => 'Please sign here:',
'authorization' => 'Authorization',
'signed' => 'Signed',

17
resources/views/email/template/master.blade.php
View File

@ -11,9 +11,10 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title></title>
</head>
<style>
<style type="text/css">
:root {
--primary-color: {{ isset($settings) ? $settings->primary_color : '#4caf50' }};
}
@ -46,6 +47,18 @@
#email-content a, .link {
word-break: break-all;
}
#email-content .button {
position: center;
}
.center {
text-align: center;
}
p {
padding-bottom: 5px;
}
</style>
<body style="margin: 0; padding: 0; background-color: {{ $design == 'light' ? '#F9FAFB' : '#111827' }};">
@ -63,7 +76,7 @@
<td bgcolor="{{ $design == 'light' ? '#ffffff' : '#1F2937'}}" style="padding: 40px 30px 40px 30px;">
<table cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
<tr>
<td align="center" id="email-content">
<td id="email-content">
@yield('greeting')
{{ $slot }}

4
resources/views/setup/index.blade.php
View File

@ -58,13 +58,13 @@
<div class="mt-4 text-sm">
<input type="checkbox" class="form-checkbox mr-2" name="terms_of_service" required>
<span>{{ ctrans('texts.i_agree') }}
<a class="button-link" href="https://www.invoiceninja.com/self-hosting-terms-service/">{{ ctrans('texts.terms_of_service') }}</a>
<a class="button-link text-blue-600" target="_blank" href="https://www.invoiceninja.com/self-hosting-terms-service/">{{ ctrans('texts.terms_of_service') }}</a>
</span>
</div>
<div class="mt-2 text-sm">
<input type="checkbox" class="form-checkbox mr-2" name="privacy_policy" required>
<span>{{ ctrans('texts.i_agree') }}
<a class="button-link" href="https://www.invoiceninja.com/self-hosting-privacy-data-control/">{{ ctrans('texts.privacy_policy') }}</a>
<a class="button-link text-blue-600" target="_blank" href="https://www.invoiceninja.com/self-hosting-privacy-data-control/">{{ ctrans('texts.privacy_policy') }}</a>
</span>
</div>

2
tests/Feature/BillingSubscriptionApiTest.php
View File

@ -45,7 +45,7 @@ class BillingSubscriptionApiTest extends TestCase
Model::reguard();
}
public function testExpenseGet()
public function testBillingSubscriptionsGet()
{
$product = Product::factory()->create([
'company_id' => $this->company->id,