RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change name for date az to_date in date_to #6

Merged
amirghasempoor merged 1 commits from feature/FixReportMission into develop 2026-05-23 07:34:56 +00:00
Conversation 0 Commits 1 Files Changed 2 +4 -4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Services/Cartables/Mission/Report/ReportTradodService.php
View File

@@ -27,7 +27,7 @@ class ReportTradodService
public function countryActivity(Request $request): array public function countryActivity(Request $request): array
{ {
$from = $request->from_date ?? today()->startOfDay(); $from = $request->from_date ?? today()->startOfDay();
$to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay(); $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
$sql = " $sql = "
SELECT* SELECT*
@@ -88,7 +88,7 @@ class ReportTradodService
{ {
$provinceId = $request->province_id ?? auth()->user()->province_id; $provinceId = $request->province_id ?? auth()->user()->province_id;
$from = $request->from_date ?? today()->startOfDay(); $from = $request->from_date ?? today()->startOfDay();
$to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay(); $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
$sql = " $sql = "
SELECT* SELECT*

4
app/Services/Cartables/Mission/Report/ReportViolationService.php
View File

@@ -27,7 +27,7 @@ class ReportViolationService
public function countryActivity(Request $request): array public function countryActivity(Request $request): array
{ {
$from = $request->from_date ?? today()->startOfDay(); $from = $request->from_date ?? today()->startOfDay();
$to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay(); $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
$sql = " $sql = "
SELECT* SELECT*
@@ -81,7 +81,7 @@ class ReportViolationService
{ {
$provinceId = $request->province_id ?? auth()->user()->province_id; $provinceId = $request->province_id ?? auth()->user()->province_id;
$from = $request->from_date ?? today()->startOfDay(); $from = $request->from_date ?? today()->startOfDay();
$to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay(); $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
$sql = " $sql = "
SELECT* SELECT*