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

Merge branch 'feature/CreateNewRequest' into 'develop'

Browse Source 
Feature/createnewrequest

See merge request witelgroup/rms_v2!163
This commit is contained in:
amirghasempoor
2025-08-25 05:38:43 +00:00
parent 2f3e85d70d dad4ee8713
commit 141628bbe8
17 changed files with 497 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php
View File

@@ -28,6 +28,7 @@ use Illuminate\Support\Facades\DB;
class GeneralManagerController extends Controller
{
use ApiResponse;
public function index(Request $request): JsonResponse
{
$query = Harim::query()
@@ -235,9 +236,9 @@ class GeneralManagerController extends Controller
return $this->successResponse();
}
public function show(ShowRequest $request, Harim $harim): JsonResponse
{
return $this->successResponse($harim->load('histories'));
}
}

23
app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php Normal file
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();
}
}

1
app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php
View File

@@ -96,7 +96,6 @@ class RequestPortalController extends Controller
'zone_fa' => MissionZones::name($request->zone),
'start_date' => $request->start_date,
'end_date' => $request->end_date,
'request_date' => $request->request_date,
'description' => $request->description,
'end_point' => $request->end_point,
'area' => json_encode($request->area),

3
app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorReport/ConstructionActivityController.php
View File

@@ -19,7 +19,6 @@ class ConstructionActivityController extends Controller
use ApiResponse;
public function countryActivity(Request $request, OperatorService $operatorService): JsonResponse
{
$data = $operatorService->countryActivity(89);
return $this->successResponse([
@@ -52,6 +51,4 @@ class ConstructionActivityController extends Controller
$name = ' گزارش نگهداری حریم راه برای ساخت و ساز غیر مجاز' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new ConstructionReport($data, $request), $name);
}
}

5
app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorReport/UtilityPassingActivityController.php
View File

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\V3\Dashboard\SafetyAndPrivacy\OperatorReport;
use App\Exports\V3\SafetyAndPrivacy\Country\UtilityPassingReport as ExcelReport;
use App\Exports\V3\SafetyAndPrivacy\Province\UtilityPassingReport;
use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Models\EdarateShahri;
use App\Models\Province;
use App\Services\Cartables\SafetyAndPrivacy\OperatorService;
@@ -15,9 +16,10 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
class UtilityPassingActivityController extends Controller
{
use ApiResponse;
public function countryActivity(Request $request, OperatorService $operatorService): JsonResponse
{
$data = $operatorService->countryActivity(91);
return $this->successResponse([
@@ -50,5 +52,4 @@ class UtilityPassingActivityController extends Controller
$name = 'گزارش نگهداری حریم راه برای عبور تاسیسات زیربنایی غیر مجاز ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new UtilityPassingReport($data, $request), $name);
}
}