update fitur perbaikan format pada bagian edit
This commit is contained in:
parent
043116fbc9
commit
1fc5f419e5
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
|
|
@ -341,7 +341,7 @@ class="form-control @error('jumlah') is-invalid @enderror"
|
||||||
@if (auth()->user()->isAdmin())
|
@if (auth()->user()->isAdmin())
|
||||||
<div class="col-md-4 harga-tambah">
|
<div class="col-md-4 harga-tambah">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label>Harga Satuan (Rp)</label>
|
<label>Harga (Rp)</label>
|
||||||
|
|
||||||
<input type="text" name="harga_satuan" id="hargaTambah"
|
<input type="text" name="harga_satuan" id="hargaTambah"
|
||||||
class="form-control @error('harga_satuan') is-invalid @enderror"
|
class="form-control @error('harga_satuan') is-invalid @enderror"
|
||||||
|
|
@ -532,7 +532,17 @@ function formatRupiah(angka) {
|
||||||
return rupiah;
|
return rupiah;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
function formatJumlah(angka){
|
||||||
|
|
||||||
|
angka = parseFloat(angka);
|
||||||
|
|
||||||
|
if(isNaN(angka)) return '';
|
||||||
|
|
||||||
|
if(angka === 0) return '0';
|
||||||
|
|
||||||
|
return angka.toString().replace(/\.?0+$/, '');
|
||||||
|
|
||||||
|
}
|
||||||
/* TAMBAH */
|
/* TAMBAH */
|
||||||
function hitungTambah() {
|
function hitungTambah() {
|
||||||
|
|
||||||
|
|
@ -622,17 +632,22 @@ function hitungEdit() {
|
||||||
$('#formEditTransaksi').attr('action', baseUrl + '/' + btn.data('id'));
|
$('#formEditTransaksi').attr('action', baseUrl + '/' + btn.data('id'));
|
||||||
$('#formEditTransaksi [name=nama_barang]').val(btn.data('nama'));
|
$('#formEditTransaksi [name=nama_barang]').val(btn.data('nama'));
|
||||||
$('#formEditTransaksi [name=jenis_transaksi]').val(btn.data('jenis'));
|
$('#formEditTransaksi [name=jenis_transaksi]').val(btn.data('jenis'));
|
||||||
$('#formEditTransaksi [name=jumlah]').val(btn.data('jumlah'));
|
$('#formEditTransaksi [name=jumlah]').val(
|
||||||
let harga = btn.data('harga');
|
formatJumlah(btn.data('jumlah'))
|
||||||
|
);
|
||||||
|
let harga = btn.data('harga');
|
||||||
|
|
||||||
if (harga !== null && harga !== undefined) {
|
if (harga !== null && harga !== undefined) {
|
||||||
harga = formatRupiah(harga.toString());
|
harga = formatRupiah(harga.toString());
|
||||||
|
} else {
|
||||||
|
harga = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
$('#formEditTransaksi [name=harga_satuan]').val(harga);
|
$('#formEditTransaksi [name=harga_satuan]').val(harga);
|
||||||
$('#formEditTransaksi [name=tanggal]').val(btn.data('tanggal'));
|
$('#formEditTransaksi [name=tanggal]').val(btn.data('tanggal'));
|
||||||
|
|
||||||
$('#jenisEdit').trigger('change');
|
$('#jenisEdit').trigger('change');
|
||||||
|
hitungEdit();
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,43 +2,47 @@
|
||||||
|
|
||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html lang="id">
|
<html lang="id">
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<meta name="csrf-token" content="{{ csrf_token() }}">
|
<meta name="csrf-token" content="{{ csrf_token() }}">
|
||||||
<title>{{ config('app.name') }} | {{ $title ?? '' }}</title>
|
<title>{{ config('app.name') }} | {{ $title ?? '' }}</title>
|
||||||
|
<link rel="icon" type="image/x-icon" href="{{ asset('assets/img/favicon.png') }}">
|
||||||
|
|
||||||
<!-- Google Font (SAMA DENGAN DASHBOARD) -->
|
<!-- Google Font (SAMA DENGAN DASHBOARD) -->
|
||||||
<link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;600&display=swap" rel="stylesheet">
|
<link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;600&display=swap" rel="stylesheet">
|
||||||
|
|
||||||
<!-- Bootstrap CSS -->
|
<!-- Bootstrap CSS -->
|
||||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet">
|
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||||
|
|
||||||
<!-- Custom CSS -->
|
<!-- Custom CSS -->
|
||||||
{{-- <link rel="stylesheet" href="{{ asset(path: 'assets/css/custom.css') }}"> --}}
|
{{-- <link rel="stylesheet" href="{{ asset(path: 'assets/css/custom.css') }}"> --}}
|
||||||
<link rel="stylesheet" href="{{ asset('assets/css/auth.css') }}?v={{ time() }}">
|
<link rel="stylesheet" href="{{ asset('assets/css/auth.css') }}?v={{ time() }}">
|
||||||
|
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body class="auth-page">
|
<body class="auth-page">
|
||||||
|
|
||||||
<div class="auth-wrapper">
|
<div class="auth-wrapper">
|
||||||
<div class="auth-card">
|
<div class="auth-card">
|
||||||
|
|
||||||
{{ $slot }}
|
{{ $slot }}
|
||||||
|
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
|
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
|
||||||
<script>
|
<script>
|
||||||
window.addEventListener("DOMContentLoaded", function () {
|
window.addEventListener("DOMContentLoaded", function() {
|
||||||
setTimeout(function () {
|
setTimeout(function() {
|
||||||
window.dispatchEvent(new Event("resize"));
|
window.dispatchEvent(new Event("resize"));
|
||||||
}, 60);
|
}, 60);
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -309,14 +309,14 @@ class="form-control @error('tanggal_produksi') is-invalid @enderror"
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label>Berat Telur Layak (Kg)</label>
|
<label>Berat Telur Layak (Kg)</label>
|
||||||
<input type="text" name="berat_telur_layak" maxlength="6" inputmode="decimal"
|
<input type="text" name="berat_telur_layak" class="form-control" maxlength="6" inputmode="decimal"
|
||||||
oninput="validasiBerat(this)">
|
oninput="validasiBerat(this)">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label>Berat Telur Rusak (Kg)</label>
|
<label>Berat Telur Rusak (Kg)</label>
|
||||||
<input type="text" name="berat_telur_rusak" maxlength="6" inputmode="decimal"
|
<input type="text" name="berat_telur_rusak" class="form-control" maxlength="6" inputmode="decimal"
|
||||||
oninput="validasiBerat(this)">
|
oninput="validasiBerat(this)">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -391,7 +391,17 @@ function autoSubmit() {
|
||||||
$('#formFilter').submit();
|
$('#formFilter').submit();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function formatBerat(angka) {
|
||||||
|
angka = parseFloat(angka);
|
||||||
|
|
||||||
|
if (isNaN(angka)) return '';
|
||||||
|
|
||||||
|
// jika nilainya 0 tetap tampil 0
|
||||||
|
if (angka === 0) return '0';
|
||||||
|
|
||||||
|
// hilangkan .00 atau nol di belakang
|
||||||
|
return angka.toString().replace(/\.?0+$/, '');
|
||||||
|
}
|
||||||
/* MODAL EDIT */
|
/* MODAL EDIT */
|
||||||
const baseUrl = "{{ url('/hasil') }}";
|
const baseUrl = "{{ url('/hasil') }}";
|
||||||
|
|
||||||
|
|
@ -401,8 +411,8 @@ function autoSubmit() {
|
||||||
$('#formEdit').attr('action', baseUrl + '/' + btn.data('id'));
|
$('#formEdit').attr('action', baseUrl + '/' + btn.data('id'));
|
||||||
$('#formEdit [name=kandang_id]').val(btn.data('kandang'));
|
$('#formEdit [name=kandang_id]').val(btn.data('kandang'));
|
||||||
$('#formEdit [name=shift]').val(btn.data('shift'));
|
$('#formEdit [name=shift]').val(btn.data('shift'));
|
||||||
$('#formEdit [name=berat_telur_layak]').val(btn.data('layak'));
|
$('#formEdit [name=berat_telur_layak]').val(formatBerat(btn.data('layak') ?? 0));
|
||||||
$('#formEdit [name=berat_telur_rusak]').val(btn.data('rusak'));
|
$('#formEdit [name=berat_telur_rusak]').val(formatBerat(btn.data('rusak') ?? 0));
|
||||||
$('#formEdit [name=tanggal_produksi]').val(btn.data('tanggal'));
|
$('#formEdit [name=tanggal_produksi]').val(btn.data('tanggal'));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -314,7 +314,7 @@ class="form-control @error('jumlah') is-invalid @enderror" value="{{ old('jumlah
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label>Harga (Kg)</label>
|
<label>Harga (Kg)</label>
|
||||||
<input type="number" name="harga_satuan" min="1" max="99999999"
|
<input type="text" name="harga_satuan" min="1" max="99999999"
|
||||||
class="form-control @error('harga_satuan') is-invalid @enderror"
|
class="form-control @error('harga_satuan') is-invalid @enderror"
|
||||||
value="{{ old('harga_satuan') }}">
|
value="{{ old('harga_satuan') }}">
|
||||||
@error('harga_satuan')
|
@error('harga_satuan')
|
||||||
|
|
@ -381,7 +381,23 @@ class="form-control @error('harga_satuan') is-invalid @enderror"
|
||||||
// ROUTE CONFIG (AMAN & DINAMIS)
|
// ROUTE CONFIG (AMAN & DINAMIS)
|
||||||
const updateRoute = "{{ route('keuangan.update', ':id') }}";
|
const updateRoute = "{{ route('keuangan.update', ':id') }}";
|
||||||
const deleteRoute = "{{ route('keuangan.delete', ':id') }}";
|
const deleteRoute = "{{ route('keuangan.delete', ':id') }}";
|
||||||
|
function formatJumlah(angka) {
|
||||||
|
angka = parseFloat(angka);
|
||||||
|
|
||||||
|
if (isNaN(angka)) return '';
|
||||||
|
|
||||||
|
if (angka === 0) return '0';
|
||||||
|
|
||||||
|
return angka.toString().replace(/\.?0+$/, '');
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatRupiah(angka) {
|
||||||
|
angka = parseInt(angka);
|
||||||
|
|
||||||
|
if (isNaN(angka)) return '';
|
||||||
|
|
||||||
|
return angka.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ".");
|
||||||
|
}
|
||||||
// MODAL EDIT
|
// MODAL EDIT
|
||||||
$('#modalEditPenjualan').on('show.bs.modal', function(e) {
|
$('#modalEditPenjualan').on('show.bs.modal', function(e) {
|
||||||
|
|
||||||
|
|
@ -400,8 +416,13 @@ class="form-control @error('harga_satuan') is-invalid @enderror"
|
||||||
|
|
||||||
$('#formEdit [name=tanggal]').val(oldTanggal ? oldTanggal : btn.data('tanggal'));
|
$('#formEdit [name=tanggal]').val(oldTanggal ? oldTanggal : btn.data('tanggal'));
|
||||||
$('#formEdit [name=jenis_produk]').val(oldProduk ? oldProduk : btn.data('produk'));
|
$('#formEdit [name=jenis_produk]').val(oldProduk ? oldProduk : btn.data('produk'));
|
||||||
$('#formEdit [name=jumlah]').val(oldJumlah ? oldJumlah : btn.data('jumlah'));
|
$('#formEdit [name=jumlah]').val(
|
||||||
$('#formEdit [name=harga_satuan]').val(oldHarga ? oldHarga : btn.data('harga'));
|
oldJumlah ? oldJumlah : formatJumlah(btn.data('jumlah'))
|
||||||
|
);
|
||||||
|
|
||||||
|
$('#formEdit [name=harga_satuan]').val(
|
||||||
|
oldHarga ? oldHarga : formatRupiah(btn.data('harga'))
|
||||||
|
);
|
||||||
|
|
||||||
hitungTotalEdit();
|
hitungTotalEdit();
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,8 @@
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||||
<title>LayerFarm | @yield('title')</title>
|
<title>LayerFarm | @yield('title')</title>
|
||||||
|
<link rel="icon" type="image/png" href="{{ asset('assets/img/favicon.png') }}">
|
||||||
<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
|
<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
|
||||||
name='viewport' />
|
name='viewport' />
|
||||||
<link rel="stylesheet" href="assets/css/bootstrap.min.css">
|
<link rel="stylesheet" href="assets/css/bootstrap.min.css">
|
||||||
|
|
@ -24,8 +25,8 @@
|
||||||
Ready Dashboard
|
Ready Dashboard
|
||||||
</a> --}}
|
</a> --}}
|
||||||
<a href="{{ route('beranda') }}" class="logo d-flex align-items-center">
|
<a href="{{ route('beranda') }}" class="logo d-flex align-items-center">
|
||||||
<img src="{{ asset('assets/img/ayam.png') }}" class="dashboard-logo" alt="Logo">
|
<img src="{{ asset('assets/img/ayam.png') }}" class="dashboard-logo" alt="Logo">
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<button class="ml-auto navbar-toggler sidenav-toggler" type="button" data-toggle="collapse"
|
<button class="ml-auto navbar-toggler sidenav-toggler" type="button" data-toggle="collapse"
|
||||||
data-target="collapse" aria-controls="sidebar" aria-expanded="false" aria-label="Toggle navigation">
|
data-target="collapse" aria-controls="sidebar" aria-expanded="false" aria-label="Toggle navigation">
|
||||||
|
|
@ -191,17 +192,17 @@ class="d-none d-sm-inline font-weight-bold text-dark">{{ auth()->user()->name }}
|
||||||
</li> --}}
|
</li> --}}
|
||||||
|
|
||||||
|
|
||||||
<li class="nav-item nav-item-logout">
|
<li class="nav-item nav-item-logout">
|
||||||
<a href="#"
|
<a href="#"
|
||||||
onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
|
onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
|
||||||
<i class="la la-sign-out"></i>
|
<i class="la la-sign-out"></i>
|
||||||
<p>Logout</p>
|
<p>Logout</p>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<form id="logout-form" method="POST" action="{{ route('logout') }}" style="display:none;">
|
<form id="logout-form" method="POST" action="{{ route('logout') }}" style="display:none;">
|
||||||
@csrf
|
@csrf
|
||||||
</form>
|
</form>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
{{-- <li class="nav-item nav-item-logout">
|
{{-- <li class="nav-item nav-item-logout">
|
||||||
<a href="#"
|
<a href="#"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue