From 5d58b2d9d7f7ea67ca81310418877bde942b6a6b Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 26 Aug 2020 17:09:00 -0700
Subject: [PATCH] Resolved allocation bug introduced by moving totals
 calculation to server side. BOD-267

---
 .../jobs-close-labmat-allocation.component.jsx               | 5 +++--
 .../jobs-close-parts-allocation.component.jsx                | 4 ++--
 client/src/pages/jobs-close/jobs-close.container.jsx         | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/client/src/components/jobs-close-labmat-allocation/jobs-close-labmat-allocation.component.jsx b/client/src/components/jobs-close-labmat-allocation/jobs-close-labmat-allocation.component.jsx
index b551cc8c9..a0a645140 100644
--- a/client/src/components/jobs-close-labmat-allocation/jobs-close-labmat-allocation.component.jsx
+++ b/client/src/components/jobs-close-labmat-allocation/jobs-close-labmat-allocation.component.jsx
@@ -40,7 +40,8 @@ export default function JobCloseLabMatAllocation({
                         Dinero({
                           amount: labmatAllocations[alloc].allocations.reduce(
                             (acc, val) => {
-                              return acc + Dinero(val.amount).getAmount();
+                              console.log("val :>> ", val);
+                              return acc + val.amount.getAmount();
                             },
                             0
                           ),
@@ -57,7 +58,7 @@ export default function JobCloseLabMatAllocation({
                           Dinero({
                             amount: labmatAllocations[alloc].allocations.reduce(
                               (acc, val) => {
-                                return acc + Dinero(val.amount).getAmount();
+                                return acc + val.amount.getAmount();
                               },
                               0
                             ),
diff --git a/client/src/components/jobs-close-parts-allocation/jobs-close-parts-allocation.component.jsx b/client/src/components/jobs-close-parts-allocation/jobs-close-parts-allocation.component.jsx
index 148e03afc..f34dd8ecf 100644
--- a/client/src/components/jobs-close-parts-allocation/jobs-close-parts-allocation.component.jsx
+++ b/client/src/components/jobs-close-parts-allocation/jobs-close-parts-allocation.component.jsx
@@ -40,7 +40,7 @@ export default function JobsClosePartsAllocation({
                         Dinero({
                           amount: partsAllocations[alloc].allocations.reduce(
                             (acc, val) => {
-                              return acc + Dinero(val.amount).getAmount();
+                              return acc + val.amount.getAmount();
                             },
                             0
                           ),
@@ -57,7 +57,7 @@ export default function JobsClosePartsAllocation({
                           Dinero({
                             amount: partsAllocations[alloc].allocations.reduce(
                               (acc, val) => {
-                                return acc + Dinero(val.amount).getAmount();
+                                return acc + val.amount.getAmount();
                               },
                               0
                             ),
diff --git a/client/src/pages/jobs-close/jobs-close.container.jsx b/client/src/pages/jobs-close/jobs-close.container.jsx
index 2091af423..cd77d9cbe 100644
--- a/client/src/pages/jobs-close/jobs-close.container.jsx
+++ b/client/src/pages/jobs-close/jobs-close.container.jsx
@@ -53,7 +53,7 @@ export function JobsCloseContainer({ setBreadcrumbs }) {
       <div>
         <JobsCloseComponent
           job={data ? data.jobs_by_pk : {}}
-          jobTotals={data.jobs_by_pk.job_totals}
+          jobTotals={JSON.parse(data.jobs_by_pk.job_totals)}
         />
       </div>
     </RbacWrapper>