From 72a31eaea60c106a13dcd79a6c2cfaa059a057c6 Mon Sep 17 00:00:00 2001 From: Nikola Cirkovic Date: Wed, 18 May 2022 01:59:25 +0200 Subject: [PATCH 1/7] INA-3 | Blade files for email content --- resources/views/email/admin/download_report.blade.php | 7 +++++++ resources/views/email/admin/download_report_text.blade.php | 4 ++++ 2 files changed, 11 insertions(+) create mode 100644 resources/views/email/admin/download_report.blade.php create mode 100644 resources/views/email/admin/download_report_text.blade.php diff --git a/resources/views/email/admin/download_report.blade.php b/resources/views/email/admin/download_report.blade.php new file mode 100644 index 000000000000..c5b2c385ea3e --- /dev/null +++ b/resources/views/email/admin/download_report.blade.php @@ -0,0 +1,7 @@ +@component('email.template.admin', ['logo' => $logo, 'settings' => $settings]) +
+

{{ ctrans('texts.download_files') }}

+

{{ ctrans('texts.download_report_description') }}

+ +
+@endcomponent diff --git a/resources/views/email/admin/download_report_text.blade.php b/resources/views/email/admin/download_report_text.blade.php new file mode 100644 index 000000000000..c63d95308b30 --- /dev/null +++ b/resources/views/email/admin/download_report_text.blade.php @@ -0,0 +1,4 @@ +{!! ctrans('texts.download_files') !!} + +{!! ctrans('texts.download_report_description') !!} + From c7cde8b96f0f63194e707c451d18e2f970b6d110 Mon Sep 17 00:00:00 2001 From: Nikola Cirkovic Date: Wed, 18 May 2022 02:00:51 +0200 Subject: [PATCH 2/7] INA-3 | Download report mailable --- app/Mail/DownloadReport.php | 54 +++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 app/Mail/DownloadReport.php diff --git a/app/Mail/DownloadReport.php b/app/Mail/DownloadReport.php new file mode 100644 index 000000000000..4650f661a6e3 --- /dev/null +++ b/app/Mail/DownloadReport.php @@ -0,0 +1,54 @@ +company = $company; + $this->csv = $csv; + $this->file_name = $file_name; + } + + /** + * Build the message. + * + * @return $this + */ + public function build() + { + App::setLocale($this->company->getLocale()); + + return $this->from(config('mail.from.address'), config('mail.from.name')) + ->subject(ctrans('texts.download_files')) + ->text('email.admin.download_report_text') + ->attachData($this->csv, $this->file_name, [ + 'mime' => 'text/csv', + ]) + ->view('email.admin.download_report', [ + 'logo' => $this->company->present()->logo, + 'whitelabel' => $this->company->account->isPaid() ? true : false, + 'settings' => $this->company->settings, + 'greeting' => $this->company->present()->name(), + ]); + } +} From a7283c65b61c9191c6ff0a687dd9ec6563be4110 Mon Sep 17 00:00:00 2001 From: Nikola Cirkovic Date: Wed, 18 May 2022 02:02:18 +0200 Subject: [PATCH 3/7] INA-3 | 'download_report_description' key added to en trans file --- resources/lang/en/texts.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index da13435fa880..edc9e2141401 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -4583,7 +4583,9 @@ $LANG = array( 'alternate_pdf_viewer' => 'Alternate PDF Viewer', 'alternate_pdf_viewer_help' => 'Improve scrolling over the PDF preview [BETA]', 'currency_cayman_island_dollar' => 'Cayman Island Dollar', - + 'download_report_description' => 'Please see attached file to check your report.' + + ); return $LANG; From 3b00edb3e2c199c00602fe612b6ef549f6a97682 Mon Sep 17 00:00:00 2001 From: Nikola Cirkovic Date: Wed, 18 May 2022 02:03:54 +0200 Subject: [PATCH 4/7] INA-3 | Job for creating csv report & sending it to the admin --- app/Jobs/Report/SendToAdmin.php | 54 +++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 app/Jobs/Report/SendToAdmin.php diff --git a/app/Jobs/Report/SendToAdmin.php b/app/Jobs/Report/SendToAdmin.php new file mode 100644 index 000000000000..9a015d789a3b --- /dev/null +++ b/app/Jobs/Report/SendToAdmin.php @@ -0,0 +1,54 @@ +company = $company; + $this->request = $request; + $this->report_class = $report_class; + $this->file_name = $file_name; + + } + + public function handle() + { + $export = new $this->report_class($this->company, $this->request); + $csv = $export->run(); + + $nmo = new NinjaMailerObject; + $nmo->mailable = new DownloadReport($this->company, $csv, $this->file_name); + $nmo->company = $this->company; + $nmo->settings = $this->company->settings; + $nmo->to_user = $this->company->owner(); + + NinjaMailerJob::dispatch($nmo); + + } +} From 9680b3540fbb4dc34547df4afa7a57b2b52c7bb2 Mon Sep 17 00:00:00 2001 From: Nikola Cirkovic Date: Wed, 18 May 2022 02:05:53 +0200 Subject: [PATCH 5/7] INA-3 | Modify controllers to use newly created Job for sending reports via mail --- .../Reports/ClientContactReportController.php | 9 ++++++--- app/Http/Controllers/Reports/ClientReportController.php | 7 ++++++- app/Http/Controllers/Reports/CreditReportController.php | 7 ++++++- .../Controllers/Reports/DocumentReportController.php | 7 ++++++- app/Http/Controllers/Reports/ExpenseReportController.php | 7 ++++++- .../Controllers/Reports/InvoiceItemReportController.php | 7 ++++++- app/Http/Controllers/Reports/InvoiceReportController.php | 8 ++++++-- app/Http/Controllers/Reports/PaymentReportController.php | 8 ++++++-- app/Http/Controllers/Reports/ProductReportController.php | 7 ++++++- app/Http/Controllers/Reports/ProfitAndLossController.php | 9 +++++++-- .../Controllers/Reports/QuoteItemReportController.php | 7 ++++++- app/Http/Controllers/Reports/QuoteReportController.php | 7 ++++++- .../Reports/RecurringInvoiceReportController.php | 7 ++++++- app/Http/Controllers/Reports/TaskReportController.php | 7 ++++++- 14 files changed, 85 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/Reports/ClientContactReportController.php b/app/Http/Controllers/Reports/ClientContactReportController.php index 5b3a20683b58..13d6c6ef6b36 100644 --- a/app/Http/Controllers/Reports/ClientContactReportController.php +++ b/app/Http/Controllers/Reports/ClientContactReportController.php @@ -14,6 +14,7 @@ namespace App\Http\Controllers\Reports; use App\Export\CSV\ContactExport; use App\Http\Controllers\BaseController; use App\Http\Requests\Report\GenericReportRequest; +use App\Jobs\Report\SendToAdmin; use App\Utils\Traits\MakesHash; use Illuminate\Http\Response; @@ -62,8 +63,11 @@ class ClientContactReportController extends BaseController */ public function __invoke(GenericReportRequest $request) { + if ($request->has('send_email') && $request->get('send_email')) { + SendToAdmin::dispatch(auth()->user()->company(), $request->all(), ContactExport::class, $this->filename); + return response([], 200); + } // expect a list of visible fields, or use the default - $export = new ContactExport(auth()->user()->company(), $request->all()); $csv = $export->run(); @@ -76,9 +80,8 @@ class ClientContactReportController extends BaseController return response()->streamDownload(function () use ($csv) { echo $csv; }, $this->filename, $headers); - + } - } diff --git a/app/Http/Controllers/Reports/ClientReportController.php b/app/Http/Controllers/Reports/ClientReportController.php index e65a59b5cb10..1d8e0ce1c6e6 100644 --- a/app/Http/Controllers/Reports/ClientReportController.php +++ b/app/Http/Controllers/Reports/ClientReportController.php @@ -14,6 +14,7 @@ namespace App\Http\Controllers\Reports; use App\Export\CSV\ClientExport; use App\Http\Controllers\BaseController; use App\Http\Requests\Report\GenericReportRequest; +use App\Jobs\Report\SendToAdmin; use App\Models\Client; use App\Utils\Traits\MakesHash; use Illuminate\Http\Response; @@ -63,6 +64,10 @@ class ClientReportController extends BaseController */ public function __invoke(GenericReportRequest $request) { + if ($request->has('send_email') && $request->get('send_email')) { + SendToAdmin::dispatch(auth()->user()->company(),$request->all(),ClientExport::class,$this->filename); + return response([], 200); + } // expect a list of visible fields, or use the default $export = new ClientExport(auth()->user()->company(), $request->all()); @@ -77,7 +82,7 @@ class ClientReportController extends BaseController return response()->streamDownload(function () use ($csv) { echo $csv; }, $this->filename, $headers); - + } diff --git a/app/Http/Controllers/Reports/CreditReportController.php b/app/Http/Controllers/Reports/CreditReportController.php index cc6fdd36e2ed..c158ca2237d4 100644 --- a/app/Http/Controllers/Reports/CreditReportController.php +++ b/app/Http/Controllers/Reports/CreditReportController.php @@ -14,6 +14,7 @@ namespace App\Http\Controllers\Reports; use App\Export\CSV\CreditExport; use App\Http\Controllers\BaseController; use App\Http\Requests\Report\GenericReportRequest; +use App\Jobs\Report\SendToAdmin; use App\Utils\Traits\MakesHash; use Illuminate\Http\Response; @@ -62,6 +63,10 @@ class CreditReportController extends BaseController */ public function __invoke(GenericReportRequest $request) { + if ($request->has('send_email') && $request->get('send_email')) { + SendToAdmin::dispatch(auth()->user()->company(),$request->all(),CreditExport::class,$this->filename); + return response([], 200); + } // expect a list of visible fields, or use the default $export = new CreditExport(auth()->user()->company(), $request->all()); @@ -76,7 +81,7 @@ class CreditReportController extends BaseController return response()->streamDownload(function () use ($csv) { echo $csv; }, $this->filename, $headers); - + } diff --git a/app/Http/Controllers/Reports/DocumentReportController.php b/app/Http/Controllers/Reports/DocumentReportController.php index d0f4d3801715..541f20b5f78c 100644 --- a/app/Http/Controllers/Reports/DocumentReportController.php +++ b/app/Http/Controllers/Reports/DocumentReportController.php @@ -14,6 +14,7 @@ namespace App\Http\Controllers\Reports; use App\Export\CSV\DocumentExport; use App\Http\Controllers\BaseController; use App\Http\Requests\Report\GenericReportRequest; +use App\Jobs\Report\SendToAdmin; use App\Utils\Traits\MakesHash; use Illuminate\Http\Response; @@ -62,6 +63,10 @@ class DocumentReportController extends BaseController */ public function __invoke(GenericReportRequest $request) { + if ($request->has('send_email') && $request->get('send_email')) { + SendToAdmin::dispatch(auth()->user()->company(),$request->all(),DocumentExport::class,$this->filename); + return response([], 200); + } // expect a list of visible fields, or use the default $export = new DocumentExport(auth()->user()->company(), $request->all()); @@ -76,7 +81,7 @@ class DocumentReportController extends BaseController return response()->streamDownload(function () use ($csv) { echo $csv; }, $this->filename, $headers); - + } diff --git a/app/Http/Controllers/Reports/ExpenseReportController.php b/app/Http/Controllers/Reports/ExpenseReportController.php index e797437fe37f..681ba1ab7821 100644 --- a/app/Http/Controllers/Reports/ExpenseReportController.php +++ b/app/Http/Controllers/Reports/ExpenseReportController.php @@ -14,6 +14,7 @@ namespace App\Http\Controllers\Reports; use App\Export\CSV\ExpenseExport; use App\Http\Controllers\BaseController; use App\Http\Requests\Report\GenericReportRequest; +use App\Jobs\Report\SendToAdmin; use App\Models\Client; use App\Utils\Traits\MakesHash; use Illuminate\Http\Response; @@ -63,6 +64,10 @@ class ExpenseReportController extends BaseController */ public function __invoke(GenericReportRequest $request) { + if ($request->has('send_email') && $request->get('send_email')) { + SendToAdmin::dispatch(auth()->user()->company(),$request->all(),ExpenseExport::class,$this->filename); + return response([], 200); + } // expect a list of visible fields, or use the default $export = new ExpenseExport(auth()->user()->company(), $request->all()); @@ -77,7 +82,7 @@ class ExpenseReportController extends BaseController return response()->streamDownload(function () use ($csv) { echo $csv; }, $this->filename, $headers); - + } diff --git a/app/Http/Controllers/Reports/InvoiceItemReportController.php b/app/Http/Controllers/Reports/InvoiceItemReportController.php index 2bba0e0694ff..1de8aedefdf2 100644 --- a/app/Http/Controllers/Reports/InvoiceItemReportController.php +++ b/app/Http/Controllers/Reports/InvoiceItemReportController.php @@ -14,6 +14,7 @@ namespace App\Http\Controllers\Reports; use App\Export\CSV\InvoiceItemExport; use App\Http\Controllers\BaseController; use App\Http\Requests\Report\GenericReportRequest; +use App\Jobs\Report\SendToAdmin; use App\Utils\Traits\MakesHash; use Illuminate\Http\Response; @@ -62,6 +63,10 @@ class InvoiceItemReportController extends BaseController */ public function __invoke(GenericReportRequest $request) { + if ($request->has('send_email') && $request->get('send_email')) { + SendToAdmin::dispatch(auth()->user()->company(),$request->all(),InvoiceItemExport::class,$this->filename); + return response([], 200); + } // expect a list of visible fields, or use the default $export = new InvoiceItemExport(auth()->user()->company(), $request->all()); @@ -76,7 +81,7 @@ class InvoiceItemReportController extends BaseController return response()->streamDownload(function () use ($csv) { echo $csv; }, $this->filename, $headers); - + } diff --git a/app/Http/Controllers/Reports/InvoiceReportController.php b/app/Http/Controllers/Reports/InvoiceReportController.php index b493bd3609a7..a9e0c585f4e8 100644 --- a/app/Http/Controllers/Reports/InvoiceReportController.php +++ b/app/Http/Controllers/Reports/InvoiceReportController.php @@ -14,6 +14,7 @@ namespace App\Http\Controllers\Reports; use App\Export\CSV\InvoiceExport; use App\Http\Controllers\BaseController; use App\Http\Requests\Report\GenericReportRequest; +use App\Jobs\Report\SendToAdmin; use App\Utils\Traits\MakesHash; use Illuminate\Http\Response; @@ -62,6 +63,10 @@ class InvoiceReportController extends BaseController */ public function __invoke(GenericReportRequest $request) { + if ($request->has('send_email') && $request->get('send_email')) { + SendToAdmin::dispatch(auth()->user()->company(),$request->all(),InvoiceExport::class,$this->filename); + return response([], 200); + } // expect a list of visible fields, or use the default $export = new InvoiceExport(auth()->user()->company(), $request->all()); @@ -76,9 +81,8 @@ class InvoiceReportController extends BaseController return response()->streamDownload(function () use ($csv) { echo $csv; }, $this->filename, $headers); - + } - } diff --git a/app/Http/Controllers/Reports/PaymentReportController.php b/app/Http/Controllers/Reports/PaymentReportController.php index 35e83bf60322..d62b4fe7a2ad 100644 --- a/app/Http/Controllers/Reports/PaymentReportController.php +++ b/app/Http/Controllers/Reports/PaymentReportController.php @@ -14,6 +14,7 @@ namespace App\Http\Controllers\Reports; use App\Export\CSV\PaymentExport; use App\Http\Controllers\BaseController; use App\Http\Requests\Report\GenericReportRequest; +use App\Jobs\Report\SendToAdmin; use App\Models\Client; use App\Utils\Traits\MakesHash; use Illuminate\Http\Response; @@ -63,6 +64,10 @@ class PaymentReportController extends BaseController */ public function __invoke(GenericReportRequest $request) { + if ($request->has('send_email') && $request->get('send_email')) { + SendToAdmin::dispatch(auth()->user()->company(), $request->all(), PaymentExport::class, $this->filename); + return response([], 200); + } // expect a list of visible fields, or use the default $export = new PaymentExport(auth()->user()->company(), $request->all()); @@ -77,9 +82,8 @@ class PaymentReportController extends BaseController return response()->streamDownload(function () use ($csv) { echo $csv; }, $this->filename, $headers); - + } - } diff --git a/app/Http/Controllers/Reports/ProductReportController.php b/app/Http/Controllers/Reports/ProductReportController.php index 1de907c127e9..732f842eab26 100644 --- a/app/Http/Controllers/Reports/ProductReportController.php +++ b/app/Http/Controllers/Reports/ProductReportController.php @@ -14,6 +14,7 @@ namespace App\Http\Controllers\Reports; use App\Export\CSV\ProductExport; use App\Http\Controllers\BaseController; use App\Http\Requests\Report\GenericReportRequest; +use App\Jobs\Report\SendToAdmin; use App\Models\Client; use App\Utils\Traits\MakesHash; use Illuminate\Http\Response; @@ -63,6 +64,10 @@ class ProductReportController extends BaseController */ public function __invoke(GenericReportRequest $request) { + if ($request->has('send_email') && $request->get('send_email')) { + SendToAdmin::dispatch(auth()->user()->company(),$request->all(),ProductExport::class,$this->filename); + return response([], 200); + } // expect a list of visible fields, or use the default $export = new ProductExport(auth()->user()->company(), $request->all()); @@ -77,7 +82,7 @@ class ProductReportController extends BaseController return response()->streamDownload(function () use ($csv) { echo $csv; }, $this->filename, $headers); - + } diff --git a/app/Http/Controllers/Reports/ProfitAndLossController.php b/app/Http/Controllers/Reports/ProfitAndLossController.php index 7c2ea81ef56b..4b4b4f70f240 100644 --- a/app/Http/Controllers/Reports/ProfitAndLossController.php +++ b/app/Http/Controllers/Reports/ProfitAndLossController.php @@ -14,6 +14,7 @@ namespace App\Http\Controllers\Reports; use App\Export\CSV\PaymentExport; use App\Http\Controllers\BaseController; use App\Http\Requests\Report\ProfitLossRequest; +use App\Jobs\Report\SendToAdmin; use App\Models\Client; use App\Services\Report\ProfitLoss; use App\Utils\Traits\MakesHash; @@ -64,13 +65,17 @@ class ProfitAndLossController extends BaseController */ public function __invoke(ProfitLossRequest $request) { + if ($request->has('send_email') && $request->get('send_email')) { + SendToAdmin::dispatch(auth()->user()->company(),$request->all(),ProfitLoss::class,$this->filename); + return response([], 200); + } // expect a list of visible fields, or use the default $pnl = new ProfitLoss(auth()->user()->company(), $request->all()); $pnl->build(); $csv = $pnl->getCsv(); - + $headers = array( 'Content-Disposition' => 'attachment', 'Content-Type' => 'text/csv', @@ -79,7 +84,7 @@ class ProfitAndLossController extends BaseController return response()->streamDownload(function () use ($csv) { echo $csv; }, $this->filename, $headers); - + } diff --git a/app/Http/Controllers/Reports/QuoteItemReportController.php b/app/Http/Controllers/Reports/QuoteItemReportController.php index f1700bf9dff8..aaa32bb66792 100644 --- a/app/Http/Controllers/Reports/QuoteItemReportController.php +++ b/app/Http/Controllers/Reports/QuoteItemReportController.php @@ -14,6 +14,7 @@ namespace App\Http\Controllers\Reports; use App\Export\CSV\QuoteItemExport; use App\Http\Controllers\BaseController; use App\Http\Requests\Report\GenericReportRequest; +use App\Jobs\Report\SendToAdmin; use App\Utils\Traits\MakesHash; use Illuminate\Http\Response; @@ -62,6 +63,10 @@ class QuoteItemReportController extends BaseController */ public function __invoke(GenericReportRequest $request) { + if ($request->has('send_email') && $request->get('send_email')) { + SendToAdmin::dispatch(auth()->user()->company(),$request->all(),QuoteItemExport::class,$this->filename); + return response([], 200); + } // expect a list of visible fields, or use the default $export = new QuoteItemExport(auth()->user()->company(), $request->all()); @@ -76,7 +81,7 @@ class QuoteItemReportController extends BaseController return response()->streamDownload(function () use ($csv) { echo $csv; }, $this->filename, $headers); - + } diff --git a/app/Http/Controllers/Reports/QuoteReportController.php b/app/Http/Controllers/Reports/QuoteReportController.php index 7b07d58a0004..b0fa10394c64 100644 --- a/app/Http/Controllers/Reports/QuoteReportController.php +++ b/app/Http/Controllers/Reports/QuoteReportController.php @@ -14,6 +14,7 @@ namespace App\Http\Controllers\Reports; use App\Export\CSV\QuoteExport; use App\Http\Controllers\BaseController; use App\Http\Requests\Report\GenericReportRequest; +use App\Jobs\Report\SendToAdmin; use App\Utils\Traits\MakesHash; use Illuminate\Http\Response; @@ -62,6 +63,10 @@ class QuoteReportController extends BaseController */ public function __invoke(GenericReportRequest $request) { + if ($request->has('send_email') && $request->get('send_email')) { + SendToAdmin::dispatch(auth()->user()->company(),$request->all(),QuoteExport::class,$this->filename); + return response([], 200); + } // expect a list of visible fields, or use the default $export = new QuoteExport(auth()->user()->company(), $request->all()); @@ -76,7 +81,7 @@ class QuoteReportController extends BaseController return response()->streamDownload(function () use ($csv) { echo $csv; }, $this->filename, $headers); - + } diff --git a/app/Http/Controllers/Reports/RecurringInvoiceReportController.php b/app/Http/Controllers/Reports/RecurringInvoiceReportController.php index bfafa677ecfe..f0d03da35e4c 100644 --- a/app/Http/Controllers/Reports/RecurringInvoiceReportController.php +++ b/app/Http/Controllers/Reports/RecurringInvoiceReportController.php @@ -14,6 +14,7 @@ namespace App\Http\Controllers\Reports; use App\Export\CSV\RecurringInvoiceExport; use App\Http\Controllers\BaseController; use App\Http\Requests\Report\GenericReportRequest; +use App\Jobs\Report\SendToAdmin; use App\Utils\Traits\MakesHash; use Illuminate\Http\Response; @@ -62,6 +63,10 @@ class RecurringInvoiceReportController extends BaseController */ public function __invoke(GenericReportRequest $request) { + if ($request->has('send_email') && $request->get('send_email')) { + SendToAdmin::dispatch(auth()->user()->company(),$request->all(),RecurringInvoiceExport::class,$this->filename); + return response([], 200); + } // expect a list of visible fields, or use the default $export = new RecurringInvoiceExport(auth()->user()->company(), $request->all()); @@ -76,7 +81,7 @@ class RecurringInvoiceReportController extends BaseController return response()->streamDownload(function () use ($csv) { echo $csv; }, $this->filename, $headers); - + } diff --git a/app/Http/Controllers/Reports/TaskReportController.php b/app/Http/Controllers/Reports/TaskReportController.php index ee1259105efb..23fda0a83ee3 100644 --- a/app/Http/Controllers/Reports/TaskReportController.php +++ b/app/Http/Controllers/Reports/TaskReportController.php @@ -14,6 +14,7 @@ namespace App\Http\Controllers\Reports; use App\Export\CSV\TaskExport; use App\Http\Controllers\BaseController; use App\Http\Requests\Report\GenericReportRequest; +use App\Jobs\Report\SendToAdmin; use App\Utils\Traits\MakesHash; use Illuminate\Http\Response; @@ -62,6 +63,10 @@ class TaskReportController extends BaseController */ public function __invoke(GenericReportRequest $request) { + if ($request->has('send_email') && $request->get('send_email')) { + SendToAdmin::dispatch(auth()->user()->company(),$request->all(),TaskExport::class,$this->filename); + return response([], 200); + } // expect a list of visible fields, or use the default $export = new TaskExport(auth()->user()->company(), $request->all()); @@ -76,7 +81,7 @@ class TaskReportController extends BaseController return response()->streamDownload(function () use ($csv) { echo $csv; }, $this->filename, $headers); - + } From c47ba04528a0bcc38a9b792c9b21dbb800660106 Mon Sep 17 00:00:00 2001 From: Nikola Cirkovic Date: Wed, 18 May 2022 02:28:45 +0200 Subject: [PATCH 6/7] INA-3 | Set response message in controllers --- app/Http/Controllers/Reports/ClientContactReportController.php | 2 +- app/Http/Controllers/Reports/ClientReportController.php | 2 +- app/Http/Controllers/Reports/CreditReportController.php | 2 +- app/Http/Controllers/Reports/DocumentReportController.php | 2 +- app/Http/Controllers/Reports/ExpenseReportController.php | 2 +- app/Http/Controllers/Reports/InvoiceItemReportController.php | 2 +- app/Http/Controllers/Reports/InvoiceReportController.php | 2 +- app/Http/Controllers/Reports/PaymentReportController.php | 2 +- app/Http/Controllers/Reports/ProductReportController.php | 2 +- app/Http/Controllers/Reports/ProfitAndLossController.php | 2 +- app/Http/Controllers/Reports/QuoteItemReportController.php | 2 +- app/Http/Controllers/Reports/QuoteReportController.php | 2 +- .../Controllers/Reports/RecurringInvoiceReportController.php | 2 +- app/Http/Controllers/Reports/TaskReportController.php | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/Reports/ClientContactReportController.php b/app/Http/Controllers/Reports/ClientContactReportController.php index 13d6c6ef6b36..acabe86ff8f3 100644 --- a/app/Http/Controllers/Reports/ClientContactReportController.php +++ b/app/Http/Controllers/Reports/ClientContactReportController.php @@ -65,7 +65,7 @@ class ClientContactReportController extends BaseController { if ($request->has('send_email') && $request->get('send_email')) { SendToAdmin::dispatch(auth()->user()->company(), $request->all(), ContactExport::class, $this->filename); - return response([], 200); + return response()->json(['message' => 'working...'], 200); } // expect a list of visible fields, or use the default $export = new ContactExport(auth()->user()->company(), $request->all()); diff --git a/app/Http/Controllers/Reports/ClientReportController.php b/app/Http/Controllers/Reports/ClientReportController.php index 1d8e0ce1c6e6..e2b780477264 100644 --- a/app/Http/Controllers/Reports/ClientReportController.php +++ b/app/Http/Controllers/Reports/ClientReportController.php @@ -66,7 +66,7 @@ class ClientReportController extends BaseController { if ($request->has('send_email') && $request->get('send_email')) { SendToAdmin::dispatch(auth()->user()->company(),$request->all(),ClientExport::class,$this->filename); - return response([], 200); + return response()->json(['message' => 'working...'], 200); } // expect a list of visible fields, or use the default diff --git a/app/Http/Controllers/Reports/CreditReportController.php b/app/Http/Controllers/Reports/CreditReportController.php index c158ca2237d4..87087ed5f545 100644 --- a/app/Http/Controllers/Reports/CreditReportController.php +++ b/app/Http/Controllers/Reports/CreditReportController.php @@ -65,7 +65,7 @@ class CreditReportController extends BaseController { if ($request->has('send_email') && $request->get('send_email')) { SendToAdmin::dispatch(auth()->user()->company(),$request->all(),CreditExport::class,$this->filename); - return response([], 200); + return response()->json(['message' => 'working...'], 200); } // expect a list of visible fields, or use the default diff --git a/app/Http/Controllers/Reports/DocumentReportController.php b/app/Http/Controllers/Reports/DocumentReportController.php index 541f20b5f78c..4bbe243277a5 100644 --- a/app/Http/Controllers/Reports/DocumentReportController.php +++ b/app/Http/Controllers/Reports/DocumentReportController.php @@ -65,7 +65,7 @@ class DocumentReportController extends BaseController { if ($request->has('send_email') && $request->get('send_email')) { SendToAdmin::dispatch(auth()->user()->company(),$request->all(),DocumentExport::class,$this->filename); - return response([], 200); + return response()->json(['message' => 'working...'], 200); } // expect a list of visible fields, or use the default diff --git a/app/Http/Controllers/Reports/ExpenseReportController.php b/app/Http/Controllers/Reports/ExpenseReportController.php index 681ba1ab7821..7617c9cee85f 100644 --- a/app/Http/Controllers/Reports/ExpenseReportController.php +++ b/app/Http/Controllers/Reports/ExpenseReportController.php @@ -66,7 +66,7 @@ class ExpenseReportController extends BaseController { if ($request->has('send_email') && $request->get('send_email')) { SendToAdmin::dispatch(auth()->user()->company(),$request->all(),ExpenseExport::class,$this->filename); - return response([], 200); + return response()->json(['message' => 'working...'], 200); } // expect a list of visible fields, or use the default diff --git a/app/Http/Controllers/Reports/InvoiceItemReportController.php b/app/Http/Controllers/Reports/InvoiceItemReportController.php index 1de8aedefdf2..727077ccace1 100644 --- a/app/Http/Controllers/Reports/InvoiceItemReportController.php +++ b/app/Http/Controllers/Reports/InvoiceItemReportController.php @@ -65,7 +65,7 @@ class InvoiceItemReportController extends BaseController { if ($request->has('send_email') && $request->get('send_email')) { SendToAdmin::dispatch(auth()->user()->company(),$request->all(),InvoiceItemExport::class,$this->filename); - return response([], 200); + return response()->json(['message' => 'working...'], 200); } // expect a list of visible fields, or use the default diff --git a/app/Http/Controllers/Reports/InvoiceReportController.php b/app/Http/Controllers/Reports/InvoiceReportController.php index a9e0c585f4e8..499c7ee85226 100644 --- a/app/Http/Controllers/Reports/InvoiceReportController.php +++ b/app/Http/Controllers/Reports/InvoiceReportController.php @@ -65,7 +65,7 @@ class InvoiceReportController extends BaseController { if ($request->has('send_email') && $request->get('send_email')) { SendToAdmin::dispatch(auth()->user()->company(),$request->all(),InvoiceExport::class,$this->filename); - return response([], 200); + return response()->json(['message' => 'working...'], 200); } // expect a list of visible fields, or use the default diff --git a/app/Http/Controllers/Reports/PaymentReportController.php b/app/Http/Controllers/Reports/PaymentReportController.php index d62b4fe7a2ad..ec7dac8a4b73 100644 --- a/app/Http/Controllers/Reports/PaymentReportController.php +++ b/app/Http/Controllers/Reports/PaymentReportController.php @@ -66,7 +66,7 @@ class PaymentReportController extends BaseController { if ($request->has('send_email') && $request->get('send_email')) { SendToAdmin::dispatch(auth()->user()->company(), $request->all(), PaymentExport::class, $this->filename); - return response([], 200); + return response()->json(['message' => 'working...'], 200); } // expect a list of visible fields, or use the default diff --git a/app/Http/Controllers/Reports/ProductReportController.php b/app/Http/Controllers/Reports/ProductReportController.php index 732f842eab26..c9fa7c9f2b27 100644 --- a/app/Http/Controllers/Reports/ProductReportController.php +++ b/app/Http/Controllers/Reports/ProductReportController.php @@ -66,7 +66,7 @@ class ProductReportController extends BaseController { if ($request->has('send_email') && $request->get('send_email')) { SendToAdmin::dispatch(auth()->user()->company(),$request->all(),ProductExport::class,$this->filename); - return response([], 200); + return response()->json(['message' => 'working...'], 200); } // expect a list of visible fields, or use the default diff --git a/app/Http/Controllers/Reports/ProfitAndLossController.php b/app/Http/Controllers/Reports/ProfitAndLossController.php index 4b4b4f70f240..6aa31c72f2d1 100644 --- a/app/Http/Controllers/Reports/ProfitAndLossController.php +++ b/app/Http/Controllers/Reports/ProfitAndLossController.php @@ -67,7 +67,7 @@ class ProfitAndLossController extends BaseController { if ($request->has('send_email') && $request->get('send_email')) { SendToAdmin::dispatch(auth()->user()->company(),$request->all(),ProfitLoss::class,$this->filename); - return response([], 200); + return response()->json(['message' => 'working...'], 200); } // expect a list of visible fields, or use the default diff --git a/app/Http/Controllers/Reports/QuoteItemReportController.php b/app/Http/Controllers/Reports/QuoteItemReportController.php index aaa32bb66792..91abb4d7d299 100644 --- a/app/Http/Controllers/Reports/QuoteItemReportController.php +++ b/app/Http/Controllers/Reports/QuoteItemReportController.php @@ -65,7 +65,7 @@ class QuoteItemReportController extends BaseController { if ($request->has('send_email') && $request->get('send_email')) { SendToAdmin::dispatch(auth()->user()->company(),$request->all(),QuoteItemExport::class,$this->filename); - return response([], 200); + return response()->json(['message' => 'working...'], 200); } // expect a list of visible fields, or use the default diff --git a/app/Http/Controllers/Reports/QuoteReportController.php b/app/Http/Controllers/Reports/QuoteReportController.php index b0fa10394c64..49d36cf90410 100644 --- a/app/Http/Controllers/Reports/QuoteReportController.php +++ b/app/Http/Controllers/Reports/QuoteReportController.php @@ -65,7 +65,7 @@ class QuoteReportController extends BaseController { if ($request->has('send_email') && $request->get('send_email')) { SendToAdmin::dispatch(auth()->user()->company(),$request->all(),QuoteExport::class,$this->filename); - return response([], 200); + return response()->json(['message' => 'working...'], 200); } // expect a list of visible fields, or use the default diff --git a/app/Http/Controllers/Reports/RecurringInvoiceReportController.php b/app/Http/Controllers/Reports/RecurringInvoiceReportController.php index f0d03da35e4c..aa170d73c2ad 100644 --- a/app/Http/Controllers/Reports/RecurringInvoiceReportController.php +++ b/app/Http/Controllers/Reports/RecurringInvoiceReportController.php @@ -65,7 +65,7 @@ class RecurringInvoiceReportController extends BaseController { if ($request->has('send_email') && $request->get('send_email')) { SendToAdmin::dispatch(auth()->user()->company(),$request->all(),RecurringInvoiceExport::class,$this->filename); - return response([], 200); + return response()->json(['message' => 'working...'], 200); } // expect a list of visible fields, or use the default diff --git a/app/Http/Controllers/Reports/TaskReportController.php b/app/Http/Controllers/Reports/TaskReportController.php index 23fda0a83ee3..b15a87610739 100644 --- a/app/Http/Controllers/Reports/TaskReportController.php +++ b/app/Http/Controllers/Reports/TaskReportController.php @@ -65,7 +65,7 @@ class TaskReportController extends BaseController { if ($request->has('send_email') && $request->get('send_email')) { SendToAdmin::dispatch(auth()->user()->company(),$request->all(),TaskExport::class,$this->filename); - return response([], 200); + return response()->json(['message' => 'working...'], 200); } // expect a list of visible fields, or use the default From 944fa97138828a826986c20a9237ac0aacc532d9 Mon Sep 17 00:00:00 2001 From: Nikola Cirkovic Date: Wed, 18 May 2022 02:29:01 +0200 Subject: [PATCH 7/7] INA-3 | Elastic license added --- app/Jobs/Report/SendToAdmin.php | 12 +++++++++++- app/Mail/DownloadReport.php | 10 +++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/Jobs/Report/SendToAdmin.php b/app/Jobs/Report/SendToAdmin.php index 9a015d789a3b..8c2e779f9294 100644 --- a/app/Jobs/Report/SendToAdmin.php +++ b/app/Jobs/Report/SendToAdmin.php @@ -1,5 +1,13 @@ company->db); $export = new $this->report_class($this->company, $this->request); $csv = $export->run(); diff --git a/app/Mail/DownloadReport.php b/app/Mail/DownloadReport.php index 4650f661a6e3..0037b6b498f9 100644 --- a/app/Mail/DownloadReport.php +++ b/app/Mail/DownloadReport.php @@ -1,5 +1,13 @@