Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 16:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

Browse Source
This commit is contained in:
David Bomba 2022-05-21 20:00:49 +10:00
commit 4500c1d6fd
4 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Requests/Report/GenericReportRequest.php
View File

@ -36,4 +36,15 @@ class GenericReportRequest extends Request
'send_email' => 'required|bool', 'send_email' => 'required|bool',
]; ];
} }
public function prepareForValidation()
{
$input = $this->all();
if(!array_key_exists('report_keys', $input))
$input['report_keys'] = [];
$this->replace($input);
}
} }

22
app/Mail/MigrationCompleted.php
View File

@ -47,6 +47,28 @@ class MigrationCompleted extends Mailable
$data['check_data'] = $this->check_data ?: ''; $data['check_data'] = $this->check_data ?: '';
$data['logo'] = $this->company->present()->logo(); $data['logo'] = $this->company->present()->logo();
$data = array_merge($data, [
'logo' => $this->company->present()->logo(),
'settings' => $this->company->settings,
'company' => $this->company,
'client_count' => $this->company->clients()->count(),
'product_count' => $this->company->products()->count(),
'invoice_count' => $this->company->invoices()->count(),
'quote_count' => $this->company->quotes()->count(),
'credit_count' => $this->company->credits()->count(),
'project_count' => $this->company->projects()->count(),
'task_count' => $this->company->tasks()->count(),
'vendor_count' => $this->company->vendors()->count(),
'payment_count' => $this->company->payments()->count(),
'recurring_invoice_count' => $this->company->recurring_invoices()->count(),
'expense_count' => $this->company->expenses()->count(),
'company_gateway_count' => $this->company->company_gateways()->count(),
'client_gateway_token_count' => $this->company->client_gateway_tokens()->count(),
'tax_rate_count' => $this->company->tax_rates()->count(),
'document_count' => $this->company->documents()->count(),
]);
$result = $this->from(config('mail.from.address'), config('mail.from.name')) $result = $this->from(config('mail.from.address'), config('mail.from.name'))
->text('email.import.completed_text', $data) ->text('email.import.completed_text', $data)
->view('email.import.completed', $data); ->view('email.import.completed', $data);

2
routes/api.php
View File

@ -153,7 +153,7 @@ Route::group(['middleware' => ['throttle:100,1', 'api_db', 'token_auth', 'locale
Route::post('recurring_quotes/bulk', 'RecurringQuoteController@bulk')->name('recurring_quotes.bulk'); Route::post('recurring_quotes/bulk', 'RecurringQuoteController@bulk')->name('recurring_quotes.bulk');
Route::put('recurring_quotes/{recurring_quote}/upload', 'RecurringQuoteController@upload'); Route::put('recurring_quotes/{recurring_quote}/upload', 'RecurringQuoteController@upload');
Route::post('refresh', 'Auth\LoginController@refresh')->middleware('throttle:30,1'); Route::post('refresh', 'Auth\LoginController@refresh')->middleware('throttle:50,1');
Route::post('reports/clients', 'Reports\ClientReportController'); Route::post('reports/clients', 'Reports\ClientReportController');
Route::post('reports/contacts', 'Reports\ClientContactReportController'); Route::post('reports/contacts', 'Reports\ClientContactReportController');

2
tests/Feature/Export/ClientCsvTest.php
View File

@ -45,6 +45,7 @@ class ClientCsvTest extends TestCase
$data = [ $data = [
"date_range" => "this_year", "date_range" => "this_year",
"report_keys" => [], "report_keys" => [],
"send_email" => false
]; ];
$response = $this->withHeaders([ $response = $this->withHeaders([
@ -62,6 +63,7 @@ class ClientCsvTest extends TestCase
$data = [ $data = [
"date_range" => "this_year", "date_range" => "this_year",
"report_keys" => [], "report_keys" => [],
"send_email" => false
]; ];
$response = $this->withHeaders([ $response = $this->withHeaders([