diff --git a/app/Exports/V3/RoadPatrols/ProvinceActivity.php b/app/Exports/V3/RoadPatrols/ProvinceActivity.php index 99e41d3b..1d7d0d8d 100644 --- a/app/Exports/V3/RoadPatrols/ProvinceActivity.php +++ b/app/Exports/V3/RoadPatrols/ProvinceActivity.php @@ -20,7 +20,7 @@ class ProvinceActivity implements FromView, WithEvents, ShouldAutoSize, WithDraw { $activities = $this->activities; - return view('v3.Reports.RoadPatrols.CountryActivity', [ + return view('v3.Reports.RoadPatrols.ProvinceActivity', [ 'activities' => $activities["activities"], 'fromDate' => $activities["fromDate"], 'toDate' => $activities["toDate"] diff --git a/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php b/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php index 91fc320c..0e94bde7 100644 --- a/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php +++ b/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php @@ -29,10 +29,10 @@ گزارش گشت راهداری و ترابری از تاریخ - {{ verta($fromFa)->format('Y/n/j') }} + {{ verta($fromDate)->format('Y/n/j') }} تا تاریخ - {{ verta($toFa)->format('Y/n/j') }} + {{ verta($toDate)->format('Y/n/j') }} diff --git a/resources/views/v3/Reports/RoadPatrols/ProvinceActivity.blade.php b/resources/views/v3/Reports/RoadPatrols/ProvinceActivity.blade.php index c8744f76..602352e5 100644 --- a/resources/views/v3/Reports/RoadPatrols/ProvinceActivity.blade.php +++ b/resources/views/v3/Reports/RoadPatrols/ProvinceActivity.blade.php @@ -29,10 +29,10 @@ گزارش گشت راهداری و ترابری از تاریخ - {{ verta($fromFa)->format('Y/n/j') }} + {{ verta($fromDate)->format('Y/n/j') }} تا تاریخ - {{ verta($toFa)->format('Y/n/j') }} + {{ verta($toDate)->format('Y/n/j') }} @@ -81,16 +81,16 @@ @foreach ($activities as $activity) - - {{ $activity['name'] }} - {{ $activity['tedade'] }} - {{ $activity['tedad_mavarede_moshede_shode_adi'] }} - {{ $activity['tedad_mavarede_moshede_shode_fori'] }} - {{ $activity['tedad_mavarede_moshede_shode_ani'] }} - {{ $activity['tedad_mavarede_peygiri_shode'] }} - {{ $activity['masafat_tey_shode'] }} - {{ $activity['tedad_faliyat_sabt_shode'] }} - + + {{ $activity->edare_name }} + {{ $activity->tedade }} + {{ $activity->tedad_mavarede_moshede_shode_adi }} + {{ $activity->tedad_mavarede_moshede_shode_fori }} + {{ $activity->tedad_mavarede_moshede_shode_ani }} + {{ $activity->tedad_mavarede_peygiri_shode }} + {{ $activity->masafat_tey_shode }} + {{ $activity->tedad_faliyat_sabt_shode }} + @endforeach