:100644 100644 137c9e75 00000000 M app/Http/Controllers/Reports/MeiPdfController.php :100644 100644 42ebc7c3 00000000 M app/Services/Relatorio/MeiReportService.php :100644 100644 7169e666 00000000 M routes/web.php diff --git a/app/Http/Controllers/Reports/MeiPdfController.php b/app/Http/Controllers/Reports/MeiPdfController.php index 137c9e75fb73953daaf9f6a6b276e37b012d9698..0b0035acbeb178e8376eb5e8671fcbb0e2433485 100644 --- a/app/Http/Controllers/Reports/MeiPdfController.php +++ b/app/Http/Controllers/Reports/MeiPdfController.php @@ -18,8 +18,9 @@ public function __construct( $this->middleware('permission:relatorio_financeiro_declaracao_mei', ['only' => ['index', '__invoke']]); } - public function index(){ - return view ('relatorio.financeiro.declaracao_mei.index'); + public function index() + { + return view('relatorio.financeiro.declaracao_mei.index'); } public function __invoke(Request $request): Response diff --git a/app/Services/Relatorio/MeiReportService.php b/app/Services/Relatorio/MeiReportService.php index 42ebc7c38eaba44ee15cfa05c062b8a84cd0a458..fff4d51c8f58a2e0de259e6e53979936e03c6bc7 100644 --- a/app/Services/Relatorio/MeiReportService.php +++ b/app/Services/Relatorio/MeiReportService.php @@ -180,14 +180,14 @@ private function serviceClassificationSql(): string private function yearExpression(string $column): string { return $this->isSqlite() - ? "CAST(strftime('%Y', ".$column.") AS INTEGER)" + ? "CAST(strftime('%Y', ".$column.') AS INTEGER)' : 'YEAR('.$column.')'; } private function monthExpression(string $column): string { return $this->isSqlite() - ? "CAST(strftime('%m', ".$column.") AS INTEGER)" + ? "CAST(strftime('%m', ".$column.') AS INTEGER)' : 'MONTH('.$column.')'; } diff --git a/routes/web.php b/routes/web.php index 7169e666376730f92b93490fa46142894e4d20d7..5bf8393d85fdd4f9e0c59e76948ad329ce4fa149 100644 --- a/routes/web.php +++ b/routes/web.php @@ -28,11 +28,11 @@ use App\Http\Controllers\OsLab\FavoriteController; use App\Http\Controllers\Produto\MovimentacaoController; use App\Http\Controllers\Produto\ProdutoController; -use App\Http\Controllers\Reports\MeiPdfController; use App\Http\Controllers\Relatorio\Financeiro\BalanceteController; use App\Http\Controllers\Relatorio\Financeiro\ContaAbertaController; use App\Http\Controllers\Relatorio\Financeiro\ReceitaDespesaController; use App\Http\Controllers\Relatorio\Sistema\AuditoriaController; +use App\Http\Controllers\Reports\MeiPdfController; use App\Http\Controllers\Servico\ServicoController; use App\Http\Controllers\TestController; use App\Http\Controllers\Venda\VendaController;