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

refactor blade files

Browse Source
This commit is contained in:
amirghasempoor
2025-04-15 16:08:16 +03:30
parent ee933a3f91
commit 613a8f0bd8
4 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Exports/V3/SafetyAndPrivacy/CountryActivityReport.php
View File

@@ -19,13 +19,13 @@ class CountryActivityReport implements FromView, WithEvents, ShouldAutoSize, Wit
public function view(): View
{
$data = $this->data;
$existedProvinces = array_keys($data['activities']);
$existedProvinces = array_keys($data);
foreach (\App\Models\Province::all() as $value) {
$provinceId = $value->id;
if (!array_key_exists($provinceId, $existedProvinces)) {
$data['activities'][] = (object) [
$data[] = (object) [
'province_id' => $provinceId,
'name_fa' => $value->name_fa,
'sum' => 0,
@@ -37,9 +37,7 @@ class CountryActivityReport implements FromView, WithEvents, ShouldAutoSize, Wit
}
return view('v3.Reports.SafetyAndPrivacy.CountryActivityReport', [
'data' => $data['activities'],
'fromDate' => $data['fromDate'],
'toDate' => $data['toDate'],
'data' => $data,
]);
}

6
app/Exports/V3/SafetyAndPrivacy/ProvinceActivityReport.php
View File

@@ -21,14 +21,14 @@ class ProvinceActivityReport implements FromView, WithEvents, ShouldAutoSize, Wi
public function view(): View
{
$data = $this->data;
$existedCities = array_keys($data['activities']);
$existedCities = array_keys($data);
$edarat = EdarateShahri::query()->where('province_id', '=', $this->request->province_id)->get(['id', 'name_fa']);
foreach ($edarat as $value) {
$edareId = $value->id;
if (!array_key_exists($edareId, $existedCities)) {
$data['activities'][] = (object) [
$data[] = (object) [
'edare_shahri_id' => $edareId,
'name_fa' => $value->name_fa,
'sum' => 0,
@@ -40,7 +40,7 @@ class ProvinceActivityReport implements FromView, WithEvents, ShouldAutoSize, Wi
}
return view('v3.Reports.SafetyAndPrivacy.ProvinceActivityReport', [
'data' => $data['activities'],
'data' => $data,
'fromDate' => $data['fromDate'],
'toDate' => $data['toDate'],
]);