Merge remote-tracking branch 'origin/master' into new
# Conflicts: # composer.lock
This commit is contained in:
commit
38ba8fac54
@ -100,14 +100,6 @@
|
|||||||
'group' => $request->group,
|
'group' => $request->group,
|
||||||
];
|
];
|
||||||
|
|
||||||
if($request->hasFile('file_upload')) {
|
|
||||||
$file = $request->file('file_upload');
|
|
||||||
$filename = $file->getClientOriginalName();
|
|
||||||
$file->move(public_path('uploads'), $filename);
|
|
||||||
$detail['file_name'] = $filename;
|
|
||||||
$detail['file_path'] = public_path('uploads');
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
DocumentDetail::create($detail);
|
DocumentDetail::create($detail);
|
||||||
}
|
}
|
||||||
|
@ -32,10 +32,7 @@ class DocumentDetail extends Model
|
|||||||
'custom_field_1',
|
'custom_field_1',
|
||||||
'custom_field_2',
|
'custom_field_2',
|
||||||
'custom_field_3',
|
'custom_field_3',
|
||||||
'custom_field_4',
|
'custom_field_4'
|
||||||
|
|
||||||
'file_name',
|
|
||||||
'file_path',
|
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -33,8 +33,6 @@ return new class extends Migration
|
|||||||
$table->string('custom_field_4')->nullable();
|
$table->string('custom_field_4')->nullable();
|
||||||
$table->string('status')->nullable();
|
$table->string('status')->nullable();
|
||||||
$table->string('keterangan')->nullable();
|
$table->string('keterangan')->nullable();
|
||||||
$table->string('file_name')->nullable();
|
|
||||||
$table->string('file_path')->nullable();
|
|
||||||
|
|
||||||
$table->timestamps();
|
$table->timestamps();
|
||||||
$table->softDeletes();
|
$table->softDeletes();
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
namespace Database\Seeders;
|
namespace Database\Seeders;
|
||||||
|
|
||||||
use App\Models\Directorat;
|
use App\Models\Directorat;
|
||||||
use App\Models\DocumentType;
|
|
||||||
use App\Models\Job;
|
use App\Models\Job;
|
||||||
use App\Models\SpecialCode;
|
use App\Models\SpecialCode;
|
||||||
use App\Models\SubDirectorat;
|
use App\Models\SubDirectorat;
|
||||||
@ -65,10 +64,5 @@ class LabelSeeder extends Seeder
|
|||||||
'kode' => '98',
|
'kode' => '98',
|
||||||
'name' => 'Softcopy'
|
'name' => 'Softcopy'
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$documentType = DocumentType::create([
|
|
||||||
'kode' => '01',
|
|
||||||
'name' => 'Surat Masuk',
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
@ -2,7 +2,7 @@
|
|||||||
$route = explode('.', Route::currentRouteName());
|
$route = explode('.', Route::currentRouteName());
|
||||||
@endphp
|
@endphp
|
||||||
<!--begin:Form-->
|
<!--begin:Form-->
|
||||||
<form class="form_{{$route[0]}}" enctype="multipart/form-data" method="POST" action="{{ route($route[0].'.store') }}">
|
<form class="form_{{$route[0]}}" method="POST" action="{{ route($route[0].'.store') }}">
|
||||||
@csrf
|
@csrf
|
||||||
<!--begin::Input group-->
|
<!--begin::Input group-->
|
||||||
<div class="d-flex flex-column mb-8 fv-row">
|
<div class="d-flex flex-column mb-8 fv-row">
|
||||||
@ -349,20 +349,6 @@
|
|||||||
</div>
|
</div>
|
||||||
<!--end::Input group-->
|
<!--end::Input group-->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-lg-12">
|
|
||||||
<!--begin::Input group-->
|
|
||||||
<div class="d-flex flex-column mb-8 fv-row">
|
|
||||||
<!--begin::Label-->
|
|
||||||
<label class="d-flex align-items-center fs-6 fw-semibold mb-2">
|
|
||||||
<span>File</span>
|
|
||||||
<span class="ms-1" data-bs-toggle="tooltip" title="Specify a target name for future usage and reference"></span>
|
|
||||||
</label>
|
|
||||||
<!--end::Label-->
|
|
||||||
<input type="file" accept="application/pdf,image/*" class="form-control form-control-solid" name="file_upload" />
|
|
||||||
</div>
|
|
||||||
<!--end::Input group-->
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!--begin::Actions-->
|
<!--begin::Actions-->
|
||||||
|
Loading…
Reference in New Issue
Block a user