Merge branch 'dev/logbook/diskon' into dev/no-cron
This commit is contained in:
commit
3b5827a778
@ -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());
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user