fix some code for some thing such as mission accident and safety privacy
This commit is contained in:
@@ -268,8 +268,8 @@ class AccidentReceiptController extends Controller
|
|||||||
'deposit_insurance_amount' => $request->deposit_insurance_amount ?? 0,
|
'deposit_insurance_amount' => $request->deposit_insurance_amount ?? 0,
|
||||||
'deposit_daghi_image' => $request->has('deposit_daghi_image') ? FileFacade::save($request->deposit_daghi_image, "receipts_files/{$accident->id}/deposit_daghi") : null,
|
'deposit_daghi_image' => $request->has('deposit_daghi_image') ? FileFacade::save($request->deposit_daghi_image, "receipts_files/{$accident->id}/deposit_daghi") : null,
|
||||||
'deposit_daghi_amount' => $request->deposit_daghi_amount ?? 0,
|
'deposit_daghi_amount' => $request->deposit_daghi_amount ?? 0,
|
||||||
'status' => $status,
|
'status' => $status,
|
||||||
'status_fa' => $status_fa,
|
'status_fa' => $status_fa,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
auth()->user()->addActivityComplete(1132);
|
auth()->user()->addActivityComplete(1132);
|
||||||
|
|||||||
@@ -153,6 +153,8 @@ class RequestPortalController extends Controller
|
|||||||
'finish_time' => $request->end_date,
|
'finish_time' => $request->end_date,
|
||||||
'state_id' => $state,
|
'state_id' => $state,
|
||||||
'state_name' => MissionStates::name($state),
|
'state_name' => MissionStates::name($state),
|
||||||
|
'explanation' => $request->explanation,
|
||||||
|
'request_date' => now(),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$mission->rahdaran()->sync($request->rahdaran);
|
$mission->rahdaran()->sync($request->rahdaran);
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ class NoProcessRequest extends FormRequest
|
|||||||
'area.type' => 'required|string',
|
'area.type' => 'required|string',
|
||||||
'area.coordinates' => 'required|array',
|
'area.coordinates' => 'required|array',
|
||||||
'category_id' => 'required|in:1,2,3',
|
'category_id' => 'required|in:1,2,3',
|
||||||
|
'explanation' => 'required|string',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ class OperatorService
|
|||||||
WITH base AS (
|
WITH base AS (
|
||||||
SELECT
|
SELECT
|
||||||
p.id AS province_id,
|
p.id AS province_id,
|
||||||
p.name AS province_name,
|
p.name_fa AS province_name,
|
||||||
a.id AS axis_type_id,
|
a.id AS axis_type_id,
|
||||||
COALESCE(SUM(t.step = 1), 0) AS s1,
|
COALESCE(SUM(t.step = 1), 0) AS s1,
|
||||||
COALESCE(SUM(t.step = 2), 0) AS s2,
|
COALESCE(SUM(t.step = 2), 0) AS s2,
|
||||||
|
|||||||
Reference in New Issue
Block a user