From 4e47f58bad076961ad20c55fe4add8a56e8132a4 Mon Sep 17 00:00:00 2001 From: Dhruv Bhatt Date: Wed, 26 Oct 2022 19:33:25 +0530 Subject: [PATCH] fixed - No query results for model [Crater\Models\Currency] (#1070) * fixed report pdf issue * Removed telescope service provider file --- .../Report/CustomerSalesReportController.php | 21 ++++---- .../Admin/Report/ExpensesReportController.php | 29 +++++----- .../Report/ItemSalesReportController.php | 29 +++++----- .../Report/ProfitLossReportController.php | 22 ++++---- .../Report/TaxSummaryReportController.php | 30 ++++++----- .../views/app/pdf/reports/expenses.blade.php | 33 ++++++------ .../app/pdf/reports/profit-loss.blade.php | 35 ++++++------ .../app/pdf/reports/sales-customers.blade.php | 53 +++++++++---------- .../app/pdf/reports/sales-items.blade.php | 41 +++++++------- .../app/pdf/reports/tax-summary.blade.php | 33 ++++++------ 10 files changed, 169 insertions(+), 157 deletions(-) diff --git a/app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php b/app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php index c807c52f..fd2740c8 100644 --- a/app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php +++ b/app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php @@ -2,24 +2,25 @@ namespace Crater\Http\Controllers\V1\Admin\Report; +use PDF; use Carbon\Carbon; -use Crater\Http\Controllers\Controller; use Crater\Models\Company; -use Crater\Models\CompanySetting; +use Crater\Models\Currency; use Crater\Models\Customer; use Illuminate\Http\Request; +use Crater\Models\CompanySetting; use Illuminate\Support\Facades\App; -use PDF; +use Crater\Http\Controllers\Controller; class CustomerSalesReportController extends Controller { /** - * Handle the incoming request. - * - * @param \Illuminate\Http\Request $request - * @param string $hash - * @return \Illuminate\Http\JsonResponse - */ + * Handle the incoming request. + * + * @param \Illuminate\Http\Request $request + * @param string $hash + * @return \Illuminate\Http\JsonResponse + */ public function __invoke(Request $request, $hash) { $company = Company::where('unique_hash', $hash)->first(); @@ -56,6 +57,7 @@ class CustomerSalesReportController extends Controller $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); + $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id)); $colors = [ 'primary_text_color', @@ -80,6 +82,7 @@ class CustomerSalesReportController extends Controller 'company' => $company, 'from_date' => $from_date, 'to_date' => $to_date, + 'currency' => $currency, ]); $pdf = PDF::loadView('app.pdf.reports.sales-customers'); diff --git a/app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php b/app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php index f4851895..3e88e355 100644 --- a/app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php +++ b/app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php @@ -2,24 +2,25 @@ namespace Crater\Http\Controllers\V1\Admin\Report; -use Carbon\Carbon; -use Crater\Http\Controllers\Controller; -use Crater\Models\Company; -use Crater\Models\CompanySetting; -use Crater\Models\Expense; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\App; use PDF; +use Carbon\Carbon; +use Crater\Models\Company; +use Crater\Models\Expense; +use Crater\Models\Currency; +use Illuminate\Http\Request; +use Crater\Models\CompanySetting; +use Illuminate\Support\Facades\App; +use Crater\Http\Controllers\Controller; class ExpensesReportController extends Controller { /** - * Handle the incoming request. - * - * @param \Illuminate\Http\Request $request - * @param string $hash - * @return \Illuminate\Http\JsonResponse - */ + * Handle the incoming request. + * + * @param \Illuminate\Http\Request $request + * @param string $hash + * @return \Illuminate\Http\JsonResponse + */ public function __invoke(Request $request, $hash) { $company = Company::where('unique_hash', $hash)->first(); @@ -43,6 +44,7 @@ class ExpensesReportController extends Controller $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); + $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id)); $colors = [ 'primary_text_color', @@ -66,6 +68,7 @@ class ExpensesReportController extends Controller 'company' => $company, 'from_date' => $from_date, 'to_date' => $to_date, + 'currency' => $currency, ]); $pdf = PDF::loadView('app.pdf.reports.expenses'); diff --git a/app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php b/app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php index c68ea2fb..c0616265 100644 --- a/app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php +++ b/app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php @@ -2,24 +2,25 @@ namespace Crater\Http\Controllers\V1\Admin\Report; -use Carbon\Carbon; -use Crater\Http\Controllers\Controller; -use Crater\Models\Company; -use Crater\Models\CompanySetting; -use Crater\Models\InvoiceItem; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\App; use PDF; +use Carbon\Carbon; +use Crater\Models\Company; +use Crater\Models\Currency; +use Illuminate\Http\Request; +use Crater\Models\InvoiceItem; +use Crater\Models\CompanySetting; +use Illuminate\Support\Facades\App; +use Crater\Http\Controllers\Controller; class ItemSalesReportController extends Controller { /** - * Handle the incoming request. - * - * @param \Illuminate\Http\Request $request - * @param string $hash - * @return \Illuminate\Http\JsonResponse - */ + * Handle the incoming request. + * + * @param \Illuminate\Http\Request $request + * @param string $hash + * @return \Illuminate\Http\JsonResponse + */ public function __invoke(Request $request, $hash) { $company = Company::where('unique_hash', $hash)->first(); @@ -43,6 +44,7 @@ class ItemSalesReportController extends Controller $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); + $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id)); $colors = [ 'primary_text_color', @@ -66,6 +68,7 @@ class ItemSalesReportController extends Controller 'company' => $company, 'from_date' => $from_date, 'to_date' => $to_date, + 'currency' => $currency, ]); $pdf = PDF::loadView('app.pdf.reports.sales-items'); diff --git a/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php b/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php index 49fe99d6..cd225dcf 100644 --- a/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php +++ b/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php @@ -2,25 +2,26 @@ namespace Crater\Http\Controllers\V1\Admin\Report; +use PDF; use Carbon\Carbon; -use Crater\Http\Controllers\Controller; use Crater\Models\Company; -use Crater\Models\CompanySetting; use Crater\Models\Expense; use Crater\Models\Payment; +use Crater\Models\Currency; use Illuminate\Http\Request; +use Crater\Models\CompanySetting; use Illuminate\Support\Facades\App; -use PDF; +use Crater\Http\Controllers\Controller; class ProfitLossReportController extends Controller { /** - * Handle the incoming request. - * - * @param \Illuminate\Http\Request $request - * @param string $hash - * @return \Illuminate\Http\JsonResponse - */ + * Handle the incoming request. + * + * @param \Illuminate\Http\Request $request + * @param string $hash + * @return \Illuminate\Http\JsonResponse + */ public function __invoke(Request $request, $hash) { $company = Company::where('unique_hash', $hash)->first(); @@ -49,6 +50,8 @@ class ProfitLossReportController extends Controller $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); + $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id)); + $colors = [ 'primary_text_color', @@ -74,6 +77,7 @@ class ProfitLossReportController extends Controller 'company' => $company, 'from_date' => $from_date, 'to_date' => $to_date, + 'currency' => $currency, ]); $pdf = PDF::loadView('app.pdf.reports.profit-loss'); diff --git a/app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php b/app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php index 48c690e4..8fdcf614 100644 --- a/app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php +++ b/app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php @@ -2,24 +2,25 @@ namespace Crater\Http\Controllers\V1\Admin\Report; -use Carbon\Carbon; -use Crater\Http\Controllers\Controller; -use Crater\Models\Company; -use Crater\Models\CompanySetting; -use Crater\Models\Tax; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\App; use PDF; +use Carbon\Carbon; +use Crater\Models\Tax; +use Crater\Models\Company; +use Crater\Models\Currency; +use Illuminate\Http\Request; +use Crater\Models\CompanySetting; +use Illuminate\Support\Facades\App; +use Crater\Http\Controllers\Controller; class TaxSummaryReportController extends Controller { /** - * Handle the incoming request. - * - * @param \Illuminate\Http\Request $request - * @param string $hash - * @return \Illuminate\Http\JsonResponse - */ + * Handle the incoming request. + * + * @param \Illuminate\Http\Request $request + * @param string $hash + * @return \Illuminate\Http\JsonResponse + */ public function __invoke(Request $request, $hash) { $company = Company::where('unique_hash', $hash)->first(); @@ -44,6 +45,8 @@ class TaxSummaryReportController extends Controller $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); + $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id)); + $colors = [ 'primary_text_color', @@ -68,6 +71,7 @@ class TaxSummaryReportController extends Controller 'company' => $company, 'from_date' => $from_date, 'to_date' => $to_date, + 'currency' => $currency, ]); $pdf = PDF::loadView('app.pdf.reports.tax-summary'); diff --git a/resources/views/app/pdf/reports/expenses.blade.php b/resources/views/app/pdf/reports/expenses.blade.php index 0cac4c9b..a38c2be7 100644 --- a/resources/views/app/pdf/reports/expenses.blade.php +++ b/resources/views/app/pdf/reports/expenses.blade.php @@ -133,11 +133,10 @@ line-height: 21px; color: #5851D8; } - @if (App::isLocale('th')) - @include('app.pdf.locale.th') + @include('app.pdf.locale.th') @endif @@ -162,18 +161,18 @@
@foreach ($expenseCategories as $expenseCategory) - - - - + + + + @endforeach
-

- {{ $expenseCategory->category->name }} -

- 		-

- {!! format_money_pdf($expenseCategory->total_amount) !!} -

-
+

+ {{ $expenseCategory->category->name }} +

+ 		+

+ {!! format_money_pdf($expenseCategory->total_amount, $currency) !!} +

+
@@ -182,7 +181,7 @@
-

{!! format_money_pdf($totalExpense) !!}

+

{!! format_money_pdf($totalExpense, $currency) !!}
@@ -192,10 +191,10 @@

@lang('pdf_total_expenses_label')

-

{!! format_money_pdf($totalExpense) !!}

+

{!! format_money_pdf($totalExpense, $currency) !!}

- + \ No newline at end of file diff --git a/resources/views/app/pdf/reports/profit-loss.blade.php b/resources/views/app/pdf/reports/profit-loss.blade.php index b6e3dee8..0aa40149 100644 --- a/resources/views/app/pdf/reports/profit-loss.blade.php +++ b/resources/views/app/pdf/reports/profit-loss.blade.php @@ -158,11 +158,10 @@ line-height: 21px; color: #5851D8; } - @if (App::isLocale('th')) - @include('app.pdf.locale.th') + @include('app.pdf.locale.th') @endif @@ -190,7 +189,7 @@

@lang("pdf_income_label")

-

{!! format_money_pdf($income) !!}

+

{!! format_money_pdf($income, $currency) !!}

@@ -198,18 +197,18 @@
@foreach ($expenseCategories as $expenseCategory) - - - - + + + + @endforeach
-

- {{ $expenseCategory->category->name }} -

- 		-

- {!! format_money_pdf($expenseCategory->total_amount) !!} -

-
+

+ {{ $expenseCategory->category->name }} +

+ 		+

+ {!! format_money_pdf($expenseCategory->total_amount, $currency) !!} +

+
@@ -219,7 +218,7 @@
-

{!! format_money_pdf($totalExpense) !!}

+

{!! format_money_pdf($totalExpense, $currency) !!}
@@ -229,10 +228,10 @@

@lang("pdf_net_profit_label")

-

{!! format_money_pdf($income - $totalExpense) !!}

+

{!! format_money_pdf($income - $totalExpense, $currency) !!}

- + \ No newline at end of file diff --git a/resources/views/app/pdf/reports/sales-customers.blade.php b/resources/views/app/pdf/reports/sales-customers.blade.php index 19d69139..b42ce91e 100644 --- a/resources/views/app/pdf/reports/sales-customers.blade.php +++ b/resources/views/app/pdf/reports/sales-customers.blade.php @@ -137,11 +137,10 @@ .text-center { text-align: center; } - @if (App::isLocale('th')) - @include('app.pdf.locale.th') + @include('app.pdf.locale.th') @endif @@ -164,34 +163,34 @@ @foreach ($customers as $customer) -

{{ $customer->name }}

-
- - @foreach ($customer->invoices as $invoice) - - - - - @endforeach -
-

- {{ $invoice->formattedInvoiceDate }} ({{ $invoice->invoice_number }}) -

- 		-

- {!! format_money_pdf($invoice->base_total) !!} -

-
-
- +

{{ $customer->name }}

+
+
+ @foreach ($customer->invoices as $invoice) - + + @endforeach
-

- {!! format_money_pdf($customer->totalAmount) !!} +

+

+ {{ $invoice->formattedInvoiceDate }} ({{ $invoice->invoice_number }}) +

+ 		+

+ {!! format_money_pdf($invoice->base_total, $currency) !!}

+
+ + + + +
+

+ {!! format_money_pdf($customer->totalAmount, $currency) !!} +

+
@endforeach @@ -203,11 +202,11 @@

- {!! format_money_pdf($totalAmount) !!} + {!! format_money_pdf($totalAmount, $currency) !!}

- + \ No newline at end of file diff --git a/resources/views/app/pdf/reports/sales-items.blade.php b/resources/views/app/pdf/reports/sales-items.blade.php index 9cd2e140..8e243f43 100644 --- a/resources/views/app/pdf/reports/sales-items.blade.php +++ b/resources/views/app/pdf/reports/sales-items.blade.php @@ -137,11 +137,10 @@ .text-center { text-align: center; } - @if (App::isLocale('th')) - @include('app.pdf.locale.th') + @include('app.pdf.locale.th') @endif @@ -165,29 +164,29 @@

@lang('pdf_items_label')

@foreach ($items as $item) -
- - - - - -
-

- {{ $item->name }} -

- 		-

- {!! format_money_pdf($item->total_amount) !!} -

-
-
+
+ + + + + +
+

+ {{ $item->name }} +

+ 		+

+ {!! format_money_pdf($item->total_amount, $currency) !!} +

+
+
@endforeach @@ -202,11 +201,11 @@

- {!! format_money_pdf($totalAmount) !!} + {!! format_money_pdf($totalAmount, $currency) !!}

- {!! format_money_pdf($totalAmount) !!} + {!! format_money_pdf($totalAmount, $currency) !!}

- + \ No newline at end of file diff --git a/resources/views/app/pdf/reports/tax-summary.blade.php b/resources/views/app/pdf/reports/tax-summary.blade.php index 9188267f..1485cb94 100644 --- a/resources/views/app/pdf/reports/tax-summary.blade.php +++ b/resources/views/app/pdf/reports/tax-summary.blade.php @@ -134,11 +134,10 @@ line-height: 21px; color: #5851D8; } - @if (App::isLocale('th')) - @include('app.pdf.locale.th') + @include('app.pdf.locale.th') @endif @@ -167,18 +166,18 @@
@foreach ($taxTypes as $tax) - - - - + + + + @endforeach
-

- {{ $tax->taxType->name }} -

- 		-

- {!! format_money_pdf($tax->total_tax_amount) !!} -

-
+

+ {{ $tax->taxType->name }} +

+ 		+

+ {!! format_money_pdf($tax->total_tax_amount, $currency) !!} +

+
@@ -189,7 +188,7 @@

- {!! format_money_pdf($totalTaxAmount) !!} + {!! format_money_pdf($totalTaxAmount, $currency) !!}

@@ -201,11 +200,11 @@

- {!! format_money_pdf($totalTaxAmount) !!} + {!! format_money_pdf($totalTaxAmount, $currency) !!}

- + \ No newline at end of file