Merge branch 'release/AIO/2024-04-26' into test-AIO

bodyshop_translations.babel

@@ -14573,6 +14573,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>unavailable</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                 </children>
                             </folder_node>
                             <folder_node>

client/src/components/courtesy-car-status-select/courtesy-car-status-select.component.jsx

@@ -28,6 +28,7 @@ const CourtesyCarStatusComponent = ({ value, onChange }, ref) => {
       <Option value="courtesycars.status.out">{t("courtesycars.status.out")}</Option>
       <Option value="courtesycars.status.sold">{t("courtesycars.status.sold")}</Option>
       <Option value="courtesycars.status.leasereturn">{t("courtesycars.status.leasereturn")}</Option>
+      <Option value="courtesycars.status.unavailable">{t("courtesycars.status.unavailable")}</Option>
     </Select>
   );
 };

client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx

@@ -61,7 +61,11 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
         {
           text: t("courtesycars.status.leasereturn"),
           value: "courtesycars.status.leasereturn"
-        }
+        },
+        {
+          text: t("courtesycars.status.unavailable"),
+          value: "courtesycars.status.unavailable",
+        },
       ],
       onFilter: (value, record) => record.status === value,
       sortOrder: state.sortedInfo.columnKey === "status" && state.sortedInfo.order,

client/src/translations/en_us/common.json

@@ -866,10 +866,11 @@
 			},
 			"status": {
 				"in": "Available",
-				"inservice": "In Service",
+				"inservice": "Service/Maintenance",
 				"leasereturn": "Lease Returned",
 				"out": "Rented",
-				"sold": "Sold"
+				"sold": "Sold",
+				"unavailable": "Unavailable"
 			},
 			"successes": {
 				"saved": "Courtesy Car saved successfully."

client/src/translations/es/common.json

@@ -869,7 +869,8 @@
 				"inservice": "",
 				"leasereturn": "",
 				"out": "",
-				"sold": ""
+				"sold": "",
+				"unavailable": ""
 			},
 			"successes": {
 				"saved": ""

client/src/translations/fr/common.json

@@ -869,7 +869,8 @@
 				"inservice": "",
 				"leasereturn": "",
 				"out": "",
-				"sold": ""
+				"sold": "",
+				"unavailable": ""
 			},
 			"successes": {
 				"saved": ""

server/cdk/cdk-calculate-allocations.js

@@ -236,10 +236,36 @@ exports.default = async function (socket, jobid) {
       const mapaAccountName = selectedDmsAllocationConfig.costs.MAPA;
       const mapaAccount = bodyshop.md_responsibility_centers.costs.find((c) => c.name === mapaAccountName);
       if (mapaAccount) {
-        if (!costCenterHash[mapaAccountName]) costCenterHash[mapaAccountName] = Dinero();
+        if (!costCenterHash[mapaAccountName])
-        costCenterHash[mapaAccountName] = costCenterHash[mapaAccountName].add(
+          costCenterHash[mapaAccountName] = Dinero();
-          Dinero(job.job_totals.rates.mapa.total).percentage(bodyshop?.cdk_configuration?.sendmaterialscosting)
+        if (job.bodyshop.use_paint_scale_data === true) {
-        );
+          if (job.mixdata.length > 0) {
+            costCenterHash[mapaAccountName] = costCenterHash[
+              mapaAccountName
+            ].add(
+              Dinero({
+                amount: Math.round(
+                  ((job.mixdata[0] && job.mixdata[0].totalliquidcost) || 0) *
+                    100
+                ),
+              })
+            );
+          } else {
+            costCenterHash[mapaAccountName] = costCenterHash[
+              mapaAccountName
+            ].add(
+              Dinero(job.job_totals.rates.mapa.total).percentage(
+                bodyshop?.cdk_configuration?.sendmaterialscosting
+              )
+            );
+          }
+        } else {
+          costCenterHash[mapaAccountName] = costCenterHash[mapaAccountName].add(
+            Dinero(job.job_totals.rates.mapa.total).percentage(
+              bodyshop?.cdk_configuration?.sendmaterialscosting
+            )
+          );
+        }
       } else {
         //console.log("NO MAPA ACCOUNT FOUND!!");
       }

server/graphql-client/queries.js

@@ -1790,6 +1790,7 @@ exports.GET_CDK_ALLOCATIONS = `query QUERY_JOB_CLOSE_DETAILS($id: uuid!) {
       md_responsibility_centers
       cdk_configuration
       pbs_configuration
+      use_paint_scale_data
     }
     ro_number
     dms_allocation
@@ -1897,6 +1898,10 @@ exports.GET_CDK_ALLOCATIONS = `query QUERY_JOB_CLOSE_DETAILS($id: uuid!) {
       line_ref
       unq_seq
     }
+    mixdata(limit: 1, order_by: {updated_at: desc}) {
+      jobid
+      totalliquidcost
+    }
   }
 }`;