Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/Helpers/Cetak.php
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,5 @@ public static function validate($jenis, $model_id)
'Mohon Generate BAST terlebih dahulu sebelum mencetak!'
);
}

}
}
9 changes: 4 additions & 5 deletions app/Helpers/Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ public static function isAkunHonorChanged($mak_old, $mak_new)
/**
* Memeriksa apakah kode akun merupakan akun persediaan.
*
* @param string $mak Kode akun yang akan diperiksa.
* @param string $mak Kode akun yang akan diperiksa.
* @return bool Mengembalikan true jika kode akun merupakan akun persediaan, sebaliknya false.
*/
public static function isAkunPersediaan(string $mak): bool
Expand All @@ -600,8 +600,8 @@ public static function isAkunPersediaan(string $mak): bool
* Fungsi ini membandingkan dua nilai akun persediaan dan menentukan apakah
* ada perubahan antara nilai lama dan nilai baru.
*
* @param string $mak_old Nilai akun persediaan lama.
* @param string $mak_new Nilai akun persediaan baru.
* @param string $mak_old Nilai akun persediaan lama.
* @param string $mak_new Nilai akun persediaan baru.
* @return bool Mengembalikan true jika akun persediaan berubah, sebaliknya false.
*/
public static function isAkunPersediaanChanged($mak_old, $mak_new)
Expand Down Expand Up @@ -938,7 +938,6 @@ public static function makeKontrakMitra($kontrak_mitra_id)
->toArray();
}


/**
* Get property from collection.
*
Expand Down Expand Up @@ -1015,7 +1014,7 @@ public static function getLatestHargaSatuanId($tanggal)
/**
* Mengambil harga satuan terbaru berdasarkan tanggal yang diberikan.
*
* @param string $tanggal Tanggal untuk memfilter data harga satuan.
* @param string $tanggal Tanggal untuk memfilter data harga satuan.
* @return HargaSatuan|null Objek HargaSatuan terbaru atau null jika tidak ditemukan.
*/
public static function getLatestHargaSatuan($tanggal)
Expand Down
1 change: 0 additions & 1 deletion app/Models/AnggaranKerangkaAcuan.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ protected static function booted(): void
$pembelian->save();
}
}

});
static::deleting(function (AnggaranKerangkaAcuan $anggaranKak) {
$ids = HonorKegiatan::where('anggaran_kerangka_acuan_id', $anggaranKak->id)->pluck('id')->toArray();
Expand Down
4 changes: 3 additions & 1 deletion app/Models/ArsipDokumen.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@

use Illuminate\Database\Eloquent\Model;

class ArsipDokumen extends Model {}
class ArsipDokumen extends Model
{
}
4 changes: 3 additions & 1 deletion app/Models/BarangPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@

use Illuminate\Database\Eloquent\Model;

class BarangPersediaan extends Model {}
class BarangPersediaan extends Model
{
}
1 change: 0 additions & 1 deletion app/Models/DaftarKontrakMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,5 @@ protected static function booted(): void
}
}
});

}
}
1 change: 0 additions & 1 deletion app/Models/KontrakMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ protected static function booted(): void
if ($kontrak->isDirty()) {
$kontrak->status = $kontrak->status === 'dibuat' ? 'diubah' : 'outdated';
}

});
}
}
2 changes: 1 addition & 1 deletion app/Nova/Actions/GenerateKontrakMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public function handle(ActionFields $fields, Collection $models)
->whereIn('honor_kegiatan_id', $honorKegiatanIds)
->update(['daftar_kontrak_mitra_id' => $daftar_mitra->id]);
}
$model::where('id',$model->id)->update(['status' => 'digenerate']);
$model::where('id', $model->id)->update(['status' => 'digenerate']);
$ids = DaftarKontrakMitra::where('updated_at', null)->get()->pluck('id');
DaftarKontrakMitra::destroy($ids);

Expand Down
2 changes: 1 addition & 1 deletion app/Nova/BarangPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static function label()
public function fields(NovaRequest $request)
{
return [

];
}

Expand Down
11 changes: 6 additions & 5 deletions app/Policies/BarangPersediaanPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

use App\Helpers\Policy;

class BarangPersediaanPolicy{
class BarangPersediaanPolicy
{
/**
* Determine whether the user can view any models.
*/
Expand All @@ -21,8 +22,8 @@ public function viewAny(): bool
public function view(): bool
{
return Policy::make()
->allowedFor('koordinator,anggota,bmn')
->get();
->allowedFor('koordinator,anggota,bmn')
->get();
}

/**
Expand All @@ -31,8 +32,8 @@ public function view(): bool
public function create(): bool
{
return Policy::make()
->allowedFor('koordinator,anggota,bmn')
->get();
->allowedFor('koordinator,anggota,bmn')
->get();
}

/**
Expand Down
16 changes: 8 additions & 8 deletions app/Policies/HonorKegiatanPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ public function create(): bool
public function update(User $user, HonorKegiatan $honor): bool
{
return Policy::make()
->allowedFor('koordinator,anggota')
->withYear($honor->tahun)
->andEqual($honor->unit_kerja_id, Helper::getDataPegawaiByUserId($user->id, now())->unit_kerja_id)
->get();
->allowedFor('koordinator,anggota')
->withYear($honor->tahun)
->andEqual($honor->unit_kerja_id, Helper::getDataPegawaiByUserId($user->id, now())->unit_kerja_id)
->get();
}

/**
Expand All @@ -64,10 +64,10 @@ public function update(User $user, HonorKegiatan $honor): bool
public function delete(User $user, HonorKegiatan $honor): bool
{
return Policy::make()
->allowedFor('koordinator,anggota')
->withYear($honor->tahun)
->andEqual($honor->unit_kerja_id, Helper::getDataPegawaiByUserId($user->id, now())->unit_kerja_id)
->get();
->allowedFor('koordinator,anggota')
->withYear($honor->tahun)
->andEqual($honor->unit_kerja_id, Helper::getDataPegawaiByUserId($user->id, now())->unit_kerja_id)
->get();
}

/**
Expand Down
2 changes: 1 addition & 1 deletion app/Policies/KerangkaAcuanPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public function view(User $user, KerangkaAcuan $kerangkaAcuan): bool
->andEqual($kerangkaAcuan->unit_kerja_id, Helper::getDataPegawaiByUserId($user->id, now())->unit_kerja_id)
->get();
}

return Policy::make()
->notAllowedFor('admin')
->withYear(Helper::getYearFromDate($kerangkaAcuan->tanggal))
Expand Down Expand Up @@ -90,5 +91,4 @@ public function runAction(User $user, KerangkaAcuan $kerangkaAcuan): bool
->withYear(Helper::getYearFromDate($kerangkaAcuan->tanggal))
->get();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ public function up(): void
{
Schema::create('master_persediaans', function (Blueprint $table) {
$table->id();
$table->string('kode',20)->nullable()->unique();
$table->string('kode', 20)->nullable()->unique();
$table->string('barang')->nullable();
$table->string('satuan',20)->nullable();
$table->string('satuan', 20)->nullable();
$table->timestamps();
});
}
Expand Down