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 @@
|
- - {{ $expenseCategory->category->name }} - - |
-
- - {!! format_money_pdf($expenseCategory->total_amount) !!} - - |
-
|
+ + {{ $expenseCategory->category->name }} + + |
+
+ + {!! format_money_pdf($expenseCategory->total_amount, $currency) !!} + + |
+
|
- {!! format_money_pdf($totalExpense) !!} +{!! format_money_pdf($totalExpense, $currency) !!} |