Compare commits

..

No commits in common. "2ce374ecb65147e90bc2c5736035b704c0e2e9e2" and "88b6355c4c5dc1da28636b2a311641d6035b637b" have entirely different histories.

2 changed files with 11 additions and 15 deletions

View File

@ -164,7 +164,6 @@
var qty = table.rows[index].getAttribute('data-qty'); var qty = table.rows[index].getAttribute('data-qty');
var diskonSatuan = table.rows[index].getAttribute('data-diskon-satuan'); var diskonSatuan = table.rows[index].getAttribute('data-diskon-satuan');
var total = table.rows[index].getAttribute('data-total'); var total = table.rows[index].getAttribute('data-total');
var row_id = table.rows[index].getAttribute('data-row-id');
qty = parseInt(qty) + 1; qty = parseInt(qty) + 1;
var totalLama = parseInt(total) + parseInt(menuPrice); var totalLama = parseInt(total) + parseInt(menuPrice);
@ -202,7 +201,7 @@
<br> <br>
${(diskonSatuan > 0) ? '<small class="text-primary"><s>Rp. ' + (harga * qty) + '</s></small> | <small class="text-danger">Rp. ' + total + '</small>' : '<small class="text-primary">Rp. ' + totalLama + '</small>'} ${(diskonSatuan > 0) ? '<small class="text-primary"><s>Rp. ' + (harga * qty) + '</s></small> | <small class="text-danger">Rp. ' + total + '</small>' : '<small class="text-primary">Rp. ' + totalLama + '</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="Keterangane.."> <input type="text" name="keterangan_satuan" data-keterangan="" class="form-control rounded-3" placeholder="Keterangan..">
</div> </div>
</td> </td>
`; `;
@ -212,11 +211,11 @@
<td class="text-center"> <td class="text-center">
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">
<span class="input-group-append"> <span class="input-group-append">
<button type="button" class="btn btn-default btn-xs btn-flat tai" onclick="decrementMenu(${row_id}, '${params.nama_produk}')"><b>-</b></button> <button type="button" class="btn btn-default btn-xs btn-flat tai" onclick="decrementMenu(${globalId}, '${params.nama_produk}')"><b>-</b></button>
</span> </span>
<input type="text" name="bayar" class="form-control rounded-3" readonly value="${qty}"> <input type="text" name="bayar" class="form-control rounded-3" readonly value="${qty}">
<span class="input-group-append"> <span class="input-group-append">
<button type="button" class="btn btn-default btn-xs btn-flat" onclick="incrementMenu(${row_id}, '${params.nama_produk}')">+</button> <button type="button" class="btn btn-default btn-xs btn-flat" onclick="incrementMenu(${globalId}, '${params.nama_produk}')">+</button>
</span> </span>
</div> </div>
</td> </td>
@ -224,13 +223,13 @@
table.rows[index].cells[2].innerHTML = ` table.rows[index].cells[2].innerHTML = `
<td class="text-center"> <td class="text-center">
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">
<input type="number" name="diskon_satuan" oninput="inputNum(this)" class="form-control rounded-3" value="${diskonSatuan}" onkeyup="diskonSatuanMenu(${row_id}, '${params.nama_produk}', this.value)"> <input type="number" name="diskon_satuan" oninput="inputNum(this)" class="form-control rounded-3" value="${diskonSatuan}" onkeyup="diskonSatuanMenu(${globalId}, '${params.nama_produk}', this.value)">
</div> </div>
</td> </td>
`; `;
table.rows[index].cells[3].innerHTML = ` table.rows[index].cells[3].innerHTML = `
<td class="text-center"> <td class="text-center">
<button class="btn btn-danger btn-sm" onclick="deleteMenu(${row_id})"> <button class="btn btn-danger btn-sm" onclick="deleteMenu(${globalId})">
<i class="fas fa-trash"></i> <i class="fas fa-trash"></i>
</button> </button>
</td> </td>

View File

@ -114,16 +114,13 @@
<input type="date" class="form-control" name="filter_tanggal_2" <input type="date" class="form-control" name="filter_tanggal_2"
id="filter_tanggal_2" value="{{ date('Y-m-d') }}"> id="filter_tanggal_2" value="{{ date('Y-m-d') }}">
</div> </div>
<div class="col-md-4 mt-5"> <div class="margin mt-5">
<div class="row"> <a href="javascript:void(0)" class="btn btn-md mr-1 btn-primary"
<a href="javascript:void(0)" class="btn btn-md mr-1 btn-primary" id="btn_filter"><i class="fas fa-search mr-1"></i>Filter
id="btn_filter"><i class="fas fa-search mr-1"></i>Filter data</a>
data</a> <button class="btn btn-md btn-warning" type="submit" id="filter_laporan"><i
<button class="btn btn-md btn-warning" type="submit" id="filter_laporan"><i class="fas fa-print mr-1"></i>Cetak</button>
class="fas fa-print mr-1"></i>Cetak</button>
</div>
</div> </div>
</div>
</form> </form>
</div> </div>
</div> </div>