TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 04:01:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed - No query results for model [Crater\Models\Currency] (#1070)

Browse Source 
* fixed report pdf issue

* Removed telescope service provider file
This commit is contained in:
Dhruv Bhatt
2022-10-26 19:33:25 +05:30
committed by GitHub
parent d8c429912e
commit 4e47f58bad
10 changed files with 169 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php
View File

@ -2,14 +2,15 @@
namespace Crater\Http\Controllers\V1\Admin\Report; namespace Crater\Http\Controllers\V1\Admin\Report;
use PDF;
use Carbon\Carbon; use Carbon\Carbon;
use Crater\Http\Controllers\Controller;
use Crater\Models\Company; use Crater\Models\Company;
use Crater\Models\CompanySetting; use Crater\Models\Currency;
use Crater\Models\Customer; use Crater\Models\Customer;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Crater\Models\CompanySetting;
use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\App;
use PDF; use Crater\Http\Controllers\Controller;
class CustomerSalesReportController extends Controller class CustomerSalesReportController extends Controller
{ {
@ -56,6 +57,7 @@ class CustomerSalesReportController extends Controller
$dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
$from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
$to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
$currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));
$colors = [ $colors = [
'primary_text_color', 'primary_text_color',
@ -80,6 +82,7 @@ class CustomerSalesReportController extends Controller
'company' => $company, 'company' => $company,
'from_date' => $from_date, 'from_date' => $from_date,
'to_date' => $to_date, 'to_date' => $to_date,
'currency' => $currency,
]); ]);
$pdf = PDF::loadView('app.pdf.reports.sales-customers'); $pdf = PDF::loadView('app.pdf.reports.sales-customers');

17
app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php
View File

@ -2,14 +2,15 @@
namespace Crater\Http\Controllers\V1\Admin\Report; 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 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 class ExpensesReportController extends Controller
{ {
@ -43,6 +44,7 @@ class ExpensesReportController extends Controller
$dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
$from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
$to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
$currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));
$colors = [ $colors = [
'primary_text_color', 'primary_text_color',
@ -66,6 +68,7 @@ class ExpensesReportController extends Controller
'company' => $company, 'company' => $company,
'from_date' => $from_date, 'from_date' => $from_date,
'to_date' => $to_date, 'to_date' => $to_date,
'currency' => $currency,
]); ]);
$pdf = PDF::loadView('app.pdf.reports.expenses'); $pdf = PDF::loadView('app.pdf.reports.expenses');

17
app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php
View File

@ -2,14 +2,15 @@
namespace Crater\Http\Controllers\V1\Admin\Report; 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 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 class ItemSalesReportController extends Controller
{ {
@ -43,6 +44,7 @@ class ItemSalesReportController extends Controller
$dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
$from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
$to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
$currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));
$colors = [ $colors = [
'primary_text_color', 'primary_text_color',
@ -66,6 +68,7 @@ class ItemSalesReportController extends Controller
'company' => $company, 'company' => $company,
'from_date' => $from_date, 'from_date' => $from_date,
'to_date' => $to_date, 'to_date' => $to_date,
'currency' => $currency,
]); ]);
$pdf = PDF::loadView('app.pdf.reports.sales-items'); $pdf = PDF::loadView('app.pdf.reports.sales-items');

10
app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php
View File

@ -2,15 +2,16 @@
namespace Crater\Http\Controllers\V1\Admin\Report; namespace Crater\Http\Controllers\V1\Admin\Report;
use PDF;
use Carbon\Carbon; use Carbon\Carbon;
use Crater\Http\Controllers\Controller;
use Crater\Models\Company; use Crater\Models\Company;
use Crater\Models\CompanySetting;
use Crater\Models\Expense; use Crater\Models\Expense;
use Crater\Models\Payment; use Crater\Models\Payment;
use Crater\Models\Currency;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Crater\Models\CompanySetting;
use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\App;
use PDF; use Crater\Http\Controllers\Controller;
class ProfitLossReportController extends Controller class ProfitLossReportController extends Controller
{ {
@ -49,6 +50,8 @@ class ProfitLossReportController extends Controller
$dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
$from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
$to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
$currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));
$colors = [ $colors = [
'primary_text_color', 'primary_text_color',
@ -74,6 +77,7 @@ class ProfitLossReportController extends Controller
'company' => $company, 'company' => $company,
'from_date' => $from_date, 'from_date' => $from_date,
'to_date' => $to_date, 'to_date' => $to_date,
'currency' => $currency,
]); ]);
$pdf = PDF::loadView('app.pdf.reports.profit-loss'); $pdf = PDF::loadView('app.pdf.reports.profit-loss');

18
app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php
View File

@ -2,14 +2,15 @@
namespace Crater\Http\Controllers\V1\Admin\Report; 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 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 class TaxSummaryReportController extends Controller
{ {
@ -44,6 +45,8 @@ class TaxSummaryReportController extends Controller
$dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
$from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
$to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
$currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));
$colors = [ $colors = [
'primary_text_color', 'primary_text_color',
@ -68,6 +71,7 @@ class TaxSummaryReportController extends Controller
'company' => $company, 'company' => $company,
'from_date' => $from_date, 'from_date' => $from_date,
'to_date' => $to_date, 'to_date' => $to_date,
'currency' => $currency,
]); ]);
$pdf = PDF::loadView('app.pdf.reports.tax-summary'); $pdf = PDF::loadView('app.pdf.reports.tax-summary');

7
resources/views/app/pdf/reports/expenses.blade.php
View File

@ -133,7 +133,6 @@
line-height: 21px; line-height: 21px;
color: #5851D8; color: #5851D8;
} }
</style> </style>
@if (App::isLocale('th')) @if (App::isLocale('th'))
@ -170,7 +169,7 @@
</td> </td>
<td> <td>
<p class="expense-amount"> <p class="expense-amount">
{!! format_money_pdf($expenseCategory->total_amount) !!} {!! format_money_pdf($expenseCategory->total_amount, $currency) !!}
</p> </p>
</td> </td>
</tr> </tr>
@ -182,7 +181,7 @@
<table class="expense-total-table"> <table class="expense-total-table">
<tr> <tr>
<td class="expense-total-cell"> <td class="expense-total-cell">
<p class="expense-total">{!! format_money_pdf($totalExpense) !!}</p> <p class="expense-total">{!! format_money_pdf($totalExpense, $currency) !!}</p>
</td> </td>
</tr> </tr>
</table> </table>
@ -192,7 +191,7 @@
<p class="report-footer-label">@lang('pdf_total_expenses_label')</p> <p class="report-footer-label">@lang('pdf_total_expenses_label')</p>
</td> </td>
<td> <td>
<p class="report-footer-value">{!! format_money_pdf($totalExpense) !!}</p> <p class="report-footer-value">{!! format_money_pdf($totalExpense, $currency) !!}</p>
</td> </td>
</tr> </tr>
</table> </table>

9
resources/views/app/pdf/reports/profit-loss.blade.php
View File

@ -158,7 +158,6 @@
line-height: 21px; line-height: 21px;
color: #5851D8; color: #5851D8;
} }
</style> </style>
@if (App::isLocale('th')) @if (App::isLocale('th'))
@ -190,7 +189,7 @@
<p class="income-title">@lang("pdf_income_label")</p> <p class="income-title">@lang("pdf_income_label")</p>
</td> </td>
<td> <td>
<p class="income-amount">{!! format_money_pdf($income) !!}</p> <p class="income-amount">{!! format_money_pdf($income, $currency) !!}</p>
</td> </td>
</tr> </tr>
</table> </table>
@ -206,7 +205,7 @@
</td> </td>
<td> <td>
<p class="expense-amount"> <p class="expense-amount">
{!! format_money_pdf($expenseCategory->total_amount) !!} {!! format_money_pdf($expenseCategory->total_amount, $currency) !!}
</p> </p>
</td> </td>
</tr> </tr>
@ -219,7 +218,7 @@
<table class="expense-total-indicator-table"> <table class="expense-total-indicator-table">
<tr> <tr>
<td class="expense-total-cell"> <td class="expense-total-cell">
<p class="expense-total">{!! format_money_pdf($totalExpense) !!}</p> <p class="expense-total">{!! format_money_pdf($totalExpense, $currency) !!}</p>
</td> </td>
</tr> </tr>
</table> </table>
@ -229,7 +228,7 @@
<p class="report-footer-label">@lang("pdf_net_profit_label")</p> <p class="report-footer-label">@lang("pdf_net_profit_label")</p>
</td> </td>
<td> <td>
<p class="report-footer-value">{!! format_money_pdf($income - $totalExpense) !!}</p> <p class="report-footer-value">{!! format_money_pdf($income - $totalExpense, $currency) !!}</p>
</td> </td>
</tr> </tr>
</table> </table>

7
resources/views/app/pdf/reports/sales-customers.blade.php
View File

@ -137,7 +137,6 @@
.text-center { .text-center {
text-align: center; text-align: center;
} }
</style> </style>
@if (App::isLocale('th')) @if (App::isLocale('th'))
@ -176,7 +175,7 @@
</td> </td>
<td> <td>
<p class="sales-amount"> <p class="sales-amount">
{!! format_money_pdf($invoice->base_total) !!} {!! format_money_pdf($invoice->base_total, $currency) !!}
</p> </p>
</td> </td>
</tr> </tr>
@ -187,7 +186,7 @@
<tr> <tr>
<td class="sales-total-cell"> <td class="sales-total-cell">
<p class="sales-total-amount"> <p class="sales-total-amount">
{!! format_money_pdf($customer->totalAmount) !!} {!! format_money_pdf($customer->totalAmount, $currency) !!}
</p> </p>
</td> </td>
</tr> </tr>
@ -203,7 +202,7 @@
</td> </td>
<td> <td>
<p class="report-footer-value"> <p class="report-footer-value">
{!! format_money_pdf($totalAmount) !!} {!! format_money_pdf($totalAmount, $currency) !!}
</p> </p>
</td> </td>
</tr> </tr>

7
resources/views/app/pdf/reports/sales-items.blade.php
View File

@ -137,7 +137,6 @@
.text-center { .text-center {
text-align: center; text-align: center;
} }
</style> </style>
@if (App::isLocale('th')) @if (App::isLocale('th'))
@ -175,7 +174,7 @@
</td> </td>
<td> <td>
<p class="item-sales-amount"> <p class="item-sales-amount">
{!! format_money_pdf($item->total_amount) !!} {!! format_money_pdf($item->total_amount, $currency) !!}
</p> </p>
</td> </td>
</tr> </tr>
@ -187,7 +186,7 @@
<tr> <tr>
<td class="sales-total-cell"> <td class="sales-total-cell">
<p class="sales-total-amount"> <p class="sales-total-amount">
{!! format_money_pdf($totalAmount) !!} {!! format_money_pdf($totalAmount, $currency) !!}
</p> </p>
</td> </td>
</tr> </tr>
@ -202,7 +201,7 @@
</td> </td>
<td> <td>
<p class="report-footer-value"> <p class="report-footer-value">
{!! format_money_pdf($totalAmount) !!} {!! format_money_pdf($totalAmount, $currency) !!}
</p> </p>
</td> </td>
</tr> </tr>

7
resources/views/app/pdf/reports/tax-summary.blade.php
View File

@ -134,7 +134,6 @@
line-height: 21px; line-height: 21px;
color: #5851D8; color: #5851D8;
} }
</style> </style>
@if (App::isLocale('th')) @if (App::isLocale('th'))
@ -175,7 +174,7 @@
</td> </td>
<td> <td>
<p class="tax-amount"> <p class="tax-amount">
{!! format_money_pdf($tax->total_tax_amount) !!} {!! format_money_pdf($tax->total_tax_amount, $currency) !!}
</p> </p>
</td> </td>
</tr> </tr>
@ -189,7 +188,7 @@
<tr> <tr>
<td class="tax-total-cell"> <td class="tax-total-cell">
<p class="tax-total"> <p class="tax-total">
{!! format_money_pdf($totalTaxAmount) !!} {!! format_money_pdf($totalTaxAmount, $currency) !!}
</p> </p>
</td> </td>
</tr> </tr>
@ -201,7 +200,7 @@
</td> </td>
<td> <td>
<p class="report-footer-value"> <p class="report-footer-value">
{!! format_money_pdf($totalTaxAmount) !!} {!! format_money_pdf($totalTaxAmount, $currency) !!}
</p> </p>
</td> </td>
</tr> </tr>