diff --git a/app/Helpers/Cetak.php b/app/Helpers/Cetak.php index d3f3cda4..9be2f1cd 100644 --- a/app/Helpers/Cetak.php +++ b/app/Helpers/Cetak.php @@ -21,7 +21,7 @@ class Cetak * @param string $filename * @return string */ - public static function cetak($jenis, $models, $filename, $template_id,) + public static function cetak($jenis, $models, $filename, $template_id) { $index = 0; $mainXml = ''; @@ -48,7 +48,7 @@ public static function cetak($jenis, $models, $filename, $template_id,) * Ambil TemplateProsessor. * * @param string $jenis kak|spj|sk|st|dpr|spd|bon - * @param $id + * @param $id * @return TemplateProcessor */ public static function getTemplate(string $jenis, $id, $template_id) @@ -180,6 +180,5 @@ public static function validate($jenis, $model_id) 'Perkiraan jumlah penggunaan anggaran tidak sama dengan total nilai barang/jasa' ); } - } } diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 8893bc4b..c4d528a0 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -1006,7 +1006,6 @@ public static function setOptionTemplate($jenis) return self::setOptions(Template::cache()->get('all')->where('jenis', $jenis), 'id', 'nama'); } - public static function setOptionPengelola($role, $tanggal, $unitKerjaId = null) { return self::setOptions(self::getUsersByPengelola($role, $tanggal, $unitKerjaId), 'id', 'name'); diff --git a/app/Imports/DaftarHonorImport.php b/app/Imports/DaftarHonorImport.php index 43e239ed..5befcbea 100644 --- a/app/Imports/DaftarHonorImport.php +++ b/app/Imports/DaftarHonorImport.php @@ -9,7 +9,7 @@ use Maatwebsite\Excel\Concerns\WithHeadingRow; use Maatwebsite\Excel\Concerns\WithMultipleSheets; -class DaftarHonorImport implements ToCollection, WithMultipleSheets, WithHeadingRow +class DaftarHonorImport implements ToCollection, WithMultipleSheets, WithHeadingRow { protected $id; diff --git a/app/Imports/KodeArsipsImport.php b/app/Imports/KodeArsipsImport.php index 76bf5075..f0b088e0 100644 --- a/app/Imports/KodeArsipsImport.php +++ b/app/Imports/KodeArsipsImport.php @@ -25,7 +25,7 @@ public function collection(Collection $rows) 'tata_naskah_id' => $this->tata_naskah_id, ], [ - 'detail' => $row['detail'], + 'detail' => $row['detail'], 'kode' => $row['kode'], 'group' => $row['group'], 'updated_at' => now(), diff --git a/app/Imports/MataAnggaransImport.php b/app/Imports/MataAnggaransImport.php index 236e5c07..6d0ae0c9 100644 --- a/app/Imports/MataAnggaransImport.php +++ b/app/Imports/MataAnggaransImport.php @@ -10,8 +10,7 @@ use Maatwebsite\Excel\Imports\HeadingRowFormatter; HeadingRowFormatter::default('none'); -class MataAnggaransImport implements ToCollection, WithHeadingRow - +class MataAnggaransImport implements ToCollection, WithHeadingRow { protected $satker; protected $wilayah; @@ -34,17 +33,18 @@ public function collection(Collection $rows) $replaces['.'.$this->wilayah] = ''; $anggaran = explode('||', $row['Kode'])[0]; $mak = strtr($anggaran, $replaces); - if ($mak) - KamusAnggaran::updateOrCreate( - [ - 'mak' => $mak, - 'dipa_id' => $this->dipa_id, - ], - [ - 'detail' => $row['Program/ Kegiatan/ KRO/ RO/ Komponen'], - 'updated_at' => now(), - ] - ); + if ($mak) { + KamusAnggaran::updateOrCreate( + [ + 'mak' => $mak, + 'dipa_id' => $this->dipa_id, + ], + [ + 'detail' => $row['Program/ Kegiatan/ KRO/ RO/ Komponen'], + 'updated_at' => now(), + ] + ); + } if (strlen($mak) == 37) { MataAnggaran::updateOrCreate( [ diff --git a/app/Imports/MitrasImport.php b/app/Imports/MitrasImport.php index e12dd977..f5c9ab0f 100644 --- a/app/Imports/MitrasImport.php +++ b/app/Imports/MitrasImport.php @@ -14,7 +14,6 @@ class MitrasImport implements ToCollection, WithHeadingRow { protected $kepka_mitra_id; - public function __construct($kepka_mitra_id) { $this->kepka_mitra_id = $kepka_mitra_id; @@ -23,24 +22,22 @@ public function __construct($kepka_mitra_id) public function collection(Collection $rows) { foreach ($rows as $row) { - if ($row['Status Seleksi (1=Terpilih, 2=Tidak Terpilih)'] == 1) - Mitra::updateOrCreate( - [ - 'nik' => $row['NIK'], - 'kepka_mitra_id' => $this->kepka_mitra_id, - ], - [ - - 'nama' => $row['Nama'], - 'email' => $row['Email'], - 'alamat' => $row['Alamat Detail'], - 'tanggal_lahir' => Carbon::createFromFormat('d/m/Y',$row['Tanggal Lahir (dd/mm/yyyy)']), - 'npwp' => $row['NPWP'], - ] - ); - - - + if ($row['Status Seleksi (1=Terpilih, 2=Tidak Terpilih)'] == 1) { + Mitra::updateOrCreate( + [ + 'nik' => $row['NIK'], + 'kepka_mitra_id' => $this->kepka_mitra_id, + ], + [ + + 'nama' => $row['Nama'], + 'email' => $row['Email'], + 'alamat' => $row['Alamat Detail'], + 'tanggal_lahir' => Carbon::createFromFormat('d/m/Y', $row['Tanggal Lahir (dd/mm/yyyy)']), + 'npwp' => $row['NPWP'], + ] + ); + } } } } diff --git a/app/Models/Mitra.php b/app/Models/Mitra.php index 12233e43..9759cead 100644 --- a/app/Models/Mitra.php +++ b/app/Models/Mitra.php @@ -24,5 +24,4 @@ public static function cacheEntities(): array }), ]; } - } diff --git a/app/Nova/Actions/ImportMitra.php b/app/Nova/Actions/ImportMitra.php index e43bb097..e37cd803 100644 --- a/app/Nova/Actions/ImportMitra.php +++ b/app/Nova/Actions/ImportMitra.php @@ -2,13 +2,11 @@ namespace App\Nova\Actions; -use App\Helpers\Helper; use App\Imports\MitrasImport; use App\Models\Mitra; use Illuminate\Bus\Queueable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Support\Collection; -use Illuminate\Support\Facades\Storage; use Laravel\Nova\Actions\Action; use Laravel\Nova\Fields\ActionFields; use Laravel\Nova\Fields\File; diff --git a/app/Nova/AnggaranKerangkaAcuan.php b/app/Nova/AnggaranKerangkaAcuan.php index 1143a3f8..c956780a 100644 --- a/app/Nova/AnggaranKerangkaAcuan.php +++ b/app/Nova/AnggaranKerangkaAcuan.php @@ -63,7 +63,7 @@ public function fields(NovaRequest $request) }), Currency::make('Perkiraan Digunakan ', 'perkiraan') - ->rules('required','gt:1') + ->rules('required', 'gt:1') ->min(1) ->step(1), diff --git a/app/Nova/JenisKontrak.php b/app/Nova/JenisKontrak.php index 02709dca..ab3c3ee4 100644 --- a/app/Nova/JenisKontrak.php +++ b/app/Nova/JenisKontrak.php @@ -52,7 +52,7 @@ public function fields(NovaRequest $request) Text::make('Jenis Kontrak', 'jenis') ->rules('required'), Currency::make('Batas maksimal (SBML)', 'sbml') - ->rules('required','gt:1') + ->rules('required', 'gt:1') ->step(1) ->min(1), ]; diff --git a/app/Nova/KerangkaAcuan.php b/app/Nova/KerangkaAcuan.php index 28a8dff4..74ffebe6 100644 --- a/app/Nova/KerangkaAcuan.php +++ b/app/Nova/KerangkaAcuan.php @@ -218,6 +218,7 @@ public function utamaFields() ]; } + /** * Fields Pengadaan Kerangka Acuan. * @@ -283,6 +284,4 @@ public function pengelolaFields() ]; } - - } diff --git a/app/Nova/Mitra.php b/app/Nova/Mitra.php index 28e95242..c16c407f 100644 --- a/app/Nova/Mitra.php +++ b/app/Nova/Mitra.php @@ -5,7 +5,6 @@ use App\Helpers\Helper; use App\Helpers\Policy; use App\Nova\Actions\AddHasManyModel; -use App\Nova\Actions\ImportMitra; use Illuminate\Http\Request; use Illuminate\Validation\Rule; use Laravel\Nova\Fields\Date; @@ -120,18 +119,18 @@ public function actions(NovaRequest $request) { $actions = []; if (Policy::make()->allowedFor('admin')->get()) { - $actions [] = + $actions [] = AddHasManyModel::make('Mitra', 'KepkaMitra', $request->viaResourceId) - ->confirmButtonText('Tambah') - ->size('7xl') - ->standalone() - ->addFields($this->fields($request)); + ->confirmButtonText('Tambah') + ->size('7xl') + ->standalone() + ->addFields($this->fields($request)); } return $actions; } - /** + /** * Return the location to redirect the user after update. * * @param \Laravel\Nova\Http\Requests\NovaRequest $request diff --git a/app/Nova/SpesifikasiKerangkaAcuan.php b/app/Nova/SpesifikasiKerangkaAcuan.php index 4b60604b..76ec19df 100644 --- a/app/Nova/SpesifikasiKerangkaAcuan.php +++ b/app/Nova/SpesifikasiKerangkaAcuan.php @@ -55,7 +55,7 @@ public function fields(NovaRequest $request) Text::make('Rincian') ->rules('required'), Number::make('Volume') - ->rules('required','gt:0')->min(0), + ->rules('required', 'gt:0')->min(0), Text::make('Satuan') ->rules('required'), Currency::make('Harga Satuan') @@ -64,7 +64,7 @@ public function fields(NovaRequest $request) ->step(1), Currency::make('Total', 'total_harga') ->dependsOn(['volume', 'harga_satuan'], function (Currency $field, NovaRequest $request, FormData $formData) { - return $field->default((float) $formData->harga_satuan * (float)$formData->volume); + return $field->default((float) $formData->harga_satuan * (float) $formData->volume); }) ->min(1) ->onlyOnIndex(), diff --git a/app/Policies/KepkaMitraPolicy.php b/app/Policies/KepkaMitraPolicy.php index b37d1da8..9b081110 100644 --- a/app/Policies/KepkaMitraPolicy.php +++ b/app/Policies/KepkaMitraPolicy.php @@ -92,5 +92,4 @@ public function addMitra(): bool ->allowedFor('admin') ->get(); } - } diff --git a/database/migrations/2024_08_14_143646_create_mitras_table.php b/database/migrations/2024_08_14_143646_create_mitras_table.php index a55f07bc..113e4e5f 100644 --- a/database/migrations/2024_08_14_143646_create_mitras_table.php +++ b/database/migrations/2024_08_14_143646_create_mitras_table.php @@ -16,9 +16,9 @@ public function up(): void $table->string('nik'); $table->string('nama'); $table->string('alamat')->nullable(); - $table->string('rekening',80)->nullable(); - $table->string('npwp',40)->nullable(); - $table->string('email',80)->nullable(); + $table->string('rekening', 80)->nullable(); + $table->string('npwp', 40)->nullable(); + $table->string('email', 80)->nullable(); $table->date('tanggal_lahir')->nullable(); $table->bigInteger('kepka_mitra_id')->nullable()->unsigned(); $table->timestamps();