diff --git a/resources/views/pages/Kasir/js.blade.php b/resources/views/pages/Kasir/js.blade.php
index 3d5e4b8..e81a3c4 100644
--- a/resources/views/pages/Kasir/js.blade.php
+++ b/resources/views/pages/Kasir/js.blade.php
@@ -724,7 +724,6 @@
timeOut: 2000
});
// location.reload();
- // window.open(result.url, '_blank');
window.open(result.url, '_blank',
"toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=900,height=600"
);
diff --git a/resources/views/pages/Kasir/js_baru.blade.php b/resources/views/pages/Kasir/js_baru.blade.php
index 0b5e31a..15d7d62 100644
--- a/resources/views/pages/Kasir/js_baru.blade.php
+++ b/resources/views/pages/Kasir/js_baru.blade.php
@@ -14,7 +14,8 @@
// adda nama menu to h5 wich id is menu-utama-yang-terpilih
document.getElementById('menu-utama-yang-terpilih').innerHTML = namaMenu;
// add total harga menu to input with id total-harga-menu-ini
- document.getElementById('harga-menu-utama-yang-terpilih').innerHTML = totalHargaMenuIni;
+ document.getElementById('harga-menu-utama-yang-terpilih').innerHTML = totalHargaMenuIni +
+ ' ';
// remove all li element in extra-menu-choised
@@ -25,13 +26,18 @@
const element = arrayExtraMenuChoised[index];
console.log(element.parent);
if (element.parent == globalId) {
- htmlnyayaini = `
-
-
-
-
-
- `;
+ htmlnyayaini = `
+
+ `;
document.getElementById('extra-menu-choised').innerHTML += htmlnyayaini;
}
@@ -41,11 +47,16 @@
function pesanExtra(params) {
console.log(params);
jsonParams = JSON.stringify(params);
- htmlnyayaini = `
+ htmlnyayaini = `
`;
// get element by id
@@ -61,6 +72,14 @@
// get all li element in extraMenuChoised
var li = extraMenuChoised.getElementsByTagName('li');
+ // remove all li element in the-extra-menu-choised
+ document.getElementById('the-extra-menu-choised' + idTableRowExtra.value).innerHTML = '';
+
+ // remove all element in arrayExtraMenuChoised where parent is idTableRowExtra.value
+ arrayExtraMenuChoised = arrayExtraMenuChoised.filter(function(el) {
+ return el.parent !== idTableRowExtra.value;
+ });
+
// loop through all li element
for (let i = 0; i < li.length; i++) {
// get id-extra-menu-choised element
@@ -74,12 +93,7 @@
`;
document.getElementById('the-extra-menu-choised' + idTableRowExtra.value).innerHTML += htmlnyayaini;
@@ -133,12 +147,7 @@
`);
@@ -149,32 +158,40 @@
}
loadAdditionalFromLocalStorage();
- function deleteAdditionalExtraMenu(id, parent, harga) {
- console.log(id);
- // get index of arrayExtraMenuChoised
- var index = arrayExtraMenuChoised.findIndex(x => x.id == id);
- // remove element from arrayExtraMenuChoised
- arrayExtraMenuChoised.splice(index, 1);
- // get element by id
- var element = document.getElementById('linyaini' + id + parent);
- // remove element from DOM
- console.log(element);
- element.remove();
- // recalculate total
- // Mendapatkan semua elemen dalam tabel dengan id 'tbody-order-menus'
- var tableRowsNya = document.querySelectorAll('#tbody-order-menus tr');
+ function deleteAdditionalExtraMenu(id, parent = null, harga = null) {
+ console.log(id + ' ' + parent + ' ' + harga);
- // Iterasi melalui setiap elemen
dan mencetak nilai atribut 'data-total'
- tableRowsNya.forEach(function(row) {
- var rownya = row.getAttribute('data-row-id');
- var dataTotal = row.getAttribute('data-total');
- dataTotal = parseInt(dataTotal) - parseInt(harga);
- if (rownya == parent) {
- row.setAttribute('data-total', dataTotal);
- document.getElementById('price' + parent).innerHTML = 'Rp. ' + dataTotal;
- }
- });
- calculateTotal();
+ if (parent == null) {
+ var element = document.getElementById('linyaygdihapus' + id);
+ element.remove();
+ } else {
+ // console.log(id);
+ // // get index of arrayExtraMenuChoised
+ // var index = arrayExtraMenuChoised.findIndex(x => x.id == id);
+ // // remove element from arrayExtraMenuChoised
+ // arrayExtraMenuChoised.splice(index, 1);
+ // get element by id
+ console.log('linyaygdihapus' + id + '-' + parent);
+ var element = document.getElementById('linyaygdihapus' + id + '-' + parent);
+ // remove element from DOM
+ // console.log(element);
+ element.remove();
+ // // recalculate total
+ // // Mendapatkan semua elemen
dalam tabel dengan id 'tbody-order-menus'
+ // var tableRowsNya = document.querySelectorAll('#tbody-order-menus tr');
+
+ // // Iterasi melalui setiap elemen
dan mencetak nilai atribut 'data-total'
+ // tableRowsNya.forEach(function(row) {
+ // var rownya = row.getAttribute('data-row-id');
+ // var dataTotal = row.getAttribute('data-total');
+ // dataTotal = parseInt(dataTotal) - parseInt(harga);
+ // if (rownya == parent) {
+ // row.setAttribute('data-total', dataTotal);
+ // document.getElementById('price' + parent).innerHTML = 'Rp. ' + dataTotal;
+ // }
+ // });
+ }
+ // calculateTotal();
}
@endpush
diff --git a/resources/views/pages/Kasir/js_baru_tmbl hapus di tabel kanan .blade.php b/resources/views/pages/Kasir/js_baru_tmbl hapus di tabel kanan .blade.php
new file mode 100644
index 0000000..0b5e31a
--- /dev/null
+++ b/resources/views/pages/Kasir/js_baru_tmbl hapus di tabel kanan .blade.php
@@ -0,0 +1,180 @@
+@push('scripts')
+
+@endpush
diff --git a/resources/views/pages/Kasir/modal_extra.blade.php b/resources/views/pages/Kasir/modal_extra.blade.php
index 07069b7..72735b2 100644
--- a/resources/views/pages/Kasir/modal_extra.blade.php
+++ b/resources/views/pages/Kasir/modal_extra.blade.php
@@ -1,5 +1,5 @@
@php
$tampungid;
-
@endphp
@foreach ($pesanan->detailPesanan as $item2)
@if ($item2->id_parent !== null && $item2->id_parent == $item->id)