wewmantap
/
martabak-grand
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix everything i can to fix it

main
zeldaababil19 2024-04-01 01:02:27 +07:00
parent babcf225ee
commit 8032cbb70a
3 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Kasir/Transaksi.php
View File

@ -218,10 +218,9 @@ class Transaksi extends Controller
]; ];
$detailPesananModels = \App\Models\DetailPesanan::create($oderDatas); $detailPesananModels = \App\Models\DetailPesanan::create($oderDatas);
if (count($request->additionalOrderMenus) > 0) { if ($request->additionalOrderMenus != null && count($request->additionalOrderMenus) > 0) {
foreach ($request->additionalOrderMenus as $keyadd2 => $valueadd2) { foreach ($request->additionalOrderMenus as $keyadd2 => $valueadd2) {
if ($key + 1 == $valueadd2['parent']) { if ($value['row_id'] == $valueadd2['parent']) {
$oderDatas = [ $oderDatas = [
'pesanan_id' => $pesananModels->id, 'pesanan_id' => $pesananModels->id,
'id_parent' => $detailPesananModels->id, 'id_parent' => $detailPesananModels->id,

66
resources/views/pages/Kasir/js.blade.php
View File

@ -103,6 +103,8 @@
var isExist = false; var isExist = false;
var index = 0; var index = 0;
var tampungLastRow = 0;
for (var i = 1, row; row = table.rows[i]; i++) { for (var i = 1, row; row = table.rows[i]; i++) {
var id = row.getAttribute('data-id'); var id = row.getAttribute('data-id');
if (menuPaket == true) { if (menuPaket == true) {
@ -113,6 +115,12 @@
index = i; index = i;
} }
} }
// get last row
var row_id = row.getAttribute('data-row-id');
if (row_id != null || row_id != undefined) {
tampungLastRow = row_id;
}
} }
if (isExist) { if (isExist) {
@ -191,8 +199,12 @@
calculateTotal(); calculateTotal();
$('#modal-default').modal('hide'); $('#modal-default').modal('hide');
} else { } else {
globalId++; if (tampungLastRow == 0) {
// console.log(globalId); tampungLastRow = globalId++
} else {
tampungLastRow = parseInt(tampungLastRow) + 1;
}
console.log(tampungLastRow);
if (paketFreenya.length >= 2) { if (paketFreenya.length >= 2) {
if (paketFreenya2.length != 0) { if (paketFreenya2.length != 0) {
paketFreenyaini2 = ' + ' + paketFreenya2.join(', '); paketFreenyaini2 = ' + ' + paketFreenya2.join(', ');
@ -202,26 +214,26 @@
paketFreenyaini = paketFreenya.join(', '); paketFreenyaini = paketFreenya.join(', ');
$('#tbody-order-menus').append(` $('#tbody-order-menus').append(`
<tr id="row-${params.id}" data-id="${params.id}" data-row-id="${globalId}" data-nama="${params.nama_produk}" data-harga="${params.harga_produk}" data-qty="1" data-diskon-satuan="0" data-total="${params.harga_produk}"> <tr id="row-${params.id}" data-id="${params.id}" data-row-id="${tampungLastRow}" data-nama="${params.nama_produk}" data-harga="${params.harga_produk}" data-qty="1" data-diskon-satuan="0" data-total="${params.harga_produk}">
<td colspan="3"> <td colspan="3">
<div class="row" style="justify-content: space-between;align-items: center;margin:2px"> <div class="row" style="justify-content: space-between;align-items: center;margin:2px">
<div class="row" style="align-items: center;"> <div class="row" style="align-items: center;">
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#modal-add-extra" onclick="setIdRowTable(${globalId}, '${params.nama_produk}', '${params.harga_produk}')"> <button type="button" class="btn btn-default" data-toggle="modal" data-target="#modal-add-extra" onclick="setIdRowTable(${tampungLastRow}, '${params.nama_produk}', '${params.harga_produk}')">
<i class="fas fa-edit"></i> <i class="fas fa-edit"></i>
</button> </button>
<span id="menu-name${globalId}">${params.nama_produk}</span> <span id="menu-name${tampungLastRow}">${params.nama_produk}</span>
</div> </div>
<small id="harga-menu-name${globalId}">${params.harga_produk}</small> <small id="harga-menu-name${tampungLastRow}">${params.harga_produk}</small>
</div> </div>
<ul id="the-extra-menu-choised${globalId}"> <ul id="the-extra-menu-choised${tampungLastRow}">
</ul> </ul>
<small id="price${globalId}" class="text-primary">Rp. ${params.harga_produk}</small> <small id="price${tampungLastRow}" class="text-primary">Rp. ${params.harga_produk}</small>
<div class="input-group input-group-sm mt-1"> <div class="input-group input-group-sm mt-1">
<input type="text" name="keterangan_satuan" class="form-control rounded-3" data-keterangan="${paketFreenyaini} ${paketFreenyaini2}" placeholder="Keterangan.." value="${paketFreenyaini} ${paketFreenyaini2}"> <input type="text" name="keterangan_satuan" class="form-control rounded-3" data-keterangan="${paketFreenyaini} ${paketFreenyaini2}" placeholder="Keterangan.." value="${paketFreenyaini} ${paketFreenyaini2}">
</div> </div>
</td> </td>
<td class="text-center"> <td class="text-center">
<button class="btn btn-danger btn-sm" onclick="deleteMenu(${globalId})"> <button class="btn btn-danger btn-sm" onclick="deleteMenu(${tampungLastRow})">
<i class="fas fa-trash"></i> <i class="fas fa-trash"></i>
</button> </button>
</td> </td>
@ -229,26 +241,26 @@
`); `);
} else { } else {
$('#tbody-order-menus').append(` $('#tbody-order-menus').append(`
<tr id="row-${params.id}" data-id="${params.id}" data-row-id="${globalId}" data-nama="${params.nama_produk}" data-harga="${params.harga_produk}" data-qty="1" data-diskon-satuan="0" data-total="${params.harga_produk}"> <tr id="row-${params.id}" data-id="${params.id}" data-row-id="${tampungLastRow}" data-nama="${params.nama_produk}" data-harga="${params.harga_produk}" data-qty="1" data-diskon-satuan="0" data-total="${params.harga_produk}">
<td colspan="3"> <td colspan="3">
<div class="row" style="justify-content: space-between;align-items: center;margin:2px"> <div class="row" style="justify-content: space-between;align-items: center;margin:2px">
<div class="row" style="align-items: center;"> <div class="row" style="align-items: center;">
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#modal-add-extra" onclick="setIdRowTable(${globalId}, '${params.nama_produk}', '${params.harga_produk}')"> <button type="button" class="btn btn-default" data-toggle="modal" data-target="#modal-add-extra" onclick="setIdRowTable(${tampungLastRow}, '${params.nama_produk}', '${params.harga_produk}')">
<i class="fas fa-edit"></i> <i class="fas fa-edit"></i>
</button> </button>
<span id="menu-name${globalId}">${params.nama_produk}</span> <span id="menu-name${tampungLastRow}">${params.nama_produk}</span>
</div> </div>
<small id="harga-menu-name${globalId}">${params.harga_produk}</small> <small id="harga-menu-name${tampungLastRow}">${params.harga_produk}</small>
</div> </div>
<ul id="the-extra-menu-choised${globalId}"> <ul id="the-extra-menu-choised${tampungLastRow}">
</ul> </ul>
<small id="price${globalId}" class="text-primary">Rp. ${params.harga_produk}</small> <small id="price${tampungLastRow}" class="text-primary">Rp. ${params.harga_produk}</small>
<div class="input-group input-group-sm mt-1"> <div class="input-group input-group-sm mt-1">
<input type="text" name="keterangan_satuan" data-keterangan="" class="form-control rounded-3" placeholder="Keterangan.."> <input type="text" name="keterangan_satuan" data-keterangan="" class="form-control rounded-3" placeholder="Keterangan..">
</div> </div>
</td> </td>
<td class="text-center"> <td class="text-center">
<button class="btn btn-danger btn-sm" onclick="deleteMenu(${globalId})"> <button class="btn btn-danger btn-sm" onclick="deleteMenu(${tampungLastRow})">
<i class="fas fa-trash"></i> <i class="fas fa-trash"></i>
</button> </button>
</td> </td>
@ -383,7 +395,8 @@
qty = parseInt(qty) - 1; qty = parseInt(qty) - 1;
var totalLama = parseInt(total) - parseInt(harga); var totalLama = parseInt(total) - parseInt(harga);
diskonSatuan = parseInt(diskonSatuan); diskonSatuan = parseInt(diskonSatuan);
total = (parseInt(total) - parseInt(harga)) - ((parseInt(total) - parseInt(harga)) * (diskonSatuan / 100)); total = (parseInt(total) - parseInt(harga)) - ((parseInt(total) - parseInt(harga)) * (diskonSatuan /
100));
table.rows[index].setAttribute('data-qty', qty); table.rows[index].setAttribute('data-qty', qty);
table.rows[index].setAttribute('data-diskon-satuan', diskonSatuan); table.rows[index].setAttribute('data-diskon-satuan', diskonSatuan);
@ -576,6 +589,8 @@
var diskonSatuan = row.getAttribute('data-diskon-satuan'); var diskonSatuan = row.getAttribute('data-diskon-satuan');
var harga = row.getAttribute('data-harga'); var harga = row.getAttribute('data-harga');
var total = row.getAttribute('data-total'); var total = row.getAttribute('data-total');
var row_id = row.getAttribute('data-row-id');
console.log(row_id);
if (diskonSatuan != 0 && diskonSatuan != null && diskonSatuan != undefined) { if (diskonSatuan != 0 && diskonSatuan != null && diskonSatuan != undefined) {
total = total - (total * (diskonSatuan / 100)); total = total - (total * (diskonSatuan / 100));
} else { } else {
@ -592,6 +607,7 @@
total: total, total: total,
keterangan: document.getElementsByName('keterangan_satuan')[i - 1] keterangan: document.getElementsByName('keterangan_satuan')[i - 1]
.value, .value,
row_id: row_id
}); });
} }
} }
@ -1216,6 +1232,7 @@
var diskonSatuan = row.getAttribute('data-diskon-satuan'); var diskonSatuan = row.getAttribute('data-diskon-satuan');
var harga = row.getAttribute('data-harga'); var harga = row.getAttribute('data-harga');
var total = row.getAttribute('data-total'); var total = row.getAttribute('data-total');
var row_id = row.getAttribute('data-row-id');
if (diskonSatuan != 0 && diskonSatuan != null && diskonSatuan != undefined) { if (diskonSatuan != 0 && diskonSatuan != null && diskonSatuan != undefined) {
total = total - (total * (diskonSatuan / 100)); total = total - (total * (diskonSatuan / 100));
} else { } else {
@ -1231,6 +1248,7 @@
harga: harga, harga: harga,
total: total, total: total,
keterangan: document.getElementsByName('keterangan_satuan')[i - 1].value, keterangan: document.getElementsByName('keterangan_satuan')[i - 1].value,
row_id: row_id
}); });
} }
} }
@ -1263,26 +1281,26 @@
globalId++; globalId++;
$('#tbody-order-menus').append(` $('#tbody-order-menus').append(`
<tr id="row-${i.id}" data-id="${i.id}" data-row-id="${globalId}" data-nama="${i.nama}" data-harga="${i.harga}" data-qty="${i.qty}" data-diskon-satuan="${i.diskonSatuan}" data-total="${i.harga * i.qty}"> <tr id="row-${i.id}" data-id="${i.id}" data-row-id="${i.row_id}" data-nama="${i.nama}" data-harga="${i.harga}" data-qty="${i.qty}" data-diskon-satuan="${i.diskonSatuan}" data-total="${i.harga * i.qty}">
<td colspan="3"> <td colspan="3">
<div class="row" style="justify-content: space-between;align-items: center;margin:2px"> <div class="row" style="justify-content: space-between;align-items: center;margin:2px">
<div class="row" style="align-items: center;"> <div class="row" style="align-items: center;">
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#modal-add-extra" onclick="setIdRowTable(${globalId}, '${i.nama}', '${i.harga * i.qty}')"> <button type="button" class="btn btn-default" data-toggle="modal" data-target="#modal-add-extra" onclick="setIdRowTable(${i.row_id}, '${i.nama}', '${i.harga * i.qty}')">
<i class="fas fa-edit"></i> <i class="fas fa-edit"></i>
</button> </button>
<span id="menu-name${globalId}">${i.nama}</span> <span id="menu-name${i.row_id}">${i.nama}</span>
</div> </div>
<small id="harga-menu-name${globalId}">${i.harga}</small> <small id="harga-menu-name${i.row_id}">${i.harga}</small>
</div> </div>
<ul id="the-extra-menu-choised${globalId}"> <ul id="the-extra-menu-choised${i.row_id}">
</ul> </ul>
${(parseInt(i.diskonSatuan) > 0) ? '<small id="price'+globalId+'" class="text-primary"><s>Rp. ' + (i.harga * i.qty) + '</s></small> | <small id="price'+globalId+'" class="text-danger">Rp. ' + ((i.harga * i.qty) - ((i.harga * i.qty) * (i.diskonSatuan / 100))) + '</small>' : '<small id="price'+globalId+'" class="text-primary">Rp. ' + (i.harga * i.qty) + '</small>'} ${(parseInt(i.diskonSatuan) > 0) ? '<small id="price'+i.row_id+'" class="text-primary"><s>Rp. ' + (i.harga * i.qty) + '</s></small> | <small id="price'+i.row_id+'" class="text-danger">Rp. ' + ((i.harga * i.qty) - ((i.harga * i.qty) * (i.diskonSatuan / 100))) + '</small>' : '<small id="price'+i.row_id+'" class="text-primary">Rp. ' + (i.harga * i.qty) + '</small>'}
<div class="input-group input-group-sm mt-1"> <div class="input-group input-group-sm mt-1">
<input type="text" name="keterangan_satuan" class="form-control rounded-3" data-keterangan="${i.keterangan}" placeholder="Keterangan.." value="${i.keterangan}"> <input type="text" name="keterangan_satuan" class="form-control rounded-3" data-keterangan="${i.keterangan}" placeholder="Keterangan.." value="${i.keterangan}">
</div> </div>
</td> </td>
<td class="text-center"> <td class="text-center">
<button class="btn btn-danger btn-sm" onclick="deleteMenu(${globalId})"> <button class="btn btn-danger btn-sm" onclick="deleteMenu(${i.row_id})">
<i class="fas fa-trash"></i> <i class="fas fa-trash"></i>
</button> </button>
</td> </td>

1
resources/views/pages/Kasir/print.blade.php
View File

@ -243,7 +243,6 @@
<p> <p>
&nbsp;&nbsp;&nbsp;&nbsp; ket: {{ $item->keterangan_produk }} &nbsp;&nbsp;&nbsp;&nbsp; ket: {{ $item->keterangan_produk }}
</p> </p>
<br>
@endif @endif
</td> </td>
</tr> </tr>