Merged in release/2023-03-10 (pull request #688)

Release/2023 03 10

client/.env.development

@@ -8,6 +8,6 @@ REACT_APP_CLOUDINARY_API_KEY=957865933348715
 REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
 REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-REACT_APP_AXIOS_BASE_API_URL=https://api.imex.online/
+REACT_APP_AXIOS_BASE_API_URL=http://localhost:4000
 REACT_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc

client/src/components/contract-form/contract-form.component.jsx

@@ -4,7 +4,7 @@ import moment from "moment";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { DateFormatter } from "../../utils/DateFormatter";
-import ContractLicenseDecodeButton from "../contract-license-decode-button/contract-license-decode-button.component";
+//import ContractLicenseDecodeButton from "../contract-license-decode-button/contract-license-decode-button.component";
 import ContractStatusSelector from "../contract-status-select/contract-status-select.component";
 import ContractsRatesChangeButton from "../contracts-rates-change-button/contracts-rates-change-button.component";
 import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
@@ -165,7 +165,9 @@ export default function ContractFormComponent({
               />
             </div>
           )}
-          <ContractLicenseDecodeButton form={form} />
+          {
+            //<ContractLicenseDecodeButton form={form} />
+          }
         </Space>
       </div>
       <LayoutFormRow header={t("contracts.labels.driverinformation")}>

client/src/components/payment-modal/payment-modal.container.jsx

@@ -7,14 +7,14 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import {
   INSERT_NEW_PAYMENT,
-  UPDATE_PAYMENT
+  UPDATE_PAYMENT,
 } from "../../graphql/payments.queries";
 import { setEmailOptions } from "../../redux/email/email.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectPayment } from "../../redux/modals/modals.selectors";
 import {
   selectBodyshop,
-  selectCurrentUser
+  selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
@@ -124,7 +124,11 @@ function PaymentModalContainer({
   };
 
   useEffect(() => {
-    if (visible) form.resetFields();
+    if (visible) {
+      form.resetFields();
+      form.resetFields();
+      form.setFieldsValue(context);
+    }
   }, [visible, form, context]);
 
   useEffect(() => {
@@ -139,6 +143,7 @@ function PaymentModalContainer({
           : t("payments.labels.edit")
       }
       visible={visible}
+      destroyOnClose
       okText={t("general.actions.save")}
       onOk={() => form.submit()}
       width="50%"

client/src/graphql/jobs.queries.js

@@ -2060,6 +2060,7 @@ export const QUERY_JOB_EXPORT_DMS = gql`
       ownr_fn
       ownr_ln
       ownr_co_nm
+      ins_co_nm
       kmin
       kmout
       v_make_desc

client/src/pages/manage/manage.page.component.jsx

@@ -193,8 +193,7 @@ export function Manage({ match, conflict, bodyshop }) {
     <Suspense
       fallback={<LoadingSpinner message={t("general.labels.loadingapp")} />}
     >
-  
+      <PaymentModalContainer />
-        <PaymentModalContainer />
 
       <BreadCrumbs />
       <BillEnterModalContainer />

server/data/autohouse.js

@@ -814,7 +814,11 @@ const CreateCosts = (job) => {
       ].add(
         Dinero({
           amount: Math.round((ticket_val.rate || 0) * 100),
-        }).multiply(ticket_val.actualhrs || ticket_val.productivehrs || 0)
+        }).multiply(
+          (ticket_val.flat_rate
+            ? ticket_val.productivehrs
+            : ticket_val.actualhrs) || 0
+        )
       );
 
       return ticket_acc;

server/graphql-client/queries.js

@@ -775,6 +775,7 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop
       cost_center
       actualhrs
       productivehrs
+      flat_rate
     }
     area_of_damage
     employee_prep_rel {