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

Merge branch 'feature/CreatePictureHarim' into 'develop'

Browse Source 
fix model

See merge request witelgroup/rms_v2!156
This commit is contained in:
amirghasempoor
2025-08-13 11:20:59 +00:00
parent cfc5d460ba 572642eb38
commit 9b1a5a815e
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorController.php
View File

@@ -87,8 +87,8 @@ class OperatorController extends Controller
$safety_and_privacy->recognize_picture = $request->has('recognize_picture') ?
FileFacade::save($request->recognize_picture, "safety_and_privacy/{$safety_and_privacy->id}") :
null;
$safety_and_privacy->recognize_picture_2 = $request->has('recognize_picture_2') ?
FileFacade::save($request->recognize_picture_2, "safety_and_privacy/{$safety_and_privacy->id}") :
$safety_and_privacy->recognize_picture_second = $request->has('recognize_picture_second') ?
FileFacade::save($request->recognize_picture_second, "safety_and_privacy/{$safety_and_privacy->id}") :
null;
$safety_and_privacy->save();

2
app/Http/Requests/V3/SafetyAndPrivacy/FirstStepStoreRequest.php
View File

@@ -27,7 +27,7 @@ class FirstStepStoreRequest extends FormRequest
'activity_date' => 'required|date_format:Y-m-d',
'activity_time' => 'required|date_format:H:i',
'recognize_picture' => 'required|image',
'recognize_picture_2' => 'required|image',
'recognize_picture_second' => 'required|image',
'axis_type_id' => 'required|integer|exists:axis_types,id',
];
}

4
app/Models/SafetyAndPrivacy.php
View File

@@ -48,7 +48,7 @@ class SafetyAndPrivacy extends Model
'supervisor_id',
'finish_picture',
'evidence_picture',
'recognize_picture_2',
'recognize_picture_second',
];
public $table = "safety_and_privacy";
@@ -99,7 +99,7 @@ class SafetyAndPrivacy extends Model
);
}
protected function recognizePicture2(): Attribute
protected function recognizePictureSecond(): Attribute
{
return Attribute::make(
get: fn($value) => $value == null ? null : Storage::disk('public')->url($value)

2
app/Services/Cartables/SafetyAndPrivacy/OperatorService.php
View File

@@ -18,7 +18,7 @@ class OperatorService
'id','lat','lon', 'recognize_picture','action_picture','created_at','step', 'final_description',
'info_fa', 'activity_date_time', 'action_picture_document_upload_date', 'judiciary_document_upload_date',
'step_fa', 'axis_type_id', 'axis_type_name', 'action_date', 'is_finished', 'status_fa', 'supervisor_description',
'operator_description', 'finish_picture', 'evidence_picture', 'recognize_picture_2'
'operator_description', 'finish_picture', 'evidence_picture', 'recognize_picture_second'
];
throw_if(is_null($user->edarate_shahri_id), new ProhibitedAction('اداره ای برای شما در سامانه ثبت نشده است!'));

4
database/migrations/2025_08_12_162810_add_pictures_to_safety_and_privacy_table.php
View File

@@ -12,7 +12,7 @@ return new class extends Migration
public function up(): void
{
Schema::table('safety_and_privacy', function (Blueprint $table) {
$table->string('recognize_picture_2')->nullable();
$table->string('recognize_picture_second')->nullable();
$table->string('finish_picture')->nullable();
$table->string('evidence_picture')->nullable();
});
@@ -24,7 +24,7 @@ return new class extends Migration
public function down(): void
{
Schema::table('safety_and_privacy', function (Blueprint $table) {
$table->dropColumn(['recognize_picture_2', 'finish_picture', 'evidence_picture']);
$table->dropColumn(['recognize_picture_second', 'finish_picture', 'evidence_picture']);
});
}
};