Merged in release/2021-11-26 (pull request #280)

release/2021-11-26

Approved-by: Patrick Fic

bodyshop_translations.babel

@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -30837,6 +30837,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>oec</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>
@@ -31330,6 +31351,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>oec</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>
                                     <concept_node>
                                         <name>orderhistory</name>
                                         <definition_loaded>false</definition_loaded>

client/src/components/dms-cdk-makes/dms-cdk-makes.refetch.component.jsx

@@ -1,10 +1,10 @@
 import { Button } from "antd";
 import axios from "axios";
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import { useTranslation } from "react-i18next";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,

client/src/components/parts-order-modal/parts-order-modal.component.jsx

@@ -164,6 +164,7 @@ export default function PartsOrderModalComponent({
         <Radio value={"none"}>{t("general.labels.none")}</Radio>
         <Radio value={"e"}>{t("parts_orders.labels.email")}</Radio>
         <Radio value={"p"}>{t("parts_orders.labels.print")}</Radio>
+        <Radio value={"oec"}>{t("parts_orders.labels.oec")}</Radio>
       </Radio.Group>
     </div>
   );

client/src/components/parts-order-modal/parts-order-modal.container.jsx

@@ -1,13 +1,16 @@
-import { useMutation, useQuery } from "@apollo/client";
+import { useMutation, useQuery, useApolloClient } from "@apollo/client";
 import { Form, Modal, notification } from "antd";
 import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { logImEXEvent } from "../../firebase/firebase.utils";
+import { logImEXEvent, auth } from "../../firebase/firebase.utils";
 import { UPDATE_JOB_LINE_STATUS } from "../../graphql/jobs-lines.queries";
-import { INSERT_NEW_PARTS_ORDERS } from "../../graphql/parts-orders.queries";
+import {
+  INSERT_NEW_PARTS_ORDERS,
+  QUERY_PARTS_ORDER_OEC,
+} from "../../graphql/parts-orders.queries";
 import { QUERY_ALL_VENDORS_FOR_ORDER } from "../../graphql/vendors.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { setEmailOptions } from "../../redux/email/email.actions";
@@ -26,6 +29,7 @@ import { TemplateList } from "../../utils/TemplateConstants";
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import PartsOrderModalComponent from "./parts-order-modal.component";
+import axios from "axios";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -52,7 +56,7 @@ export function PartsOrderModalContainer({
   insertAuditTrail,
 }) {
   const { t } = useTranslation();
-
+  const client = useApolloClient();
   const { visible, context, actions } = partsOrderModal;
   const {
     jobId,
@@ -175,7 +179,7 @@ export function PartsOrderModalContainer({
     }
 
     if (refetch) refetch();
-    toggleModalVisible();
+
     const Templates = TemplateList("partsorder", context);
 
     if (sendType === "e") {
@@ -215,7 +219,50 @@ export function PartsOrderModalContainer({
         {},
         "p"
       );
+    } else if (sendType === "oec") {
+      //Send to Partner OEC.
+      try {
+        const partsOrder = await client.query({
+          query: QUERY_PARTS_ORDER_OEC,
+          variables: {
+            id: insertResult.data.insert_parts_orders.returning[0].id,
+          },
+        });
+
+        const oecResponse = await axios.post(
+          "http://localhost:1337/oec/",
+
+          partsOrder.data.parts_orders_by_pk,
+          {
+            headers: {
+              Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
+            },
+          }
+        );
+
+        if (oecResponse.data && oecResponse.data.success === false) {
+          notification.open({
+            type: "error",
+            message: t("parts_orders.errors.oec", {
+              error: oecResponse.data.error,
+            }),
+          });
+        }
+
+        
+      } catch (error) {
+        console.log("Error OEC.", error);
+        notification["error"]({
+          message: t("parts_orders.errors.oec", {
+            error: JSON.stringify(error.message),
+          }),
+        });
+
+        return;
+      }
     }
+
+    toggleModalVisible();
   };
 
   const initialValues = {

client/src/graphql/parts-orders.queries.js

@@ -11,6 +11,278 @@ export const INSERT_NEW_PARTS_ORDERS = gql`
   }
 `;
 
+export const QUERY_PARTS_ORDER_OEC = gql`
+  query QUERY_PARTS_ORDER_OEC($id: uuid!) {
+    parts_orders_by_pk(id: $id) {
+      parts_order_lines {
+        jobline {
+          tran_code
+          act_price
+          db_ref
+          db_price
+          db_hrs
+          glass_flag
+          id
+          lbr_amt
+          lbr_hrs_j
+          lbr_inc
+          lbr_op
+          lbr_op_j
+          lbr_tax
+          lbr_typ_j
+          line_desc
+          line_ind
+          line_no
+          line_ref
+          location
+          misc_amt
+          misc_sublt
+          misc_tax
+          mod_lb_hrs
+          mod_lbr_ty
+          oem_partno
+          op_code_desc
+          paint_stg
+          paint_tone
+          part_qty
+          part_type
+          price_inc
+          price_j
+          prt_dsmk_m
+          prt_dsmk_p
+          tax_part
+          unq_seq
+          alt_co_id
+          alt_overrd
+          alt_part_i
+          alt_partm
+          alt_partno
+          bett_amt
+          bett_pctg
+          bett_tax
+          bett_type
+          cert_part
+          est_seq
+        }
+        act_price
+        id
+        db_price
+        line_desc
+        quantity
+      }
+      job {
+        bodyshop{
+          shopname
+          bill_tax_rates
+        }
+        ro_number
+        clm_no
+        asgn_no
+        asgn_date
+        state_tax_rate
+        area_of_damage
+        asgn_no
+        asgn_type
+        ciecaid
+        clm_addr1
+        clm_city
+        clm_addr2
+        clm_ct_fn
+        clm_ct_ln
+        clm_ct_ph
+        clm_ct_phx
+        clm_ctry
+        clm_ea
+        clm_fax
+        clm_faxx
+        clm_ofc_id
+        clm_ofc_nm
+        clm_ph1
+        clm_ph1x
+        clm_ph2
+        clm_ph2x
+        clm_st
+        clm_title
+        clm_total
+        clm_zip
+        ded_amt
+        est_addr1
+        est_addr2
+        est_city
+        est_co_nm
+        est_ct_fn
+        est_ctry
+        est_ct_ln
+        est_ea
+        est_ph1
+        est_st
+        est_zip
+        g_bett_amt
+        id
+        ins_addr1
+        ins_city
+        ins_addr2
+        ins_co_id
+        ins_co_nm
+        ins_ct_fn
+        ins_ct_ln
+        ins_ct_ph
+        ins_ct_phx
+        ins_ctry
+        ins_ea
+        ins_fax
+        ins_faxx
+        ins_memo
+        ins_ph1
+        ins_ph1x
+        ins_ph2
+        ins_ph2x
+        ins_st
+        ins_title
+        ins_zip
+        insd_addr1
+        insd_addr2
+        insd_city
+        insd_co_nm
+        insd_ctry
+        insd_ea
+        insd_fax
+        insd_faxx
+        insd_fn
+        insd_ln
+        insd_ph1
+        insd_ph1x
+        insd_ph2
+        insd_ph2x
+        insd_st
+        insd_title
+        insd_zip
+        job_totals
+        loss_cat
+        loss_date
+        loss_desc
+        loss_of_use
+        loss_type
+        ownr_addr1
+        ownr_addr2
+        ownr_city
+        ownr_co_nm
+        ownr_ctry
+        ownr_ea
+        ownr_fax
+        ownr_faxx
+        ownr_ph1
+        ownr_fn
+        ownr_ln
+        ownr_ph1x
+        ownr_ph2
+        ownr_ph2x
+        ownr_st
+        ownr_title
+        ownr_zip
+        parts_tax_rates
+        pay_amt
+        pay_date
+        pay_type
+        pay_chknm
+        payee_nms
+        plate_no
+        plate_st
+        po_number
+        policy_no
+        tax_lbr_rt
+        tax_levies_rt
+        tax_paint_mat_rt
+        tax_predis
+        tax_prethr
+        tax_pstthr
+        tax_registration_number
+        tax_str_rt
+        tax_shop_mat_rt
+        tax_sub_rt
+        tax_thramt
+        tax_tow_rt
+        theft_ind
+        tlos_ind
+        towin
+        v_color
+        v_make_desc
+        v_model_desc
+        v_model_yr
+        v_vin
+        vehicle {
+          v_bstyle
+          v_type
+          v_trimcode
+          v_tone
+          v_stage
+          v_prod_dt
+          v_options
+          v_paint_codes
+          v_model_yr
+          v_model_desc
+          v_mldgcode
+          v_makecode
+          v_make_desc
+          v_engine
+          v_cond
+          v_color
+          trim_color
+          shopid
+          plate_no
+          plate_st
+          db_v_code
+          v_vin
+        }
+        agt_zip
+        agt_st
+        agt_ph2x
+        agt_ph2
+        agt_ph1x
+        agt_ph1
+        agt_lic_no
+        agt_faxx
+        agt_fax
+        agt_ea
+        agt_ctry
+        agt_ct_phx
+        agt_ct_ph
+        agt_ct_ln
+        agt_ct_fn
+        agt_co_nm
+        agt_co_id
+        agt_city
+        agt_addr1
+        agt_addr2
+        adj_g_disc
+        rate_matd
+        rate_mash
+        rate_mapa
+        rate_mahw
+        rate_macs
+        rate_mabl
+        rate_ma3s
+        rate_ma2t
+        rate_ma2s
+        rate_lau
+        rate_las
+        rate_lar
+        rate_lam
+        rate_lag
+        rate_laf
+        rate_lae
+        rate_lad
+        rate_lab
+        rate_laa
+        rate_la4
+        rate_la3
+        rate_la2
+        rate_la1
+      }
+    }
+  }
+`;
+
 export const DELETE_PARTS_ORDER = gql`
   mutation DELETE_PARTS_ORDER($partsOrderId: uuid!) {
     delete_parts_orders_by_pk(id: $partsOrderId) {

client/src/pages/mobile-payment/mobile-payment.container.jsx

@@ -1,7 +1,7 @@
-import React from "react";
-import MobilePaymentComponent from "./mobile-payment.component";
 import { Elements } from "@stripe/react-stripe-js";
 import { loadStripe } from "@stripe/stripe-js";
+import React from "react";
+import MobilePaymentComponent from "./mobile-payment.component";
 
 const stripePromise = new Promise((resolve, reject) => {
   resolve(

client/src/translations/en_us/common.json

@@ -1833,7 +1833,8 @@
 			"errors": {
 				"associatedbills": "This parts order cannot",
 				"backordering": "Error backordering part {{message}}.",
-				"creating": "Error encountered when creating parts order. "
+				"creating": "Error encountered when creating parts order. ",
+				"oec": "Error creating EMS files for OEC. {{error}}"
 			},
 			"fields": {
 				"act_price": "Price",
@@ -1861,6 +1862,7 @@
 				"email": "Send by Email",
 				"inthisorder": "Parts in this Order",
 				"newpartsorder": "New Parts Order",
+				"oec": "Order via OEC",
 				"orderhistory": "Order History",
 				"parts_orders": "Parts Orders",
 				"print": "Show Printed Form",

client/src/translations/es/common.json

@@ -1833,7 +1833,8 @@
 			"errors": {
 				"associatedbills": "",
 				"backordering": "",
-				"creating": "Se encontró un error al crear el pedido de piezas."
+				"creating": "Se encontró un error al crear el pedido de piezas.",
+				"oec": ""
 			},
 			"fields": {
 				"act_price": "",
@@ -1861,6 +1862,7 @@
 				"email": "Enviar por correo electrónico",
 				"inthisorder": "Partes en este pedido",
 				"newpartsorder": "",
+				"oec": "",
 				"orderhistory": "Historial de pedidos",
 				"parts_orders": "",
 				"print": "Mostrar formulario impreso",

client/src/translations/fr/common.json

@@ -1833,7 +1833,8 @@
 			"errors": {
 				"associatedbills": "",
 				"backordering": "",
-				"creating": "Erreur rencontrée lors de la création de la commande de pièces."
+				"creating": "Erreur rencontrée lors de la création de la commande de pièces.",
+				"oec": ""
 			},
 			"fields": {
 				"act_price": "",
@@ -1861,6 +1862,7 @@
 				"email": "Envoyé par email",
 				"inthisorder": "Pièces dans cette commande",
 				"newpartsorder": "",
+				"oec": "",
 				"orderhistory": "Historique des commandes",
 				"parts_orders": "",
 				"print": "Afficher le formulaire imprimé",

hasura/metadata/tables.yaml

@@ -2160,6 +2160,7 @@
       - sublet_completed
       - sublet_ignored
       - tax_part
+      - tran_code
       - unq_seq
       - updated_at
   select_permissions:
@@ -2221,6 +2222,7 @@
       - sublet_completed
       - sublet_ignored
       - tax_part
+      - tran_code
       - unq_seq
       - updated_at
       filter:
@@ -2293,6 +2295,7 @@
       - sublet_completed
       - sublet_ignored
       - tax_part
+      - tran_code
       - unq_seq
       - updated_at
       filter:
@@ -2305,7 +2308,16 @@
                     _eq: X-Hasura-User-Id
               - active:
                   _eq: true
-      check: null
+      check:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
   delete_permissions:
   - role: user
     permission:

hasura/migrations/1638223143109_alter_table_public_joblines_add_column_tran_code/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."joblines" add column "tran_code" text
+--  null;

hasura/migrations/1638223143109_alter_table_public_joblines_add_column_tran_code/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."joblines" add column "tran_code" text
+ null;