Changed global Dinero rounding IO-469.

This commit is contained in:
Patrick Fic
2021-02-02 14:43:09 -08:00
parent d1280e8680
commit 49a9f71d19
5 changed files with 12 additions and 11 deletions

View File

@@ -97,20 +97,12 @@ function BillEnterModalContainer({
const newAdjustments = _.cloneDeep(
existingAdjustments.data.jobs_by_pk.lbr_adjustments
);
console.log(
"🚀 ~ file: bill-enter-modal.container.jsx ~ line 99 ~ handleFinish ~ newAdjustments",
newAdjustments
);
adjKeys.forEach((key) => {
newAdjustments[key] =
(newAdjustments[key] || 0) + adjustmentsToInsert[key];
});
console.log(
"🚀 ~ file: bill-enter-modal.container.jsx ~ line 109 ~ adjKeys.forEach ~ newAdjustments",
newAdjustments
);
const jobUpdate = client.mutate({
mutation: UPDATE_JOB,
variables: {

View File

@@ -140,8 +140,12 @@ export function BillEnterModalLinesComponent({
...item,
actual_cost: !!item.actual_cost
? item.actual_cost
: parseFloat(e.target.value) *
(1 - discount),
: Math.round(
(parseFloat(e.target.value) *
(1 - discount) +
Number.EPSILON) *
100
) / 100,
};
}
return item;

View File

@@ -22,9 +22,12 @@ export const CalculateBillTotal = (invoice) => {
billlines.forEach((i) => {
if (!!i) {
console.log("Amount:", (i.actual_cost || 0) * 100);
const itemTotal = Dinero({
amount: Math.round((i.actual_cost || 0) * 100) || 0,
amount:
Math.round(((i.actual_cost || 0) * 100 + Number.EPSILON) * 100) / 100,
}).multiply(i.quantity || 1);
subtotal = subtotal.add(itemTotal);
if (i.applicable_taxes.federal) {
federalTax = federalTax.add(

View File

@@ -16,6 +16,7 @@ require("dotenv").config();
Dinero.defaultCurrency = "CAD";
Dinero.globalLocale = "en-CA";
Dinero.globalRoundingMode = "HALF_UP";
ReactDOM.render(
<Provider store={store}>

View File

@@ -2,6 +2,7 @@ const Dinero = require("dinero.js");
Dinero.defaultCurrency = "CAD";
Dinero.globalLocale = "en-CA";
Dinero.globalRoundingMode = "HALF_UP";
exports.default = async function (req, res) {
const { job } = req.body;