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
6 changes: 2 additions & 4 deletions app/Helpers/Cetak.php
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ public static function bon($id)
$tim_id = Helper::getPropertyFromCollection(Helper::getDataPegawaiByUserId($data->user_id, $data->tanggal_permintaan), 'unit_kerja_id');

return [
'tim' =>Helper::getPropertyFromCollection(UnitKerja::cache()->get('all')->where('id', $tim_id)->first(), 'unit'),
'tim' => Helper::getPropertyFromCollection(UnitKerja::cache()->get('all')->where('id', $tim_id)->first(), 'unit'),
'kegiatan' => $data->kegiatan,
'keterangan' => $data->keterangan,
'tanggal_permintaan' => Helper::terbilangTanggal($data->tanggal_permintaan),
Expand All @@ -373,8 +373,6 @@ public static function bon($id)
];
}



public static function validate($jenis, $model_id)
{
if ($jenis === 'kak') {
Expand Down Expand Up @@ -434,7 +432,7 @@ public static function validate($jenis, $model_id)
if ($jenis === 'bastp') {
$bastp = PembelianPersediaan::where('id', $model_id)->first();
throw_if(
!in_array($bastp->status, ['berkode', 'dicetak']),
! in_array($bastp->status, ['berkode', 'dicetak']),
'Hanya yang berstatus berkode atau dicetak yang dapat dicetak ulang.'
);
throw_if(
Expand Down
2 changes: 1 addition & 1 deletion app/Helpers/Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ public static function cekStokPersediaan($id)
->where('master_persediaan_id', $id)
->groupBy('master_persediaan_id')
->first();
return $stok ? $stok->stok : 0;

return $stok ? $stok->stok : 0;
}

/**
Expand Down
16 changes: 6 additions & 10 deletions app/Models/BarangPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@

namespace App\Models;

use App\Models\PermintaanPersediaan;
use App\Models\PersediaanKeluar;
use App\Models\PersediaanMasuk;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;

class BarangPersediaan extends Model
{
protected $fillable = [
'tanggal_transaksi'
'tanggal_transaksi',
];

protected $casts = [
Expand All @@ -30,13 +27,13 @@ protected static function booted(): void
if (! empty($persediaan->masterPersediaan)) {
$persediaan->barang = $persediaan->masterPersediaan->barang;
$persediaan->satuan = $persediaan->masterPersediaan->satuan;

}
if ($persediaan->barang_persediaanable_type == 'App\Models\PembelianPersediaan' && $persediaan->isDirty()) {
if ($persediaan->isClean('master_persediaan_id'))
PembelianPersediaan::where('id', $persediaan->barang_persediaanable_id)
->where('status', 'diterima')
->update(['status' => 'outdated']);
if ($persediaan->isClean('master_persediaan_id')) {
PembelianPersediaan::where('id', $persediaan->barang_persediaanable_id)
->where('status', 'diterima')
->update(['status' => 'outdated']);
}
PembelianPersediaan::where('id', $persediaan->barang_persediaanable_id)
->where('status', 'berkode')
->update(['status' => 'diterima']);
Expand All @@ -46,7 +43,6 @@ protected static function booted(): void
PermintaanPersediaan::where('id', $persediaan->barang_persediaanable_id)
->where('status', 'dicetak')
->update(['status' => 'outdated']);

}
if ($persediaan->barang_persediaanable_type == 'App\Models\PersediaanKeluar' && $persediaan->isDirty()) {
$persediaan->tanggal_transaksi = PersediaanKeluar::find($persediaan->barang_persediaanable_id)->tanggal_buku;
Expand Down
1 change: 0 additions & 1 deletion app/Models/IzinKeluar.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace App\Models;

use App\Helpers\Helper;
use App\Helpers\Policy;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Support\Facades\Auth;
Expand Down
36 changes: 17 additions & 19 deletions app/Models/PembelianPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,28 +43,26 @@ protected static function booted(): void
});
static::updating(function (PembelianPersediaan $pembelian) {
if ($pembelian->bast_naskah_keluar_id === null) {
$default_naskah = NaskahDefault::cache()->get('all')
->where('jenis', 'bastp')
->first();
$naskahkeluar = new NaskahKeluar;
$naskahkeluar->tanggal = $pembelian->tanggal_bast;
$naskahkeluar->jenis_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'jenis_naskah_id');
$naskahkeluar->kode_arsip_id = Helper::getPropertyFromCollection($default_naskah, 'kode_arsip_id')[0];
$naskahkeluar->derajat_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'derajat_naskah_id');
$naskahkeluar->tujuan = 'Pengelola Barang Persediaan';
$naskahkeluar->perihal = 'BAST '.$pembelian->rincian;
$naskahkeluar->generate = 'A';
$naskahkeluar->save();
$pembelian->bast_naskah_keluar_id = $naskahkeluar->id;
} else {
if ($pembelian->isDirty(['tanggal_bast'])) {
$naskahkeluar = NaskahKeluar::where('id', $pembelian->bast_naskah_keluar_id)->first();
$default_naskah = NaskahDefault::cache()->get('all')
->where('jenis', 'bastp')
->first();
$naskahkeluar = new NaskahKeluar;
$naskahkeluar->tanggal = $pembelian->tanggal_bast;
$naskahkeluar->jenis_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'jenis_naskah_id');
$naskahkeluar->kode_arsip_id = Helper::getPropertyFromCollection($default_naskah, 'kode_arsip_id')[0];
$naskahkeluar->derajat_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'derajat_naskah_id');
$naskahkeluar->tujuan = 'Pengelola Barang Persediaan';
$naskahkeluar->perihal = 'BAST '.$pembelian->rincian;
$naskahkeluar->generate = 'A';
$naskahkeluar->save();
$pembelian->bast_naskah_keluar_id = $naskahkeluar->id;
} else {
if ($pembelian->isDirty(['tanggal_bast'])) {
$naskahkeluar = NaskahKeluar::where('id', $pembelian->bast_naskah_keluar_id)->first();
$naskahkeluar->tanggal = $pembelian->tanggal_bast;
$naskahkeluar->save();
}
}
}
});


}
}
1 change: 0 additions & 1 deletion app/Models/PermintaanPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ protected static function booted(): void
}
});


static::deleting(function (PermintaanPersediaan $permintaan) {
$permintaan->daftarBarangPersediaans->each->delete();
});
Expand Down
4 changes: 2 additions & 2 deletions app/Models/PersediaanKeluar.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ protected static function booted(): void
static::saving(function (PersediaanKeluar $persediaan) {
if ($persediaan->isDirty('tanggal_buku')) {
BarangPersediaan::where('barang_persediaanable_id', $persediaan->id)
->where('barang_persediaanable_type', 'App\Models\PersediaanKeluar')
->update(['tanggal_transaksi' => $persediaan->tanggal_buku]);
->where('barang_persediaanable_type', 'App\Models\PersediaanKeluar')
->update(['tanggal_transaksi' => $persediaan->tanggal_buku]);
}
});
static::deleting(function (PersediaanKeluar $persediaan) {
Expand Down
8 changes: 2 additions & 6 deletions app/Nova/Actions/ImportBarangFromSpesifikasiKerangkaAcuan.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,12 @@
namespace App\Nova\Actions;

use App\Models\BarangPersediaan;
use App\Models\Mitra;
use App\Models\SpesifikasiKerangkaAcuan;
use Illuminate\Bus\Queueable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Support\Carbon;
use Illuminate\Support\Collection;
use Laravel\Nova\Actions\Action;
use Laravel\Nova\Fields\ActionFields;
use Laravel\Nova\Fields\File;
use Laravel\Nova\Fields\Heading;
use Laravel\Nova\Http\Requests\NovaRequest;

class ImportBarangFromSpesifikasiKerangkaAcuan extends Action
Expand All @@ -33,9 +29,9 @@ public function handle(ActionFields $fields, Collection $models)
BarangPersediaan::where('barang_persediaanable_id', $model->id)
->where('barang_persediaanable_type', 'App\Models\PembelianPersediaan')
->delete();
$speks =SpesifikasiKerangkaAcuan::where('kerangka_acuan_id', $model->kerangka_acuan_id)->get();
$speks = SpesifikasiKerangkaAcuan::where('kerangka_acuan_id', $model->kerangka_acuan_id)->get();
foreach ($speks as $spek) {
$barang = New BarangPersediaan;
$barang = new BarangPersediaan;
$barang->barang = $spek->rincian;
$barang->satuan = $spek->satuan;
$barang->volume = $spek->volume;
Expand Down
1 change: 0 additions & 1 deletion app/Nova/Actions/SetStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public function handle(ActionFields $fields, Collection $models)
{
$model = $models->first();
$model->query()->update([$this->statusField => $this->status]);

}

/**
Expand Down
5 changes: 2 additions & 3 deletions app/Nova/BarangPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ public function fields(NovaRequest $request)
->step(1)
->rules('required', 'gt:0')->min(0);
}

}

if ($request->viaResource == 'permintaan-persediaans') {
Expand Down Expand Up @@ -151,8 +150,8 @@ public function fields(NovaRequest $request)
->rules('required', 'gt:0');
$fields[] =
Number::make('Harga Satuan')
->step(1)
->rules('required', 'gt:0')->min(0);
->step(1)
->rules('required', 'gt:0')->min(0);
}

if ($request->viaResource == 'persediaan-keluars') {
Expand Down
2 changes: 0 additions & 2 deletions app/Nova/DaftarHonorMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use App\Helpers\Policy;
use App\Nova\Actions\EditRekening;
use App\Nova\Actions\ImportDaftarHonorMitra;
use App\Nova\Lenses\RekapHonorMitra;
use Laravel\Nova\Fields\Currency;
use Laravel\Nova\Fields\Number;
use Laravel\Nova\Fields\Status;
Expand Down Expand Up @@ -141,7 +140,6 @@ public function filters(NovaRequest $request)
public function lenses(NovaRequest $request)
{
return [


];
}
Expand Down
8 changes: 4 additions & 4 deletions app/Nova/HonorKegiatan.php
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,10 @@ public function actions(NovaRequest $request)
if (Policy::make()->allowedFor('all')->get()) {
$actions[] =
Download::make('spj', 'Unduh SPJ')
->showInline()
->showOnDetail()
->exceptOnIndex()
->confirmButtonText('Unduh');
->showInline()
->showOnDetail()
->exceptOnIndex()
->confirmButtonText('Unduh');
$actions[] =
ExportTemplateBos::make()
->showInline()
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/MasterPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public static function label()

public function subtitle()
{
return $this->barang . ' (' . $this->satuan . ')';
return $this->barang.' ('.$this->satuan.')';
}

/**
Expand Down
17 changes: 8 additions & 9 deletions app/Nova/PembelianPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

use App\Helpers\Helper;
use App\Helpers\Policy;
use App\Models\BarangPersediaan;
use App\Nova\Actions\Download;
use App\Nova\Actions\ImportBarangFromSpesifikasiKerangkaAcuan;
use App\Nova\Actions\SetStatus;
Expand Down Expand Up @@ -71,7 +70,7 @@ public function fields(NovaRequest $request)
Panel::make('Keterangan Serah Terima Barang', [
Date::make('Tanggal BAST', 'tanggal_bast')
->displayUsing(fn ($tanggal) => Helper::terbilangTanggal($tanggal))
->rules('nullable', 'bail', 'after_or_equal:tanggal_kak' ,'before_or_equal:today'),
->rules('nullable', 'bail', 'after_or_equal:tanggal_kak', 'before_or_equal:today'),
Select::make('Pejabat Pembuat Komitmen', 'ppk_user_id')
->rules('required')
->searchable()
Expand Down Expand Up @@ -128,7 +127,7 @@ public function cards(NovaRequest $request)
{
return [
HelperPembelianPersediaan::make()
->width('full'),
->width('full'),
];
}

Expand Down Expand Up @@ -191,12 +190,12 @@ public function actions(NovaRequest $request)

return $this->resource instanceof Model && $this->resource->tanggal_bast !== null && $this->resource->tanggal_buku !== null && $this->resource->status === 'diterima';
});
$actions[] =
Download::make('bastp', 'Unduh BAST')
->showInline()
->showOnDetail()
->exceptOnIndex()
->confirmButtonText('Unduh');
$actions[] =
Download::make('bastp', 'Unduh BAST')
->showInline()
->showOnDetail()
->exceptOnIndex()
->confirmButtonText('Unduh');
}

return $actions;
Expand Down
4 changes: 2 additions & 2 deletions app/Nova/PersediaanKeluar.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ public function fields(NovaRequest $request)
->rules('required', 'max:40'),
Date::make('Tanggal Dokumen', 'tanggal_dokumen')
->sortable()
->displayUsing(fn($tanggal) => Helper::terbilangTanggal($tanggal))
->displayUsing(fn ($tanggal) => Helper::terbilangTanggal($tanggal))
->rules('required'),
Text::make('Rincian', 'rincian')
->rules('required'),
Date::make('Tanggal Buku', 'tanggal_buku')
->sortable()
->displayUsing(fn($tanggal) => Helper::terbilangTanggal($tanggal))
->displayUsing(fn ($tanggal) => Helper::terbilangTanggal($tanggal))
->rules('required', 'after_or_equal:tanggal_dokumen'),

MorphMany::make('Daftar Barang Persediaan', 'daftarBarangPersediaans', 'App\Nova\BarangPersediaan'),
Expand Down
7 changes: 1 addition & 6 deletions app/Policies/BarangPersediaanPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ public function create(): bool

return false;
});

}

/**
Expand Down Expand Up @@ -86,8 +85,6 @@ public function update(): bool
->get();
}



return false;
});
}
Expand Down Expand Up @@ -119,8 +116,6 @@ public function delete(): bool
->get();
}



return false;
});
}
Expand All @@ -130,7 +125,7 @@ public function delete(): bool
*/
public function replicate(): bool
{
return false;
return false;
}

public function runAction(): bool
Expand Down
1 change: 0 additions & 1 deletion app/Providers/NovaServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use App\Helpers\Helper;
use App\Models\Pengelola;
use App\Nova\BastMitra;
use App\Nova\DaftarHonorMitra;
use App\Nova\Dashboards\Main;
use App\Nova\Dipa;
use App\Nova\HargaSatuan;
Expand Down