Merge branch 'dev/logbook/diskon' into dev/no-cron

This commit is contained in:
Salman Manoe 2024-10-07 10:36:34 +07:00
commit 3b5827a778

View File

@ -1731,6 +1731,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
}
});
listData.forEach(d -> {
d.put("hargaJual", d.get("hargaJasa"));
RemunHargaJasa hargaJasa = hargaJasaFixedPay(d);
d.put("hargaJasa", hargaJasa.getNilai());
d.put("keterangan", hargaJasa.getKeterangan());
@ -1875,6 +1876,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
d.put("isBatalPaket", false);
});
listData.forEach(d -> {
d.put("hargaJual", d.get("hargaJasa"));
RemunHargaJasa hargaJasa = hargaJasaFixedPay(d);
d.put("hargaJasa", hargaJasa.getNilai());
d.put("keterangan", hargaJasa.getKeterangan());