This commit is contained in:
2025-08-19 14:35:16 +03:30
parent d350f2666d
commit 39d30b8aa7
5 changed files with 72 additions and 48 deletions

View File

@@ -0,0 +1,23 @@
<?php
namespace App\Http\Controllers\V3\Dashboard\Harim;
use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Models\Harim;
use Illuminate\Http\Request;
class PanjareVahedController extends Controller
{
use ApiResponse;
public function receiveNewRequests()
{
// find city and province by lat,lng
Harim::query()->create([
]);
return $this->successResponse();
}
}

View File

@@ -13,7 +13,9 @@ class ConfirmPaymentInfoRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->accident->status === AccidentStates::SODOR_NAME_BIME_VA_DAGHI->value;
return in_array($this->accident->status,
[AccidentStates::SODOR_NAME_BIME_VA_DAGHI->value, AccidentStates::SABT_FISH->value]
);
}
/**

View File

@@ -49,11 +49,11 @@ class OperatorService
) s
),
provinces AS (
SELECT DISTINCT province_fa FROM safety_and_privacy WHERE info_id = ?
SELECT DISTINCT province_id FROM safety_and_privacy WHERE info_id = ?
),
data AS (
SELECT
p.province_fa,
p.province_id,
c.axis_type_id,
c.step,
COUNT(sp.id) AS total
@@ -62,18 +62,18 @@ class OperatorService
LEFT JOIN safety_and_privacy sp
ON sp.axis_type_id = c.axis_type_id
AND sp.step = c.step
AND sp.province_fa = p.province_fa
AND sp.province_id = p.province_id
AND sp.info_id = ?
GROUP BY p.province_fa, c.axis_type_id, c.step
GROUP BY p.province_id, c.axis_type_id, c.step
)
SELECT
province_fa,
province_id,
axis_type_id,
step,
total,
SUM(total) OVER (PARTITION BY province_fa) AS total_sum
SUM(total) OVER (PARTITION BY province_id) AS total_sum
FROM data
ORDER BY province_fa, axis_type_id, step
ORDER BY province_id, axis_type_id, step
", [$info_id, $info_id]);
}
@@ -90,7 +90,7 @@ class OperatorService
) s
),
edarat AS (
SELECT id AS edare_id, name_fa
SELECT id AS edare_id
FROM edarate_shahri
WHERE province_id = :provinceId
),
@@ -111,7 +111,6 @@ class OperatorService
)
SELECT
e.edare_id,
e.name_fa AS edare_name,
d.axis_type_id,
d.step,
d.total,
@@ -124,5 +123,4 @@ class OperatorService
'infoId' => $info_id,
]);
}
}

View File

@@ -44,11 +44,12 @@
40 => 'App\\Providers\\AppServiceProvider',
41 => 'App\\Providers\\AuthServiceProvider',
42 => 'App\\Providers\\EventServiceProvider',
43 => 'App\\Providers\\RouteServiceProvider',
44 => 'App\\Providers\\TelescopeServiceProvider',
45 => 'Barryvdh\\Debugbar\\ServiceProvider',
46 => 'App\\Providers\\DataTableServiceProvider',
47 => 'App\\Providers\\FileServiceProvider',
43 => 'App\\Providers\\HorizonServiceProvider',
44 => 'App\\Providers\\RouteServiceProvider',
45 => 'App\\Providers\\TelescopeServiceProvider',
46 => 'Barryvdh\\Debugbar\\ServiceProvider',
47 => 'App\\Providers\\DataTableServiceProvider',
48 => 'App\\Providers\\FileServiceProvider',
),
'eager' =>
array (
@@ -81,11 +82,12 @@
26 => 'App\\Providers\\AppServiceProvider',
27 => 'App\\Providers\\AuthServiceProvider',
28 => 'App\\Providers\\EventServiceProvider',
29 => 'App\\Providers\\RouteServiceProvider',
30 => 'App\\Providers\\TelescopeServiceProvider',
31 => 'Barryvdh\\Debugbar\\ServiceProvider',
32 => 'App\\Providers\\DataTableServiceProvider',
33 => 'App\\Providers\\FileServiceProvider',
29 => 'App\\Providers\\HorizonServiceProvider',
30 => 'App\\Providers\\RouteServiceProvider',
31 => 'App\\Providers\\TelescopeServiceProvider',
32 => 'Barryvdh\\Debugbar\\ServiceProvider',
33 => 'App\\Providers\\DataTableServiceProvider',
34 => 'App\\Providers\\FileServiceProvider',
),
'deferred' =>
array (

View File

@@ -558,7 +558,9 @@ Route::prefix('harim')
Route::post('/confirm_guarantee_letter_need/{harim}', 'confirmGuaranteeLetterNeed')->name('confirmGuaranteeLetterNeed');
Route::get('/{harim}', 'show')->name('show');
});
Route::prefix('user_management')
});
Route::prefix('user_management')
->name('user_management.')
->controller(UserManagementController::class)
->group(function () {
@@ -583,7 +585,4 @@ Route::prefix('harim')
Route::delete('/{user}', 'destroy')->name('destroy');
Route::post('/change_password/{user}', 'changePassword')->name('changePassword');
Route::post('delete-role/{id}', 'deleteRole')->name('deleteRole');
});
});