Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into tender
This commit is contained in:
@@ -81,6 +81,7 @@ use Modules\Lpj\Http\Requests\SurveyorRequest;
|
||||
use Modules\Lpj\Http\Requests\FormSurveyorRequest;
|
||||
use Modules\Lpj\Emails\SendJadwalKunjunganEmail;
|
||||
use App\Helpers\Lpj;
|
||||
use Modules\Lpj\Models\Authorization;
|
||||
|
||||
class SurveyorController extends Controller
|
||||
{
|
||||
@@ -366,7 +367,7 @@ class SurveyorController extends Controller
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'message' => 'Data berhasil disimpan',
|
||||
'file' => $newFoto
|
||||
'path' => $newFoto[0]['path'],
|
||||
], 200);
|
||||
}
|
||||
|
||||
@@ -1073,7 +1074,12 @@ class SurveyorController extends Controller
|
||||
|
||||
// Pastikan input adalah array dan index valid
|
||||
if (is_array($inputValue) && isset($inputValue[$index])) {
|
||||
$pembanding[$field] = $inputValue[$index];
|
||||
$value = $inputValue[$index];
|
||||
// Format hanya untuk harga, harga_diskon, dan total
|
||||
if (in_array($field, ['harga', 'harga_diskon', 'total'])) {
|
||||
$value = preg_replace('/[^0-9]/', '', $value); // Hapus karakter non-angka
|
||||
}
|
||||
$pembanding[$field] = $value;
|
||||
} else {
|
||||
$pembanding[$field] = null;
|
||||
}
|
||||
@@ -1178,6 +1184,9 @@ class SurveyorController extends Controller
|
||||
if ($request->filled($field)) {
|
||||
$newValue = $request->input($field);
|
||||
|
||||
if (in_array($field, ['harga', 'harga_diskon', 'total'])) {
|
||||
$newValue = preg_replace('/[^0-9]/', '', $newValue);
|
||||
}
|
||||
// Fields untuk tanah
|
||||
if (in_array($field, ['luas_tanah'])) {
|
||||
// Pastikan struktur array ada sebelum diakses
|
||||
@@ -1327,7 +1336,9 @@ class SurveyorController extends Controller
|
||||
foreach ($fields as $field) {
|
||||
if ($request->filled($field)) {
|
||||
$newValue = $request->input($field);
|
||||
|
||||
if (in_array($field, ['harga', 'harga_diskon', 'total'])) {
|
||||
$newValue = preg_replace('/[^0-9]/', '', $newValue);
|
||||
}
|
||||
// Fields untuk alamat dalam asset
|
||||
if (in_array($field, ['address', 'village_code', 'district_code', 'city_code', 'province_code'])) {
|
||||
|
||||
|
||||
@@ -42,11 +42,12 @@
|
||||
: null;
|
||||
@endphp
|
||||
|
||||
{{ !empty($bentukTanah) ? implode(', ', $bentukTanah) : 'Data tidak tersedia' }}
|
||||
{{ !empty($bentukTanah) ? implode(', ', $bentukTanah) : '' }}
|
||||
|
||||
@if (in_array('Lainnya', $bentukTanah) && $lainnya)
|
||||
@if (!empty($bentukTanah) && in_array('Lainnya', $bentukTanah) && !is_null($lainnya))
|
||||
({{ $lainnya }})
|
||||
@endif
|
||||
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
@@ -97,19 +98,16 @@
|
||||
<td>:</td>
|
||||
<td style="padding: 2px; vertical-align: top;">
|
||||
@php
|
||||
$posisiKavling = isset($forminspeksi['tanah']['posisi_kavling']['posisi_kavling'])
|
||||
? $forminspeksi['tanah']['posisi_kavling']['posisi_kavling']
|
||||
: [];
|
||||
$lainnya = isset($forminspeksi['tanah']['posisi_kavling']['lainnya'])
|
||||
? $forminspeksi['tanah']['posisi_kavling']['lainnya']
|
||||
: null;
|
||||
$posisiKavling = $forminspeksi['tanah']['posisi_kavling']['posisi_kavling'] ?? [];
|
||||
$lainnya = $forminspeksi['tanah']['posisi_kavling']['lainnya'] ?? null;
|
||||
@endphp
|
||||
|
||||
{{ !empty($posisiKavling) ? implode(', ', $posisiKavling) : '' }}
|
||||
|
||||
@if (in_array('Lainnya', $posisiKavling) && $lainnya)
|
||||
@if (!empty($posisiKavling) && in_array('Lainnya', $posisiKavling) && !empty($lainnya))
|
||||
({{ $lainnya }})
|
||||
@endif
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -134,13 +132,14 @@
|
||||
<td style="padding: 2px; vertical-align: top;">
|
||||
@php
|
||||
$kondisiFisikTanah = $forminspeksi['tanah']['kondisi_fisik_tanah']['kondisi_fisik_tanah'][0] ?? '-';
|
||||
$lainnya = $forminspeksi['tanah']['kondisi_fisik_tanah']['lainnya'];
|
||||
$lainnya = $forminspeksi['tanah']['kondisi_fisik_tanah']['lainnya'] ?? null;
|
||||
@endphp
|
||||
|
||||
{{ $kondisiFisikTanah }}
|
||||
@if ($kondisiFisikTanah === 'Lainnya' && $lainnya)
|
||||
@if ($kondisiFisikTanah === 'Lainnya' && !empty($lainnya))
|
||||
({{ $lainnya }})
|
||||
@endif
|
||||
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
|
||||
@@ -182,7 +182,7 @@
|
||||
@endphp
|
||||
<td style="width: 100%; vertical-align: top; text-align: center" colspan="2"
|
||||
class="photo-item border">
|
||||
<p style="font-weight: medium; font-size: 10px">{{ $category }} -
|
||||
<p style="font-weight: medium; font-size: 10px">Lainnya -
|
||||
|
||||
@isset($subcategory)
|
||||
@if (trim($subcategory) !== '')
|
||||
@@ -206,7 +206,7 @@
|
||||
$imagePath = storage_path('app/public/' . $item['path']);
|
||||
@endphp
|
||||
<td style="width: 50%; vertical-align: top; text-align: center" class="photo-item border">
|
||||
<p style="font-weight: medium; font-size: 10px">{{ $category }} -
|
||||
<p style="font-weight: medium; font-size: 10px">Lainnya -
|
||||
|
||||
@isset($subcategory)
|
||||
@if (trim($subcategory) !== '')
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
||||
<label class="form-label max-w-56">Harga Penawaran</label>
|
||||
<div class="flex flex-wrap items-baseline w-full">
|
||||
<span>Rp. {{ $item['harga'] }}</span>
|
||||
<span>{{ isset($item['harga']) ? formatRupiah($item['harga']) : '' }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -321,7 +321,7 @@
|
||||
@if ($key == 'luas_tanah' || $key == 'luas_bangunan')
|
||||
{{ $data[$key] ?? '-' }} m²
|
||||
@elseif($key == 'harga' || $key == 'harga_diskon')
|
||||
Rp. {{ $data[$key] ?? 0 }}
|
||||
{{ formatRupiah($data[$key]) ?? 0 }}
|
||||
@elseif($key == 'kordinat')
|
||||
@php
|
||||
$lat = $data['kordinat_lat'] ?? null;
|
||||
|
||||
@@ -125,8 +125,8 @@
|
||||
}
|
||||
} else {
|
||||
// Format currency untuk input harga
|
||||
if (name.includes('harga') || name.includes('total') || name.includes('diskon')) {
|
||||
element.value = value ? value.toString() : '0';
|
||||
if (name.includes('diskon')) {
|
||||
element.value = value || '0';
|
||||
} else {
|
||||
element.value = value || '';
|
||||
}
|
||||
@@ -364,16 +364,16 @@
|
||||
input.value = '';
|
||||
}
|
||||
|
||||
if (input.classList.contains('currency')) {
|
||||
if (input.classList.contains('currency-format')) {
|
||||
input.addEventListener('input', function() {
|
||||
handleCurrencyInput(this);
|
||||
|
||||
|
||||
// Special handling for price-related inputs
|
||||
// Calculate prices if needed
|
||||
if (input.name.includes('harga_pembanding') ||
|
||||
input.name.includes('diskon_pembanding')) {
|
||||
const inputs = document.getElementsByName(input.name);
|
||||
const index = Array.from(inputs).indexOf(this);
|
||||
calculatePrices(index);
|
||||
calculatePrices('pembanding', index);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -394,7 +394,10 @@
|
||||
}
|
||||
|
||||
|
||||
|
||||
function handleCurrencyInput(input) {
|
||||
const value = input.value.replace(/[^\d]/g, '');
|
||||
input.value = formatCurrency(value);
|
||||
}
|
||||
|
||||
function removeColumn() {
|
||||
if (columnCount > 1) {
|
||||
@@ -445,6 +448,13 @@
|
||||
ensureLocationEventListeners();
|
||||
}
|
||||
|
||||
function initializeCurrencyFormat() {
|
||||
document.querySelectorAll('.currency-format').forEach(input => {
|
||||
input.addEventListener('input', function() {
|
||||
formatCurrency(this);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function initializeFirstPembandingListeners() {
|
||||
const firstProvinceSelect = document.getElementById('province_code_pembanding');
|
||||
@@ -658,5 +668,18 @@
|
||||
}
|
||||
});
|
||||
}
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
// Initialize currency format for existing inputs
|
||||
document.querySelectorAll('.currency-format').forEach(input => {
|
||||
input.addEventListener('input', function() {
|
||||
handleCurrencyInput(this);
|
||||
});
|
||||
|
||||
// Format initial values if they exist
|
||||
if (input.value) {
|
||||
input.value = formatCurrency(input.value);
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
|
||||
@@ -176,7 +176,7 @@
|
||||
<input type="hidden" name="nomor_registrasi" value="{{ $permohonan->nomor_registrasi }}">
|
||||
|
||||
|
||||
<div class="card border border-agi-100 bg-white rounded-lg shadow-md">
|
||||
<div class="card border border-agi-100 rounded-lg shadow-md">
|
||||
<div class="card-body">
|
||||
<div class=" py-4 flex items-center justify-between">
|
||||
<h1 class="text-md font-medium text-gray-900">Upload Foto</h1>
|
||||
@@ -273,10 +273,11 @@
|
||||
Dropzone.autoDiscover = false;
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
let myDropzone = null;
|
||||
let uploadQueue = 0;
|
||||
let uploadBatch = [];
|
||||
|
||||
function initDropzone(selector, paramName) {
|
||||
try {
|
||||
// Pastikan elemen ada sebelum membuat Dropzone
|
||||
const dropzoneElement = document.querySelector(selector);
|
||||
if (!dropzoneElement) {
|
||||
console.error(`Dropzone element not found: ${selector}`);
|
||||
@@ -286,11 +287,10 @@
|
||||
myDropzone = new Dropzone(selector, {
|
||||
url: "{{ route('surveyor.storeFoto') }}",
|
||||
paramName: paramName,
|
||||
maxFilesize: 10,
|
||||
maxFilesize: 30,
|
||||
acceptedFiles: 'image/*',
|
||||
uploadMultiple: false,
|
||||
parallelUploads: 1,
|
||||
maxFiles: 10,
|
||||
autoProcessQueue: true,
|
||||
dictDefaultMessage: 'Seret foto atau klik untuk unggah',
|
||||
|
||||
@@ -304,101 +304,41 @@
|
||||
param_name: paramName,
|
||||
nomor_registrasi: '{{ $permohonan->nomor_registrasi ?? '' }}',
|
||||
},
|
||||
error: function(file, response) {
|
||||
Swal.fire({
|
||||
icon: 'error',
|
||||
title: 'Upload Gagal',
|
||||
text: response.message || 'Error tidak diketahui'
|
||||
});
|
||||
|
||||
addedfiles: function(files) {
|
||||
uploadQueue += files.length;
|
||||
uploadBatch = Array.from(files);
|
||||
if (files.length > 0) showLoadingOverlay();
|
||||
},
|
||||
|
||||
error: function(file, response) {
|
||||
handleUploadComplete(file, false, response.message);
|
||||
},
|
||||
success: function(file, response) {
|
||||
if (response.success) {
|
||||
Swal.fire({
|
||||
icon: 'success',
|
||||
title: 'Upload Berhasil',
|
||||
toast: true,
|
||||
position: 'top-end',
|
||||
showConfirmButton: false,
|
||||
timer: 1500
|
||||
});
|
||||
updatePhotoGallery();
|
||||
const fileData = {
|
||||
path: response.path || file.path,
|
||||
name: file.name,
|
||||
description: '',
|
||||
category: 'lainnya',
|
||||
sub: '',
|
||||
param_name: paramName
|
||||
};
|
||||
|
||||
addEditAndDeleteButtons(file, fileData);
|
||||
handleUploadComplete(file, true);
|
||||
} else {
|
||||
handleUploadComplete(file, false, response.message);
|
||||
}
|
||||
},
|
||||
|
||||
init: function() {
|
||||
// var myDropzone = this;
|
||||
var loadingIndicator = $(`
|
||||
<div class="loading-overlay" style="
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: rgba(255,255,255,0.7);
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
z-index: 1000;
|
||||
">
|
||||
<div class="loader"></div>
|
||||
</div>
|
||||
`);
|
||||
|
||||
var $dropzoneElement = $(selector);
|
||||
$dropzoneElement.css('position', 'relative');
|
||||
$dropzoneElement.append(loadingIndicator);
|
||||
|
||||
$.ajax({
|
||||
url: "{{ route('surveyor.getFoto') }}",
|
||||
method: 'GET',
|
||||
data: {
|
||||
permohonan_id: {{ $permohonan->id ?? 0 }},
|
||||
dokument_id: '{{ request('dokument') ?? '' }}',
|
||||
param_name: paramName
|
||||
},
|
||||
headers: {
|
||||
'X-CSRF-TOKEN': '{{ csrf_token() }}'
|
||||
},
|
||||
beforeSend: function() {
|
||||
loadingIndicator.show();
|
||||
},
|
||||
success: function(response) {
|
||||
if (response.fotos && response.fotos.length) {
|
||||
response.fotos.forEach(function(foto) {
|
||||
var mockFile = {
|
||||
name: foto.name,
|
||||
size: foto.size || 12345,
|
||||
originalPath: foto.path
|
||||
};
|
||||
|
||||
myDropzone.emit("addedfile", mockFile);
|
||||
myDropzone.emit("thumbnail", mockFile,
|
||||
foto.path);
|
||||
myDropzone.emit("complete", mockFile);
|
||||
addEditAndDeleteButtons(mockFile, {
|
||||
path: foto.path,
|
||||
name: foto.name,
|
||||
description: foto
|
||||
.description || '',
|
||||
category: foto.category ||
|
||||
'lainnya',
|
||||
sub: foto.sub || '',
|
||||
param_name: paramName
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
error: function(xhr, status, error) {
|
||||
console.error('Gagal memuat foto:', error);
|
||||
},
|
||||
complete: function() {
|
||||
loadingIndicator.hide();
|
||||
}
|
||||
});
|
||||
loadExistingPhotos(this, paramName);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
return myDropzone;
|
||||
} catch (error) {
|
||||
console.error('Dropzone initialization error:', error);
|
||||
@@ -406,29 +346,8 @@
|
||||
}
|
||||
}
|
||||
|
||||
function updatePhotoGallery() {
|
||||
const gallery = document.querySelector('#upload-dropzone');
|
||||
|
||||
if (!myDropzone) {
|
||||
console.error('Dropzone is not initialized');
|
||||
return;
|
||||
}
|
||||
|
||||
gallery.innerHTML = `
|
||||
<div style="
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: rgba(255,255,255,0.7);
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
z-index: 1000;">
|
||||
<div class="loader"></div>
|
||||
</div>
|
||||
`;
|
||||
function loadExistingPhotos(dropzone, paramName) {
|
||||
showLoadingOverlay();
|
||||
|
||||
$.ajax({
|
||||
url: "{{ route('surveyor.getFoto') }}",
|
||||
@@ -436,15 +355,13 @@
|
||||
data: {
|
||||
permohonan_id: {{ $permohonan->id ?? 0 }},
|
||||
dokument_id: '{{ request('dokument') ?? '' }}',
|
||||
param_name: 'upload_foto'
|
||||
param_name: paramName
|
||||
},
|
||||
headers: {
|
||||
'X-CSRF-TOKEN': '{{ csrf_token() }}'
|
||||
},
|
||||
success: function(response) {
|
||||
if (response.fotos && response.fotos.length) {
|
||||
gallery.innerHTML = '';
|
||||
|
||||
response.fotos.forEach(function(foto) {
|
||||
var mockFile = {
|
||||
name: foto.name,
|
||||
@@ -452,33 +369,119 @@
|
||||
originalPath: foto.path
|
||||
};
|
||||
|
||||
myDropzone.emit("addedfile", mockFile);
|
||||
myDropzone.emit("thumbnail", mockFile, foto.path);
|
||||
myDropzone.emit("complete", mockFile);
|
||||
dropzone.emit("addedfile", mockFile);
|
||||
dropzone.emit("thumbnail", mockFile, foto.path);
|
||||
dropzone.emit("complete", mockFile);
|
||||
addEditAndDeleteButtons(mockFile, {
|
||||
path: foto.path,
|
||||
name: foto.name,
|
||||
description: foto.description || '',
|
||||
category: foto.category || 'lainnya',
|
||||
sub: foto.sub || '',
|
||||
param_name: 'upload_foto'
|
||||
param_name: paramName
|
||||
});
|
||||
});
|
||||
} else {
|
||||
gallery.innerHTML = '<p>Tidak ada foto yang ditemukan.</p>';
|
||||
}
|
||||
},
|
||||
error: function(xhr, status, error) {
|
||||
console.error('Gagal memuat foto:', error);
|
||||
gallery.innerHTML = '<p>Gagal memuat foto. Silakan coba lagi.</p>';
|
||||
showErrorMessage('Gagal memuat foto yang ada');
|
||||
},
|
||||
complete: function() {
|
||||
gallery.innerHTML = gallery.innerHTML.includes('loader') ? '' : gallery
|
||||
.innerHTML;
|
||||
hideLoadingOverlay();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function handleUploadComplete(file, isSuccess, errorMessage = null) {
|
||||
uploadQueue--;
|
||||
const index = uploadBatch.indexOf(file);
|
||||
if (index > -1) {
|
||||
uploadBatch.splice(index, 1);
|
||||
}
|
||||
|
||||
// Show individual error if any
|
||||
if (!isSuccess && errorMessage) {
|
||||
showErrorMessage(errorMessage);
|
||||
}
|
||||
|
||||
// If all uploads are complete
|
||||
if (uploadQueue === 0) {
|
||||
hideLoadingOverlay();
|
||||
|
||||
// Show final status message
|
||||
const totalFiles = uploadBatch.length + 1; // +1 for current file
|
||||
if (totalFiles === 1) {
|
||||
// Single file upload
|
||||
if (isSuccess) {
|
||||
showSuccessMessage('Foto berhasil diupload');
|
||||
}
|
||||
} else {
|
||||
// Multiple files upload
|
||||
showSuccessMessage(`${totalFiles} foto berhasil diupload`);
|
||||
}
|
||||
|
||||
// Reset batch
|
||||
uploadBatch = [];
|
||||
}
|
||||
}
|
||||
|
||||
function showLoadingOverlay() {
|
||||
const overlay = document.querySelector('.loading-overlay');
|
||||
if (!overlay) {
|
||||
// Buat elemen overlay
|
||||
const loadingOverlay = document.createElement('div');
|
||||
loadingOverlay.className = 'loading-overlay';
|
||||
loadingOverlay.style.cssText = `
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
z-index: 9999;
|
||||
`;
|
||||
|
||||
// Tambahkan loader di dalam overlay
|
||||
loadingOverlay.innerHTML = '<div class="loader"></div>';
|
||||
|
||||
// Tambahkan overlay ke dalam <body>
|
||||
document.body.appendChild(loadingOverlay);
|
||||
} else {
|
||||
// Tampilkan overlay jika sudah ada
|
||||
overlay.style.display = 'flex';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function hideLoadingOverlay() {
|
||||
const overlay = document.querySelector('.loading-overlay');
|
||||
if (overlay) overlay.style.display = 'none';
|
||||
}
|
||||
|
||||
function showSuccessMessage(message) {
|
||||
Swal.fire({
|
||||
icon: 'success',
|
||||
title: message,
|
||||
toast: true,
|
||||
position: 'top-end',
|
||||
showConfirmButton: false,
|
||||
timer: 1500
|
||||
});
|
||||
}
|
||||
|
||||
function showErrorMessage(message) {
|
||||
Swal.fire({
|
||||
icon: 'error',
|
||||
title: 'Upload Gagal',
|
||||
text: message || 'Error tidak diketahui'
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
// Inisialisasi Dropzone untuk elemen awal dengan pengecekan
|
||||
function safeInitDropzone(selector, paramName) {
|
||||
setTimeout(() => {
|
||||
@@ -492,15 +495,12 @@
|
||||
// Inisialisasi dropzone untuk elemen awal
|
||||
safeInitDropzone('#upload-dropzone', 'upload_foto');
|
||||
|
||||
|
||||
// Event listener untuk menambah lantai
|
||||
|
||||
});
|
||||
|
||||
let fotoObjekJaminan = @json($fotoObjekJaminan);
|
||||
|
||||
// Fungsi untuk membuka modal dan mengatur data
|
||||
function openEditDataModal(file, response) {
|
||||
window.openEditDrawer = function(file, response) {
|
||||
// Mengisi data input berdasarkan respons
|
||||
document.getElementById('editDataFilePath').value = response.path || '';
|
||||
document.getElementById('editDataName').value = response.name || '';
|
||||
@@ -567,12 +567,10 @@
|
||||
cssMaxHeight: 500
|
||||
});
|
||||
|
||||
|
||||
|
||||
// openModal('editPhotoModal');
|
||||
}
|
||||
|
||||
function addEditAndDeleteButtons(file, response) {
|
||||
window.addEditAndDeleteButtons = function(file, response) {
|
||||
|
||||
const filePreviewElement = file.previewElement;
|
||||
|
||||
@@ -592,7 +590,8 @@
|
||||
editButton.style.cursor = 'pointer';
|
||||
editButton.setAttribute("data-drawer-toggle", "#drawer_2_2");
|
||||
editButton.onclick = function() {
|
||||
openEditDataModal(file, response);
|
||||
// e.preventDefault();
|
||||
openEditDrawer(file, response);
|
||||
};
|
||||
|
||||
// Tombol Hapus
|
||||
|
||||
@@ -391,7 +391,7 @@
|
||||
value="{{ $inspectionData['asset']['harga'] ?? '' }}">
|
||||
</td>
|
||||
<td class="px-4 py-2">
|
||||
<input type="text" name="harga_pembanding[]" class="input currency">
|
||||
<input type="text" name="harga_pembanding[]" class="input currency-format">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
@@ -34,34 +34,22 @@
|
||||
|
||||
|
||||
function formatCurrency(value, isDiskon = false) {
|
||||
// Konversi value ke string, pastikan bukan null/undefined
|
||||
let stringValue = value === null || value === undefined ? '' : String(value);
|
||||
|
||||
// Ganti koma dengan titik untuk memastikan parsing numerik
|
||||
stringValue = stringValue.replace(/,/g, '.');
|
||||
|
||||
// Hapus karakter non-numerik kecuali titik
|
||||
let numericValue = stringValue.replace(/[^\d.]/g, '');
|
||||
|
||||
// Parse nilai numerik
|
||||
const parsedValue = parseFloat(numericValue);
|
||||
|
||||
if (isDiskon) {
|
||||
// Format untuk diskon
|
||||
return isNaN(parsedValue) ? '' : parsedValue.toLocaleString('id-ID', {
|
||||
minimumFractionDigits: 0,
|
||||
maximumFractionDigits: 2
|
||||
});
|
||||
} else {
|
||||
// Format untuk mata uang tanpa desimal
|
||||
return isNaN(parsedValue) ? '' : parsedValue.toLocaleString('id-ID', {
|
||||
minimumFractionDigits: 0,
|
||||
maximumFractionDigits: 0
|
||||
});
|
||||
}
|
||||
// Ensure the value is a valid number
|
||||
const numericValue = parseFloat(value);
|
||||
if (isNaN(numericValue)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Format the number with commas for thousands separators
|
||||
const formattedValue = numericValue.toLocaleString('id-ID', {
|
||||
style: 'currency',
|
||||
currency: 'IDR', // Indonesian Rupiah
|
||||
minimumFractionDigits: isDiskon ? 2 : 0, // Include decimals for discounts
|
||||
maximumFractionDigits: isDiskon ? 2 : 0,
|
||||
});
|
||||
|
||||
return formattedValue;
|
||||
}
|
||||
|
||||
function previewImage(input, previewId) {
|
||||
if (input.files && input.files[0]) {
|
||||
@@ -505,5 +493,4 @@
|
||||
alamatTidakSesuai.style.display = 'grid'; // Tampilkan "Alamat Tidak Sesuai"
|
||||
}
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user