- enable sourcemap / manifest

Signed-off-by: Dave Richer <dave@imexsystems.ca>

.circleci/config.yml

@@ -3,7 +3,6 @@ orbs:
   #snyk: snyk/snyk@0.0.8
   #cypress: cypress-io/cypress@1.23.0
   aws-s3: circleci/aws-s3@4.0.0
-  aws-cli: circleci/aws-cli@4.0
   eb: circleci/aws-elastic-beanstalk@2.0.1
 jobs:
   api-deploy:
@@ -41,7 +40,7 @@ jobs:
   app-build:
     docker:
       - image: cimg/node:16.15.0
-    resource_class: large
+
     working_directory: ~/repo/client
 
     steps:
@@ -61,7 +60,7 @@ jobs:
   app-beta-build:
     docker:
       - image: cimg/node:18.18.2
-    resource_class: large
+    resource_class: xlarge
     working_directory: ~/repo/client
 
     steps:
@@ -73,11 +72,6 @@ jobs:
 
       - run: npm run build
 
-      - aws-cli/setup:
-          aws_access_key_id: AWS_ACCESS_KEY_ID
-          aws_secret_access_key: AWS_SECRET_ACCESS_KEY
-          region: AWS_REGION
-
       - aws-s3/sync:
           from: build
           to: "s3://imex-online-beta/"
@@ -106,7 +100,7 @@ jobs:
   test-app-build:
     docker:
       - image: cimg/node:16.15.0
-    resource_class: large
+
     working_directory: ~/repo/client
 
     steps:
@@ -126,7 +120,7 @@ jobs:
   test-app-beta-build:
     docker:
       - image: cimg/node:18.18.2
-    resource_class: large
+    resource_class: snaptsoft/pfic
     working_directory: ~/repo/client
 
     steps:
@@ -139,13 +133,6 @@ jobs:
 
       - run: npm run build:test
 
-      - run: npm run sentry:sourcemaps
-
-      - aws-cli/setup:
-          aws_access_key_id: AWS_ACCESS_KEY_ID
-          aws_secret_access_key: AWS_SECRET_ACCESS_KEY
-          region: AWS_REGION
-
       - aws-s3/sync:
           from: build
           to: "s3://imex-online-test-beta/"

.eslintrc.json

@@ -8,6 +8,7 @@
     "Atomics": "readonly",
     "SharedArrayBuffer": "readonly"
   },
+
   "parserOptions": {
     "ecmaVersion": 2018,
     "sourceType": "module"

.prettierrc.js

@@ -1,16 +0,0 @@
-exports.default = {
-  printWidth: 120,
-  useTabs: false,
-  tabWidth: 2,
-  trailingComma: "es5",
-  semi: true,
-  singleQuote: false,
-  bracketSpacing: true,
-  arrowParens: "always",
-  jsxSingleQuote: false,
-  bracketSameLine: false,
-  endOfLine: "lf",
-  importOrder: ["^@core/(.*)$", "^@server/(.*)$", "^@ui/(.*)$", "^[./]"],
-  importOrderSeparation: true,
-  importOrderSortSpecifiers: true,
-};

.vscode/launch.json

@@ -8,6 +8,7 @@
       "type": "pwa-chrome",
       "webRoot": "${workspaceFolder}/client/src"
     },
+
     {
       "name": "Chrome",
       "type": "chrome",

README.MD

@@ -6,8 +6,7 @@ npx deadfile ./src/index.js --exclude build templates
 
 #Crushing all hasura migrations by creating a new initialization from the server.
 hasura migrate create "Init" --from-server --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
-hasura migrate apply --version "1620771761757" --skip-execution --endpoint https://db.imex.online/ --admin-secret '
+hasura migrate apply --version "1620771761757" --skip-execution --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
-Production-ImEXOnline!@#'
 hasura migrate status --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
 
 Generate the license file: 

_reference/DeploymentChecklist.md

@@ -1,3 +1,4 @@
+
 Ensure following environment variables are set: 
 
 __S3 Related__

_reference/JSReportSetup.md

@@ -16,11 +16,9 @@ jsreport configure
 
 sudo apt-get install -y libgconf-2-4
 sudo wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >>
+sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
-/etc/apt/sources.list.d/google.list'
 sudo apt-get update
-sudo apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst
+sudo apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst --no-install-recommends
---no-install-recommends
 
 # on ubuntu 20 run also
 

_reference/Jest CheatSheet.md

@@ -6,9 +6,7 @@
 
 </div>
 
-_I recommend [Mrm](https://github.com/sapegin/mrm-tasks/tree/master/packages/mrm-task-jest)
+_I recommend [Mrm](https://github.com/sapegin/mrm-tasks/tree/master/packages/mrm-task-jest) and [jest-codemods](https://github.com/skovhus/jest-codemods) for single-command Jest installation and easy migration from other frameworks._
-and [jest-codemods](https://github.com/skovhus/jest-codemods) for single-command Jest installation and easy migration
-from other frameworks._
 
 <!-- To reformat run: npx prettier --print-width 100 --single-quote --no-semi --prose-wrap never --write Readme.md -->
 
@@ -207,8 +205,8 @@ expect(fn.mock.calls[0][0]).toBe(2) // fn.mock.calls[0][0] — the first argumen
 - `nthCalledWith` → `toHaveBeenNthCalledWith`
 - `toReturnTimes` → `toHaveReturnedTimes`
 - `toReturnWith` → `toHaveReturnedWith`
-- `lastReturnedWith`→ `toHaveLastReturnedWith`
+- `lastReturnedWith` → `toHaveLastReturnedWith`
-- `nthReturnedWith` →`toHaveNthReturnedWith`
+- `nthReturnedWith` → `toHaveNthReturnedWith`
   </details>
 
 ### Misc
@@ -246,8 +244,7 @@ test('resolve to lemon', async () => {
 
 See [more examples](https://facebook.github.io/jest/docs/en/tutorial-async.html) in Jest docs.
 
-It’s a good practice to specify a number of expected assertions in async tests, so the test will fail if your assertions
+It’s a good practice to specify a number of expected assertions in async tests, so the test will fail if your assertions weren’t called at all.
-weren’t called at all.
 
 ```js
 test('async test', () => {
@@ -346,8 +343,7 @@ jest.mock('lodash/memoize', () => a => a, { virtual: true }) // The original lod
 
 [jest.mock docs](https://facebook.github.io/jest/docs/jest-object.html#jestmockmodulename-factory-options)
 
-> Note: When using `babel-jest`, calls to `jest.mock` will automatically be hoisted to the top of the code block.
+> Note: When using `babel-jest`, calls to `jest.mock` will automatically be hoisted to the top of the code block. Use `jest.doMock` if you want to explicitly avoid this behavior.
-> Use `jest.doMock` if you want to explicitly avoid this behavior.
 
 ### Mock modules using a mock file
 
@@ -363,8 +359,7 @@ jest.mock('lodash/memoize', () => a => a, { virtual: true }) // The original lod
     jest.mock('lodash/memoize')
     ```
 
-> Note: When using `babel-jest`, calls to `jest.mock` will automatically be hoisted to the top of the code block.
+> Note: When using `babel-jest`, calls to `jest.mock` will automatically be hoisted to the top of the code block. Use `jest.doMock` if you want to explicitly avoid this behavior.
-> Use `jest.doMock` if you want to explicitly avoid this behavior.
 
 [Manual mocks docs](https://facebook.github.io/jest/docs/manual-mocks.html)
 
@@ -412,7 +407,7 @@ fn.mockReset() // Clears and removes any mocked return values or implementations
 fn.mockRestore() // Resets and restores the initial implementation
 ```
 
-> Note: `mockRestore`works only with mocks created by `jest.spyOn`.
+> Note: `mockRestore` works only with mocks created by `jest.spyOn`.
 
 For all mocks:
 
@@ -432,8 +427,7 @@ const fs = require.requireActual('fs') // Original module
 
 ### Timer mocks
 
-Write synchronous test for code that uses native timer
+Write synchronous test for code that uses native timer functions (`setTimeout`, `setInterval`, `clearTimeout`, `clearInterval`).
-functions (`setTimeout`, `setInterval`, `clearTimeout`, `clearInterval`).
 
 ```js
 // Enable fake timers
@@ -507,8 +501,7 @@ tests.only('make each pony pink'...
 
 ## Testing modules with side effects
 
-Node.js and Jest will cache modules you `require`. To test modules with side effects you’ll need to reset the module
+Node.js and Jest will cache modules you `require`. To test modules with side effects you’ll need to reset the module registry between tests:
-registry between tests:
 
 ```js
 const modulePath = '../module-to-test'
@@ -532,8 +525,7 @@ test('second text', () => {
 
 ## Usage with Babel and TypeScript
 
-Add [babel-jest](https://github.com/facebook/jest/tree/master/packages/babel-jest)
+Add [babel-jest](https://github.com/facebook/jest/tree/master/packages/babel-jest) or [ts-jest](https://github.com/kulshekhar/ts-jest). Check their docs for installation instructions.
-or [ts-jest](https://github.com/kulshekhar/ts-jest). Check their docs for installation instructions.
 
 ## Resources
 
@@ -544,14 +536,10 @@ or [ts-jest](https://github.com/kulshekhar/ts-jest). Check their docs for instal
 - [Effective Snapshot Testing](https://blog.kentcdodds.com/effective-snapshot-testing-e0d1a2c28eca) by Kent C. Dodds
 - [Migrating to Jest](https://medium.com/@kentcdodds/migrating-to-jest-881f75366e7e#.pc4s5ut6z) by Kent C. Dodds
 - [Migrating AVA to Jest](http://browniefed.com/blog/migrating-ava-to-jest/) by Jason Brown
-- [How to Test React and MobX with Jest](https://semaphoreci.com/community/tutorials/how-to-test-react-and-mobx-with-jest)
+- [How to Test React and MobX with Jest](https://semaphoreci.com/community/tutorials/how-to-test-react-and-mobx-with-jest) by Will Stern
-  by Will Stern
+- [Testing React Intl components with Jest and Enzyme](https://medium.com/@sapegin/testing-react-intl-components-with-jest-and-enzyme-f9d43d9c923e) by Artem Sapegin
-- [Testing React Intl components with Jest and Enzyme](https://medium.com/@sapegin/testing-react-intl-components-with-jest-and-enzyme-f9d43d9c923e)
+- [Testing with Jest: 15 Awesome Tips and Tricks](https://medium.com/@stipsan/testing-with-jest-15-awesome-tips-and-tricks-42150ec4c262) by Stian Didriksen
-  by Artem Sapegin
+- Taking Advantage of Jest Matchers by Ben McCormick: [Part 1](https://benmccormick.org/2017/08/15/jest-matchers-1/), [Part 2](https://benmccormick.org/2017/09/04/jest-matchers-2/)
-- [Testing with Jest: 15 Awesome Tips and Tricks](https://medium.com/@stipsan/testing-with-jest-15-awesome-tips-and-tricks-42150ec4c262)
-  by Stian Didriksen
-- Taking Advantage of Jest Matchers by Ben
-  McCormick: [Part 1](https://benmccormick.org/2017/08/15/jest-matchers-1/), [Part 2](https://benmccormick.org/2017/09/04/jest-matchers-2/)
 
 ---
 
@@ -571,8 +559,6 @@ This software has been developed with lots of coffee, buy me one more cup to kee
 
 ## Author and license
 
-[Artem Sapegin](http://sapegin.me/), a frontend engineer at [Omio](https://omio.com/) and the creator
+[Artem Sapegin](http://sapegin.me/), a frontend engineer at [Omio](https://omio.com/) and the creator of [React Styleguidist](https://react-styleguidist.js.org/). I also write about frontend at [my blog](https://blog.sapegin.me/).
-of [React Styleguidist](https://react-styleguidist.js.org/). I also write about frontend
-at [my blog](https://blog.sapegin.me/).
 
 CC0 1.0 Universal license, see the included [License.md](/License.md) file.

_reference/New Hasura Deployment.md

@@ -46,8 +46,7 @@ $ hasura migrate create "init" --from-server
 ## mark the migration as applied on this server
 
 $ hasura migrate apply --version "<version>" --skip-execution
-If you are using schemas other than public, use --schema "schema_name" flag to indicate each one of them in the create
+If you are using schemas other than public, use --schema "schema_name" flag to indicate each one of them in the create command. This flag can be used multiple times. See more details about the usage in the docs.
-command. This flag can be used multiple times. See more details about the usage in the docs.
 
 Step 4: Verify the status
 Execute the following command to verify status of migration:
@@ -55,5 +54,4 @@ Execute the following command to verify status of migration:
 $ hasura migrate status
 You have brand new migrations now!
 
-This can also be used to combine (kind of squash) all of your migration files into a single one. You're snapshotting the
+This can also be used to combine (kind of squash) all of your migration files into a single one. You're snapshotting the state of a server and adding it as a new migration.
-state of a server and adding it as a new migration.

_reference/OEC/Audatex.xsl

@@ -96,13 +96,10 @@
                             <xsl:value-of select="//Envelope/@UniqueFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateID">
-                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of
+                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of select="//Envelope/@SoftwareVersion"/>-<xsl:value-of select="//Envelope/@UniqueFileID"/>
-                                select="//Envelope/@SoftwareVersion"/>-
-                            <xsl:value-of select="//Envelope/@UniqueFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateIDv2">
-                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-
+                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of select="//Envelope/@UniqueFileID"/>
-                            <xsl:value-of select="//Envelope/@UniqueFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateFormatVersion">
                             <xsl:value-of select="//Envelope/@EMSVersion"/>
@@ -223,8 +220,7 @@
                                     <xsl:choose>
                                         <xsl:when test="string-length(substring-before(//Admin/@InsuranceZip, '-'))=5">
                                             <xsl:choose>
-                                                <xsl:when
+                                                <xsl:when test="string-length(substring-after(//Admin/@InsuranceZip, '-'))=4">
-                                                        test="string-length(substring-after(//Admin/@InsuranceZip, '-'))=4">
                                                     <xsl:value-of select="//Admin/@InsuranceZip"/>
                                                 </xsl:when>
                                                 <xsl:otherwise>
@@ -235,8 +231,7 @@
                                     </xsl:choose>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin/@InsuranceZip)=9">
-                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>-
+                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>-<xsl:value-of select="substring(//Admin/@InsuranceZip, 6, 4)"/>
-                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 6, 4)"/>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin/@InsuranceZip)&gt;4">
                                     <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>
@@ -249,8 +244,7 @@
                         <xsl:attribute name="Phone">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsurancePhone1Ext[. != '']">
-                                    <xsl:value-of select="//Admin/@InsurancePhone1"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsurancePhone1"/>&#32;x<xsl:value-of select="//Admin/@InsurancePhone1Ext"/>
-                                    <xsl:value-of select="//Admin/@InsurancePhone1Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsurancePhone1"/>
@@ -260,8 +254,7 @@
                         <xsl:attribute name="Phone2">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsurancePhone2Ext[. != '']">
-                                    <xsl:value-of select="//Admin/@InsurancePhone2"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsurancePhone2"/>&#32;x<xsl:value-of select="//Admin/@InsurancePhone2Ext"/>
-                                    <xsl:value-of select="//Admin/@InsurancePhone2Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsurancePhone2"/>
@@ -271,8 +264,7 @@
                         <xsl:attribute name="Fax">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsuranceFaxExt[. != '']">
-                                    <xsl:value-of select="//Admin/@InsuranceFax"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsuranceFax"/>&#32;x<xsl:value-of select="//Admin/@InsuranceFaxExt"/>
-                                    <xsl:value-of select="//Admin/@InsuranceFaxExt"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsuranceFax"/>
@@ -327,8 +319,7 @@
                                     <xsl:choose>
                                         <xsl:when test="string-length(substring-before(//Admin2/@EstimatorZip, '-'))=5">
                                             <xsl:choose>
-                                                <xsl:when
+                                                <xsl:when test="string-length(substring-after(//Admin2/@EstimatorZip, '-'))=4">
-                                                        test="string-length(substring-after(//Admin2/@EstimatorZip, '-'))=4">
                                                     <xsl:value-of select="//Admin2/@EstimatorZip"/>
                                                 </xsl:when>
                                                 <xsl:otherwise>
@@ -339,8 +330,7 @@
                                     </xsl:choose>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin2/@EstimatorZip)=9">
-                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>-
+                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>-<xsl:value-of select="substring(//Admin2/@EstimatorZip, 6, 4)"/>
-                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 6, 4)"/>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin2/@EstimatorZip)&gt;4">
                                     <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>
@@ -353,8 +343,7 @@
                         <xsl:attribute name="Phone">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorPhone1Ext[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone1"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone1"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorPhone1Ext"/>
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone1Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorPhone1"/>
@@ -364,8 +353,7 @@
                         <xsl:attribute name="Phone2">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorPhone2Ext[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone2"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone2"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorPhone2Ext"/>
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone2Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorPhone2"/>
@@ -375,8 +363,7 @@
                         <xsl:attribute name="Fax">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorFaxExt[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorFax"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorFax"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorFaxExt"/>
-                                    <xsl:value-of select="//Admin2/@EstimatorFaxExt"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorFax"/>
@@ -392,8 +379,7 @@
                             <xsl:if test="string-length(//Admin2/@VehicleInDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@VehicleInDate, ' ')"/>
                                 <xsl:if test="string-length(//Admin2/@VehicleInTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleInTime, 1, 2)"/>:
+                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleInTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@VehicleInTime, 3, 2)"/>
-                                    <xsl:value-of select="substring(//Admin2/@VehicleInTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -401,8 +387,7 @@
                             <xsl:if test="string-length(//Admin2/@TargetVehicleOutDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@TargetVehicleOutDate,' ')"/>
                                 <xsl:if test="string-length(//Admin2/@TargetVehicleOutTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 1, 2)"/>:
+                                    &#32;<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 3, 2)"/>
-                                    <xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -410,8 +395,7 @@
                             <xsl:if test="string-length(//Admin2/@VehicleOutDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@VehicleOutDate, ' ')"/>
                                 <xsl:if test="string-length(//Admin2/@VehicleOutTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 1, 2)"/>:
+                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 3, 2)"/>
-                                    <xsl:value-of select="substring(//Admin2/@VehicleOutTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -486,9 +470,7 @@
                             <xsl:when test="$PrimaryPartType='PAN' or $PrimaryPartType='PAP'">1</xsl:when>
                             <xsl:when test="$PrimaryPartType='PAA' or $PrimaryPartType='PATR'">2</xsl:when>
                             <xsl:when test="$PrimaryPartType='PAL'">3</xsl:when>
-                            <xsl:when test="$PrimaryPartType='PAM' or $PrimaryPartType='PAC' or $PrimaryPartType='PAR'">
+                            <xsl:when test="$PrimaryPartType='PAM' or $PrimaryPartType='PAC' or $PrimaryPartType='PAR'">4</xsl:when>
-                                4
-                            </xsl:when>
                             <xsl:otherwise>0</xsl:otherwise>
                         </xsl:choose>
                     </xsl:attribute>
@@ -497,10 +479,7 @@
                             <xsl:when test="$SecondaryPartType='PAN'">1</xsl:when>
                             <xsl:when test="$SecondaryPartType='PAA' or $SecondaryPartType='PATR'">2</xsl:when>
                             <xsl:when test="$SecondaryPartType='PAL'">3</xsl:when>
-                            <xsl:when
+                            <xsl:when test="$SecondaryPartType='PAM' or $SecondaryPartType='PAC' or $SecondaryPartType='PAR'">4</xsl:when>
-                                    test="$SecondaryPartType='PAM' or $SecondaryPartType='PAC' or $SecondaryPartType='PAR'">
-                                4
-                            </xsl:when>
                             <xsl:otherwise>0</xsl:otherwise>
                         </xsl:choose>
                     </xsl:attribute>
@@ -567,16 +546,11 @@
                         <!-- If LaborOp is OP1, then allow the part to import CP 12/28/08 for Shop Client Release 4.1.4 -->
                         <xsl:choose>
                             <xsl:when test="@TransactionCode='3'">False</xsl:when>
-                            <xsl:when
+                            <xsl:when test="@TransactionCode='1' or @TransactionCode=' ' or @TransactionCode='' or @TransactionCode='2'">
-                                    test="@TransactionCode='1' or @TransactionCode=' ' or @TransactionCode='' or @TransactionCode='2'">
                                 <xsl:choose>
-                                    <xsl:when
+                                    <xsl:when test="@PartType='PAN' or @PartType='PAG' or @PartType='PAM' or @PartType='PAP' or @PartType='PAL' or @PartType='PAA' or @PartType='PAC' or @PartType='PATR'">
-                                            test="@PartType='PAN' or @PartType='PAG' or @PartType='PAM' or @PartType='PAP' or @PartType='PAL' or @PartType='PAA' or @PartType='PAC' or @PartType='PATR'">
                                         <xsl:choose>
-                                            <xsl:when
+                                            <xsl:when test="@LaborType='LAD' or @LaborType='LAE' or @LaborType='LAU' or @LaborType='LAT'">False</xsl:when>
-                                                    test="@LaborType='LAD' or @LaborType='LAE' or @LaborType='LAU' or @LaborType='LAT'">
-                                                False
-                                            </xsl:when>
                                             <xsl:otherwise>
                                                 <xsl:choose>
                                                     <!--xsl:when test="@LaborOp='OP0'">False</xsl:when -->

_reference/OEC/AudatexMapping.xml

@@ -1,222 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TranslationDescriptor>
-    <FileTranslations FormatName="ADP EMS" ElementName="Estimate"
+    <FileTranslations FormatName="ADP EMS" ElementName="Estimate" Description="Translation Descriptor for a ADP ShopLink Estimate, Version EMS 2.0">
-                      Description="Translation Descriptor for a ADP ShopLink Estimate, Version EMS 2.0">
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.env">
             <DBFFileTranslation ID="ID1" ElementName="Envelope" Description="Envelope Table">
                 <DBFFieldSpec FieldName="RO_ID" Form="attribute" Name="RONum" FieldType="" Description="RO Number"/>
-                <DBFFieldSpec FieldName="UNQFILE_ID" Form="attribute" Name="UniqueFileID" FieldType=""
+                <DBFFieldSpec FieldName="UNQFILE_ID" Form="attribute" Name="UniqueFileID" FieldType="" Description="Unique File Identifier"/>
-                              Description="Unique File Identifier"/>
+                <DBFFieldSpec FieldName="ESTFILE_ID" Form="attribute" Name="EstimateFileID" FieldType="" Description="Estimate File Identifier"/>
-                <DBFFieldSpec FieldName="ESTFILE_ID" Form="attribute" Name="EstimateFileID" FieldType=""
+                <DBFFieldSpec FieldName="INCL_ADMIN" Form="attribute" Name="IncludesAdminInfo" FieldType="Boolean" Description="Includes Admin Info Flag"/>
-                              Description="Estimate File Identifier"/>
+                <DBFFieldSpec FieldName="INCL_VEH" Form="attribute" Name="IncludesVehicleInfo" FieldType="Boolean" Description="Includes Vehicle Info Flag"/>
-                <DBFFieldSpec FieldName="INCL_ADMIN" Form="attribute" Name="IncludesAdminInfo" FieldType="Boolean"
+                <DBFFieldSpec FieldName="INCL_EST" Form="attribute" Name="IncludesEstimateInfo" FieldType="Boolean" Description="Includes Estimate Info Flag"/>
-                              Description="Includes Admin Info Flag"/>
+                <DBFFieldSpec FieldName="INCL_PROFL" Form="attribute" Name="IncludesProfileInfo" FieldType="Boolean" Description="Includes Profile Info Flag"/>
-                <DBFFieldSpec FieldName="INCL_VEH" Form="attribute" Name="IncludesVehicleInfo" FieldType="Boolean"
+                <DBFFieldSpec FieldName="INCL_TOTAL" Form="attribute" Name="IncludesTotalsInfo" FieldType="Boolean" Description="Includes Totals Info Flag"/>
-                              Description="Includes Vehicle Info Flag"/>
+                <DBFFieldSpec FieldName="INCL_VENDR" Form="attribute" Name="IncludesVendorInfo" FieldType="Boolean" Description="Includes Vendor Info Flag"/>
-                <DBFFieldSpec FieldName="INCL_EST" Form="attribute" Name="IncludesEstimateInfo" FieldType="Boolean"
+                <DBFFieldSpec FieldName="EMS_VER" Form="attribute" Name="EMSVersion" FieldType="" Description="EMS Version Number"/>
-                              Description="Includes Estimate Info Flag"/>
+                <DBFFieldSpec FieldName="SUPP_NO" Form="attribute" Name="SupplementNum" FieldType="" Description="Supplement Number"/>
-                <DBFFieldSpec FieldName="INCL_PROFL" Form="attribute" Name="IncludesProfileInfo" FieldType="Boolean"
+                <DBFFieldSpec FieldName="TRANS_TYPE" Form="attribute" Name="TransactionType" FieldType="" Description="Transaction Type"/>
-                              Description="Includes Profile Info Flag"/>
+                <DBFFieldSpec FieldName="EST_SYSTEM" Form="attribute" Name="EstimatingSystem" FieldType="" Description="Estimating System Software"/>
-                <DBFFieldSpec FieldName="INCL_TOTAL" Form="attribute" Name="IncludesTotalsInfo" FieldType="Boolean"
+                <DBFFieldSpec FieldName="SW_VERSION" Form="attribute" Name="SoftwareVersion" FieldType="" Description="Software Version Identifier"/>
-                              Description="Includes Totals Info Flag"/>
-                <DBFFieldSpec FieldName="INCL_VENDR" Form="attribute" Name="IncludesVendorInfo" FieldType="Boolean"
-                              Description="Includes Vendor Info Flag"/>
-                <DBFFieldSpec FieldName="EMS_VER" Form="attribute" Name="EMSVersion" FieldType=""
-                              Description="EMS Version Number"/>
-                <DBFFieldSpec FieldName="SUPP_NO" Form="attribute" Name="SupplementNum" FieldType=""
-                              Description="Supplement Number"/>
-                <DBFFieldSpec FieldName="TRANS_TYPE" Form="attribute" Name="TransactionType" FieldType=""
-                              Description="Transaction Type"/>
-                <DBFFieldSpec FieldName="EST_SYSTEM" Form="attribute" Name="EstimatingSystem" FieldType=""
-                              Description="Estimating System Software"/>
-                <DBFFieldSpec FieldName="SW_VERSION" Form="attribute" Name="SoftwareVersion" FieldType=""
-                              Description="Software Version Identifier"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.LIN">
             <DBFFileTranslation ID="ID2" ElementSetName="PartsList" ElementName="Part" Description="Parts List Table">
-                <DBFFieldSpec FieldName="OEM_PARTNO" Form="attribute" Name="TDPartNum" FieldType=""
+                <DBFFieldSpec FieldName="OEM_PARTNO" Form="attribute" Name="TDPartNum" FieldType="" Description="Part Number"/>
-                              Description="Part Number"/>
+                <DBFFieldSpec FieldName="ALT_PARTNO" Form="attribute" Name="AltPartNum" FieldType="" Description="Alternate Part Number"/>
-                <DBFFieldSpec FieldName="ALT_PARTNO" Form="attribute" Name="AltPartNum" FieldType=""
+                <DBFFieldSpec FieldName="ACT_PRICE" Form="attribute" Name="ActPrice" FieldType="" Description="Actual Part Price"/>
-                              Description="Alternate Part Number"/>
+                <DBFFieldSpec FieldName="LINE_DESC" Form="attribute" Name="TDPartDesc" FieldType="" Description="Part Description"/>
-                <DBFFieldSpec FieldName="ACT_PRICE" Form="attribute" Name="ActPrice" FieldType=""
+                <DBFFieldSpec FieldName="DB_PRICE" Form="attribute" Name="TDEstimate" FieldType="" Description="DB_Price"/>
-                              Description="Actual Part Price"/>
+                <DBFFieldSpec FieldName="PART_QTY" Form="attribute" Name="TDPartQty" FieldType="" Description="Part Quantity"/>
-                <DBFFieldSpec FieldName="LINE_DESC" Form="attribute" Name="TDPartDesc" FieldType=""
+                <DBFFieldSpec FieldName="PART_TYPE" Form="attribute" Name="PartType" FieldType="" Description="Part Type"/>
-                              Description="Part Description"/>
+                <DBFFieldSpec FieldName="MOD_LBR_TY" Form="attribute" Name="LaborType" FieldType="" Description="Labor Type"/>
-                <DBFFieldSpec FieldName="DB_PRICE" Form="attribute" Name="TDEstimate" FieldType=""
+                <DBFFieldSpec FieldName="MOD_LB_HRS" Form="attribute" Name="LaborHours" FieldType="" Description="Labor Hours"/>
-                              Description="DB_Price"/>
-                <DBFFieldSpec FieldName="PART_QTY" Form="attribute" Name="TDPartQty" FieldType=""
-                              Description="Part Quantity"/>
-                <DBFFieldSpec FieldName="PART_TYPE" Form="attribute" Name="PartType" FieldType=""
-                              Description="Part Type"/>
-                <DBFFieldSpec FieldName="MOD_LBR_TY" Form="attribute" Name="LaborType" FieldType=""
-                              Description="Labor Type"/>
-                <DBFFieldSpec FieldName="MOD_LB_HRS" Form="attribute" Name="LaborHours" FieldType=""
-                              Description="Labor Hours"/>
                 <DBFFieldSpec FieldName="LBR_OP" Form="attribute" Name="LaborOp" FieldType="" Description="Labor Op"/>
-                <DBFFieldSpec FieldName="LINE_NO" Form="attribute" Name="LineNumber" FieldType=""
+                <DBFFieldSpec FieldName="LINE_NO" Form="attribute" Name="LineNumber" FieldType="" Description="Line number"/>
-                              Description="Line number"/>
                 <DBFFieldSpec FieldName="UNQ_SEQ" Form="attribute" Name="SequenceNumber" FieldType="" Description=""/>
-                <DBFFieldSpec FieldName="LINE_IND" Form="attribute" Name="SupplementLevel" FieldType=""
+                <DBFFieldSpec FieldName="LINE_IND" Form="attribute" Name="SupplementLevel" FieldType="" Description="Supplement Level"/>
-                              Description="Supplement Level"/>
+                <DBFFieldSpec FieldName="TRAN_CODE" Form="attribute" Name="TransactionCode" FieldType="" Description="Transaction Code"/>
-                <DBFFieldSpec FieldName="TRAN_CODE" Form="attribute" Name="TransactionCode" FieldType=""
+                <DBFFieldSpec FieldName="PRICE_INC" Form="attribute" Name="PriceIncluded" FieldType="" Description="Price Included"/>
-                              Description="Transaction Code"/>
+                <DBFFieldSpec FieldName="PRT_DSMK_P" Form="attribute" Name="MarkUp" FieldType="" Description="Price Mark up for non OEM parts"/>
-                <DBFFieldSpec FieldName="PRICE_INC" Form="attribute" Name="PriceIncluded" FieldType=""
-                              Description="Price Included"/>
-                <DBFFieldSpec FieldName="PRT_DSMK_P" Form="attribute" Name="MarkUp" FieldType=""
-                              Description="Price Mark up for non OEM parts"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.VEH">
             <DBFFileTranslation ID="ID3" ElementName="Vehicle" Description="Vehicle Table">
                 <DBFFieldSpec FieldName="V_VIN" Form="attribute" Name="TransVIN" FieldType="" Description=""/>
-                <DBFFieldSpec FieldName="V_MODEL_YR" Form="attribute" Name="TransYear" FieldType=""
+                <DBFFieldSpec FieldName="V_MODEL_YR" Form="attribute" Name="TransYear" FieldType="" Description="V_MODEL_YR"/>
-                              Description="V_MODEL_YR"/>
+                <DBFFieldSpec FieldName="V_MAKEDESC" Form="attribute" Name="ManufName" FieldType="" Description="V_MAKEDESC"/>
-                <DBFFieldSpec FieldName="V_MAKEDESC" Form="attribute" Name="ManufName" FieldType=""
+                <DBFFieldSpec FieldName="V_MAKECODE" Form="attribute" Name="ManufCode" FieldType="" Description="V_MAKECODE"/>
-                              Description="V_MAKEDESC"/>
+                <DBFFieldSpec FieldName="V_MODEL" Form="attribute" Name="TransModel" FieldType="" Description="V_MODEL"/>
-                <DBFFieldSpec FieldName="V_MAKECODE" Form="attribute" Name="ManufCode" FieldType=""
+                <DBFFieldSpec FieldName="V_MILEAGE" Form="attribute" Name="TransMileage" FieldType="" Description="V_MILEAGE"/>
-                              Description="V_MAKECODE"/>
-                <DBFFieldSpec FieldName="V_MODEL" Form="attribute" Name="TransModel" FieldType=""
-                              Description="V_MODEL"/>
-                <DBFFieldSpec FieldName="V_MILEAGE" Form="attribute" Name="TransMileage" FieldType=""
-                              Description="V_MILEAGE"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.AD1">
             <DBFFileTranslation ID="ID4" ElementName="Admin" Description="Administrative information">
-                <DBFFieldSpec FieldName="OWNR_LN" Form="attribute" Name="OwnerL" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_LN" Form="attribute" Name="OwnerL" FieldType="" Description="Owner Lastname"/>
-                              Description="Owner Lastname"/>
+                <DBFFieldSpec FieldName="OWNR_FN" Form="attribute" Name="OwnerF" FieldType="" Description="Owner Firstname"/>
-                <DBFFieldSpec FieldName="OWNR_FN" Form="attribute" Name="OwnerF" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_CO_NM" Form="attribute" Name="OwnerCompanyName" FieldType="" Description="Owner Company Name"/>
-                              Description="Owner Firstname"/>
+                <DBFFieldSpec FieldName="OWNR_TITLE" Form="attribute" Name="OwnerTitle" FieldType="" Description="Owner Title"/>
-                <DBFFieldSpec FieldName="OWNR_CO_NM" Form="attribute" Name="OwnerCompanyName" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_ADDR1" Form="attribute" Name="OwnerAddr1" FieldType="" Description="Owner Address Line 1"/>
-                              Description="Owner Company Name"/>
+                <DBFFieldSpec FieldName="OWNR_ADDR2" Form="attribute" Name="OwnerAddr2" FieldType="" Description="Owner Address Line 2"/>
-                <DBFFieldSpec FieldName="OWNR_TITLE" Form="attribute" Name="OwnerTitle" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_CITY" Form="attribute" Name="OwnerCity" FieldType="" Description="Owner City"/>
-                              Description="Owner Title"/>
+                <DBFFieldSpec FieldName="OWNR_ST" Form="attribute" Name="OwnerState" FieldType="" Description="Owner State"/>
-                <DBFFieldSpec FieldName="OWNR_ADDR1" Form="attribute" Name="OwnerAddr1" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_ZIP" Form="attribute" Name="OwnerZip" FieldType="" Description="Owner Zip"/>
-                              Description="Owner Address Line 1"/>
+                <DBFFieldSpec FieldName="OWNR_CTRY" Form="attribute" Name="OwnerCountry" FieldType="" Description="Owner Country"/>
-                <DBFFieldSpec FieldName="OWNR_ADDR2" Form="attribute" Name="OwnerAddr2" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_PH1" Form="attribute" Name="OwnerPhone1" FieldType="" Description="Owner Primary Phone"/>
-                              Description="Owner Address Line 2"/>
+                <DBFFieldSpec FieldName="OWNR_PH1X" Form="attribute" Name="OwnerPhone1Ext" FieldType="" Description="Owner Primary Phone Extension"/>
-                <DBFFieldSpec FieldName="OWNR_CITY" Form="attribute" Name="OwnerCity" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_PH2" Form="attribute" Name="OwnerPhone2" FieldType="" Description="Owner Secondary Phone"/>
-                              Description="Owner City"/>
+                <DBFFieldSpec FieldName="OWNR_PH2X" Form="attribute" Name="OwnerPhone2Ext" FieldType="" Description="Owner Secondary Phone Extension"/>
-                <DBFFieldSpec FieldName="OWNR_ST" Form="attribute" Name="OwnerState" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_FAX" Form="attribute" Name="OwnerFax" FieldType="" Description="Owner Fax"/>
-                              Description="Owner State"/>
+                <DBFFieldSpec FieldName="OWNR_FAXX" Form="attribute" Name="OwnerFaxExt" FieldType="" Description="Owner Fax Extension"/>
-                <DBFFieldSpec FieldName="OWNR_ZIP" Form="attribute" Name="OwnerZip" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_EA" Form="attribute" Name="OwnerEmail" FieldType="" Description="Owner Email Address"/>
-                              Description="Owner Zip"/>
+                <DBFFieldSpec FieldName="INS_CO_NM" Form="attribute" Name="InsuranceCompanyName" FieldType="" Description="Insurance Company Name"/>
-                <DBFFieldSpec FieldName="OWNR_CTRY" Form="attribute" Name="OwnerCountry" FieldType=""
+                <DBFFieldSpec FieldName="INS_CO_ID" Form="attribute" Name="InsuranceCompanyID" FieldType="" Description="Insurance Company Identifier"/>
-                              Description="Owner Country"/>
+                <DBFFieldSpec FieldName="INS_ADDR1" Form="attribute" Name="InsuranceAddr1" FieldType="" Description="Insurance Address Line 1"/>
-                <DBFFieldSpec FieldName="OWNR_PH1" Form="attribute" Name="OwnerPhone1" FieldType=""
+                <DBFFieldSpec FieldName="INS_ADDR2" Form="attribute" Name="InsuranceAddr2" FieldType="" Description="Insurance Address Line 2"/>
-                              Description="Owner Primary Phone"/>
+                <DBFFieldSpec FieldName="INS_CITY" Form="attribute" Name="InsuranceCity" FieldType="" Description="Insurance City"/>
-                <DBFFieldSpec FieldName="OWNR_PH1X" Form="attribute" Name="OwnerPhone1Ext" FieldType=""
+                <DBFFieldSpec FieldName="INS_ST" Form="attribute" Name="InsuranceState" FieldType="" Description="Insurance State"/>
-                              Description="Owner Primary Phone Extension"/>
+                <DBFFieldSpec FieldName="INS_ZIP" Form="attribute" Name="InsuranceZip" FieldType="" Description="Insurance Zip"/>
-                <DBFFieldSpec FieldName="OWNR_PH2" Form="attribute" Name="OwnerPhone2" FieldType=""
+                <DBFFieldSpec FieldName="INS_CTRY" Form="attribute" Name="InsuranceCountry" FieldType="" Description="Insurance Country"/>
-                              Description="Owner Secondary Phone"/>
+                <DBFFieldSpec FieldName="INS_PH1" Form="attribute" Name="InsurancePhone1" FieldType="" Description="Insurance Primary Phone"/>
-                <DBFFieldSpec FieldName="OWNR_PH2X" Form="attribute" Name="OwnerPhone2Ext" FieldType=""
+                <DBFFieldSpec FieldName="INS_PH1X" Form="attribute" Name="InsurancePhone1Ext" FieldType="" Description="Insurance Primary Phone Extension"/>
-                              Description="Owner Secondary Phone Extension"/>
+                <DBFFieldSpec FieldName="INS_PH2" Form="attribute" Name="InsurancePhone2" FieldType="" Description="Insurance Secondary Phone"/>
-                <DBFFieldSpec FieldName="OWNR_FAX" Form="attribute" Name="OwnerFax" FieldType=""
+                <DBFFieldSpec FieldName="INS_PH2X" Form="attribute" Name="InsurancePhone2Ext" FieldType="" Description="Insurance Secondary Phone Extension"/>
-                              Description="Owner Fax"/>
+                <DBFFieldSpec FieldName="INS_FAX" Form="attribute" Name="InsuranceFax" FieldType="" Description="Insurance Fax"/>
-                <DBFFieldSpec FieldName="OWNR_FAXX" Form="attribute" Name="OwnerFaxExt" FieldType=""
+                <DBFFieldSpec FieldName="INS_FAXX" Form="attribute" Name="InsuranceFaxExt" FieldType="" Description="Insurance Fax Extension"/>
-                              Description="Owner Fax Extension"/>
+                <DBFFieldSpec FieldName="INS_EA" Form="attribute" Name="InsuranceEmail" FieldType="" Description="Insurance Email Address"/>
-                <DBFFieldSpec FieldName="OWNR_EA" Form="attribute" Name="OwnerEmail" FieldType=""
+                <DBFFieldSpec FieldName="INSD_LN" Form="attribute" Name="InsuranceLName" FieldType="" Description="Insurance Last Name"/>
-                              Description="Owner Email Address"/>
+                <DBFFieldSpec FieldName="CLM_NO" Form="attribute" Name="ClaimNumber" FieldType="" Description="Claim Number"/>
-                <DBFFieldSpec FieldName="INS_CO_NM" Form="attribute" Name="InsuranceCompanyName" FieldType=""
-                              Description="Insurance Company Name"/>
-                <DBFFieldSpec FieldName="INS_CO_ID" Form="attribute" Name="InsuranceCompanyID" FieldType=""
-                              Description="Insurance Company Identifier"/>
-                <DBFFieldSpec FieldName="INS_ADDR1" Form="attribute" Name="InsuranceAddr1" FieldType=""
-                              Description="Insurance Address Line 1"/>
-                <DBFFieldSpec FieldName="INS_ADDR2" Form="attribute" Name="InsuranceAddr2" FieldType=""
-                              Description="Insurance Address Line 2"/>
-                <DBFFieldSpec FieldName="INS_CITY" Form="attribute" Name="InsuranceCity" FieldType=""
-                              Description="Insurance City"/>
-                <DBFFieldSpec FieldName="INS_ST" Form="attribute" Name="InsuranceState" FieldType=""
-                              Description="Insurance State"/>
-                <DBFFieldSpec FieldName="INS_ZIP" Form="attribute" Name="InsuranceZip" FieldType=""
-                              Description="Insurance Zip"/>
-                <DBFFieldSpec FieldName="INS_CTRY" Form="attribute" Name="InsuranceCountry" FieldType=""
-                              Description="Insurance Country"/>
-                <DBFFieldSpec FieldName="INS_PH1" Form="attribute" Name="InsurancePhone1" FieldType=""
-                              Description="Insurance Primary Phone"/>
-                <DBFFieldSpec FieldName="INS_PH1X" Form="attribute" Name="InsurancePhone1Ext" FieldType=""
-                              Description="Insurance Primary Phone Extension"/>
-                <DBFFieldSpec FieldName="INS_PH2" Form="attribute" Name="InsurancePhone2" FieldType=""
-                              Description="Insurance Secondary Phone"/>
-                <DBFFieldSpec FieldName="INS_PH2X" Form="attribute" Name="InsurancePhone2Ext" FieldType=""
-                              Description="Insurance Secondary Phone Extension"/>
-                <DBFFieldSpec FieldName="INS_FAX" Form="attribute" Name="InsuranceFax" FieldType=""
-                              Description="Insurance Fax"/>
-                <DBFFieldSpec FieldName="INS_FAXX" Form="attribute" Name="InsuranceFaxExt" FieldType=""
-                              Description="Insurance Fax Extension"/>
-                <DBFFieldSpec FieldName="INS_EA" Form="attribute" Name="InsuranceEmail" FieldType=""
-                              Description="Insurance Email Address"/>
-                <DBFFieldSpec FieldName="INSD_LN" Form="attribute" Name="InsuranceLName" FieldType=""
-                              Description="Insurance Last Name"/>
-                <DBFFieldSpec FieldName="CLM_NO" Form="attribute" Name="ClaimNumber" FieldType=""
-                              Description="Claim Number"/>
 
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.AD2">
             <DBFFileTranslation ID="ID5" ElementName="Admin2" Description="Administrative information2">
-                <DBFFieldSpec FieldName="EST_CT_LN" Form="attribute" Name="EstimatorL" FieldType=""
+                <DBFFieldSpec FieldName="EST_CT_LN" Form="attribute" Name="EstimatorL" FieldType="" Description="Estimator Lastname"/>
-                              Description="Estimator Lastname"/>
+                <DBFFieldSpec FieldName="EST_CT_FN" Form="attribute" Name="EstimatorF" FieldType="" Description="Estimator Firstname"/>
-                <DBFFieldSpec FieldName="EST_CT_FN" Form="attribute" Name="EstimatorF" FieldType=""
+                <DBFFieldSpec FieldName="EST_CO_NM" Form="attribute" Name="EstimatorCompanyName" FieldType="" Description="Estimator Company Name"/>
-                              Description="Estimator Firstname"/>
+                <DBFFieldSpec FieldName="EST_CO_ID" Form="attribute" Name="EstimatorCompanyID" FieldType="" Description="Estimator Company Identifier"/>
-                <DBFFieldSpec FieldName="EST_CO_NM" Form="attribute" Name="EstimatorCompanyName" FieldType=""
+                <DBFFieldSpec FieldName="EST_ADDR1" Form="attribute" Name="EstimatorAddr1" FieldType="" Description="Estimator Address1"/>
-                              Description="Estimator Company Name"/>
+                <DBFFieldSpec FieldName="EST_ADDR2" Form="attribute" Name="EstimatorAddr2" FieldType="" Description="Estimator Address2"/>
-                <DBFFieldSpec FieldName="EST_CO_ID" Form="attribute" Name="EstimatorCompanyID" FieldType=""
+                <DBFFieldSpec FieldName="EST_CITY" Form="attribute" Name="EstimatorCity" FieldType="" Description="Estimator City"/>
-                              Description="Estimator Company Identifier"/>
+                <DBFFieldSpec FieldName="EST_ST" Form="attribute" Name="EstimatorState" FieldType="" Description="Estimator State"/>
-                <DBFFieldSpec FieldName="EST_ADDR1" Form="attribute" Name="EstimatorAddr1" FieldType=""
+                <DBFFieldSpec FieldName="EST_ZIP" Form="attribute" Name="EstimatorZip" FieldType="" Description="Estimator Zip"/>
-                              Description="Estimator Address1"/>
+                <DBFFieldSpec FieldName="EST_CTRY" Form="attribute" Name="EstimatorCountry" FieldType="" Description="Estimator Country"/>
-                <DBFFieldSpec FieldName="EST_ADDR2" Form="attribute" Name="EstimatorAddr2" FieldType=""
+                <DBFFieldSpec FieldName="EST_PH1" Form="attribute" Name="EstimatorPhone1" FieldType="" Description="Estimator Primary Phone"/>
-                              Description="Estimator Address2"/>
+                <DBFFieldSpec FieldName="EST_PH1X" Form="attribute" Name="EstimatorPhone1Ext" FieldType="" Description="Estimator Primary Phone Extension"/>
-                <DBFFieldSpec FieldName="EST_CITY" Form="attribute" Name="EstimatorCity" FieldType=""
+                <DBFFieldSpec FieldName="EST_PH2" Form="attribute" Name="EstimatorPhone2" FieldType="" Description="Estimator Secondary Phone"/>
-                              Description="Estimator City"/>
+                <DBFFieldSpec FieldName="EST_PH2X" Form="attribute" Name="EstimatorPhone2Ext" FieldType="" Description="Estimator Secondary Phone Extension"/>
-                <DBFFieldSpec FieldName="EST_ST" Form="attribute" Name="EstimatorState" FieldType=""
+                <DBFFieldSpec FieldName="EST_FAX" Form="attribute" Name="EstimatorFax" FieldType="" Description="Estimator Fax"/>
-                              Description="Estimator State"/>
+                <DBFFieldSpec FieldName="EST_FAXX" Form="attribute" Name="EstimatorFaxExt" FieldType="" Description="Estimator Fax Extension"/>
-                <DBFFieldSpec FieldName="EST_ZIP" Form="attribute" Name="EstimatorZip" FieldType=""
+                <DBFFieldSpec FieldName="EST_EA" Form="attribute" Name="EstimatorEmail" FieldType="" Description="Estimator Email Address"/>
-                              Description="Estimator Zip"/>
+                <DBFFieldSpec FieldName="EST_LIC_NO" Form="attribute" Name="EstimatorLicenseNumber" FieldType="" Description="Estimator License Number"/>
-                <DBFFieldSpec FieldName="EST_CTRY" Form="attribute" Name="EstimatorCountry" FieldType=""
+                <DBFFieldSpec FieldName="EST_FILENO" Form="attribute" Name="EstimatorFileNumber" FieldType="" Description="Estimator File Number"/>
-                              Description="Estimator Country"/>
+                <DBFFieldSpec FieldName="RO_IN_DATE" Form="attribute" Name="VehicleInDate" FieldType="" Description="Date arrived in shop"/>
-                <DBFFieldSpec FieldName="EST_PH1" Form="attribute" Name="EstimatorPhone1" FieldType=""
+                <DBFFieldSpec FieldName="RO_IN_TIME" Form="attribute" Name="VehicleInTime" FieldType="" Description="Time arrived in shop"/>
-                              Description="Estimator Primary Phone"/>
+                <DBFFieldSpec FieldName="TAR_DATE" Form="attribute" Name="TargetVehicleOutDate" FieldType="" Description="Target date to be completed"/>
-                <DBFFieldSpec FieldName="EST_PH1X" Form="attribute" Name="EstimatorPhone1Ext" FieldType=""
+                <DBFFieldSpec FieldName="TAR_TIME" Form="attribute" Name="TargetVehicleOutTime" FieldType="" Description="Target time to be completed"/>
-                              Description="Estimator Primary Phone Extension"/>
+                <DBFFieldSpec FieldName="RO_CMPDATE" Form="attribute" Name="VehicleOutDate" FieldType="" Description="Date completed"/>
-                <DBFFieldSpec FieldName="EST_PH2" Form="attribute" Name="EstimatorPhone2" FieldType=""
+                <DBFFieldSpec FieldName="RO_CMPTIME" Form="attribute" Name="VehicleOutTime" FieldType="" Description="Time completed"/>
-                              Description="Estimator Secondary Phone"/>
+                <DBFFieldSpec FieldName="RF_CITY" Form="attribute" Name="BodyShopCity" FieldType="" Description="Body Shop City"/>
-                <DBFFieldSpec FieldName="EST_PH2X" Form="attribute" Name="EstimatorPhone2Ext" FieldType=""
+                <DBFFieldSpec FieldName="RF_CO_NM" Form="attribute" Name="BodyShopName" FieldType="" Description="Body Shop Name"/>
-                              Description="Estimator Secondary Phone Extension"/>
-                <DBFFieldSpec FieldName="EST_FAX" Form="attribute" Name="EstimatorFax" FieldType=""
-                              Description="Estimator Fax"/>
-                <DBFFieldSpec FieldName="EST_FAXX" Form="attribute" Name="EstimatorFaxExt" FieldType=""
-                              Description="Estimator Fax Extension"/>
-                <DBFFieldSpec FieldName="EST_EA" Form="attribute" Name="EstimatorEmail" FieldType=""
-                              Description="Estimator Email Address"/>
-                <DBFFieldSpec FieldName="EST_LIC_NO" Form="attribute" Name="EstimatorLicenseNumber" FieldType=""
-                              Description="Estimator License Number"/>
-                <DBFFieldSpec FieldName="EST_FILENO" Form="attribute" Name="EstimatorFileNumber" FieldType=""
-                              Description="Estimator File Number"/>
-                <DBFFieldSpec FieldName="RO_IN_DATE" Form="attribute" Name="VehicleInDate" FieldType=""
-                              Description="Date arrived in shop"/>
-                <DBFFieldSpec FieldName="RO_IN_TIME" Form="attribute" Name="VehicleInTime" FieldType=""
-                              Description="Time arrived in shop"/>
-                <DBFFieldSpec FieldName="TAR_DATE" Form="attribute" Name="TargetVehicleOutDate" FieldType=""
-                              Description="Target date to be completed"/>
-                <DBFFieldSpec FieldName="TAR_TIME" Form="attribute" Name="TargetVehicleOutTime" FieldType=""
-                              Description="Target time to be completed"/>
-                <DBFFieldSpec FieldName="RO_CMPDATE" Form="attribute" Name="VehicleOutDate" FieldType=""
-                              Description="Date completed"/>
-                <DBFFieldSpec FieldName="RO_CMPTIME" Form="attribute" Name="VehicleOutTime" FieldType=""
-                              Description="Time completed"/>
-                <DBFFieldSpec FieldName="RF_CITY" Form="attribute" Name="BodyShopCity" FieldType=""
-                              Description="Body Shop City"/>
-                <DBFFieldSpec FieldName="RF_CO_NM" Form="attribute" Name="BodyShopName" FieldType=""
-                              Description="Body Shop Name"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.TTL">
           <DBFFileTranslation ID="ID6" ElementName="Total" Description="Total Table">
-                <DBFFieldSpec FieldName="G_TTL_AMT" Form="attribute" Name="GrandTotalAmount" FieldType=""
+            <DBFFieldSpec FieldName="G_TTL_AMT" Form="attribute" Name="GrandTotalAmount" FieldType="" Description=""/>
-                              Description=""/>
           </DBFFileTranslation>
         </FileTranslation>
     </FileTranslations>

_reference/OEC/CCC.xsl

@@ -1,3 +1,4 @@
+
 <?xml version="1.0" ?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" >
     <xsl:template match="/">
@@ -90,13 +91,10 @@
                             <xsl:value-of select="//Envelope/@UniqueFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateID">
-                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of
+                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of select="//Envelope/@SoftwareVersion"/>-<xsl:value-of select="//Envelope/@UniqueFileID"/>
-                                select="//Envelope/@SoftwareVersion"/>-
-                            <xsl:value-of select="//Envelope/@UniqueFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateIDv2">
-                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-
+                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of select="//Envelope/@UniqueFileID"/>
-                            <xsl:value-of select="//Envelope/@UniqueFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateFormatVersion">
                             <xsl:value-of select="//Envelope/@EMSVersion"/>
@@ -217,8 +215,7 @@
                                     <xsl:choose>
                                         <xsl:when test="string-length(substring-before(//Admin/@InsuranceZip, '-'))=5">
                                             <xsl:choose>
-                                                <xsl:when
+                                                <xsl:when test="string-length(substring-after(//Admin/@InsuranceZip, '-'))=4">
-                                                        test="string-length(substring-after(//Admin/@InsuranceZip, '-'))=4">
                                                     <xsl:value-of select="//Admin/@InsuranceZip"/>
                                                 </xsl:when>
                                                 <xsl:otherwise>
@@ -229,8 +226,7 @@
                                     </xsl:choose>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin/@InsuranceZip)=9">
-                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>-
+                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>-<xsl:value-of select="substring(//Admin/@InsuranceZip, 6, 4)"/>
-                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 6, 4)"/>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin/@InsuranceZip)&gt;4">
                                     <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>
@@ -243,8 +239,7 @@
                         <xsl:attribute name="Phone">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsurancePhone1Ext[. != '']">
-                                    <xsl:value-of select="//Admin/@InsurancePhone1"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsurancePhone1"/>&#32;x<xsl:value-of select="//Admin/@InsurancePhone1Ext"/>
-                                    <xsl:value-of select="//Admin/@InsurancePhone1Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsurancePhone1"/>
@@ -254,8 +249,7 @@
                         <xsl:attribute name="Phone2">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsurancePhone2Ext[. != '']">
-                                    <xsl:value-of select="//Admin/@InsurancePhone2"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsurancePhone2"/>&#32;x<xsl:value-of select="//Admin/@InsurancePhone2Ext"/>
-                                    <xsl:value-of select="//Admin/@InsurancePhone2Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsurancePhone2"/>
@@ -265,8 +259,7 @@
                         <xsl:attribute name="Fax">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsuranceFaxExt[. != '']">
-                                    <xsl:value-of select="//Admin/@InsuranceFax"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsuranceFax"/>&#32;x<xsl:value-of select="//Admin/@InsuranceFaxExt"/>
-                                    <xsl:value-of select="//Admin/@InsuranceFaxExt"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsuranceFax"/>
@@ -315,8 +308,7 @@
                                     <xsl:choose>
                                         <xsl:when test="string-length(substring-before(//Admin2/@EstimatorZip, '-'))=5">
                                             <xsl:choose>
-                                                <xsl:when
+                                                <xsl:when test="string-length(substring-after(//Admin2/@EstimatorZip, '-'))=4">
-                                                        test="string-length(substring-after(//Admin2/@EstimatorZip, '-'))=4">
                                                     <xsl:value-of select="//Admin2/@EstimatorZip"/>
                                                 </xsl:when>
                                                 <xsl:otherwise>
@@ -327,8 +319,7 @@
                                     </xsl:choose>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin2/@EstimatorZip)=9">
-                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>-
+                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>-<xsl:value-of select="substring(//Admin2/@EstimatorZip, 6, 4)"/>
-                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 6, 4)"/>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin2/@EstimatorZip)&gt;4">
                                     <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>
@@ -341,8 +332,7 @@
                         <xsl:attribute name="Phone">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorPhone1Ext[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone1"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone1"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorPhone1Ext"/>
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone1Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorPhone1"/>
@@ -352,8 +342,7 @@
                         <xsl:attribute name="Phone2">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorPhone2Ext[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone2"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone2"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorPhone2Ext"/>
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone2Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorPhone2"/>
@@ -363,8 +352,7 @@
                         <xsl:attribute name="Fax">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorFaxExt[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorFax"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorFax"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorFaxExt"/>
-                                    <xsl:value-of select="//Admin2/@EstimatorFaxExt"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorFax"/>
@@ -380,8 +368,7 @@
                             <xsl:if test="string-length(//Admin2/@VehicleInDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@VehicleInDate, ' ')"/>
                                 <xsl:if test="string-length(//Admin2/@VehicleInTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleInTime, 1, 2)"/>:
+                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleInTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@VehicleInTime, 3, 2)"/>
-                                    <xsl:value-of select="substring(//Admin2/@VehicleInTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -389,8 +376,7 @@
                             <xsl:if test="string-length(//Admin2/@TargetVehicleOutDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@TargetVehicleOutDate,' ')"/>
                                 <xsl:if test="string-length(//Admin2/@TargetVehicleOutTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 1, 2)"/>:
+                                    &#32;<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 3, 2)"/>
-                                    <xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -398,8 +384,7 @@
                             <xsl:if test="string-length(//Admin2/@VehicleOutDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@VehicleOutDate, ' ')"/>
                                 <xsl:if test="string-length(//Admin2/@VehicleOutTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 1, 2)"/>:
+                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 3, 2)"/>
-                                    <xsl:value-of select="substring(//Admin2/@VehicleOutTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -580,14 +565,10 @@
                             <xsl:when test="@TransactionCode='3'">False</xsl:when>
                             <xsl:when test="@TransactionCode='1' or @TransactionCode ='2'">
                                 <xsl:choose>
-                                    <xsl:when
+                                    <xsl:when test="@PartType='PAN' or @PartType='PAG' or @PartType='PAM' or @PartType='PAP' or @PartType='PAL' or @PartType='PAA' or @PartType='PAO' or @PartType='PAR' or @PartType=''" >
-                                            test="@PartType='PAN' or @PartType='PAG' or @PartType='PAM' or @PartType='PAP' or @PartType='PAL' or @PartType='PAA' or @PartType='PAO' or @PartType='PAR' or @PartType=''">
                                         <!-- we now handle blank part types-->
                                         <xsl:choose>
-                                            <xsl:when
+                                            <xsl:when test="@LaborType='LAD' or @LaborType='LAE' or @LaborType='LAU' or @LaborType='LAT'">False</xsl:when>
-                                                    test="@LaborType='LAD' or @LaborType='LAE' or @LaborType='LAU' or @LaborType='LAT'">
-                                                False
-                                            </xsl:when>
                                             <xsl:otherwise>
                                                 <xsl:choose>
                                                     <xsl:when test="@LaborOp=''">False</xsl:when>

_reference/OEC/CCCMapping.xml

@@ -1,216 +1,125 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TranslationDescriptor>
-    <FileTranslations FormatName="CCC" ElementName="Estimate"
+    <FileTranslations FormatName="CCC" ElementName="Estimate" Description="Translation Descriptor for a CCC Estimate, Version 2.0">
-                      Description="Translation Descriptor for a CCC Estimate, Version 2.0">
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.env">
             <DBFFileTranslation ID="ID1" ElementName="Envelope" Description="Envelope Table">
                 <DBFFieldSpec FieldName="RO_ID" Form="attribute" Name="RONum" FieldType="" Description="RO Number"/>
-                <DBFFieldSpec FieldName="UNQFILE_ID" Form="attribute" Name="UniqueFileID" FieldType=""
+                <DBFFieldSpec FieldName="UNQFILE_ID" Form="attribute" Name="UniqueFileID" FieldType="" Description="Unique File Identifier"/>
-                              Description="Unique File Identifier"/>
+                <DBFFieldSpec FieldName="ESTFILE_ID" Form="attribute" Name="EstimateFileID" FieldType="" Description="Estimate File Identifier"/>
-                <DBFFieldSpec FieldName="ESTFILE_ID" Form="attribute" Name="EstimateFileID" FieldType=""
+                <DBFFieldSpec FieldName="INCL_ADMIN" Form="attribute" Name="IncludesAdminInfo" FieldType="Boolean" Description="Includes Admin Info Flag"/>
-                              Description="Estimate File Identifier"/>
+                <DBFFieldSpec FieldName="INCL_VEH" Form="attribute" Name="IncludesVehicleInfo" FieldType="Boolean" Description="Includes Vehicle Info Flag"/>
-                <DBFFieldSpec FieldName="INCL_ADMIN" Form="attribute" Name="IncludesAdminInfo" FieldType="Boolean"
+                <DBFFieldSpec FieldName="INCL_EST" Form="attribute" Name="IncludesEstimateInfo" FieldType="Boolean" Description="Includes Estimate Info Flag"/>
-                              Description="Includes Admin Info Flag"/>
+                <DBFFieldSpec FieldName="INCL_PROFL" Form="attribute" Name="IncludesProfileInfo" FieldType="Boolean" Description="Includes Profile Info Flag"/>
-                <DBFFieldSpec FieldName="INCL_VEH" Form="attribute" Name="IncludesVehicleInfo" FieldType="Boolean"
+                <DBFFieldSpec FieldName="INCL_TOTAL" Form="attribute" Name="IncludesTotalsInfo" FieldType="Boolean" Description="Includes Totals Info Flag"/>
-                              Description="Includes Vehicle Info Flag"/>
+                <DBFFieldSpec FieldName="INCL_VENDR" Form="attribute" Name="IncludesVendorInfo" FieldType="Boolean" Description="Includes Vendor Info Flag"/>
-                <DBFFieldSpec FieldName="INCL_EST" Form="attribute" Name="IncludesEstimateInfo" FieldType="Boolean"
+                <DBFFieldSpec FieldName="EMS_VER" Form="attribute" Name="EMSVersion" FieldType="" Description="EMS Version Number"/>
-                              Description="Includes Estimate Info Flag"/>
+                <DBFFieldSpec FieldName="SUPP_NO" Form="attribute" Name="SupplementNum" FieldType="" Description="Supplement Number"/>
-                <DBFFieldSpec FieldName="INCL_PROFL" Form="attribute" Name="IncludesProfileInfo" FieldType="Boolean"
+                <DBFFieldSpec FieldName="TRANS_TYPE" Form="attribute" Name="TransactionType" FieldType="" Description="Transaction Type"/>
-                              Description="Includes Profile Info Flag"/>
+                <DBFFieldSpec FieldName="EST_SYSTEM" Form="attribute" Name="EstimatingSystem" FieldType="" Description="Estimating System Software"/>
-                <DBFFieldSpec FieldName="INCL_TOTAL" Form="attribute" Name="IncludesTotalsInfo" FieldType="Boolean"
+                <DBFFieldSpec FieldName="SW_VERSION" Form="attribute" Name="SoftwareVersion" FieldType="" Description="Software Version Identifier"/>
-                              Description="Includes Totals Info Flag"/>
-                <DBFFieldSpec FieldName="INCL_VENDR" Form="attribute" Name="IncludesVendorInfo" FieldType="Boolean"
-                              Description="Includes Vendor Info Flag"/>
-                <DBFFieldSpec FieldName="EMS_VER" Form="attribute" Name="EMSVersion" FieldType=""
-                              Description="EMS Version Number"/>
-                <DBFFieldSpec FieldName="SUPP_NO" Form="attribute" Name="SupplementNum" FieldType=""
-                              Description="Supplement Number"/>
-                <DBFFieldSpec FieldName="TRANS_TYPE" Form="attribute" Name="TransactionType" FieldType=""
-                              Description="Transaction Type"/>
-                <DBFFieldSpec FieldName="EST_SYSTEM" Form="attribute" Name="EstimatingSystem" FieldType=""
-                              Description="Estimating System Software"/>
-                <DBFFieldSpec FieldName="SW_VERSION" Form="attribute" Name="SoftwareVersion" FieldType=""
-                              Description="Software Version Identifier"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.LIN">
             <DBFFileTranslation ID="ID2" ElementSetName="PartsList" ElementName="Part" Description="Parts List Table">
-                <DBFFieldSpec FieldName="OEM_PARTNO" Form="attribute" Name="TDPartNum" FieldType=""
+                <DBFFieldSpec FieldName="OEM_PARTNO" Form="attribute" Name="TDPartNum" FieldType="" Description="Part Number"/>
-                              Description="Part Number"/>
+                <DBFFieldSpec FieldName="ALT_PARTNO" Form="attribute" Name="AltPartNum" FieldType="" Description="Alternate Part Number"/>
-                <DBFFieldSpec FieldName="ALT_PARTNO" Form="attribute" Name="AltPartNum" FieldType=""
+                <DBFFieldSpec FieldName="ACT_PRICE" Form="attribute" Name="ActPrice" FieldType="" Description="Actual Part Price"/>
-                              Description="Alternate Part Number"/>
+                <DBFFieldSpec FieldName="LINE_DESC" Form="attribute" Name="TDPartDesc" FieldType="" Description="Part Description"/>
-                <DBFFieldSpec FieldName="ACT_PRICE" Form="attribute" Name="ActPrice" FieldType=""
+                <DBFFieldSpec FieldName="DB_PRICE" Form="attribute" Name="TDEstimate" FieldType="" Description="DB_Price"/>
-                              Description="Actual Part Price"/>
+                <DBFFieldSpec FieldName="PART_QTY" Form="attribute" Name="TDPartQty" FieldType="" Description="PART_QTY"/>
-                <DBFFieldSpec FieldName="LINE_DESC" Form="attribute" Name="TDPartDesc" FieldType=""
-                              Description="Part Description"/>
-                <DBFFieldSpec FieldName="DB_PRICE" Form="attribute" Name="TDEstimate" FieldType=""
-                              Description="DB_Price"/>
-                <DBFFieldSpec FieldName="PART_QTY" Form="attribute" Name="TDPartQty" FieldType=""
-                              Description="PART_QTY"/>
                 <DBFFieldSpec FieldName="LINE_NO" Form="attribute" Name="LineNumber" FieldType="" Description=""/>
                 <DBFFieldSpec FieldName="UNQ_SEQ" Form="attribute" Name="SequenceNumber" FieldType="" Description=""/>
-                <DBFFieldSpec FieldName="PART_TYPE" Form="attribute" Name="PartType" FieldType=""
+                <DBFFieldSpec FieldName="PART_TYPE" Form="attribute" Name="PartType" FieldType="" Description="Part Type"/>
-                              Description="Part Type"/>
+                <DBFFieldSpec FieldName="MOD_LBR_TY" Form="attribute" Name="LaborType" FieldType="" Description="Labor Type"/>
-                <DBFFieldSpec FieldName="MOD_LBR_TY" Form="attribute" Name="LaborType" FieldType=""
+                <DBFFieldSpec FieldName="MOD_LB_HRS" Form="attribute" Name="LaborHours" FieldType="" Description="Labor Hours"/>
-                              Description="Labor Type"/>
-                <DBFFieldSpec FieldName="MOD_LB_HRS" Form="attribute" Name="LaborHours" FieldType=""
-                              Description="Labor Hours"/>
                 <DBFFieldSpec FieldName="LBR_OP" Form="attribute" Name="LaborOp" FieldType="" Description="Labor Op"/>
-                <DBFFieldSpec FieldName="LINE_IND" Form="attribute" Name="SupplementLevel" FieldType=""
+                <DBFFieldSpec FieldName="LINE_IND" Form="attribute" Name="SupplementLevel" FieldType="" Description="Supplement Level"/>
-                              Description="Supplement Level"/>
+                <DBFFieldSpec FieldName="TRAN_CODE" Form="attribute" Name="TransactionCode" FieldType="" Description="Transaction Code"/>
-                <DBFFieldSpec FieldName="TRAN_CODE" Form="attribute" Name="TransactionCode" FieldType=""
+                <DBFFieldSpec FieldName="LINE_REF" Form="attribute" Name="TDLineRef" FieldType="" Description="Line Reference Number"/>
-                              Description="Transaction Code"/>
-                <DBFFieldSpec FieldName="LINE_REF" Form="attribute" Name="TDLineRef" FieldType=""
-                              Description="Line Reference Number"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.VEH">
             <DBFFileTranslation ID="ID3" ElementName="Vehicle" Description="Vehicle Table">
                 <DBFFieldSpec FieldName="V_VIN" Form="attribute" Name="TransVIN" FieldType="" Description="V_VIN"/>
-                <DBFFieldSpec FieldName="V_MODEL_YR" Form="attribute" Name="TransYear" FieldType=""
+                <DBFFieldSpec FieldName="V_MODEL_YR" Form="attribute" Name="TransYear" FieldType="" Description="V_MODEL_YR"/>
-                              Description="V_MODEL_YR"/>
+                <DBFFieldSpec FieldName="V_MAKEDESC" Form="attribute" Name="ManufName" FieldType="" Description="V_MAKEDESC"/>
-                <DBFFieldSpec FieldName="V_MAKEDESC" Form="attribute" Name="ManufName" FieldType=""
+                <DBFFieldSpec FieldName="V_MAKECODE" Form="attribute" Name="ManufCode" FieldType="" Description="V_MAKECODE"/>
-                              Description="V_MAKEDESC"/>
+                <DBFFieldSpec FieldName="V_MODEL" Form="attribute" Name="TransModel" FieldType="" Description="V_MODEL"/>
-                <DBFFieldSpec FieldName="V_MAKECODE" Form="attribute" Name="ManufCode" FieldType=""
+                <DBFFieldSpec FieldName="V_MILEAGE" Form="attribute" Name="TransMileage" FieldType="" Description="V_MILEAGE"/>
-                              Description="V_MAKECODE"/>
-                <DBFFieldSpec FieldName="V_MODEL" Form="attribute" Name="TransModel" FieldType=""
-                              Description="V_MODEL"/>
-                <DBFFieldSpec FieldName="V_MILEAGE" Form="attribute" Name="TransMileage" FieldType=""
-                              Description="V_MILEAGE"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.AD1">
             <DBFFileTranslation ID="ID4" ElementName="Admin" Description="Administrative information">
-                <DBFFieldSpec FieldName="OWNR_LN" Form="attribute" Name="OwnerL" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_LN" Form="attribute" Name="OwnerL" FieldType="" Description="Owner Lastname"/>
-                              Description="Owner Lastname"/>
+                <DBFFieldSpec FieldName="OWNR_FN" Form="attribute" Name="OwnerF" FieldType="" Description="Owner Firstname"/>
-                <DBFFieldSpec FieldName="OWNR_FN" Form="attribute" Name="OwnerF" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_CO_NM" Form="attribute" Name="OwnerCompanyName" FieldType="" Description="Owner Company Name"/>
-                              Description="Owner Firstname"/>
+                <DBFFieldSpec FieldName="OWNR_TITLE" Form="attribute" Name="OwnerTitle" FieldType="" Description="Owner Title"/>
-                <DBFFieldSpec FieldName="OWNR_CO_NM" Form="attribute" Name="OwnerCompanyName" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_ADDR1" Form="attribute" Name="OwnerAddr1" FieldType="" Description="Owner Address Line 1"/>
-                              Description="Owner Company Name"/>
+                <DBFFieldSpec FieldName="OWNR_ADDR2" Form="attribute" Name="OwnerAddr2" FieldType="" Description="Owner Address Line 2"/>
-                <DBFFieldSpec FieldName="OWNR_TITLE" Form="attribute" Name="OwnerTitle" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_CITY" Form="attribute" Name="OwnerCity" FieldType="" Description="Owner City"/>
-                              Description="Owner Title"/>
+                <DBFFieldSpec FieldName="OWNR_ST" Form="attribute" Name="OwnerState" FieldType="" Description="Owner State"/>
-                <DBFFieldSpec FieldName="OWNR_ADDR1" Form="attribute" Name="OwnerAddr1" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_ZIP" Form="attribute" Name="OwnerZip" FieldType="" Description="Owner Zip"/>
-                              Description="Owner Address Line 1"/>
+                <DBFFieldSpec FieldName="OWNR_CTRY" Form="attribute" Name="OwnerCountry" FieldType="" Description="Owner Country"/>
-                <DBFFieldSpec FieldName="OWNR_ADDR2" Form="attribute" Name="OwnerAddr2" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_PH1" Form="attribute" Name="OwnerPhone1" FieldType="" Description="Owner Primary Phone"/>
-                              Description="Owner Address Line 2"/>
+                <DBFFieldSpec FieldName="OWNR_PH1X" Form="attribute" Name="OwnerPhone1Ext" FieldType="" Description="Owner Primary Phone Extension"/>
-                <DBFFieldSpec FieldName="OWNR_CITY" Form="attribute" Name="OwnerCity" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_PH2" Form="attribute" Name="OwnerPhone2" FieldType="" Description="Owner Secondary Phone"/>
-                              Description="Owner City"/>
+                <DBFFieldSpec FieldName="OWNR_PH2X" Form="attribute" Name="OwnerPhone2Ext" FieldType="" Description="Owner Secondary Phone Extension"/>
-                <DBFFieldSpec FieldName="OWNR_ST" Form="attribute" Name="OwnerState" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_FAX" Form="attribute" Name="OwnerFax" FieldType="" Description="Owner Fax"/>
-                              Description="Owner State"/>
+                <DBFFieldSpec FieldName="OWNR_FAXX" Form="attribute" Name="OwnerFaxExt" FieldType="" Description="Owner Fax Extension"/>
-                <DBFFieldSpec FieldName="OWNR_ZIP" Form="attribute" Name="OwnerZip" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_EA" Form="attribute" Name="OwnerEmail" FieldType="" Description="Owner Email Address"/>
-                              Description="Owner Zip"/>
+                <DBFFieldSpec FieldName="INS_CO_NM" Form="attribute" Name="InsuranceCompanyName" FieldType="" Description="Insurance Company Name"/>
-                <DBFFieldSpec FieldName="OWNR_CTRY" Form="attribute" Name="OwnerCountry" FieldType=""
+                <DBFFieldSpec FieldName="INS_CO_ID" Form="attribute" Name="InsuranceCompanyID" FieldType="" Description="Insurance Company Identifier"/>
-                              Description="Owner Country"/>
+                <DBFFieldSpec FieldName="INS_ADDR1" Form="attribute" Name="InsuranceAddr1" FieldType="" Description="Insurance Address Line 1"/>
-                <DBFFieldSpec FieldName="OWNR_PH1" Form="attribute" Name="OwnerPhone1" FieldType=""
+                <DBFFieldSpec FieldName="INS_ADDR2" Form="attribute" Name="InsuranceAddr2" FieldType="" Description="Insurance Address Line 2"/>
-                              Description="Owner Primary Phone"/>
+                <DBFFieldSpec FieldName="INS_CITY" Form="attribute" Name="InsuranceCity" FieldType="" Description="Insurance City"/>
-                <DBFFieldSpec FieldName="OWNR_PH1X" Form="attribute" Name="OwnerPhone1Ext" FieldType=""
+                <DBFFieldSpec FieldName="INS_ST" Form="attribute" Name="InsuranceState" FieldType="" Description="Insurance State"/>
-                              Description="Owner Primary Phone Extension"/>
+                <DBFFieldSpec FieldName="INS_ZIP" Form="attribute" Name="InsuranceZip" FieldType="" Description="Insurance Zip"/>
-                <DBFFieldSpec FieldName="OWNR_PH2" Form="attribute" Name="OwnerPhone2" FieldType=""
+                <DBFFieldSpec FieldName="INS_CTRY" Form="attribute" Name="InsuranceCountry" FieldType="" Description="Insurance Country"/>
-                              Description="Owner Secondary Phone"/>
+                <DBFFieldSpec FieldName="INS_PH1" Form="attribute" Name="InsurancePhone1" FieldType="" Description="Insurance Primary Phone"/>
-                <DBFFieldSpec FieldName="OWNR_PH2X" Form="attribute" Name="OwnerPhone2Ext" FieldType=""
+                <DBFFieldSpec FieldName="INS_PH1X" Form="attribute" Name="InsurancePhone1Ext" FieldType="" Description="Insurance Primary Phone Extension"/>
-                              Description="Owner Secondary Phone Extension"/>
+                <DBFFieldSpec FieldName="INS_PH2" Form="attribute" Name="InsurancePhone2" FieldType="" Description="Insurance Secondary Phone"/>
-                <DBFFieldSpec FieldName="OWNR_FAX" Form="attribute" Name="OwnerFax" FieldType=""
+                <DBFFieldSpec FieldName="INS_PH2X" Form="attribute" Name="InsurancePhone2Ext" FieldType="" Description="Insurance Secondary Phone Extension"/>
-                              Description="Owner Fax"/>
+                <DBFFieldSpec FieldName="INS_FAX" Form="attribute" Name="InsuranceFax" FieldType="" Description="Insurance Fax"/>
-                <DBFFieldSpec FieldName="OWNR_FAXX" Form="attribute" Name="OwnerFaxExt" FieldType=""
+                <DBFFieldSpec FieldName="INS_FAXX" Form="attribute" Name="InsuranceFaxExt" FieldType="" Description="Insurance Fax Extension"/>
-                              Description="Owner Fax Extension"/>
+                <DBFFieldSpec FieldName="INS_EA" Form="attribute" Name="InsuranceEmail" FieldType="" Description="Insurance Email Address"/>
-                <DBFFieldSpec FieldName="OWNR_EA" Form="attribute" Name="OwnerEmail" FieldType=""
+                <DBFFieldSpec FieldName="INSD_LN" Form="attribute" Name="InsuranceLName" FieldType="" Description="Insurance Last Name"/>
-                              Description="Owner Email Address"/>
+                <DBFFieldSpec FieldName="CLM_NO" Form="attribute" Name="ClaimNumber" FieldType="" Description="Claim Number"/>
-                <DBFFieldSpec FieldName="INS_CO_NM" Form="attribute" Name="InsuranceCompanyName" FieldType=""
-                              Description="Insurance Company Name"/>
-                <DBFFieldSpec FieldName="INS_CO_ID" Form="attribute" Name="InsuranceCompanyID" FieldType=""
-                              Description="Insurance Company Identifier"/>
-                <DBFFieldSpec FieldName="INS_ADDR1" Form="attribute" Name="InsuranceAddr1" FieldType=""
-                              Description="Insurance Address Line 1"/>
-                <DBFFieldSpec FieldName="INS_ADDR2" Form="attribute" Name="InsuranceAddr2" FieldType=""
-                              Description="Insurance Address Line 2"/>
-                <DBFFieldSpec FieldName="INS_CITY" Form="attribute" Name="InsuranceCity" FieldType=""
-                              Description="Insurance City"/>
-                <DBFFieldSpec FieldName="INS_ST" Form="attribute" Name="InsuranceState" FieldType=""
-                              Description="Insurance State"/>
-                <DBFFieldSpec FieldName="INS_ZIP" Form="attribute" Name="InsuranceZip" FieldType=""
-                              Description="Insurance Zip"/>
-                <DBFFieldSpec FieldName="INS_CTRY" Form="attribute" Name="InsuranceCountry" FieldType=""
-                              Description="Insurance Country"/>
-                <DBFFieldSpec FieldName="INS_PH1" Form="attribute" Name="InsurancePhone1" FieldType=""
-                              Description="Insurance Primary Phone"/>
-                <DBFFieldSpec FieldName="INS_PH1X" Form="attribute" Name="InsurancePhone1Ext" FieldType=""
-                              Description="Insurance Primary Phone Extension"/>
-                <DBFFieldSpec FieldName="INS_PH2" Form="attribute" Name="InsurancePhone2" FieldType=""
-                              Description="Insurance Secondary Phone"/>
-                <DBFFieldSpec FieldName="INS_PH2X" Form="attribute" Name="InsurancePhone2Ext" FieldType=""
-                              Description="Insurance Secondary Phone Extension"/>
-                <DBFFieldSpec FieldName="INS_FAX" Form="attribute" Name="InsuranceFax" FieldType=""
-                              Description="Insurance Fax"/>
-                <DBFFieldSpec FieldName="INS_FAXX" Form="attribute" Name="InsuranceFaxExt" FieldType=""
-                              Description="Insurance Fax Extension"/>
-                <DBFFieldSpec FieldName="INS_EA" Form="attribute" Name="InsuranceEmail" FieldType=""
-                              Description="Insurance Email Address"/>
-                <DBFFieldSpec FieldName="INSD_LN" Form="attribute" Name="InsuranceLName" FieldType=""
-                              Description="Insurance Last Name"/>
-                <DBFFieldSpec FieldName="CLM_NO" Form="attribute" Name="ClaimNumber" FieldType=""
-                              Description="Claim Number"/>
 
 
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.AD2">
             <DBFFileTranslation ID="ID5" ElementName="Admin2" Description="Administrative information2">
-                <DBFFieldSpec FieldName="EST_CT_LN" Form="attribute" Name="EstimatorL" FieldType=""
+                <DBFFieldSpec FieldName="EST_CT_LN" Form="attribute" Name="EstimatorL" FieldType="" Description="Estimator Lastname"/>
-                              Description="Estimator Lastname"/>
+                <DBFFieldSpec FieldName="EST_CT_FN" Form="attribute" Name="EstimatorF" FieldType="" Description="Estimator Firstname"/>
-                <DBFFieldSpec FieldName="EST_CT_FN" Form="attribute" Name="EstimatorF" FieldType=""
+                <DBFFieldSpec FieldName="EST_CO_NM" Form="attribute" Name="EstimatorCompanyName" FieldType="" Description="Estimator Company Name"/>
-                              Description="Estimator Firstname"/>
+                <DBFFieldSpec FieldName="EST_CO_ID" Form="attribute" Name="EstimatorCompanyID" FieldType="" Description="Estimator Company Identifier"/>
-                <DBFFieldSpec FieldName="EST_CO_NM" Form="attribute" Name="EstimatorCompanyName" FieldType=""
+                <DBFFieldSpec FieldName="EST_ADDR1" Form="attribute" Name="EstimatorAddr1" FieldType="" Description="Estimator Address1"/>
-                              Description="Estimator Company Name"/>
+                <DBFFieldSpec FieldName="EST_ADDR2" Form="attribute" Name="EstimatorAddr2" FieldType="" Description="Estimator Address2"/>
-                <DBFFieldSpec FieldName="EST_CO_ID" Form="attribute" Name="EstimatorCompanyID" FieldType=""
+                <DBFFieldSpec FieldName="EST_CITY" Form="attribute" Name="EstimatorCity" FieldType="" Description="Estimator City"/>
-                              Description="Estimator Company Identifier"/>
+                <DBFFieldSpec FieldName="EST_ST" Form="attribute" Name="EstimatorState" FieldType="" Description="Estimator State"/>
-                <DBFFieldSpec FieldName="EST_ADDR1" Form="attribute" Name="EstimatorAddr1" FieldType=""
+                <DBFFieldSpec FieldName="EST_ZIP" Form="attribute" Name="EstimatorZip" FieldType="" Description="Estimator Zip"/>
-                              Description="Estimator Address1"/>
+                <DBFFieldSpec FieldName="EST_CTRY" Form="attribute" Name="EstimatorCountry" FieldType="" Description="Estimator Country"/>
-                <DBFFieldSpec FieldName="EST_ADDR2" Form="attribute" Name="EstimatorAddr2" FieldType=""
+                <DBFFieldSpec FieldName="EST_PH1" Form="attribute" Name="EstimatorPhone1" FieldType="" Description="Estimator Primary Phone"/>
-                              Description="Estimator Address2"/>
+                <DBFFieldSpec FieldName="EST_PH1X" Form="attribute" Name="EstimatorPhone1Ext" FieldType="" Description="Estimator Primary Phone Extension"/>
-                <DBFFieldSpec FieldName="EST_CITY" Form="attribute" Name="EstimatorCity" FieldType=""
+                <DBFFieldSpec FieldName="EST_PH2" Form="attribute" Name="EstimatorPhone2" FieldType="" Description="Estimator Secondary Phone"/>
-                              Description="Estimator City"/>
+                <DBFFieldSpec FieldName="EST_PH2X" Form="attribute" Name="EstimatorPhone2Ext" FieldType="" Description="Estimator Secondary Phone Extension"/>
-                <DBFFieldSpec FieldName="EST_ST" Form="attribute" Name="EstimatorState" FieldType=""
+                <DBFFieldSpec FieldName="EST_FAX" Form="attribute" Name="EstimatorFax" FieldType="" Description="Estimator Fax"/>
-                              Description="Estimator State"/>
+                <DBFFieldSpec FieldName="EST_FAXX" Form="attribute" Name="EstimatorFaxExt" FieldType="" Description="Estimator Fax Extension"/>
-                <DBFFieldSpec FieldName="EST_ZIP" Form="attribute" Name="EstimatorZip" FieldType=""
+                <DBFFieldSpec FieldName="EST_EA" Form="attribute" Name="EstimatorEmail" FieldType="" Description="Estimator Email Address"/>
-                              Description="Estimator Zip"/>
+                <DBFFieldSpec FieldName="EST_LIC_NO" Form="attribute" Name="EstimatorLicenseNumber" FieldType="" Description="Estimator License Number"/>
-                <DBFFieldSpec FieldName="EST_CTRY" Form="attribute" Name="EstimatorCountry" FieldType=""
+                <DBFFieldSpec FieldName="EST_FILENO" Form="attribute" Name="EstimatorFileNumber" FieldType="" Description="Estimator File Number"/>
-                              Description="Estimator Country"/>
+                <DBFFieldSpec FieldName="RO_IN_DATE" Form="attribute" Name="VehicleInDate" FieldType="" Description="Date arrived in shop"/>
-                <DBFFieldSpec FieldName="EST_PH1" Form="attribute" Name="EstimatorPhone1" FieldType=""
+                <DBFFieldSpec FieldName="RO_IN_TIME" Form="attribute" Name="VehicleInTime" FieldType="" Description="Time arrived in shop"/>
-                              Description="Estimator Primary Phone"/>
+                <DBFFieldSpec FieldName="TAR_DATE" Form="attribute" Name="TargetVehicleOutDate" FieldType="" Description="Target date to be completed"/>
-                <DBFFieldSpec FieldName="EST_PH1X" Form="attribute" Name="EstimatorPhone1Ext" FieldType=""
+                <DBFFieldSpec FieldName="TAR_TIME" Form="attribute" Name="TargetVehicleOutTime" FieldType="" Description="Target time to be completed"/>
-                              Description="Estimator Primary Phone Extension"/>
+                <DBFFieldSpec FieldName="RO_CMPDATE" Form="attribute" Name="VehicleOutDate" FieldType="" Description="Date completed"/>
-                <DBFFieldSpec FieldName="EST_PH2" Form="attribute" Name="EstimatorPhone2" FieldType=""
+                <DBFFieldSpec FieldName="RO_CMPTIME" Form="attribute" Name="VehicleOutTime" FieldType="" Description="Time completed"/>
-                              Description="Estimator Secondary Phone"/>
-                <DBFFieldSpec FieldName="EST_PH2X" Form="attribute" Name="EstimatorPhone2Ext" FieldType=""
-                              Description="Estimator Secondary Phone Extension"/>
-                <DBFFieldSpec FieldName="EST_FAX" Form="attribute" Name="EstimatorFax" FieldType=""
-                              Description="Estimator Fax"/>
-                <DBFFieldSpec FieldName="EST_FAXX" Form="attribute" Name="EstimatorFaxExt" FieldType=""
-                              Description="Estimator Fax Extension"/>
-                <DBFFieldSpec FieldName="EST_EA" Form="attribute" Name="EstimatorEmail" FieldType=""
-                              Description="Estimator Email Address"/>
-                <DBFFieldSpec FieldName="EST_LIC_NO" Form="attribute" Name="EstimatorLicenseNumber" FieldType=""
-                              Description="Estimator License Number"/>
-                <DBFFieldSpec FieldName="EST_FILENO" Form="attribute" Name="EstimatorFileNumber" FieldType=""
-                              Description="Estimator File Number"/>
-                <DBFFieldSpec FieldName="RO_IN_DATE" Form="attribute" Name="VehicleInDate" FieldType=""
-                              Description="Date arrived in shop"/>
-                <DBFFieldSpec FieldName="RO_IN_TIME" Form="attribute" Name="VehicleInTime" FieldType=""
-                              Description="Time arrived in shop"/>
-                <DBFFieldSpec FieldName="TAR_DATE" Form="attribute" Name="TargetVehicleOutDate" FieldType=""
-                              Description="Target date to be completed"/>
-                <DBFFieldSpec FieldName="TAR_TIME" Form="attribute" Name="TargetVehicleOutTime" FieldType=""
-                              Description="Target time to be completed"/>
-                <DBFFieldSpec FieldName="RO_CMPDATE" Form="attribute" Name="VehicleOutDate" FieldType=""
-                              Description="Date completed"/>
-                <DBFFieldSpec FieldName="RO_CMPTIME" Form="attribute" Name="VehicleOutTime" FieldType=""
-                              Description="Time completed"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.TTL">
           <DBFFileTranslation ID="ID6" ElementName="Total" Description="Total Table">
-                <DBFFieldSpec FieldName="G_TTL_AMT" Form="attribute" Name="GrandTotalAmount" FieldType=""
+            <DBFFieldSpec FieldName="G_TTL_AMT" Form="attribute" Name="GrandTotalAmount" FieldType="" Description=""/>
-                              Description=""/>
           </DBFFileTranslation>
         </FileTranslation>
     </FileTranslations>

_reference/OEC/Mitchell.xsl

@@ -90,13 +90,10 @@
                             <xsl:value-of select="//Envelope/@UniqueFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateID">
-                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of
+                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of select="//Envelope/@SoftwareVersion"/>-<xsl:value-of select="//Envelope/@EstimateFileID"/>
-                                select="//Envelope/@SoftwareVersion"/>-
-                            <xsl:value-of select="//Envelope/@EstimateFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateIDv2">
-                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-
+                            <xsl:value-of select="//Envelope/@EstimatingSystem"/>-<xsl:value-of select="//Envelope/@EstimateFileID"/>
-                            <xsl:value-of select="//Envelope/@EstimateFileID"/>
                         </xsl:attribute>
                         <xsl:attribute name="EstimateFormatVersion">
                             <xsl:value-of select="//Envelope/@EMSVersion"/>
@@ -217,8 +214,7 @@
                                     <xsl:choose>
                                         <xsl:when test="string-length(substring-before(//Admin/@InsuranceZip, '-'))=5">
                                             <xsl:choose>
-                                                <xsl:when
+                                                <xsl:when test="string-length(substring-after(//Admin/@InsuranceZip, '-'))=4">
-                                                        test="string-length(substring-after(//Admin/@InsuranceZip, '-'))=4">
                                                     <xsl:value-of select="//Admin/@InsuranceZip"/>
                                                 </xsl:when>
                                                 <xsl:otherwise>
@@ -229,8 +225,7 @@
                                     </xsl:choose>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin/@InsuranceZip)=9">
-                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>-
+                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>-<xsl:value-of select="substring(//Admin/@InsuranceZip, 6, 4)"/>
-                                    <xsl:value-of select="substring(//Admin/@InsuranceZip, 6, 4)"/>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin/@InsuranceZip)&gt;4">
                                     <xsl:value-of select="substring(//Admin/@InsuranceZip, 1, 5)"/>
@@ -243,8 +238,7 @@
                         <xsl:attribute name="Phone">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsurancePhone1Ext[. != '']">
-                                    <xsl:value-of select="//Admin/@InsurancePhone1"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsurancePhone1"/>&#32;x<xsl:value-of select="//Admin/@InsurancePhone1Ext"/>
-                                    <xsl:value-of select="//Admin/@InsurancePhone1Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsurancePhone1"/>
@@ -254,8 +248,7 @@
                         <xsl:attribute name="Phone2">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsurancePhone2Ext[. != '']">
-                                    <xsl:value-of select="//Admin/@InsurancePhone2"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsurancePhone2"/>&#32;x<xsl:value-of select="//Admin/@InsurancePhone2Ext"/>
-                                    <xsl:value-of select="//Admin/@InsurancePhone2Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsurancePhone2"/>
@@ -265,8 +258,7 @@
                         <xsl:attribute name="Fax">
                             <xsl:choose>
                                 <xsl:when test="//Admin/@InsuranceFaxExt[. != '']">
-                                    <xsl:value-of select="//Admin/@InsuranceFax"/>&#32;x
+                                    <xsl:value-of select="//Admin/@InsuranceFax"/>&#32;x<xsl:value-of select="//Admin/@InsuranceFaxExt"/>
-                                    <xsl:value-of select="//Admin/@InsuranceFaxExt"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin/@InsuranceFax"/>
@@ -318,8 +310,7 @@
                                     <xsl:choose>
                                         <xsl:when test="string-length(substring-before(//Admin2/@EstimatorZip, '-'))=5">
                                             <xsl:choose>
-                                                <xsl:when
+                                                <xsl:when test="string-length(substring-after(//Admin2/@EstimatorZip, '-'))=4">
-                                                        test="string-length(substring-after(//Admin2/@EstimatorZip, '-'))=4">
                                                     <xsl:value-of select="//Admin2/@EstimatorZip"/>
                                                 </xsl:when>
                                                 <xsl:otherwise>
@@ -330,8 +321,7 @@
                                     </xsl:choose>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin2/@EstimatorZip)=9">
-                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>-
+                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>-<xsl:value-of select="substring(//Admin2/@EstimatorZip, 6, 4)"/>
-                                    <xsl:value-of select="substring(//Admin2/@EstimatorZip, 6, 4)"/>
                                 </xsl:when>
                                 <xsl:when test="string-length(//Admin2/@EstimatorZip)&gt;4">
                                     <xsl:value-of select="substring(//Admin2/@EstimatorZip, 1, 5)"/>
@@ -344,8 +334,7 @@
                         <xsl:attribute name="Phone">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorPhone1Ext[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone1"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone1"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorPhone1Ext"/>
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone1Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorPhone1"/>
@@ -355,8 +344,7 @@
                         <xsl:attribute name="Phone2">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorPhone2Ext[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone2"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorPhone2"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorPhone2Ext"/>
-                                    <xsl:value-of select="//Admin2/@EstimatorPhone2Ext"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorPhone2"/>
@@ -366,8 +354,7 @@
                         <xsl:attribute name="Fax">
                             <xsl:choose>
                                 <xsl:when test="//Admin2/@EstimatorFaxExt[. != '']">
-                                    <xsl:value-of select="//Admin2/@EstimatorFax"/>&#32;x
+                                    <xsl:value-of select="//Admin2/@EstimatorFax"/>&#32;x<xsl:value-of select="//Admin2/@EstimatorFaxExt"/>
-                                    <xsl:value-of select="//Admin2/@EstimatorFaxExt"/>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="//Admin2/@EstimatorFax"/>
@@ -383,8 +370,7 @@
                             <xsl:if test="string-length(//Admin2/@VehicleInDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@VehicleInDate, ' ')"/>
                                 <xsl:if test="string-length(//Admin2/@VehicleInTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleInTime, 1, 2)"/>:
+                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleInTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@VehicleInTime, 3, 2)"/>
-                                    <xsl:value-of select="substring(//Admin2/@VehicleInTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -392,8 +378,7 @@
                             <xsl:if test="string-length(//Admin2/@TargetVehicleOutDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@TargetVehicleOutDate,' ')"/>
                                 <xsl:if test="string-length(//Admin2/@TargetVehicleOutTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 1, 2)"/>:
+                                    &#32;<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 3, 2)"/>
-                                    <xsl:value-of select="substring(//Admin2/@TargetVehicleOutTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -401,8 +386,7 @@
                             <xsl:if test="string-length(//Admin2/@VehicleOutDate)&gt;6">
                                 <xsl:value-of select="substring-before(//Admin2/@VehicleOutDate, ' ')"/>
                                 <xsl:if test="string-length(//Admin2/@VehicleOutTime)=4">
-                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 1, 2)"/>:
+                                    &#32;<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 1, 2)"/>:<xsl:value-of select="substring(//Admin2/@VehicleOutTime, 3, 2)"/>
-                                    <xsl:value-of select="substring(//Admin2/@VehicleOutTime, 3, 2)"/>
                                 </xsl:if>
                             </xsl:if>
                         </xsl:attribute>
@@ -558,13 +542,9 @@
                             <xsl:when test="@TransactionCode='3'">False</xsl:when>
                             <xsl:when test="@TransactionCode='1' or @TransactionCode='2'">
                                 <xsl:choose>
-                                    <xsl:when
+                                    <xsl:when test="@PartType='PAN' or @PartType='PAG' or @PartType='PAM' or @PartType='PAP' or @PartType='PAL' or @PartType='PAA' or @PartType='PAR' or @PartType='PAC'">
-                                            test="@PartType='PAN' or @PartType='PAG' or @PartType='PAM' or @PartType='PAP' or @PartType='PAL' or @PartType='PAA' or @PartType='PAR' or @PartType='PAC'">
                                         <xsl:choose>
-                                            <xsl:when
+                                            <xsl:when test="@LaborType='LAD' or @LaborType='LAE' or @LaborType='LAU' or @LaborType='LAT'">False</xsl:when>
-                                                    test="@LaborType='LAD' or @LaborType='LAE' or @LaborType='LAU' or @LaborType='LAT'">
-                                                False
-                                            </xsl:when>
                                             <xsl:otherwise>
                                                 <xsl:choose>
                                                     <xsl:when test="@LaborOp='OP0'">False</xsl:when>

_reference/OEC/MitchellMapping.xml

@@ -1,221 +1,128 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TranslationDescriptor>
-    <FileTranslations FormatName="Mitchell" ElementName="Estimate"
+    <FileTranslations FormatName="Mitchell" ElementName="Estimate" Description="Translation Descriptor for a Mitchell Estimate, Version EMS 2.0">
-                      Description="Translation Descriptor for a Mitchell Estimate, Version EMS 2.0">
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.env">
             <DBFFileTranslation ID="ID1" ElementName="Envelope" Description="Envelope Table">
                 <DBFFieldSpec FieldName="RO_ID" Form="attribute" Name="RONum" FieldType="" Description="RO Number"/>
-                <DBFFieldSpec FieldName="UNQFILE_ID" Form="attribute" Name="UniqueFileID" FieldType=""
+                <DBFFieldSpec FieldName="UNQFILE_ID" Form="attribute" Name="UniqueFileID" FieldType="" Description="Unique File Identifier"/>
-                              Description="Unique File Identifier"/>
+                <DBFFieldSpec FieldName="ESTFILE_ID" Form="attribute" Name="EstimateFileID" FieldType="" Description="Estimate File Identifier"/>
-                <DBFFieldSpec FieldName="ESTFILE_ID" Form="attribute" Name="EstimateFileID" FieldType=""
+                <DBFFieldSpec FieldName="INCL_ADMIN" Form="attribute" Name="IncludesAdminInfo" FieldType="Boolean" Description="Includes Admin Info Flag"/>
-                              Description="Estimate File Identifier"/>
+                <DBFFieldSpec FieldName="INCL_VEH" Form="attribute" Name="IncludesVehicleInfo" FieldType="Boolean" Description="Includes Vehicle Info Flag"/>
-                <DBFFieldSpec FieldName="INCL_ADMIN" Form="attribute" Name="IncludesAdminInfo" FieldType="Boolean"
+                <DBFFieldSpec FieldName="INCL_EST" Form="attribute" Name="IncludesEstimateInfo" FieldType="Boolean" Description="Includes Estimate Info Flag"/>
-                              Description="Includes Admin Info Flag"/>
+                <DBFFieldSpec FieldName="INCL_PROFL" Form="attribute" Name="IncludesProfileInfo" FieldType="Boolean" Description="Includes Profile Info Flag"/>
-                <DBFFieldSpec FieldName="INCL_VEH" Form="attribute" Name="IncludesVehicleInfo" FieldType="Boolean"
+                <DBFFieldSpec FieldName="INCL_TOTAL" Form="attribute" Name="IncludesTotalsInfo" FieldType="Boolean" Description="Includes Totals Info Flag"/>
-                              Description="Includes Vehicle Info Flag"/>
+                <DBFFieldSpec FieldName="INCL_VENDR" Form="attribute" Name="IncludesVendorInfo" FieldType="Boolean" Description="Includes Vendor Info Flag"/>
-                <DBFFieldSpec FieldName="INCL_EST" Form="attribute" Name="IncludesEstimateInfo" FieldType="Boolean"
+                <DBFFieldSpec FieldName="EMS_VER" Form="attribute" Name="EMSVersion" FieldType="" Description="EMS Version Number"/>
-                              Description="Includes Estimate Info Flag"/>
+                <DBFFieldSpec FieldName="SUPP_NO" Form="attribute" Name="SupplementNum" FieldType="" Description="Supplement Number"/>
-                <DBFFieldSpec FieldName="INCL_PROFL" Form="attribute" Name="IncludesProfileInfo" FieldType="Boolean"
+                <DBFFieldSpec FieldName="TRANS_TYPE" Form="attribute" Name="TransactionType" FieldType="" Description="Transaction Type"/>
-                              Description="Includes Profile Info Flag"/>
+                <DBFFieldSpec FieldName="EST_SYSTEM" Form="attribute" Name="EstimatingSystem" FieldType="" Description="Estimating System Software"/>
-                <DBFFieldSpec FieldName="INCL_TOTAL" Form="attribute" Name="IncludesTotalsInfo" FieldType="Boolean"
+                <DBFFieldSpec FieldName="SW_VERSION" Form="attribute" Name="SoftwareVersion" FieldType="" Description="Software Version Identifier"/>
-                              Description="Includes Totals Info Flag"/>
-                <DBFFieldSpec FieldName="INCL_VENDR" Form="attribute" Name="IncludesVendorInfo" FieldType="Boolean"
-                              Description="Includes Vendor Info Flag"/>
-                <DBFFieldSpec FieldName="EMS_VER" Form="attribute" Name="EMSVersion" FieldType=""
-                              Description="EMS Version Number"/>
-                <DBFFieldSpec FieldName="SUPP_NO" Form="attribute" Name="SupplementNum" FieldType=""
-                              Description="Supplement Number"/>
-                <DBFFieldSpec FieldName="TRANS_TYPE" Form="attribute" Name="TransactionType" FieldType=""
-                              Description="Transaction Type"/>
-                <DBFFieldSpec FieldName="EST_SYSTEM" Form="attribute" Name="EstimatingSystem" FieldType=""
-                              Description="Estimating System Software"/>
-                <DBFFieldSpec FieldName="SW_VERSION" Form="attribute" Name="SoftwareVersion" FieldType=""
-                              Description="Software Version Identifier"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.LIN">
             <DBFFileTranslation ID="ID2" ElementSetName="PartsList" ElementName="Part" Description="Parts List Table">
-                <DBFFieldSpec FieldName="OEM_PARTNO" Form="attribute" Name="TDPartNum" FieldType=""
+                <DBFFieldSpec FieldName="OEM_PARTNO" Form="attribute" Name="TDPartNum" FieldType="" Description="Part Number"/>
-                              Description="Part Number"/>
+                <DBFFieldSpec FieldName="ALT_PARTNO" Form="attribute" Name="AltPartNum" FieldType="" Description="Alternate Part Number"/>
-                <DBFFieldSpec FieldName="ALT_PARTNO" Form="attribute" Name="AltPartNum" FieldType=""
+                <DBFFieldSpec FieldName="ACT_PRICE" Form="attribute" Name="ActPrice" FieldType="" Description="Actual Part Price"/>
-                              Description="Alternate Part Number"/>
+                <DBFFieldSpec FieldName="LINE_DESC" Form="attribute" Name="TDPartDesc" FieldType="" Description="Part Description"/>
-                <DBFFieldSpec FieldName="ACT_PRICE" Form="attribute" Name="ActPrice" FieldType=""
+                <DBFFieldSpec FieldName="DB_PRICE" Form="attribute" Name="TDEstimate" FieldType="" Description="DB_Price"/>
-                              Description="Actual Part Price"/>
+                <DBFFieldSpec FieldName="PART_QTY" Form="attribute" Name="TDPartQty" FieldType="" Description="Part Quantity"/>
-                <DBFFieldSpec FieldName="LINE_DESC" Form="attribute" Name="TDPartDesc" FieldType=""
-                              Description="Part Description"/>
-                <DBFFieldSpec FieldName="DB_PRICE" Form="attribute" Name="TDEstimate" FieldType=""
-                              Description="DB_Price"/>
-                <DBFFieldSpec FieldName="PART_QTY" Form="attribute" Name="TDPartQty" FieldType=""
-                              Description="Part Quantity"/>
                 <DBFFieldSpec FieldName="LINE_NO" Form="attribute" Name="LineNumber" FieldType="" Description=""/>
                 <DBFFieldSpec FieldName="UNQ_SEQ" Form="attribute" Name="SequenceNumber" FieldType="" Description=""/>
-                <DBFFieldSpec FieldName="PART_TYPE" Form="attribute" Name="PartType" FieldType=""
+                <DBFFieldSpec FieldName="PART_TYPE" Form="attribute" Name="PartType" FieldType="" Description="Part Type"/>
-                              Description="Part Type"/>
+                <DBFFieldSpec FieldName="MOD_LBR_TY" Form="attribute" Name="LaborType" FieldType="" Description="Labor Type"/>
-                <DBFFieldSpec FieldName="MOD_LBR_TY" Form="attribute" Name="LaborType" FieldType=""
+                <DBFFieldSpec FieldName="MOD_LB_HRS" Form="attribute" Name="LaborHours" FieldType="" Description="Labor Hours"/>
-                              Description="Labor Type"/>
-                <DBFFieldSpec FieldName="MOD_LB_HRS" Form="attribute" Name="LaborHours" FieldType=""
-                              Description="Labor Hours"/>
                 <DBFFieldSpec FieldName="LBR_OP" Form="attribute" Name="LaborOp" FieldType="" Description="Labor Op"/>
-                <DBFFieldSpec FieldName="LINE_IND" Form="attribute" Name="SupplementLevel" FieldType=""
+                <DBFFieldSpec FieldName="LINE_IND" Form="attribute" Name="SupplementLevel" FieldType="" Description="Supplement Level"/>
-                              Description="Supplement Level"/>
+                <DBFFieldSpec FieldName="TRAN_CODE" Form="attribute" Name="TransactionCode" FieldType="" Description="Transaction Code"/>
-                <DBFFieldSpec FieldName="TRAN_CODE" Form="attribute" Name="TransactionCode" FieldType=""
+                <DBFFieldSpec FieldName="GLASS_FLAG" Form="attribute" Name="GlassFlag" FieldType="" Description="Glass Flag"/>
-                              Description="Transaction Code"/>
+                <DBFFieldSpec FieldName="PRT_DSMK_M" Form="attribute" Name="MarkUp" FieldType="" Description="Price Mark up for non OEM parts"/>
-                <DBFFieldSpec FieldName="GLASS_FLAG" Form="attribute" Name="GlassFlag" FieldType=""
-                              Description="Glass Flag"/>
-                <DBFFieldSpec FieldName="PRT_DSMK_M" Form="attribute" Name="MarkUp" FieldType=""
-                              Description="Price Mark up for non OEM parts"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.VEH">
             <DBFFileTranslation ID="ID3" ElementName="Vehicle" Description="Vehicle Table">
                 <DBFFieldSpec FieldName="V_VIN" Form="attribute" Name="TransVIN" FieldType="" Description=""/>
-                <DBFFieldSpec FieldName="V_MODEL_YR" Form="attribute" Name="TransYear" FieldType=""
+                <DBFFieldSpec FieldName="V_MODEL_YR" Form="attribute" Name="TransYear" FieldType="" Description="V_MODEL_YR"/>
-                              Description="V_MODEL_YR"/>
+                <DBFFieldSpec FieldName="V_MAKEDESC" Form="attribute" Name="ManufName" FieldType="" Description="V_MAKEDESC"/>
-                <DBFFieldSpec FieldName="V_MAKEDESC" Form="attribute" Name="ManufName" FieldType=""
+                <DBFFieldSpec FieldName="V_MAKECODE" Form="attribute" Name="ManufCode" FieldType="" Description="V_MAKECODE"/>
-                              Description="V_MAKEDESC"/>
+                <DBFFieldSpec FieldName="V_MODEL" Form="attribute" Name="TransModel" FieldType="" Description="V_MODEL"/>
-                <DBFFieldSpec FieldName="V_MAKECODE" Form="attribute" Name="ManufCode" FieldType=""
+                <DBFFieldSpec FieldName="V_MILEAGE" Form="attribute" Name="TransMileage" FieldType="" Description="V_MILEAGE"/>
-                              Description="V_MAKECODE"/>
-                <DBFFieldSpec FieldName="V_MODEL" Form="attribute" Name="TransModel" FieldType=""
-                              Description="V_MODEL"/>
-                <DBFFieldSpec FieldName="V_MILEAGE" Form="attribute" Name="TransMileage" FieldType=""
-                              Description="V_MILEAGE"/>
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.AD1">
             <DBFFileTranslation ID="ID4" ElementName="Admin" Description="Administrative information">
-                <DBFFieldSpec FieldName="OWNR_LN" Form="attribute" Name="OwnerL" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_LN" Form="attribute" Name="OwnerL" FieldType="" Description="Owner Lastname"/>
-                              Description="Owner Lastname"/>
+                <DBFFieldSpec FieldName="OWNR_FN" Form="attribute" Name="OwnerF" FieldType="" Description="Owner Firstname"/>
-                <DBFFieldSpec FieldName="OWNR_FN" Form="attribute" Name="OwnerF" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_CO_NM" Form="attribute" Name="OwnerCompanyName" FieldType="" Description="Owner Company Name"/>
-                              Description="Owner Firstname"/>
+                <DBFFieldSpec FieldName="OWNR_TITLE" Form="attribute" Name="OwnerTitle" FieldType="" Description="Owner Title"/>
-                <DBFFieldSpec FieldName="OWNR_CO_NM" Form="attribute" Name="OwnerCompanyName" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_ADDR1" Form="attribute" Name="OwnerAddr1" FieldType="" Description="Owner Address Line 1"/>
-                              Description="Owner Company Name"/>
+                <DBFFieldSpec FieldName="OWNR_ADDR2" Form="attribute" Name="OwnerAddr2" FieldType="" Description="Owner Address Line 2"/>
-                <DBFFieldSpec FieldName="OWNR_TITLE" Form="attribute" Name="OwnerTitle" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_CITY" Form="attribute" Name="OwnerCity" FieldType="" Description="Owner City"/>
-                              Description="Owner Title"/>
+                <DBFFieldSpec FieldName="OWNR_ST" Form="attribute" Name="OwnerState" FieldType="" Description="Owner State"/>
-                <DBFFieldSpec FieldName="OWNR_ADDR1" Form="attribute" Name="OwnerAddr1" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_ZIP" Form="attribute" Name="OwnerZip" FieldType="" Description="Owner Zip"/>
-                              Description="Owner Address Line 1"/>
+                <DBFFieldSpec FieldName="OWNR_CTRY" Form="attribute" Name="OwnerCountry" FieldType="" Description="Owner Country"/>
-                <DBFFieldSpec FieldName="OWNR_ADDR2" Form="attribute" Name="OwnerAddr2" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_PH1" Form="attribute" Name="OwnerPhone1" FieldType="" Description="Owner Primary Phone"/>
-                              Description="Owner Address Line 2"/>
+                <DBFFieldSpec FieldName="OWNR_PH1X" Form="attribute" Name="OwnerPhone1Ext" FieldType="" Description="Owner Primary Phone Extension"/>
-                <DBFFieldSpec FieldName="OWNR_CITY" Form="attribute" Name="OwnerCity" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_PH2" Form="attribute" Name="OwnerPhone2" FieldType="" Description="Owner Secondary Phone"/>
-                              Description="Owner City"/>
+                <DBFFieldSpec FieldName="OWNR_PH2X" Form="attribute" Name="OwnerPhone2Ext" FieldType="" Description="Owner Secondary Phone Extension"/>
-                <DBFFieldSpec FieldName="OWNR_ST" Form="attribute" Name="OwnerState" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_FAX" Form="attribute" Name="OwnerFax" FieldType="" Description="Owner Fax"/>
-                              Description="Owner State"/>
+                <DBFFieldSpec FieldName="OWNR_FAXX" Form="attribute" Name="OwnerFaxExt" FieldType="" Description="Owner Fax Extension"/>
-                <DBFFieldSpec FieldName="OWNR_ZIP" Form="attribute" Name="OwnerZip" FieldType=""
+                <DBFFieldSpec FieldName="OWNR_EA" Form="attribute" Name="OwnerEmail" FieldType="" Description="Owner Email Address"/>
-                              Description="Owner Zip"/>
+                <DBFFieldSpec FieldName="INS_CO_NM" Form="attribute" Name="InsuranceCompanyName" FieldType="" Description="Insurance Company Name"/>
-                <DBFFieldSpec FieldName="OWNR_CTRY" Form="attribute" Name="OwnerCountry" FieldType=""
+                <DBFFieldSpec FieldName="INS_CO_ID" Form="attribute" Name="InsuranceCompanyID" FieldType="" Description="Insurance Company Identifier"/>
-                              Description="Owner Country"/>
+                <DBFFieldSpec FieldName="INS_ADDR1" Form="attribute" Name="InsuranceAddr1" FieldType="" Description="Insurance Address Line 1"/>
-                <DBFFieldSpec FieldName="OWNR_PH1" Form="attribute" Name="OwnerPhone1" FieldType=""
+                <DBFFieldSpec FieldName="INS_ADDR2" Form="attribute" Name="InsuranceAddr2" FieldType="" Description="Insurance Address Line 2"/>
-                              Description="Owner Primary Phone"/>
+                <DBFFieldSpec FieldName="INS_CITY" Form="attribute" Name="InsuranceCity" FieldType="" Description="Insurance City"/>
-                <DBFFieldSpec FieldName="OWNR_PH1X" Form="attribute" Name="OwnerPhone1Ext" FieldType=""
+                <DBFFieldSpec FieldName="INS_ST" Form="attribute" Name="InsuranceState" FieldType="" Description="Insurance State"/>
-                              Description="Owner Primary Phone Extension"/>
+                <DBFFieldSpec FieldName="INS_ZIP" Form="attribute" Name="InsuranceZip" FieldType="" Description="Insurance Zip"/>
-                <DBFFieldSpec FieldName="OWNR_PH2" Form="attribute" Name="OwnerPhone2" FieldType=""
+                <DBFFieldSpec FieldName="INS_CTRY" Form="attribute" Name="InsuranceCountry" FieldType="" Description="Insurance Country"/>
-                              Description="Owner Secondary Phone"/>
+                <DBFFieldSpec FieldName="INS_PH1" Form="attribute" Name="InsurancePhone1" FieldType="" Description="Insurance Primary Phone"/>
-                <DBFFieldSpec FieldName="OWNR_PH2X" Form="attribute" Name="OwnerPhone2Ext" FieldType=""
+                <DBFFieldSpec FieldName="INS_PH1X" Form="attribute" Name="InsurancePhone1Ext" FieldType="" Description="Insurance Primary Phone Extension"/>
-                              Description="Owner Secondary Phone Extension"/>
+                <DBFFieldSpec FieldName="INS_PH2" Form="attribute" Name="InsurancePhone2" FieldType="" Description="Insurance Secondary Phone"/>
-                <DBFFieldSpec FieldName="OWNR_FAX" Form="attribute" Name="OwnerFax" FieldType=""
+                <DBFFieldSpec FieldName="INS_PH2X" Form="attribute" Name="InsurancePhone2Ext" FieldType="" Description="Insurance Secondary Phone Extension"/>
-                              Description="Owner Fax"/>
+                <DBFFieldSpec FieldName="INS_FAX" Form="attribute" Name="InsuranceFax" FieldType="" Description="Insurance Fax"/>
-                <DBFFieldSpec FieldName="OWNR_FAXX" Form="attribute" Name="OwnerFaxExt" FieldType=""
+                <DBFFieldSpec FieldName="INS_FAXX" Form="attribute" Name="InsuranceFaxExt" FieldType="" Description="Insurance Fax Extension"/>
-                              Description="Owner Fax Extension"/>
+                <DBFFieldSpec FieldName="INS_EA" Form="attribute" Name="InsuranceEmail" FieldType="" Description="Insurance Email Address"/>
-                <DBFFieldSpec FieldName="OWNR_EA" Form="attribute" Name="OwnerEmail" FieldType=""
+                <DBFFieldSpec FieldName="INSD_LN" Form="attribute" Name="InsuranceLName" FieldType="" Description="Insurance Last Name"/>
-                              Description="Owner Email Address"/>
+                <DBFFieldSpec FieldName="CLM_NO" Form="attribute" Name="ClaimNumber" FieldType="" Description="Claim Number"/>
-                <DBFFieldSpec FieldName="INS_CO_NM" Form="attribute" Name="InsuranceCompanyName" FieldType=""
-                              Description="Insurance Company Name"/>
-                <DBFFieldSpec FieldName="INS_CO_ID" Form="attribute" Name="InsuranceCompanyID" FieldType=""
-                              Description="Insurance Company Identifier"/>
-                <DBFFieldSpec FieldName="INS_ADDR1" Form="attribute" Name="InsuranceAddr1" FieldType=""
-                              Description="Insurance Address Line 1"/>
-                <DBFFieldSpec FieldName="INS_ADDR2" Form="attribute" Name="InsuranceAddr2" FieldType=""
-                              Description="Insurance Address Line 2"/>
-                <DBFFieldSpec FieldName="INS_CITY" Form="attribute" Name="InsuranceCity" FieldType=""
-                              Description="Insurance City"/>
-                <DBFFieldSpec FieldName="INS_ST" Form="attribute" Name="InsuranceState" FieldType=""
-                              Description="Insurance State"/>
-                <DBFFieldSpec FieldName="INS_ZIP" Form="attribute" Name="InsuranceZip" FieldType=""
-                              Description="Insurance Zip"/>
-                <DBFFieldSpec FieldName="INS_CTRY" Form="attribute" Name="InsuranceCountry" FieldType=""
-                              Description="Insurance Country"/>
-                <DBFFieldSpec FieldName="INS_PH1" Form="attribute" Name="InsurancePhone1" FieldType=""
-                              Description="Insurance Primary Phone"/>
-                <DBFFieldSpec FieldName="INS_PH1X" Form="attribute" Name="InsurancePhone1Ext" FieldType=""
-                              Description="Insurance Primary Phone Extension"/>
-                <DBFFieldSpec FieldName="INS_PH2" Form="attribute" Name="InsurancePhone2" FieldType=""
-                              Description="Insurance Secondary Phone"/>
-                <DBFFieldSpec FieldName="INS_PH2X" Form="attribute" Name="InsurancePhone2Ext" FieldType=""
-                              Description="Insurance Secondary Phone Extension"/>
-                <DBFFieldSpec FieldName="INS_FAX" Form="attribute" Name="InsuranceFax" FieldType=""
-                              Description="Insurance Fax"/>
-                <DBFFieldSpec FieldName="INS_FAXX" Form="attribute" Name="InsuranceFaxExt" FieldType=""
-                              Description="Insurance Fax Extension"/>
-                <DBFFieldSpec FieldName="INS_EA" Form="attribute" Name="InsuranceEmail" FieldType=""
-                              Description="Insurance Email Address"/>
-                <DBFFieldSpec FieldName="INSD_LN" Form="attribute" Name="InsuranceLName" FieldType=""
-                              Description="Insurance Last Name"/>
-                <DBFFieldSpec FieldName="CLM_NO" Form="attribute" Name="ClaimNumber" FieldType=""
-                              Description="Claim Number"/>
 
 
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.AD2">
             <DBFFileTranslation ID="ID5" ElementName="Admin2" Description="Administrative information2">
-                <DBFFieldSpec FieldName="EST_CT_LN" Form="attribute" Name="EstimatorL" FieldType=""
+                <DBFFieldSpec FieldName="EST_CT_LN" Form="attribute" Name="EstimatorL" FieldType="" Description="Estimator Lastname"/>
-                              Description="Estimator Lastname"/>
+                <DBFFieldSpec FieldName="EST_CT_FN" Form="attribute" Name="EstimatorF" FieldType="" Description="Estimator Firstname"/>
-                <DBFFieldSpec FieldName="EST_CT_FN" Form="attribute" Name="EstimatorF" FieldType=""
+                <DBFFieldSpec FieldName="EST_CO_NM" Form="attribute" Name="EstimatorCompanyName" FieldType="" Description="Estimator Company Name"/>
-                              Description="Estimator Firstname"/>
+                <DBFFieldSpec FieldName="EST_CO_ID" Form="attribute" Name="EstimatorCompanyID" FieldType="" Description="Estimator Company Identifier"/>
-                <DBFFieldSpec FieldName="EST_CO_NM" Form="attribute" Name="EstimatorCompanyName" FieldType=""
+                <DBFFieldSpec FieldName="EST_ADDR1" Form="attribute" Name="EstimatorAddr1" FieldType="" Description="Estimator Address1"/>
-                              Description="Estimator Company Name"/>
+                <DBFFieldSpec FieldName="EST_ADDR2" Form="attribute" Name="EstimatorAddr2" FieldType="" Description="Estimator Address2"/>
-                <DBFFieldSpec FieldName="EST_CO_ID" Form="attribute" Name="EstimatorCompanyID" FieldType=""
+                <DBFFieldSpec FieldName="EST_CITY" Form="attribute" Name="EstimatorCity" FieldType="" Description="Estimator City"/>
-                              Description="Estimator Company Identifier"/>
+                <DBFFieldSpec FieldName="EST_ST" Form="attribute" Name="EstimatorState" FieldType="" Description="Estimator State"/>
-                <DBFFieldSpec FieldName="EST_ADDR1" Form="attribute" Name="EstimatorAddr1" FieldType=""
+                <DBFFieldSpec FieldName="EST_ZIP" Form="attribute" Name="EstimatorZip" FieldType="" Description="Estimator Zip"/>
-                              Description="Estimator Address1"/>
+                <DBFFieldSpec FieldName="EST_CTRY" Form="attribute" Name="EstimatorCountry" FieldType="" Description="Estimator Country"/>
-                <DBFFieldSpec FieldName="EST_ADDR2" Form="attribute" Name="EstimatorAddr2" FieldType=""
+                <DBFFieldSpec FieldName="EST_PH1" Form="attribute" Name="EstimatorPhone1" FieldType="" Description="Estimator Primary Phone"/>
-                              Description="Estimator Address2"/>
+                <DBFFieldSpec FieldName="EST_PH1X" Form="attribute" Name="EstimatorPhone1Ext" FieldType="" Description="Estimator Primary Phone Extension"/>
-                <DBFFieldSpec FieldName="EST_CITY" Form="attribute" Name="EstimatorCity" FieldType=""
+                <DBFFieldSpec FieldName="EST_PH2" Form="attribute" Name="EstimatorPhone2" FieldType="" Description="Estimator Secondary Phone"/>
-                              Description="Estimator City"/>
+                <DBFFieldSpec FieldName="EST_PH2X" Form="attribute" Name="EstimatorPhone2Ext" FieldType="" Description="Estimator Secondary Phone Extension"/>
-                <DBFFieldSpec FieldName="EST_ST" Form="attribute" Name="EstimatorState" FieldType=""
+                <DBFFieldSpec FieldName="EST_FAX" Form="attribute" Name="EstimatorFax" FieldType="" Description="Estimator Fax"/>
-                              Description="Estimator State"/>
+                <DBFFieldSpec FieldName="EST_FAXX" Form="attribute" Name="EstimatorFaxExt" FieldType="" Description="Estimator Fax Extension"/>
-                <DBFFieldSpec FieldName="EST_ZIP" Form="attribute" Name="EstimatorZip" FieldType=""
+                <DBFFieldSpec FieldName="EST_EA" Form="attribute" Name="EstimatorEmail" FieldType="" Description="Estimator Email Address"/>
-                              Description="Estimator Zip"/>
+                <DBFFieldSpec FieldName="EST_LIC_NO" Form="attribute" Name="EstimatorLicenseNumber" FieldType="" Description="Estimator License Number"/>
-                <DBFFieldSpec FieldName="EST_CTRY" Form="attribute" Name="EstimatorCountry" FieldType=""
+                <DBFFieldSpec FieldName="EST_FILENO" Form="attribute" Name="EstimatorFileNumber" FieldType="" Description="Estimator File Number"/>
-                              Description="Estimator Country"/>
+                <DBFFieldSpec FieldName="RO_IN_DATE" Form="attribute" Name="VehicleInDate" FieldType="" Description="Date arrived in shop"/>
-                <DBFFieldSpec FieldName="EST_PH1" Form="attribute" Name="EstimatorPhone1" FieldType=""
+                <DBFFieldSpec FieldName="RO_IN_TIME" Form="attribute" Name="VehicleInTime" FieldType="" Description="Time arrived in shop"/>
-                              Description="Estimator Primary Phone"/>
+                <DBFFieldSpec FieldName="TAR_DATE" Form="attribute" Name="TargetVehicleOutDate" FieldType="" Description="Target date to be completed"/>
-                <DBFFieldSpec FieldName="EST_PH1X" Form="attribute" Name="EstimatorPhone1Ext" FieldType=""
+                <DBFFieldSpec FieldName="TAR_TIME" Form="attribute" Name="TargetVehicleOutTime" FieldType="" Description="Target time to be completed"/>
-                              Description="Estimator Primary Phone Extension"/>
+                <DBFFieldSpec FieldName="RO_CMPDATE" Form="attribute" Name="VehicleOutDate" FieldType="" Description="Date completed"/>
-                <DBFFieldSpec FieldName="EST_PH2" Form="attribute" Name="EstimatorPhone2" FieldType=""
+                <DBFFieldSpec FieldName="RO_CMPTIME" Form="attribute" Name="VehicleOutTime" FieldType="" Description="Time completed"/>
-                              Description="Estimator Secondary Phone"/>
+                <DBFFieldSpec FieldName="RF_CO_NM" Form="attribute" Name="BodyShopName" FieldType="" Description="Body Shop Name"/>
-                <DBFFieldSpec FieldName="EST_PH2X" Form="attribute" Name="EstimatorPhone2Ext" FieldType=""
-                              Description="Estimator Secondary Phone Extension"/>
-                <DBFFieldSpec FieldName="EST_FAX" Form="attribute" Name="EstimatorFax" FieldType=""
-                              Description="Estimator Fax"/>
-                <DBFFieldSpec FieldName="EST_FAXX" Form="attribute" Name="EstimatorFaxExt" FieldType=""
-                              Description="Estimator Fax Extension"/>
-                <DBFFieldSpec FieldName="EST_EA" Form="attribute" Name="EstimatorEmail" FieldType=""
-                              Description="Estimator Email Address"/>
-                <DBFFieldSpec FieldName="EST_LIC_NO" Form="attribute" Name="EstimatorLicenseNumber" FieldType=""
-                              Description="Estimator License Number"/>
-                <DBFFieldSpec FieldName="EST_FILENO" Form="attribute" Name="EstimatorFileNumber" FieldType=""
-                              Description="Estimator File Number"/>
-                <DBFFieldSpec FieldName="RO_IN_DATE" Form="attribute" Name="VehicleInDate" FieldType=""
-                              Description="Date arrived in shop"/>
-                <DBFFieldSpec FieldName="RO_IN_TIME" Form="attribute" Name="VehicleInTime" FieldType=""
-                              Description="Time arrived in shop"/>
-                <DBFFieldSpec FieldName="TAR_DATE" Form="attribute" Name="TargetVehicleOutDate" FieldType=""
-                              Description="Target date to be completed"/>
-                <DBFFieldSpec FieldName="TAR_TIME" Form="attribute" Name="TargetVehicleOutTime" FieldType=""
-                              Description="Target time to be completed"/>
-                <DBFFieldSpec FieldName="RO_CMPDATE" Form="attribute" Name="VehicleOutDate" FieldType=""
-                              Description="Date completed"/>
-                <DBFFieldSpec FieldName="RO_CMPTIME" Form="attribute" Name="VehicleOutTime" FieldType=""
-                              Description="Time completed"/>
-                <DBFFieldSpec FieldName="RF_CO_NM" Form="attribute" Name="BodyShopName" FieldType=""
-                              Description="Body Shop Name"/>
 
             </DBFFileTranslation>
         </FileTranslation>
         <FileTranslation TranslatorID="OECImportEngine.DBFTranslator" FileNameMask="*.TTL">
           <DBFFileTranslation ID="ID6" ElementName="Total" Description="Total Table">
-                <DBFFieldSpec FieldName="G_TTL_AMT" Form="attribute" Name="GrandTotalAmount" FieldType=""
+            <DBFFieldSpec FieldName="G_TTL_AMT" Form="attribute" Name="GrandTotalAmount" FieldType="" Description=""/>
-                              Description=""/>
           </DBFFileTranslation>
         </FileTranslation>
     </FileTranslations>

_reference/TeamsSlackInvestigationFinalVersion.md

@@ -1,316 +0,0 @@
-## Microsoft Teams
-
-Integrating Microsoft Teams into your Node.js backend and React frontend application can enhance communication and workflow efficiency,
-especially in a body shop management context for the automotive industry. Microsoft Teams provides several ways to integrate its functionalities into your application, 
-including bots, tabs, messaging extensions, webhooks, and connectors. Here's an overview of the options and how to implement them:
-
-### 0.5 - Share to Teams (TM)
-
-- https://learn.microsoft.com/en-us/microsoftteams/platform/concepts/build-and-test/share-to-teams-from-web-apps
-- https://learn.microsoft.com/en-us/microsoftteams/platform/concepts/build-and-test/share-to-teams-from-personal-app-or-tab
-- https://learn.microsoft.com/en-us/microsoftteams/platform/concepts/device-capabilities/people-picker-capability
-- (Example of some Teams code Integrations) https://github.com/microsoft/teams-powerapps-app-templates/
-
-### 1. Microsoft Graph API
-The Microsoft Graph API is the gateway to data and intelligence in Microsoft 365, including Teams. It allows you to work with Teams data like channels, messages, and more. You can use it to post status changes back to Teams or read data from Teams to affect your site.
-
-Backend (Node.js): Use the @microsoft/microsoft-graph-client package to make API calls to Teams. You will need to handle authentication with Azure AD, which can be done using the @azure/identity package to get tokens for Graph API requests.
-
-*Implementation Steps*:
-
-Register your application in Azure AD to get the client_id and client_secret.
-
-(Is client_id and client_secret going to be something required for every customer or is it going to be a singleton)
-Implement OAuth 2.0 authorization flow to obtain access tokens.
-(This will need to be tracked by association to a bodyshop)
-
-bodyshop->Channels | People ->Messages
-
-Use the access token to make requests to the Microsoft Graph API to interact with Teams.
-
-### 2. Webhooks and Connectors
-Webhooks allow your application to send notifications to a Teams channel, which is useful for posting status changes. Connectors are a set of predefined webhooks that offer a more integrated experience.
-
-Setup:
-In Microsoft Teams, configure an incoming webhook for the channel you want to post messages to.
-Use the webhook URL to send JSON payloads from your Node.js backend, which can then be displayed in Teams.
-
-
-### 3. Bots
-Bots in Teams can interact with users to take commands or post information. You can use the Bot Framework along with the Teams activity handler to create bots that can communicate with your React frontend and Node.js backend.
-
-Backend (Node.js): Use the botbuilder package to create and manage your bot's interactions with Teams.
-
-*Implementation Steps*:
-
-Create a bot registration in Azure Bot Services.
-Implement the bot logic in your Node.js application using the Bot Framework SDK.
-Use the Microsoft Bot Framework's TeamsActivityHandler to respond to Teams-specific activities.
-
-### 4. Tabs
-Tabs in Teams allow you to integrate web-based content as part of Teams, which can be your React application or specific parts of it. This is particularly useful for creating a seamless experience within Teams.
-
-*Implementation Steps*:
-- Create a Teams app manifest that defines your tab and its configuration.
-- Host your React application or the specific parts you want to embed as a tab.
-- Use the Teams SDK in your React application to interact with Teams context and APIs.
-
-*Getting Started*:
-Microsoft Teams Toolkit for Visual Studio Code: This toolkit simplifies the process of setting up your Teams application, including authentication, configuration, and deployment.
-Documentation and Samples: Microsoft provides extensive documentation and sample code for developing Teams applications, which can be invaluable for getting started and solving specific challenges.
-Implementing these features requires a good understanding of both the Microsoft Teams platform and your application's architecture. 
-Start small, perhaps by implementing notifications via webhooks, and gradually add more complex integrations like bots or tabs based on your needs and user feedback.
-
-### Examples:
-
-##### Posting Messages to a Teams Channel Using Incoming Webhooks
-
-1 - Set up an Incoming Webhook in Microsoft Teams:
-- Go to the Teams channel where you want to post messages.
-- Click on the three dots (...) next to the channel name and select Connectors.
-- Search for Incoming Webhook, click Add, and then Configure.
-- Name your webhook, upload an image if desired, and click Create.
-- Copy the webhook URL provided.
-
-  (Patrick Note: The clients might have issues with setting up webhooks, it requires a lot of user configuration and our users are not technical).
-
-2 - Node.js Code to Post a Message:
-
-Ensure you have axios or any HTTP client library installed in your Node.js project. If not, you can install axios via npm: npm install axios.
-Use the following code snippet to post a message to the Teams channel:
-
-```javascript 
-const axios = require('axios');
-
-// Replace 'YOUR_WEBHOOK_URL' with your actual webhook URL
-const webhookUrl = 'YOUR_WEBHOOK_URL';
-
-const message = {
-  "@type": "MessageCard",
-  "@context": "http://schema.org/extensions",
-  "summary": "Issue 176715375",
-  "themeColor": "0078D7",
-  "title": "Issue opened: \"Push notifications not working\"",
-  "sections": [{
-    "activityTitle": "A new issue was created",
-    "activitySubtitle": "Today, 2:36 PM",
-    "activityImage": "https://example.com/issues/image.png",
-    "facts": [{
-        "name": "Repository:",
-        "value": "Repo name"
-      },
-      {
-        "name": "Issue #:",
-        "value": "176715375"
-      }
-    ],
-    "markdown": true
-  }]
-};
-
-axios.post(webhookUrl, message)
-  .then(response => console.log('Successfully sent message to Teams channel'))
-  .catch(error => console.error('Error sending message to Teams channel', error));
-```
-
-#### Creating a Simple Bot for Teams
-1 Prerequisites:
-- Register your bot with the Microsoft Bot Framework and get your bot's App ID and App Password.
-- Use the Bot Framework SDK for JavaScript.
-  2 Install Dependencies:
-- You need to install the botbuilder package. Run npm install botbuilder.
-
-The following example demonstrates a simple bot that echoes back received messages.
-
-```javascript
-const { BotFrameworkAdapter, MemoryStorage, ConversationState, TurnContext } = require('botbuilder');
-
-// Create adapter.
-// See https://aka.ms/about-bot-adapter to learn more about adapters.
-const adapter = new BotFrameworkAdapter({
-    appId: process.env.MicrosoftAppId,
-    appPassword: process.env.MicrosoftAppPassword
-});
-
-// Create conversation state with in-memory storage provider.
-const conversationState = new ConversationState(new MemoryStorage());
-adapter.use(conversationState);
-
-// Listen for incoming requests.
-server.post('/api/messages', (req, res) => {
-    adapter.processActivity(req, res, async (context) => {
-        // Echo back what the user said
-        if (context.activity.type === 'message') {
-            await context.sendActivity(`You said '${context.activity.text}'`);
-        }
-    });
-});
-```
-
-Running Your Bot:
-- Make sure to expose your bot endpoint (/api/messages in this case) to the internet using a service like ngrok.
-- Update your bot's messaging endpoint in the Microsoft Bot Framework portal to point to the ngrok URL.
-
-### Slash Commands (Bot)
-1 -  Create a Microsoft Teams App: You need to develop a Teams app that can interact with users through commands. This involves using the Microsoft Teams Developer Platform and possibly the Bot Framework.
-2 - Use Bots for Custom Commands: The primary way to introduce custom slash commands in Teams is through bots. Bots can respond to specific commands (or messages) that are input by users. When you create a bot for Teams, you can define custom commands that the bot will recognize and respond to.
-3 - Developing the Bot: You can develop a bot using the Microsoft Bot Framework. This allows your bot to receive and send messages to a Teams channel or chat. Within your bot's code, you can define what actions to take when it receives specific commands.
-4 - Register Your Bot with Microsoft Bot Framework: Register your bot with the Microsoft Bot Framework and configure it to work with Microsoft Teams. This step involves getting a Microsoft App ID and password that are necessary for your bot to communicate with the Teams platform.
-5 - Add Your Bot to Microsoft Teams: Once your bot is developed and registered, you can package your Teams app (which includes the bot) and upload it to Microsoft Teams. This will make your bot available to users within Teams, where they can interact with it using the custom commands you've defined.
-6 - Handling Slash Commands: In the context of your bot's code, you will need to interpret messages that start with a slash (/) as commands. You can then parse the command text and perform the appropriate actions or respond accordingly.
-7 - Publish Your App: For broader distribution, you can publish your Teams app to the Teams app store or distribute it within your organization through the Teams admin center.
-/ <command> <arb> ....
-(Unrelated to teams but then used in teams for functionality)
-- A Job has a todo list
-- a todo item may have an employee
-- a todo item may have a due date
-- a todo item may have a priority
-
---- Call notes ----
-- Tasks (TODO List)
-- EMail reminders
-
-## Slack
-
-Integrating Slack into your Node.js backend and React frontend application can significantly streamline communication and operations for your automotive industry body shop management software. Slack offers various integration points including bots, apps, webhooks, and its rich API to facilitate interactions between your application and Slack workspace. Here's how you can leverage these integration points:
-
-### 1. **Slack Web API**
-
-The Slack Web API allows you to interact with Slack, enabling functionalities like sending messages, managing channels, and more directly from your application.
-
-- **Backend (Node.js)**: Utilize the `@slack/web-api` package to make API calls from your Node.js backend. This will be the backbone for actions such as posting status updates to Slack channels or handling commands from Slack that can affect your site.
-
-- **Implementation Steps**:
-    1. Create a Slack app in your Slack workspace and obtain the API tokens.
-    2. Use the `@slack/web-api` package to authenticate and interact with Slack API endpoints.
-    3. Implement features such as sending messages or processing events from Slack.
-
-### 2. **Incoming Webhooks**
-
-For simpler integrations focused on sending notifications to Slack channels, incoming webhooks are straightforward and effective. They allow you to send messages to a specific channel without a full-blown app.
-
-- **Setup**:
-    1. Create an incoming webhook from the Slack app configuration page.
-    2. Use the webhook URL to send messages from your Node.js backend by making simple HTTP POST requests with your message payload.
-
-### 3. **Bots**
-
-Slack bots can facilitate interactive experiences within your Slack workspace, responding to commands, posting notifications, or even pulling data from your site on demand.
-
-- **Backend (Node.js)**: Leverage the `@slack/bolt` framework, which simplifies creating Slack bots with event handling, messaging, and built-in OAuth support.
-
-- **Implementation Steps**:
-    1. Create a Slack app and enable bot features.
-    2. Use the `@slack/bolt` package to develop your bot, handling events like messages or commands.
-    3. Deploy your bot and set it to listen to incoming events from Slack.
-
-### 4. **Slack Block Kit**
-
-For more engaging and interactive messages, Slack's Block Kit provides a UI framework that allows you to create richly formatted messages, modals, and more.
-
-- **Frontend (React)** and **Backend (Node.js)**: Utilize Slack's Block Kit to design complex messages with buttons, sections, and interactive components. You can send these payloads through the Web API or from bots to enhance your app's interaction with users.
-
-### Getting Started
-
-- **Slack API Documentation and Tools**: Slack's API documentation is comprehensive and includes tutorials, tooling (like Block Kit Builder), and SDK documentation to help you get started.
-
-- **Testing and Development**: Slack provides a sandbox environment for you to test your app's integrations and interactions without affecting your live workspace.
-
-To integrate Slack into your application effectively, start by planning out the interactions you need (e.g., notifications, commands, information retrieval) and map these to the appropriate Slack features. Then, incrementally build and test each integration, utilizing Slack's development tools and your existing Node.js and React knowledge to create a seamless experience for your users.
-
-#### Examples
-
-1. Incoming Webhooks
-   Incoming Webhooks are a simple way to post messages from your Node.js application into Slack channels. They're perfect for notifying team members about status changes or updates.
-
-Setup:
-
-1 - Create a new Slack app in your workspace and enable incoming webhooks.
-2 - Add a new webhook to your app and choose the channel it will post to.
-3 - Use the webhook URL to send messages from your backend.
-
-Node.js Example:
-
-```javascript
-
-const axios = require('axios');
-const webhookUrl = 'YOUR_SLACK_WEBHOOK_URL';
-
-async function postMessageToSlack(message) {
-  await axios.post(webhookUrl, {
-    text: message, // Your message here
-  });
-}
-
-postMessageToSlack('New status update on the automotive project!').catch(console.error);
-```
-2. Bots
-   Slack bots can interact with users via messages, respond to commands, and even post updates. They're great for building interactive features.
-
-Setup:
-
-1 - Create a Slack app and add the Bot Token Scopes (like chat:write).
-2 - Install the app to your workspace to get your bot token.
-3 - Use the @slack/bolt framework for easy bot development in Node.js.
-
-Node.js Example:
-
-```javascript
-const { App } = require('@slack/bolt');
-
-const app = new App({
-  token: process.env.SLACK_BOT_TOKEN, // Set your bot's access token here
-  signingSecret: process.env.SLACK_SIGNING_SECRET // Set your app's signing secret here
-});
-
-app.message('hello', async ({ message, say }) => {
-  await say(`Hey there <@${message.user}>!`);
-});
-
-(async () => {
-  await app.start(process.env.PORT || 3000);
-  console.log('Slack bot is running!');
-})();
-```
-
-3. Slash Commands
-   Slash Commands allow users to interact with your application directly from Slack by typing commands that start with /.
-
-Setup:
-
-1 - Create a Slack app and configure a new Slash Command (e.g., /statusupdate).
-2 - Point the command request URL to your Node.js backend endpoint.
-3 - Implement the endpoint to handle the command and respond accordingly.
-
-Node.js Example:
-
-```javascript
-const express = require('express');
-const bodyParser = require('body-parser');
-
-const app = express();
-app.use(bodyParser.urlencoded({ extended: false }));
-
-app.post('/slack/commands/statusupdate', (req, res) => {
-  const { text, user_name } = req.body; // Command input and user info
-  // Logic to handle the command goes here. For example, update a status or fetch information.
-  res.send(`Status update received: ${text} - from ${user_name}`);
-});
-
-app.listen(process.env.PORT || 3000, () => console.log('Server is running'));
-```
-
-4. Interactive Components
-   Interactive components like buttons or menus can make your Slack messages more engaging and interactive.
-
-Setup:
-1 - Enable Interactivity in your Slack app settings.
-2 - Implement an endpoint in your Node.js backend to handle interactions.
-3 - Send messages with interactive components from your backend.
-
-Implementing these features into your Node.js and React application will enable a more dynamic and integrated experience for users of your body shop management software. Start with the simpler integrations like webhooks and progressively incorporate bots and interactive components as needed.
-
-ACTION ITEMS:
-- Slot in tasks, this will be a dependency for things we want to do in the future.
-- This would involve GUI components
-- This would involve a backend component

_reference/reportFiltersAndSorters.md

@@ -1,189 +0,0 @@
-# Filters and Sorters
-
-This documentation details the schema required for `.filters` files on the report server. It is used to dynamically
-modify the graphQL query and provide the user more power over their reports.
-
-For filters and sorters, valid types include (`type` key in the schema):
-- string (default)
-- number
-- bool or boolean
-- date
-
-## Special Notes
-- When passing the data to the template server, the property filters and sorters is added to the data object and will reflect the filters and sorters the user has selected
-
-## High level Schema Overview
-
-```javascript
-const schema = {
-    "filters": [
-        {
-            "name": "jobs.joblines.mod_lb_hrs", // Name and path of the field in the graphQL query
-            "translation": "jobs.joblines.mod_lb_hrs_1", // Translation key for the label used in the GUI
-            "label": "mod_lb_hrs_1",    // Label used in the case the GUI does not contain a translation
-            "type": "number" // Type of field, can be number or string currently
-        },
-        // ... more filters
-    ],
-    "sorters": [
-        {
-            "name": "jobs.joblines.mod_lb_hrs",  // Name and path of the field in the graphQL query
-            "translation": "jobs.joblines.mod_lb_hrs_1",  // Translation key for the label used in the GUI
-            "label": "mod_lb_hrs_1", // Label used in the case the GUI does not contain a translation
-            "type": "number"  // Type of field, can be number or string currently
-        },
-        // ... more sorters
-    ],
-    "dates": {
-        // This is not yet implemented and will be added in a future release
-    }
-}
-```
-
-## Filters
-
-Filters effect the where clause of the graphQL query. They are used to filter the data returned from the server.
-A note on special notation used in the `name` field.
-
-## Reflection
-
-Filters can make use of reflection to pre-fill select boxes, the following is an example of that in the filters file.
-
-```json
-    {
-      "name": "jobs.status",
-      "translation": "jobs.fields.status",
-      "label": "Status",
-      "type": "string",
-      "reflector": {
-        "type": "internal",
-        "name": "special.job_statuses"
-      }
-    }
-```
-
-in this example, a reflector with the type 'internal' (all types at the moment require this, and it is used for future functionality), with a name of `special.job_statuses`
-
-The following cases are available
-
-- `special.job_statuses` - This will reflect the statuses of the jobs table `bodyshop.md_ro_statuses.statuses'`
-- `special.cost_centers` - This will reflect the cost centers `bodyshop.md_responsibility_centers.costs`
-- `special.categories` - This will reflect the categories `bodyshop.md_categories`
-- `special.insurance_companies` - This will reflect the insurance companies `bodyshop.md_ins_cos`'
-- `special.employee_teams` - This will reflect the employee teams `bodyshop.employee_teams`
-- `special.employees` - This will reflect the employees `bodyshop.employees`
-- `special.first_names` - This will reflect the first names `bodyshop.employees`
-- `special.last_names` - This will reflect the last names `bodyshop.employees`
-- `special.referral_sources` - This will reflect the referral sources `bodyshop.md_referral_sources`
-- `special.class`- This will reflect the class `bodyshop.md_classes`
-- `special.lost_sale_reasons` - This will reflect the lost sale reasons `bodyshop.md_lost_sale_reasons`
-- `special.alt_transports` - This will reflect the alternative transports `bodyshop.appt_alt_transport`
-- `special.payment_types` - This will reflect the payment types `bodyshop.md_payment_types`
-- `special.payment_payers` - This is a special case with a key value set of [Customer, Insurance]
-
-### Path without brackets, multi level
-
-`"name": "jobs.joblines.mod_lb_hrs",`
-This will produce a where clause at the `joblines` level of the graphQL query,
-
-```graphql
-query gendoc_hours_sold_detail_open($starttz: timestamptz!, $endtz: timestamptz!) {
-    jobs(
-        where: {date_invoiced: {_is_null: true}, date_open: {_gte: $starttz, _lte: $endtz}, ro_number: {_is_null: false}, voided: {_eq: false}}
-    ) {
-        joblines(
-            order_by: {line_no: asc}
-            where: {removed: {_eq: false}, mod_lb_hrs: {_lt: 3}}
-        ) {
-            line_no
-            mod_lbr_ty
-            mod_lb_hrs
-            convertedtolbr
-            convertedtolbr_data
-        }
-        ownr_co_nm
-        ownr_fn
-        ownr_ln
-        plate_no
-        ro_number
-        status
-        v_make_desc
-        v_model_desc
-        v_model_yr
-        v_vin
-        v_color
-    }
-}
-```
-
-### Path with brackets,top level
-
-`"name": "[jobs].joblines.mod_lb_hrs",`
-This will produce a where clause at the `jobs` level of the graphQL query.
-
-```graphql
-query gendoc_hours_sold_detail_open($starttz: timestamptz!, $endtz: timestamptz!) {
-    jobs(
-        where: {date_invoiced: {_is_null: true}, date_open: {_gte: $starttz, _lte: $endtz}, ro_number: {_is_null: false}, voided: {_eq: false}, joblines: {mod_lb_hrs: {_gt: 4}}}
-    ) {
-        joblines(
-            order_by: {line_no: asc}
-            where: {removed: {_eq: false}}
-        ) {
-            line_no
-            mod_lbr_ty
-            mod_lb_hrs
-            convertedtolbr
-            convertedtolbr_data
-        }
-        ownr_co_nm
-        ownr_fn
-        ownr_ln
-        plate_no
-        ro_number
-        status
-        v_make_desc
-        v_model_desc
-        v_model_yr
-        v_vin
-        v_color
-    }
-}
-```
-
-## Known Caveats
-
-- Will only support two level of nesting in the graphQL query `jobs.joblines.mod_lb_hrs` vs `[jobs].joblines.mod_lb_hrs`
-  is fine, but `jobs.[joblines.].some_table.mod_lb_hrs` is not.
-- The type object must be 'string' or 'number'  or 'bool' or 'boolean' or 'date' and is case-sensitive.
-- The `translation` key is used to look up the label in the GUI, if it is not found, the `label` key is used.
-- Do not add the ability to filter things that are already filtered as part of the original query, this would be
-  redundant and could cause issues.
-- Do not add the ability to filter on things like FK constraints, must like the above example.
-- *INHERITANCE CAVEAT* If you have a filters file on a parent report that has a child that you do not want the filters inherited from, you must place a blank filters file (valid json so {}) on the child report level. This will than fetch the child filters, which are empty and move along, versus inheriting the parent filters.
-
-## Sorters
-
-- Sorters follow the same schema as filters, however, they do not do square bracket wrapping to indicate level hoisting,
-  a filter added on `job.md_status` would be added at the top level, and a filter added on `jobs.joblines.mod_lb_hrs`
-  would be added at the `joblines` level.
-- Most of the reports currently do sorting on a template level, this will need to change to actually see the results
-  using the sorters.
-
-### Default Sorters
-
-- A sorter can be given a default object containing a `order` and `direction` key value. This will be used to sort the report if the user does not select any of the sorters themselves.
-- The `order` key is the order in which the sorters are applied, and the `direction` key is the direction of the sort, either `asc` or `desc`.
-
-```json
-{
-    "name": "jobs.joblines.mod_lb_hrs",
-    "translation": "jobs.joblines.mod_lb_hrs_1",
-    "label": "mod_lb_hrs_1",
-    "type": "number",
-    "default": {
-        "order": 1,
-        "direction": "asc"
-    }
-}
-```

client/.env.development

@@ -1,13 +1,13 @@
-REACT_APP_GRAPHQL_ENDPOINT=https://db.dev.bodyshop.app/v1/graphql
+VITE_APP_GRAPHQL_ENDPOINT=https://db.dev.bodyshop.app/v1/graphql
-REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.dev.bodyshop.app/v1/graphql
+VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.dev.bodyshop.app/v1/graphql
-REACT_APP_GA_CODE=231099835
+VITE_APP_GA_CODE=231099835
-REACT_APP_FIREBASE_CONFIG={"apiKey":"AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc","authDomain":"imex-dev.firebaseapp.com","databaseURL":"https://imex-dev.firebaseio.com","projectId":"imex-dev","storageBucket":"imex-dev.appspot.com","messagingSenderId":"759548147434","appId":"1:759548147434:web:e8239868a48ceb36700993","measurementId":"G-K5XRBVVB4S"}
+VITE_APP_FIREBASE_CONFIG={"apiKey":"AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc","authDomain":"imex-dev.firebaseapp.com","databaseURL":"https://imex-dev.firebaseio.com","projectId":"imex-dev","storageBucket":"imex-dev.appspot.com","messagingSenderId":"759548147434","appId":"1:759548147434:web:e8239868a48ceb36700993","measurementId":"G-K5XRBVVB4S"}
-REACT_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/io-test
+VITE_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/io-test
-REACT_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/io-test
+VITE_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/io-test
-REACT_APP_CLOUDINARY_API_KEY=957865933348715
+VITE_APP_CLOUDINARY_API_KEY=957865933348715
-REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
+VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
-REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
+VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
-REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
+VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-REACT_APP_AXIOS_BASE_API_URL=http://localhost:4000
+VITE_APP_AXIOS_BASE_API_URL=http://localhost:4000
-REACT_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
+VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
-REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
+VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc

client/README.md

@@ -15,8 +15,7 @@ You will also see any lint errors in the console.
 ### `yarn test`
 
 Launches the test runner in the interactive watch mode.<br />
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-information.
 
 ### `yarn build`
 
@@ -32,21 +31,15 @@ See the section about [deployment](https://facebook.github.io/create-react-app/d
 
 **Note: this is a one-way operation. Once you `eject`, you can’t go back!**
 
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-remove the single build dependency from your project.
 
-Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right
+Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-into your project so you have full control over them. All of the commands except `eject` will still work, but they will
-point to the copied scripts so you can tweak them. At this point you’re on your own.
 
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t
-customize it when you are ready for it.
 
 ## Learn More
 
-You can learn more in
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
 
 To learn React, check out the [React documentation](https://reactjs.org/).
 
@@ -72,5 +65,4 @@ This section has moved here: https://facebook.github.io/create-react-app/docs/de
 
 ### `yarn build` fails to minify
 
-This section has moved
+This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
-here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify

client/cypress/e2e/01-General Render/01-home.cy.js

@@ -4,8 +4,7 @@ describe("Renders the General Page", () => {
   beforeEach(() => {
     cy.visit("/");
   });
-    it("Renders Correctly", () => {
+  it("Renders Correctly", () => {});
-    });
   it("Has the Slogan", () => {
     cy.findByText("A whole x22new kind of shop management system.").should(
       "exist"

client/cypress/e2e/2-advanced-examples/misc.cy.js

@@ -89,10 +89,8 @@ context('Misc', () => {
         scale: false,
         disableTimersAndAnimations: true,
         screenshotOnRunFailure: true,
-                onBeforeScreenshot() {
+        onBeforeScreenshot () { },
-                },
+        onAfterScreenshot () { },
-                onAfterScreenshot() {
-                },
       })
     })
   })

client/cypress/e2e/2-advanced-examples/spies_stubs_clocks.cy.js

@@ -8,8 +8,7 @@ context('Spies, Stubs, and Clock', () => {
     cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
 
     const obj = {
-            foo() {
+      foo () {},
-            },
     }
 
     const spy = cy.spy(obj, 'foo').as('anyArgs')

client/cypress/tsconfig.json

@@ -2,11 +2,7 @@
   "compilerOptions": {
     "allowJs": true,
     "baseUrl": "../node_modules",
-    "types": [
+    "types": ["cypress"]
-      "cypress"
-    ]
   },
-  "include": [
+  "include": ["**/*.*"]
-    "**/*.*"
-  ]
 }

client/index.html

@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="/favicon.png" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#002366" />
+    <meta name="description" content="ImEX Online" />
+    <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
+    <link rel="apple-touch-icon" href="public/logo192.png" />
+    <script type="text/javascript">
+      window.$crisp = [];
+      window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
+      (function () {
+        d = document;
+        s = d.createElement("script");
+        s.src = "https://client.crisp.chat/l.js";
+        s.async = 1;
+        d.getElementsByTagName("head")[0].appendChild(s);
+      })();
+    </script>
+    <script>
+      !(function () {
+        "use strict";
+        var e = [
+          "debug",
+          "destroy",
+          "do",
+          "help",
+          "identify",
+          "is",
+          "off",
+          "on",
+          "ready",
+          "render",
+          "reset",
+          "safe",
+          "set",
+        ];
+        if (window.noticeable)
+          console.warn("Noticeable SDK code snippet loaded more than once");
+        else {
+          var n = (window.noticeable = window.noticeable || []);
+          function t(e) {
+            return function () {
+              var t = Array.prototype.slice.call(arguments);
+              return t.unshift(e), n.push(t), n;
+            };
+          }
+          !(function () {
+            for (var o = 0; o < e.length; o++) {
+              var r = e[o];
+              n[r] = t(r);
+            }
+          })(),
+            (function () {
+              var e = document.createElement("script");
+              (e.async = !0), (e.src = "https://sdk.noticeable.io/l.js");
+              var n = document.head;
+              n.insertBefore(e, n.firstChild);
+            })();
+        }
+      })();
+    </script>
+
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="/manifest.json" />
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>ImEX Online</title>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+
+    <script type="module" src="src/index.js"></script>
+  </body>
+</html>

client/package.json

@@ -1,82 +1,91 @@
 {
   "name": "bodyshop",
   "version": "0.2.1",
+  "engines": {
+    "node": "18.18.2"
+  },
+  "type": "commonjs",
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
     "@ant-design/compatible": "^5.1.2",
     "@ant-design/pro-layout": "^7.17.16",
-    "@apollo/client": "^3.8.10",
+    "@apollo/client": "^3.9.0",
     "@asseinfo/react-kanban": "^2.2.0",
     "@craco/craco": "^7.1.0",
     "@fingerprintjs/fingerprintjs": "^4.2.2",
     "@jsreport/browser-client": "^3.1.0",
-    "@reduxjs/toolkit": "^2.2.1",
+    "@reduxjs/toolkit": "^2.1.0",
-    "@sentry/cli": "^2.28.6",
+    "@sentry/cli": "^2.27.0",
-    "@sentry/react": "^7.104.0",
+    "@sentry/react": "^7.99.0",
-    "@sentry/tracing": "^7.104.0",
+    "@sentry/tracing": "^7.99.0",
     "@splitsoftware/splitio-react": "^1.11.0",
     "@tanem/react-nprogress": "^5.0.51",
-    "antd": "^5.14.2",
+    "@vitejs/plugin-legacy": "^5.3.0",
+    "@vitejs/plugin-react": "^4.2.1",
+    "@vitejs/plugin-react-refresh": "^1.3.6",
+    "@vitejs/plugin-react-swc": "^3.6.0",
+    "antd": "^5.13.3",
     "apollo-link-logger": "^2.0.1",
     "apollo-link-sentry": "^3.3.0",
     "axios": "^1.6.7",
-    "craco-less": "^3.0.1",
+    "consola": "^3.2.3",
     "dayjs": "^1.11.10",
     "dayjs-business-days2": "^1.2.2",
     "dinero.js": "^1.9.1",
-    "dotenv": "^16.4.5",
+    "dotenv": "^16.4.1",
     "enquire-js": "^0.2.1",
     "env-cmd": "^10.1.0",
+    "esbuild": "^0.20.0",
     "exifr": "^7.1.3",
-    "firebase": "^10.8.1",
+    "firebase": "^10.7.2",
     "graphql": "^16.6.0",
-    "i18next": "^23.10.0",
+    "i18next": "^23.8.1",
     "i18next-browser-languagedetector": "^7.0.2",
-    "jsoneditor": "^10.0.1",
+    "jsoneditor": "^10.0.0",
     "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.10.57",
+    "libphonenumber-js": "^1.10.54",
-    "logrocket": "^8.0.1",
+    "logrocket": "^7.0.0",
     "markerjs2": "^2.32.0",
     "normalize-url": "^8.0.0",
     "phone": "^3.1.42",
     "preval.macro": "^5.0.0",
     "prop-types": "^15.8.1",
-    "query-string": "^9.0.0",
+    "query-string": "^8.1.0",
     "rc-queue-anim": "^2.0.0",
     "rc-scroll-anim": "^2.7.6",
     "react": "^18.2.0",
-    "react-big-calendar": "^1.11.0",
+    "react-big-calendar": "^1.8.7",
     "react-color": "^2.19.3",
-    "react-cookie": "^7.1.0",
+    "react-cookie": "^7.0.2",
     "react-dom": "^18.2.0",
     "react-drag-listview": "^2.0.0",
     "react-grid-gallery": "^1.0.0",
     "react-grid-layout": "1.3.4",
-    "react-i18next": "^14.0.5",
+    "react-i18next": "^14.0.1",
     "react-icons": "^5.0.1",
     "react-image-lightbox": "^5.1.4",
-    "react-intersection-observer": "^9.8.1",
+    "react-intersection-observer": "^9.5.3",
     "react-markdown": "^9.0.1",
-    "react-number-format": "^5.3.3",
+    "react-number-format": "^5.1.4",
     "react-redux": "^9.1.0",
     "react-resizable": "^3.0.5",
-    "react-router-dom": "^6.22.2",
+    "react-router-dom": "^6.21.2",
-    "react-scripts": "^5.0.1",
     "react-sticky": "^6.0.3",
     "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.5",
-    "recharts": "^2.12.2",
+    "recharts": "^2.11.0",
     "redux": "^5.0.1",
     "redux-persist": "^6.0.0",
     "redux-saga": "^1.3.0",
     "redux-state-sync": "^3.1.4",
     "reselect": "^5.1.0",
-    "sass": "^1.71.1",
+    "sass": "^1.70.0",
     "socket.io-client": "^4.7.4",
     "styled-components": "^6.1.8",
     "subscriptions-transport-ws": "^0.11.0",
     "terser-webpack-plugin": "^5.3.10",
+    "vite-plugin-svgr": "^4.2.0",
     "web-vitals": "^3.5.2",
     "workbox-core": "^7.0.0",
     "workbox-expiration": "^7.0.0",
@@ -84,15 +93,15 @@
     "workbox-precaching": "^7.0.0",
     "workbox-routing": "^7.0.0",
     "workbox-strategies": "^7.0.0",
-    "yauzl": "^3.1.1"
+    "yauzl": "^2.10.0"
   },
   "scripts": {
     "analyze": "source-map-explorer 'build/static/js/*.js'",
-    "start": "craco start",
+    "start": "vite",
-    "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
+    "build": "cross-env-shell VITE_APP_GIT_SHA=\\\"`git rev-parse --short HEAD`\\\" vite build && npm run sentry:sourcemaps",
     "build:test": "env-cmd -f .env.test npm run build",
     "build-deploy:test": "npm run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
-    "buildcra": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
+    "buildcra": "cross-env-shell VITE_APP_GIT_SHA=\\\"`git rev-parse --short HEAD`\\\" vite build",
     "test": "cypress open",
     "eject": "react-scripts eject",
     "madge": "madge  --image ./madge-graph.svg --extensions js,jsx,ts,tsx --circular .",
@@ -123,12 +132,28 @@
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@sentry/webpack-plugin": "^2.14.2",
+    "@babel/preset-react": "^7.23.3",
+    "@emotion/babel-plugin": "^11.11.0",
+    "@emotion/react": "^11.11.3",
+    "@sentry/webpack-plugin": "^2.10.3",
+    "@swc/core": "^1.3.107",
+    "@swc/plugin-styled-components": "^1.5.108",
     "@testing-library/cypress": "^10.0.1",
-    "cypress": "^13.6.6",
+    "browserslist": "^4.22.3",
+    "browserslist-to-esbuild": "^2.1.1",
+    "craco-less": "^3.0.1",
+    "cross-env": "^7.0.3",
+    "cypress": "^13.6.4",
     "eslint-plugin-cypress": "^2.15.1",
+    "memfs": "^4.6.0",
+    "os-browserify": "^0.3.0",
     "react-error-overlay": "6.0.11",
     "redux-logger": "^3.0.6",
-    "source-map-explorer": "^2.5.3"
+    "source-map-explorer": "^2.5.3",
+    "vite": "^5.0.11",
+    "vite-plugin-babel": "^1.2.0",
+    "vite-plugin-legacy": "^2.1.0",
+    "vite-plugin-node-polyfills": "^0.19.0",
+    "vite-plugin-style-import": "^2.0.0"
   }
 }

client/public/index.html

@@ -1,88 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <link href="%PUBLIC_URL%/favicon.png" rel="icon"/>
-    <meta content="width=device-width, initial-scale=1" name="viewport"/>
-    <meta content="#002366" name="theme-color"/>
-    <meta content="ImEX Online" name="description"/>
-    <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
-    <link href="logo192.png" rel="apple-touch-icon"/>
-    <script type="text/javascript">
-        window.$crisp = [];
-        window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
-        (function () {
-            d = document;
-            s = d.createElement("script");
-            s.src = "https://client.crisp.chat/l.js";
-            s.async = 1;
-            d.getElementsByTagName("head")[0].appendChild(s);
-        })();
-    </script>
-    <script>
-        !(function () {
-            "use strict";
-            var e = [
-                "debug",
-                "destroy",
-                "do",
-                "help",
-                "identify",
-                "is",
-                "off",
-                "on",
-                "ready",
-                "render",
-                "reset",
-                "safe",
-                "set",
-            ];
-            if (window.noticeable)
-                console.warn("Noticeable SDK code snippet loaded more than once");
-            else {
-                var n = (window.noticeable = window.noticeable || []);
-
-                function t(e) {
-                    return function () {
-                        var t = Array.prototype.slice.call(arguments);
-                        return t.unshift(e), n.push(t), n;
-                    };
-                }
-
-                !(function () {
-                    for (var o = 0; o < e.length; o++) {
-                        var r = e[o];
-                        n[r] = t(r);
-                    }
-                })(),
-                    (function () {
-                        var e = document.createElement("script");
-                        (e.async = !0), (e.src = "https://sdk.noticeable.io/l.js");
-                        var n = document.head;
-                        n.insertBefore(e, n.firstChild);
-                    })();
-            }
-        })();
-    </script>
-
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link href="%PUBLIC_URL%/manifest.json" rel="manifest"/>
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>ImEX Online</title>
-</head>
-<body>
-<noscript>You need to enable JavaScript to run this app.</noscript>
-<div id="root"></div>
-</body>
-</html>

client/src/App/App.container.jsx

@@ -17,7 +17,7 @@ dayjs.locale("en");
 
 const config = {
     core: {
-        authorizationKey: process.env.REACT_APP_SPLIT_API,
+        authorizationKey: import.meta.env.VITE_APP_SPLIT_API,
         key: "anon",
     },
 };

client/src/App/App.styles.scss

@@ -83,7 +83,6 @@
   animation: alertBlinker 1s linear infinite;
   color: blue;
 }
-
 @keyframes alertBlinker {
   50% {
     color: red;
@@ -100,7 +99,6 @@
   color: rgba(255, 140, 0, 0.8);
   font-weight: bold;
 }
-
 .production-completion-past {
   color: rgba(255, 0, 0, 0.8);
   font-weight: bold;

client/src/App/themeProvider.js

@@ -50,7 +50,7 @@ const devTheme = {
  */
 const prodTheme = {};
 
-const currentTheme = process.env.NODE_ENV === "development" ? devTheme
+const currentTheme = import.meta.env.DEV ? devTheme
     : prodTheme;
 
 const finaltheme = {

client/src/assets/User.svg

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1"
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 -256 1792 1792">
-     viewBox="0 -256 1792 1792">
 <g transform="matrix(1,0,0,-1,197.42373,1300.6102)">
     <path d="M 1408,131 Q 1408,11 1335,-58.5 1262,-128 1141,-128 H 267 Q 146,-128 73,-58.5 0,11 0,131 0,184 3.5,234.5 7,285 17.5,343.5 28,402 44,452 q 16,50 43,97.5 27,47.5 62,81 35,33.5 85.5,53.5 50.5,20 111.5,20 9,0 42,-21.5 33,-21.5 74.5,-48 41.5,-26.5 108,-48 Q 637,565 704,565 q 67,0 133.5,21.5 66.5,21.5 108,48 41.5,26.5 74.5,48 33,21.5 42,21.5 61,0 111.5,-20 50.5,-20 85.5,-53.5 35,-33.5 62,-81 27,-47.5 43,-97.5 16,-50 26.5,-108.5 10.5,-58.5 14,-109 Q 1408,184 1408,131 z m -320,893 Q 1088,865 975.5,752.5 863,640 704,640 545,640 432.5,752.5 320,865 320,1024 320,1183 432.5,1295.5 545,1408 704,1408 863,1408 975.5,1295.5 1088,1183 1088,1024 z"/>
 </g>

client/src/assets/car.svg

@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M23.5 7c.276 0 .5.224.5.5v.511c0 .793-.926.989-1.616.989l-1.086-2h2.202zm-1.441 3.506c.639 1.186.946 2.252.946 3.666 0 1.37-.397 2.533-1.005 3.981v1.847c0 .552-.448 1-1 1h-1.5c-.552 0-1-.448-1-1v-1h-13v1c0 .552-.448 1-1 1h-1.5c-.552 0-1-.448-1-1v-1.847c-.608-1.448-1.005-2.611-1.005-3.981 0-1.414.307-2.48.946-3.666.829-1.537 1.851-3.453 2.93-5.252.828-1.382 1.262-1.707 2.278-1.889 1.532-.275 2.918-.365 4.851-.365s3.319.09 4.851.365c1.016.182 1.45.507 2.278 1.889 1.079 1.799 2.101 3.715 2.93 5.252zm-16.059 2.994c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5.672 1.5 1.5 1.5 1.5-.672 1.5-1.5zm10 1c0-.276-.224-.5-.5-.5h-7c-.276 0-.5.224-.5.5s.224.5.5.5h7c.276 0 .5-.224.5-.5zm2.941-5.527s-.74-1.826-1.631-3.142c-.202-.298-.515-.502-.869-.566-1.511-.272-2.835-.359-4.441-.359s-2.93.087-4.441.359c-.354.063-.667.267-.869.566-.891 1.315-1.631 3.142-1.631 3.142 1.64.313 4.309.497 6.941.497s5.301-.184 6.941-.497zm2.059 4.527c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5.672 1.5 1.5 1.5 1.5-.672 1.5-1.5zm-18.298-6.5h-2.202c-.276 0-.5.224-.5.5v.511c0 .793.926.989 1.616.989l1.086-2z"/></svg>
-    <path d="M23.5 7c.276 0 .5.224.5.5v.511c0 .793-.926.989-1.616.989l-1.086-2h2.202zm-1.441 3.506c.639 1.186.946 2.252.946 3.666 0 1.37-.397 2.533-1.005 3.981v1.847c0 .552-.448 1-1 1h-1.5c-.552 0-1-.448-1-1v-1h-13v1c0 .552-.448 1-1 1h-1.5c-.552 0-1-.448-1-1v-1.847c-.608-1.448-1.005-2.611-1.005-3.981 0-1.414.307-2.48.946-3.666.829-1.537 1.851-3.453 2.93-5.252.828-1.382 1.262-1.707 2.278-1.889 1.532-.275 2.918-.365 4.851-.365s3.319.09 4.851.365c1.016.182 1.45.507 2.278 1.889 1.079 1.799 2.101 3.715 2.93 5.252zm-16.059 2.994c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5.672 1.5 1.5 1.5 1.5-.672 1.5-1.5zm10 1c0-.276-.224-.5-.5-.5h-7c-.276 0-.5.224-.5.5s.224.5.5.5h7c.276 0 .5-.224.5-.5zm2.941-5.527s-.74-1.826-1.631-3.142c-.202-.298-.515-.502-.869-.566-1.511-.272-2.835-.359-4.441-.359s-2.93.087-4.441.359c-.354.063-.667.267-.869.566-.891 1.315-1.631 3.142-1.631 3.142 1.64.313 4.309.497 6.941.497s5.301-.184 6.941-.497zm2.059 4.527c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5.672 1.5 1.5 1.5 1.5-.672 1.5-1.5zm-18.298-6.5h-2.202c-.276 0-.5.224-.5.5v.511c0 .793.926.989 1.616.989l1.086-2z"/>
-</svg>

client/src/assets/icons/technology.svg

@@ -1,21 +1,5 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?><svg style="enable-background:new 0 0 128 128;" version="1.1" viewBox="0 0 128 128" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><style type="text/css">
-<svg style="enable-background:new 0 0 128 128;" version="1.1" viewBox="0 0 128 128" xml:space="preserve"
-     xmlns="http://www.w3.org/2000/svg"><style type="text/css">
 	.st0{fill:none;stroke:#000000;stroke-width:8;stroke-miterlimit:10;}
 	.st1{display:none;}
 	.st2{display:inline;opacity:0.25;fill:#F45EFD;}
-</style>
+</style><g id="_x31_2_3D_Printing"/><g id="_x31_1_VR_Gear"/><g id="_x31_0_Virtual_reality"/><g id="_x39__Augmented_reality"/><g id="_x38__Teleport"/><g id="_x37__Glassess"/><g id="_x36__Folding_phone"/><g id="_x35__Drone"/><g id="_x34__Retina_scan"/><g id="_x33__Smartwatch"/><g id="_x32__Bionic_Arm"/><g id="_x31__Chip"><g><path d="M108,40c-5.2,0-9.6,3.3-11.3,8H84V32h-8V20h-8v12h-8V20h-8v12h-8v16H24v-8.7c4.7-1.7,8-6.1,8-11.3c0-6.6-5.4-12-12-12    S8,21.4,8,28c0,5.2,3.3,9.6,8,11.3V56h28v8H16v16.7c-4.7,1.7-8,6.1-8,11.3c0,6.6,5.4,12,12,12s12-5.4,12-12c0-5.2-3.3-9.6-8-11.3    V72h20v16h8v12h8V88h8v12h8V88h8V72h8v16.7c-4.7,1.7-8,6.1-8,11.3c0,6.6,5.4,12,12,12s12-5.4,12-12c0-5.2-3.3-9.6-8-11.3V64H84v-8    h12.7c1.7,4.7,6.1,8,11.3,8c6.6,0,12-5.4,12-12S114.6,40,108,40z M20,32c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S22.2,32,20,32z     M20,96c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S22.2,96,20,96z M76,80H52V40h24V80z M96,96c2.2,0,4,1.8,4,4s-1.8,4-4,4s-4-1.8-4-4    S93.8,96,96,96z M108,56c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S110.2,56,108,56z"/><rect height="8" width="8" x="56" y="64"/></g></g><g class="st1" id="Guide"><path class="st2" d="M120,8v112H8V8H120 M128,0H0v128h128V0L128,0z"/></g></svg>
-    <g id="_x31_2_3D_Printing"/>
-    <g id="_x31_1_VR_Gear"/>
-    <g id="_x31_0_Virtual_reality"/>
-    <g id="_x39__Augmented_reality"/>
-    <g id="_x38__Teleport"/>
-    <g id="_x37__Glassess"/>
-    <g id="_x36__Folding_phone"/>
-    <g id="_x35__Drone"/>
-    <g id="_x34__Retina_scan"/>
-    <g id="_x33__Smartwatch"/>
-    <g id="_x32__Bionic_Arm"/>
-    <g id="_x31__Chip"><g><path d="M108,40c-5.2,0-9.6,3.3-11.3,8H84V32h-8V20h-8v12h-8V20h-8v12h-8v16H24v-8.7c4.7-1.7,8-6.1,8-11.3c0-6.6-5.4-12-12-12    S8,21.4,8,28c0,5.2,3.3,9.6,8,11.3V56h28v8H16v16.7c-4.7,1.7-8,6.1-8,11.3c0,6.6,5.4,12,12,12s12-5.4,12-12c0-5.2-3.3-9.6-8-11.3    V72h20v16h8v12h8V88h8v12h8V88h8V72h8v16.7c-4.7,1.7-8,6.1-8,11.3c0,6.6,5.4,12,12,12s12-5.4,12-12c0-5.2-3.3-9.6-8-11.3V64H84v-8    h12.7c1.7,4.7,6.1,8,11.3,8c6.6,0,12-5.4,12-12S114.6,40,108,40z M20,32c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S22.2,32,20,32z     M20,96c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S22.2,96,20,96z M76,80H52V40h24V80z M96,96c2.2,0,4,1.8,4,4s-1.8,4-4,4s-4-1.8-4-4    S93.8,96,96,96z M108,56c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S110.2,56,108,56z"/><rect
-            height="8" width="8" x="56" y="64"/></g></g>
-    <g class="st1" id="Guide"><path class="st2" d="M120,8v112H8V8H120 M128,0H0v128h128V0L128,0z"/></g></svg>

client/src/assets/unfolded_car-orig.svg

@@ -5,9 +5,10 @@
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-        xmlns="http://www.w3.org/2000/svg"
    width="1668"
    height="1160"
    id="svg2"

client/src/assets/unfolded_car.svg

@@ -3,9 +3,10 @@
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-        xmlns="http://www.w3.org/2000/svg"
    viewBox="0 0 1668 1160"
    version="1.1"
    id="svg166"

client/src/assets/unfolded_car_clean.svg

@@ -1,162 +1,92 @@
 <svg id="svg166" version="1.1" viewBox="0 0 1668 1160" xmlns="http://www.w3.org/2000/svg">
  <g id="g158" transform="translate(254 -254)">
   <g id="g34" transform="translate(-13.78 3.524)" stroke="#000">
-            <path id="path10"
+   <path id="path10" d="m494.57 1006.9c41.429-15.714 140-11.427 191.43-12.857 51.429-1.429 160.48 10.23 201.43 27.143 40.995 16.93 134.78 67.656 151.43 72.857 22.857 7.143 41.429 7.143 80 20 38.572 12.857 25.714 32.857 25.714 32.857l-30-4.286-5.756 52.92s37.185 1.366 41.47 15.652c4.286 14.286 5.715 31.428-2.856 41.428-8.572 10-14.286-1.428-18.572 12.858-4.286 14.285-2.857 28.571-27.143 27.142-24.285-1.428-98.571 0-98.571 0s-15.714-108.57-98.573-105.71c-82.857 2.857-95.714 105.71-95.714 105.71h-500s-5.714-104.28-97.143-105.71c-91.428-1.428-98.571 105.71-98.571 105.71h-65.713l-18.572-38.571c-0.515 0-26.243 0-21.428-17.143 4.651-16.561-4.286-41.428 17.142-41.428 21.429 0 47.143 1.428 47.143 1.428l15.715-44.286-41.429-2.857s34.286-24.285 118.57-32.857c84.286-8.571 157.14-8.571 192.86-31.428 35.714-22.858 137.14-78.572 137.14-78.572z" fill="none" stroke-width="5"/>
-                  d="m494.57 1006.9c41.429-15.714 140-11.427 191.43-12.857 51.429-1.429 160.48 10.23 201.43 27.143 40.995 16.93 134.78 67.656 151.43 72.857 22.857 7.143 41.429 7.143 80 20 38.572 12.857 25.714 32.857 25.714 32.857l-30-4.286-5.756 52.92s37.185 1.366 41.47 15.652c4.286 14.286 5.715 31.428-2.856 41.428-8.572 10-14.286-1.428-18.572 12.858-4.286 14.285-2.857 28.571-27.143 27.142-24.285-1.428-98.571 0-98.571 0s-15.714-108.57-98.573-105.71c-82.857 2.857-95.714 105.71-95.714 105.71h-500s-5.714-104.28-97.143-105.71c-91.428-1.428-98.571 105.71-98.571 105.71h-65.713l-18.572-38.571c-0.515 0-26.243 0-21.428-17.143 4.651-16.561-4.286-41.428 17.142-41.428 21.429 0 47.143 1.428 47.143 1.428l15.715-44.286-41.429-2.857s34.286-24.285 118.57-32.857c84.286-8.571 157.14-8.571 192.86-31.428 35.714-22.858 137.14-78.572 137.14-78.572z"
-                  fill="none" stroke-width="5"/>
    <path id="path12" d="m28.857 1254h92.857m180 0h517.14m172.86 0h151.43" fill="none" stroke-width="2"/>
-            <path id="path14"
+   <path id="path14" d="m364.57 1101.1c15.715-18.572 123.37-81.525 151.43-88.572 29.502-7.41 103-7.142 103-7.142l-7.143 95.714z" fill="#f0ffeb" stroke-width="5"/>
-                  d="m364.57 1101.1c15.715-18.572 123.37-81.525 151.43-88.572 29.502-7.41 103-7.142 103-7.142l-7.143 95.714z"
-                  fill="#f0ffeb" stroke-width="5"/>
    <path id="path16" d="m404.57 1071.1v28.571" fill="none" stroke-width="2"/>
-            <path id="path18"
+   <path id="path18" d="m644.7 1006.8-4.285 94.328h207.16c-11.307-20.753-46.612-74.906-72.857-88.572-14.285-10-82.878-4.327-130.02-5.756zm167.02 7.164s80 84.286 85.715 87.143c5.714 2.857 115.71 1.428 115.71 1.428s-77.143-47.141-102.86-58.571c-25.715-11.429-90-31.429-98.572-30z" fill="#f0ffeb" stroke-width="5"/>
-                  d="m644.7 1006.8-4.285 94.328h207.16c-11.307-20.753-46.612-74.906-72.857-88.572-14.285-10-82.878-4.327-130.02-5.756zm167.02 7.164s80 84.286 85.715 87.143c5.714 2.857 115.71 1.428 115.71 1.428s-77.143-47.141-102.86-58.571c-25.715-11.429-90-31.429-98.572-30z"
-                  fill="#f0ffeb" stroke-width="5"/>
    <g fill="none">
-                <path id="path20"
+    <path id="path20" d="m345.64 1091.7c-14.075 30.968-18.298 71.788-18.298 94.31 0 22.521 4.223 91.493 22.521 105.57m282.93-298.41c-1.408 5.63-4.047 81.903-6.51 106.93-3.67 18.715-4.989 51.219-6.159 87.315 0 22.522 7.038 80.233 12.669 105.57" stroke-width="5"/>
-                      d="m345.64 1091.7c-14.075 30.968-18.298 71.788-18.298 94.31 0 22.521 4.223 91.493 22.521 105.57m282.93-298.41c-1.408 5.63-4.047 81.903-6.51 106.93-3.67 18.715-4.989 51.219-6.159 87.315 0 22.522 7.038 80.233 12.669 105.57"
+    <path id="path22" d="m103.53 1252.1s15.483-85.864 106.98-85.864c91.494 0 109.79 87.271 109.79 87.271m479.99 0s15.483-85.863 106.98-85.863c91.493 0 109.79 87.27 109.79 87.27m-947.31-57.711h63.342" stroke-width="2"/>
-                      stroke-width="5"/>
+    <path id="path24" d="m779.18 1000.2c18.299 12.668 56.304 50.673 92.9 104.16 36.598 53.489 8.447 59.12-18.298 74.603-26.744 15.483-49.266 42.227-67.564 112.61" stroke-width="5"/>
-                <path id="path22"
-                      d="m103.53 1252.1s15.483-85.864 106.98-85.864c91.494 0 109.79 87.271 109.79 87.271m479.99 0s15.483-85.863 106.98-85.863c91.493 0 109.79 87.27 109.79 87.27m-947.31-57.711h63.342"
-                      stroke-width="2"/>
-                <path id="path24"
-                      d="m779.18 1000.2c18.299 12.668 56.304 50.673 92.9 104.16 36.598 53.489 8.447 59.12-18.298 74.603-26.744 15.483-49.266 42.227-67.564 112.61"
-                      stroke-width="5"/>
     <path id="path26" d="m1112.8 1196h-129.5m-696.76-0.222h544.74m-22.522-150.61v54.896" stroke-width="2"/>
    </g>
    <g stroke-width="2">
-                <rect id="rect28" x="558.65" y="1144.9" width="41.286" height="14.541" rx="2.933" ry="7.379"
+    <rect id="rect28" x="558.65" y="1144.9" width="41.286" height="14.541" rx="2.933" ry="7.379" fill="#e6e6e6"/>
-                      fill="#e6e6e6"/>
+    <rect id="rect30" x="816.24" y="1144.9" width="41.286" height="14.541" rx="2.933" ry="7.379" fill="#e6e6e6"/>
-                <rect id="rect30" x="816.24" y="1144.9" width="41.286" height="14.541" rx="2.933" ry="7.379"
+    <rect id="rect32" x="259.53" y="1146.3" width="18.776" height="11.738" rx="1.63" ry="7.692" fill="#ffcb00"/>
-                      fill="#e6e6e6"/>
-                <rect id="rect32" x="259.53" y="1146.3" width="18.776" height="11.738" rx="1.63" ry="7.692"
-                      fill="#ffcb00"/>
    </g>
   </g>
   <g id="g54" transform="translate(-13.78 15.524)" stroke="#000">
-            <path id="path36" d="m62.767 812.59-11.712 16.12-18.95-6.157v-19.925l18.95-6.158z" fill="none"
+   <path id="path36" d="m62.767 812.59-11.712 16.12-18.95-6.157v-19.925l18.95-6.158z" fill="none" stroke-width="5"/>
-                  stroke-width="5"/>
    <path id="path38" d="m31.742 745.02 315.3-111.2m-316.71 254.77 315.3 115.42" fill="none" stroke-width="2"/>
-            <path id="path40"
+   <path id="path40" d="m341.41 632.78 140.76 38.005s-8.446 49.222-8.446 71.963v147.62c0 30.967 8.445 78.825 8.445 78.825l-140.76 33.782s-17.242-61.902-17.242-92.901l2.111-185.8c-1.408-30.967 15.132-91.493 15.132-91.493z" fill="#f0ffeb" stroke-width="5"/>
-                  d="m341.41 632.78 140.76 38.005s-8.446 49.222-8.446 71.963v147.62c0 30.967 8.445 78.825 8.445 78.825l-140.76 33.782s-17.242-61.902-17.242-92.901l2.111-185.8c-1.408-30.967 15.132-91.493 15.132-91.493z"
-                  fill="#f0ffeb" stroke-width="5"/>
    <g fill="none">
-                <path id="path42"
+    <path id="path42" d="m482.17 670.79s94.309 5.63 152.02 5.63c106.98 0 201.29-5.63 201.29-5.63m-1.408 297s-77.418-5.63-199.88-5.63c-68.972 0-152.02 7.038-152.02 7.038" stroke-width="5"/>
-                      d="m482.17 670.79s94.309 5.63 152.02 5.63c106.98 0 201.29-5.63 201.29-5.63m-1.408 297s-77.418-5.63-199.88-5.63c-68.972 0-152.02 7.038-152.02 7.038"
+    <rect id="rect44" x="528.62" y="729.2" width="106.98" height="181.58" rx="31.19" ry="34.436" stroke-width="2"/>
-                      stroke-width="5"/>
+    <path id="path46" d="m345.78 632.78h-294.19l-14.076 102.75-7.038 11.26v142.17l7.038 14.076 15.483 101.35h288.56m491.11-333.6s-12.668 47.858-12.668 73.195v146.39c0 25.336 12.668 77.417 12.668 77.417l205.51 38.005h108.38s14.076-81.64 14.076-115.42v-147.8c0-38.005-14.076-109.79-14.076-109.79h-108.38z" stroke-width="5"/>
-                <rect id="rect44" x="528.62" y="729.2" width="106.98" height="181.58" rx="31.19" ry="34.436"
-                      stroke-width="2"/>
-                <path id="path46"
-                      d="m345.78 632.78h-294.19l-14.076 102.75-7.038 11.26v142.17l7.038 14.076 15.483 101.35h288.56m491.11-333.6s-12.668 47.858-12.668 73.195v146.39c0 25.336 12.668 77.417 12.668 77.417l205.51 38.005h108.38s14.076-81.64 14.076-115.42v-147.8c0-38.005-14.076-109.79-14.076-109.79h-108.38z"
-                      stroke-width="5"/>
    </g>
-            <path id="path48"
+   <path id="path48" d="m843.92 689.09s-8.445 40.82-8.445 56.303v144.98c0 19.706 7.038 57.711 7.038 57.711s94.308 26.744 123.87 26.744h42.228v-312.49h-47.859c-25.336 0-116.83 26.745-116.83 26.745z" fill="#f0ffeb" stroke-width="5"/>
-                  d="m843.92 689.09s-8.445 40.82-8.445 56.303v144.98c0 19.706 7.038 57.711 7.038 57.711s94.308 26.744 123.87 26.744h42.228v-312.49h-47.859c-25.336 0-116.83 26.745-116.83 26.745z"
+   <path id="path50" d="m1038.2 632.78s30.967 40.82 30.967 111.2v146.39c0 64.749-30.967 116.83-30.967 116.83m-713.65-263.22 32.374-32.375v-40.82 112.61m-33.078 81.641 32.374-32.375v-40.82 112.61m648.9-116.83-32.375-32.374v-40.82 112.61" fill="none" stroke-width="2"/>
-                  fill="#f0ffeb" stroke-width="5"/>
+   <path id="path52" d="m341.41 632.78s-42.228 78.825-42.228 111.2v146.39c0 40.82 42.228 114.02 42.228 114.02" fill="none" stroke-width="2"/>
-            <path id="path50"
-                  d="m1038.2 632.78s30.967 40.82 30.967 111.2v146.39c0 64.749-30.967 116.83-30.967 116.83m-713.65-263.22 32.374-32.375v-40.82 112.61m-33.078 81.641 32.374-32.375v-40.82 112.61m648.9-116.83-32.375-32.374v-40.82 112.61"
-                  fill="none" stroke-width="2"/>
-            <path id="path52" d="m341.41 632.78s-42.228 78.825-42.228 111.2v146.39c0 40.82 42.228 114.02 42.228 114.02"
-                  fill="none" stroke-width="2"/>
   </g>
   <g fill="none" stroke="#000">
-            <path id="path56"
+   <path id="path56" d="m-106.79 740.92 1.407-91.493s5.63-23.93-25.337-25.337c-30.967-1.408-26.744 2.815-26.744 2.815l1.408 415.24h28.152c28.152 0 22.521-22.52 22.521-22.52v-95.717c-12.677 0-11.26-9.614-11.26-16.891v-149.2c0.45-18.89 9.853-16.892 9.853-16.892z" stroke-width="5"/>
-                  d="m-106.79 740.92 1.407-91.493s5.63-23.93-25.337-25.337c-30.967-1.408-26.744 2.815-26.744 2.815l1.408 415.24h28.152c28.152 0 22.521-22.52 22.521-22.52v-95.717c-12.677 0-11.26-9.614-11.26-16.891v-149.2c0.45-18.89 9.853-16.892 9.853-16.892z"
+   <path id="path58" d="m-155.99 646.16h49.265m-48.415 374.27h49.266m-50.82-315.37h49.266m-46.451 259.81h49.266" stroke-width="2.2"/>
-                  stroke-width="5"/>
-            <path id="path58"
-                  d="m-155.99 646.16h49.265m-48.415 374.27h49.266m-50.82-315.37h49.266m-46.451 259.81h49.266"
-                  stroke-width="2.2"/>
    <path id="path60" d="m-147.1 703.82v260.4m9.853-258.84v260.4" stroke-width="2"/>
   </g>
   <g id="g88" transform="translate(-13.78 15.524)" stroke="#000">
-            <path id="path62"
+   <path id="path62" d="m494.57 641.61c41.429 15.714 140 11.428 191.43 12.856s160.48-10.23 201.43-27.143c40.995-16.93 134.78-67.656 151.43-72.857 22.857-7.143 41.429-7.143 80-20 38.572-12.857 25.714-32.857 25.714-32.857l-30 4.285-5.756-52.92s37.185-1.365 41.47-15.651c4.286-14.286 5.715-31.429-2.856-41.429-8.572-10-14.286 1.429-18.572-12.857-4.286-14.285-2.857-28.571-27.143-27.143-24.285 1.429-98.571 0-98.571 0s-15.714 108.57-98.572 105.72c-82.857-2.857-95.714-105.72-95.714-105.72h-500s-5.714 104.29-97.143 105.72c-91.428 1.428-98.571-105.72-98.571-105.72h-65.714l-18.572 38.572c-0.515 0-26.243 0-21.428 17.143 4.651 16.561-4.286 41.428 17.142 41.428 21.429 0 47.143-1.428 47.143-1.428l15.715 44.285-41.429 2.859s34.286 24.285 118.57 32.857c84.286 8.571 157.14 8.571 192.86 31.428 35.714 22.857 137.14 78.572 137.14 78.572z" fill="none" stroke-width="5"/>
-                  d="m494.57 641.61c41.429 15.714 140 11.428 191.43 12.856s160.48-10.23 201.43-27.143c40.995-16.93 134.78-67.656 151.43-72.857 22.857-7.143 41.429-7.143 80-20 38.572-12.857 25.714-32.857 25.714-32.857l-30 4.285-5.756-52.92s37.185-1.365 41.47-15.651c4.286-14.286 5.715-31.429-2.856-41.429-8.572-10-14.286 1.429-18.572-12.857-4.286-14.285-2.857-28.571-27.143-27.143-24.285 1.429-98.571 0-98.571 0s-15.714 108.57-98.572 105.72c-82.857-2.857-95.714-105.72-95.714-105.72h-500s-5.714 104.29-97.143 105.72c-91.428 1.428-98.571-105.72-98.571-105.72h-65.714l-18.572 38.572c-0.515 0-26.243 0-21.428 17.143 4.651 16.561-4.286 41.428 17.142 41.428 21.429 0 47.143-1.428 47.143-1.428l15.715 44.285-41.429 2.859s34.286 24.285 118.57 32.857c84.286 8.571 157.14 8.571 192.86 31.428 35.714 22.857 137.14 78.572 137.14 78.572z"
-                  fill="none" stroke-width="5"/>
    <path id="path64" d="m28.857 394.47h92.857m180 0h517.14m172.86 0h151.43" fill="none" stroke-width="2"/>
-            <path id="path66"
+   <path id="path66" d="m364.57 547.33c15.715 18.571 123.37 81.524 151.43 88.571 29.502 7.41 103 7.143 103 7.143l-7.143-95.714z" fill="#f0ffeb" stroke-width="5"/>
-                  d="m364.57 547.33c15.715 18.571 123.37 81.524 151.43 88.571 29.502 7.41 103 7.143 103 7.143l-7.143-95.714z"
-                  fill="#f0ffeb" stroke-width="5"/>
    <path id="path68" d="m404.57 577.33v-28.571" fill="none" stroke-width="2"/>
-            <path id="path70"
+   <path id="path70" d="m644.7 641.64-4.285-94.328h207.16c-11.307 20.753-46.612 74.906-72.857 88.571-14.285 10-82.878 4.328-130.02 5.757zm167.02-7.165s80-84.285 85.715-87.142c5.714-2.857 115.71-1.429 115.71-1.429s-77.143 47.143-102.86 58.572c-25.715 11.428-90 31.428-98.572 30z" fill="#f0ffeb" stroke-width="5"/>
-                  d="m644.7 641.64-4.285-94.328h207.16c-11.307 20.753-46.612 74.906-72.857 88.571-14.285 10-82.878 4.328-130.02 5.757zm167.02-7.165s80-84.285 85.715-87.142c5.714-2.857 115.71-1.429 115.71-1.429s-77.143 47.143-102.86 58.572c-25.715 11.428-90 31.428-98.572 30z"
-                  fill="#f0ffeb" stroke-width="5"/>
    <g fill="none">
-                <path id="path72"
+    <path id="path72" d="m345.64 556.81c-14.075-30.967-18.298-71.787-18.298-94.309 0-22.521 4.223-91.493 22.521-105.57m282.93 298.41c-1.408-5.63-4.047-81.905-6.51-106.93-3.67-18.714-4.989-51.218-6.159-87.314 0-22.522 7.038-80.233 12.669-105.57" stroke-width="5"/>
-                      d="m345.64 556.81c-14.075-30.967-18.298-71.787-18.298-94.309 0-22.521 4.223-91.493 22.521-105.57m282.93 298.41c-1.408-5.63-4.047-81.905-6.51-106.93-3.67-18.714-4.989-51.218-6.159-87.314 0-22.522 7.038-80.233 12.669-105.57"
+    <path id="path74" d="m103.53 396.34s15.483 85.864 106.98 85.864c91.494 0 109.79-87.271 109.79-87.271m479.99 0s15.483 85.863 106.98 85.863c91.493 0 109.79-87.27 109.79-87.27m-947.31 57.71h63.342" stroke-width="2"/>
-                      stroke-width="5"/>
+    <path id="path76" d="m779.18 648.3c18.299-12.669 56.304-50.674 92.9-104.16 36.598-53.489 8.447-59.12-18.298-74.603-26.744-15.483-49.266-42.228-67.564-112.61" stroke-width="5"/>
-                <path id="path74"
+    <path id="path78" d="m1112.8 452.42h-129.5m-696.76 0.223h544.74m-22.522 150.61v-54.895" stroke-width="2"/>
-                      d="m103.53 396.34s15.483 85.864 106.98 85.864c91.494 0 109.79-87.271 109.79-87.271m479.99 0s15.483 85.863 106.98 85.863c91.493 0 109.79-87.27 109.79-87.27m-947.31 57.71h63.342"
-                      stroke-width="2"/>
-                <path id="path76"
-                      d="m779.18 648.3c18.299-12.669 56.304-50.674 92.9-104.16 36.598-53.489 8.447-59.12-18.298-74.603-26.744-15.483-49.266-42.228-67.564-112.61"
-                      stroke-width="5"/>
-                <path id="path78" d="m1112.8 452.42h-129.5m-696.76 0.223h544.74m-22.522 150.61v-54.895"
-                      stroke-width="2"/>
    </g>
    <g stroke-width="2">
-                <rect id="rect80" transform="scale(1 -1)" x="558.65" y="-503.55" width="41.286" height="14.541"
+    <rect id="rect80" transform="scale(1 -1)" x="558.65" y="-503.55" width="41.286" height="14.541" rx="2.933" ry="7.379" fill="#e6e6e6"/>
-                      rx="2.933" ry="7.379" fill="#e6e6e6"/>
+    <rect id="rect82" transform="scale(1 -1)" x="816.24" y="-503.55" width="41.286" height="14.541" rx="2.933" ry="7.379" fill="#e6e6e6"/>
-                <rect id="rect82" transform="scale(1 -1)" x="816.24" y="-503.55" width="41.286" height="14.541"
+    <rect id="rect84" transform="scale(1 -1)" x="259.53" y="-502.15" width="18.776" height="11.738" rx="1.63" ry="7.692" fill="#ffcb00"/>
-                      rx="2.933" ry="7.379" fill="#e6e6e6"/>
-                <rect id="rect84" transform="scale(1 -1)" x="259.53" y="-502.15" width="18.776" height="11.738"
-                      rx="1.63" ry="7.692" fill="#ffcb00"/>
     <circle id="circle86" transform="translate(941.34 284)" cx="59.119" cy="211.28" r="16.891" fill="#fff"/>
    </g>
   </g>
   <path id="path90" d="m-126.58 704.93v260.4" fill="none" stroke="#000" stroke-width="2"/>
-        <path id="path92" d="m-153.88 992.49v-26.041h45.043v52.08h-45.043zm0-316.71v-27.448h45.043v54.898h-45.043z"
+  <path id="path92" d="m-153.88 992.49v-26.041h45.043v52.08h-45.043zm0-316.71v-27.448h45.043v54.898h-45.043z" fill="#ffffc0"/>
-              fill="#ffffc0"/>
   <g fill="none" stroke="#000">
-            <path id="path94"
+   <path id="path94" d="m-157.4 624.38s-4.223-12.669-18.299-12.669-14.076 8.446-14.076 8.446v423.69s1.408 9.853 14.076 9.853c12.669 0 18.3-9.853 18.3-9.853" stroke-width="5"/>
-                  d="m-157.4 624.38s-4.223-12.669-18.299-12.669-14.076 8.446-14.076 8.446v423.69s1.408 9.853 14.076 9.853c12.669 0 18.3-9.853 18.3-9.853"
+   <path id="path96" d="m-191.18 624.38s-35.19-1.408-35.19 21.114v371.6c0 22.521 36.597 25.336 36.597 25.336" stroke-width="5"/>
-                  stroke-width="5"/>
-            <path id="path96" d="m-191.18 624.38s-35.19-1.408-35.19 21.114v371.6c0 22.521 36.597 25.336 36.597 25.336"
-                  stroke-width="5"/>
    <g stroke-width="2">
     <rect id="rect98" x="-216.51" y="648.31" width="16.891" height="35.19" rx="7.742" ry="6.284"/>
     <rect id="rect100" x="-216.51" y="985.58" width="16.891" height="35.19" rx="7.742" ry="6.284"/>
     <path id="path102" d="m-62.939 645.49h30.967v377.24h-30.967z"/>
    </g>
-            <path id="path104"
+   <path id="path104" d="m1200.9 633.86v73.195h67.565v-83.048l-25.337-14.076zm0 329.38h67.565v78.826l-23.93 14.076-43.635-18.3zm0-270.26v284.33m67.565-283.74v284.33" stroke-width="5"/>
-                  d="m1200.9 633.86v73.195h67.565v-83.048l-25.337-14.076zm0 329.38h67.565v78.826l-23.93 14.076-43.635-18.3zm0-270.26v284.33m67.565-283.74v284.33"
+   <path id="path106" d="m1216.6 759.51h14.076v147.8h-14.076zm7.631-1.408v-53.488m0 257.37v-53.49m30.375-201.06v256.18" stroke-width="2"/>
-                  stroke-width="5"/>
+   <path id="path108" d="m1268.8 624.97s4.223-12.668 18.299-12.668 14.076 8.445 14.076 8.445v423.69s-1.408 9.853-14.076 9.853c-12.669 0-18.299-9.853-18.299-9.853m33.783-419.46s35.19-1.408 35.19 21.114v371.6c0 22.521-36.598 25.337-36.598 25.337" stroke-width="5"/>
-            <path id="path106"
-                  d="m1216.6 759.51h14.076v147.8h-14.076zm7.631-1.408v-53.488m0 257.37v-53.49m30.375-201.06v256.18"
-                  stroke-width="2"/>
-            <path id="path108"
-                  d="m1268.8 624.97s4.223-12.668 18.299-12.668 14.076 8.445 14.076 8.445v423.69s-1.408 9.853-14.076 9.853c-12.669 0-18.299-9.853-18.299-9.853m33.783-419.46s35.19-1.408 35.19 21.114v371.6c0 22.521-36.598 25.337-36.598 25.337"
-                  stroke-width="5"/>
    <g stroke-width="2">
-                <rect id="rect110" transform="scale(-1 1)" x="-1329.9" y="648.9" width="16.891" height="35.19"
+    <rect id="rect110" transform="scale(-1 1)" x="-1329.9" y="648.9" width="16.891" height="35.19" rx="7.742" ry="6.284"/>
-                      rx="7.742" ry="6.284"/>
+    <rect id="rect112" transform="scale(-1 1)" x="-1329.9" y="986.17" width="16.891" height="35.19" rx="7.742" ry="6.284"/>
-                <rect id="rect112" transform="scale(-1 1)" x="-1329.9" y="986.17" width="16.891" height="35.19"
+    <path id="path114" d="m1199.7 632.82 67.565 74.603m-67.565 0.592 67.565-73.195m-67.342 328.16 67.565 74.602m-67.565 0.593 67.565-73.195"/>
-                      rx="7.742" ry="6.284"/>
-                <path id="path114"
-                      d="m1199.7 632.82 67.565 74.603m-67.565 0.592 67.565-73.195m-67.342 328.16 67.565 74.602m-67.565 0.593 67.565-73.195"/>
    </g>
   </g>
   <g stroke="#000">
    <g stroke-width="2">
-                <circle id="circle116" transform="translate(78.489 1074.7)" cx="119.65" cy="202.84" r="76.01"
+    <circle id="circle116" transform="translate(78.489 1074.7)" cx="119.65" cy="202.84" r="76.01" fill="#c8c8c8"/>
-                        fill="#c8c8c8"/>
+    <circle id="circle118" transform="translate(94.676 1204.9)" cx="103.46" cy="72.633" r="44.339" fill="#fff"/>
-                <circle id="circle118" transform="translate(94.676 1204.9)" cx="103.46" cy="72.633" r="44.339"
+    <circle id="circle120" transform="translate(78.489 187.66)" cx="119.65" cy="202.84" r="76.01" fill="#c8c8c8"/>
-                        fill="#fff"/>
+    <circle id="circle122" transform="translate(94.676 317.86)" cx="103.46" cy="72.633" r="44.339" fill="#fff"/>
-                <circle id="circle120" transform="translate(78.489 187.66)" cx="119.65" cy="202.84" r="76.01"
+    <circle id="circle124" transform="translate(773.02 187.66)" cx="119.65" cy="202.84" r="76.01" fill="#c8c8c8"/>
-                        fill="#c8c8c8"/>
+    <circle id="circle126" transform="translate(789.21 317.86)" cx="103.46" cy="72.633" r="44.339" fill="#fff"/>
-                <circle id="circle122" transform="translate(94.676 317.86)" cx="103.46" cy="72.633" r="44.339"
+    <circle id="circle128" transform="translate(773.02 1074.7)" cx="119.65" cy="202.84" r="76.01" fill="#c8c8c8"/>
-                        fill="#fff"/>
+    <circle id="circle130" transform="translate(789.21 1204.9)" cx="103.46" cy="72.633" r="44.339" fill="#fff"/>
-                <circle id="circle124" transform="translate(773.02 187.66)" cx="119.65" cy="202.84" r="76.01"
-                        fill="#c8c8c8"/>
-                <circle id="circle126" transform="translate(789.21 317.86)" cx="103.46" cy="72.633" r="44.339"
-                        fill="#fff"/>
-                <circle id="circle128" transform="translate(773.02 1074.7)" cx="119.65" cy="202.84" r="76.01"
-                        fill="#c8c8c8"/>
-                <circle id="circle130" transform="translate(789.21 1204.9)" cx="103.46" cy="72.633" r="44.339"
-                        fill="#fff"/>
    </g>
    <path id="path132" d="m1338.5 829.07h40.82" fill="none" stroke-width="5"/>
-            <circle id="circle134" transform="translate(1441.3 600.31)" cx="-59.119" cy="229.58" r="4.223"
+   <circle id="circle134" transform="translate(1441.3 600.31)" cx="-59.119" cy="229.58" r="4.223" fill="#3c3c3c" stroke-width="5"/>
-                    fill="#3c3c3c" stroke-width="5"/>
    <g stroke-width="2">
     <path id="path136" d="m778.06 845.37-38.709-38.709" fill="none"/>
     <g id="g146" transform="translate(-13.78 15.524)" fill="#3c3c3c">
@@ -209,8 +139,6 @@
   <circle id="s26" cx="1339.4" cy="581.37" r="61.935"/>
  </g>
  <g id="layer3">
-        <text id="p15" opacity="0" x="382.62802" y="1034.3463" fill="#fd0000" font-family="sans-serif"
+  <text id="p15" opacity="0" x="382.62802" y="1034.3463" fill="#fd0000" font-family="sans-serif" font-size="1696.9px" letter-spacing="0px" stroke-width="17.676" word-spacing="0px" style="line-height:5.25" xml:space="preserve"><tspan id="tspan4997" x="382.62802" y="1034.3463" fill="#fd0000" stroke-width="17.676">x</tspan></text>
-              font-size="1696.9px" letter-spacing="0px" stroke-width="17.676" word-spacing="0px"
-              style="line-height:5.25" xml:space="preserve"><tspan id="tspan4997" x="382.62802" y="1034.3463" fill="#fd0000" stroke-width="17.676">x</tspan></text>
  </g>
 </svg>

client/src/components/accounting-payables-table/accounting-payables-table.component.jsx

@@ -1,20 +1,21 @@
-import {Card, Checkbox, Input, Space, Table} from "antd";import queryString from "query-string";
+import { Input, Table, Checkbox, Card, Space } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import {connect } from "react-redux";
 import { Link } from "react-router-dom";
-import { createStructuredSelector } from "reselect";
-import {logImEXEvent} from "../../firebase/firebase.utils";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import {DateFormatter} from "../../utils/DateFormatter";
-import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
-import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
-import PayableExportAll from "../payable-export-all-button/payable-export-all-button.component";
 import PayableExportButton from "../payable-export-button/payable-export-button.component";
-import BillMarkSelectedExported from "../payable-mark-selected-exported/payable-mark-selected-exported.component";
+import PayableExportAll from "../payable-export-all-button/payable-export-all-button.component";
+import { DateFormatter } from "../../utils/DateFormatter";
+import queryString from "query-string";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
+import BillMarkSelectedExported from "../payable-mark-selected-exported/payable-mark-selected-exported.component";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -146,7 +147,7 @@ export function AccountingPayablesTableComponent({
       title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
-
+      sorter: (a, b) => a.clm_total - b.clm_total,
 
       render: (text, record) => (
         <PayableExportButton

client/src/components/accounting-payments-table/accounting-payments-table.component.jsx

@@ -8,16 +8,14 @@ import {logImEXEvent} from "../../firebase/firebase.utils";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
-import {pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
-import OwnerNameDisplay, {
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-  OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
 import PaymentExportButton from "../payment-export-button/payment-export-button.component";
 import PaymentMarkSelectedExported from "../payment-mark-selected-exported/payment-mark-selected-exported.component";
 import PaymentsExportAllButton from "../payments-export-all-button/payments-export-all-button.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -77,11 +75,7 @@ export function AccountingPayablesTableComponent({
       dataIndex: "owner",
       key: "owner",
       ellipsis: true,
-            sorter: (a, b) =>
+      sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
-        alphaSort(
-          OwnerNameDisplayFunction(a.job),
-          OwnerNameDisplayFunction(b.job)
-        ),
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
@@ -100,9 +94,7 @@ export function AccountingPayablesTableComponent({
       title: t("payments.fields.amount"),
       dataIndex: "amount",
       key: "amount",
-            sorter: (a, b) => a.amount - b.amount,
+      render: (text, record) => (
-      sortOrder:
-        state.sortedInfo.columnKey === "amount" && state.sortedInfo.order,render: (text, record) => (
         <CurrencyFormatter>{record.amount}</CurrencyFormatter>
       ),
     },
@@ -119,21 +111,19 @@ export function AccountingPayablesTableComponent({
     {
       title: t("payments.fields.created_at"),
       dataIndex: "created_at",
-            key: "created_at",sorter: (a, b) => dateSort(a.created_at, b.created_at),
+      key: "created_at",
-      sortOrder:
-        state.sortedInfo.columnKey === "created_at" && state.sortedInfo.order,
       render: (text, record) => (
         <DateTimeFormatter>{record.created_at}</DateTimeFormatter>
       ),
     },
-        //{
+    {
-          //  title: t("payments.fields.exportedat"),
+      title: t("payments.fields.exportedat"),
-          //  dataIndex: "exportedat",
+      dataIndex: "exportedat",
-          //  key: "exportedat",
+      key: "exportedat",
-          //  render: (text, record) => (
+      render: (text, record) => (
-            //    <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
+        <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
-          //  ),
+      ),
-        //},
+    },
     {
       title: t("exportlogs.labels.attempts"),
       dataIndex: "attempts",
@@ -147,7 +137,7 @@ export function AccountingPayablesTableComponent({
       title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
-
+      sorter: (a, b) => a.clm_total - b.clm_total,
 
       render: (text, record) => (
         <PaymentExportButton

client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx

@@ -4,19 +4,17 @@ import {useTranslation} from "react-i18next";
 import { Link } from "react-router-dom";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import {alphaSort, dateSort, statusSort } from "../../utils/sorters";
+import { alphaSort, dateSort } from "../../utils/sorters";
 import JobExportButton from "../jobs-close-export-button/jobs-close-export-button.component";
 import JobsExportAllButton from "../jobs-export-all-button/jobs-export-all-button.component";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import {DateFormatter} from "../../utils/DateFormatter";
-import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
-import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
+import { DateFormatter } from "../../utils/DateFormatter";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -65,7 +63,7 @@ export function AccountingReceivablesTableComponent({
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
-            sorter: (a, b) => statusSort(a, b, bodyshop.md_ro_statuses.statuses),
+      sorter: (a, b) => a.status - b.status,
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
     },
@@ -85,8 +83,7 @@ export function AccountingReceivablesTableComponent({
       title: t("jobs.fields.owner"),
       dataIndex: "owner",
       key: "owner",
-            sorter: (a, b) =>
+      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
-        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
@@ -106,15 +103,7 @@ export function AccountingReceivablesTableComponent({
       dataIndex: "vehicle",
       key: "vehicle",
       ellipsis: true,
-            sorter: (a, b) =>
+      render: (text, record) => {
-        alphaSort(
-          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
-            a.v_model_desc || ""
-          }`,
-          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
-        ),
-      sortOrder:
-        state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,render: (text, record) => {
         return record.vehicleid ? (
           <Link to={"/manage/vehicles/" + record.vehicleid}>
             {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${

client/src/components/allocations-assignment/allocations-assignment.component.jsx

@@ -1,4 +1,4 @@
-import {Button, InputNumber, Popover, Select} from "antd";
+import { Select, Button, Popover, InputNumber } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";

client/src/components/audit-trail-values/audit-trail-values.component.jsx

@@ -2,7 +2,6 @@ import React from "react";
 import { List } from "antd";
 import Icon from "@ant-design/icons";
 import { FaArrowRight } from "react-icons/fa";
-
 export default function AuditTrailValuesComponent({ oldV, newV }) {
   if (!oldV && !newV) return <div></div>;
 

client/src/components/barcode-popup/barcode-popup.component.jsx

@@ -1,8 +1,7 @@
-import {Popover, Tag} from "antd";
+import { Tag, Popover } from "antd";
 import React from "react";
 import Barcode from "react-barcode";
 import { useTranslation } from "react-i18next";
-
 export default function BarcodePopupComponent({ value, children }) {
   const { t } = useTranslation();
   return (

client/src/components/bill-cm-returns-table/bill-cm-returns-table.component.jsx

@@ -3,7 +3,6 @@ import React, {useEffect} from "react";
 import { useTranslation } from "react-i18next";
 import ReadOnlyFormItemComponent from "../form-items-formatted/read-only-form-item.component";
 import "./bill-cm-returns-table.styles.scss";
-
 export default function BillCmdReturnsTableComponent({
   form,
   returnLoading,

client/src/components/bill-delete-button/bill-delete-button.component.jsx

@@ -5,20 +5,8 @@ import React, {useState} from "react";
 import { useTranslation } from "react-i18next";
 import { DELETE_BILL } from "../../graphql/bills.queries";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
-import {insertAuditTrail} from "../../redux/application/application.actions";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
 
-const mapStateToProps = createStructuredSelector({});
+export default function BillDeleteButton({ bill, callback }) {
-const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({ jobid, operation, type }) =>
-        dispatch(insertAuditTrail({ jobid, operation, type })),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(BillDeleteButton);
-
-export function BillDeleteButton({ bill, jobid, callback, insertAuditTrail }) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [deleteBill] = useMutation(DELETE_BILL);
@@ -48,11 +36,6 @@ export function BillDeleteButton({ bill, jobid, callback, insertAuditTrail }) {
 
     if (!!!result.errors) {
       notification["success"]({ message: t("bills.successes.deleted") });
-            insertAuditTrail({
-                jobid: jobid,
-                operation: AuditTrailMapping.billdeleted(bill.invoice_number),
-            type: "billdeleted",
-      });
 
       if (callback && typeof callback === "function") callback(bill.id);
     } else {

client/src/components/bill-detail-edit/bill-detail-edit-component.jsx

@@ -7,7 +7,11 @@ import {useTranslation} from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import {DELETE_BILL_LINE, INSERT_NEW_BILL_LINES, UPDATE_BILL_LINE} from "../../graphql/bill-lines.queries";
+import {
+  DELETE_BILL_LINE,
+  INSERT_NEW_BILL_LINES,
+  UPDATE_BILL_LINE
+} from "../../graphql/bill-lines.queries";
 import { QUERY_BILL_BY_PK, UPDATE_BILL } from "../../graphql/bills.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { setModalContext } from "../../redux/modals/modals.actions";
@@ -30,8 +34,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
     setPartsOrderContext: (context) =>
         dispatch(setModalContext({context: context, modal: "partsOrder"})),
-    insertAuditTrail: ({jobid, operation, type}) =>
+    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 export default connect(
@@ -145,7 +149,6 @@ export function BillDetailEditcontainer({setPartsOrderContext, insertAuditTrail,
             jobid: bill.jobid,
             billid: search.billid,
             operation: AuditTrailMapping.billupdated(bill.invoice_number),
-        type: "billupdated",
         });
 
         await refetch();

client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx

@@ -16,8 +16,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   setPartsOrderContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "partsOrder" })),
-    insertAuditTrail: ({jobid, operation, type}) =>
+  insertAuditTrail: ({ jobid, operation }) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export default connect(

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -1,5 +1,5 @@
 import { useApolloClient, useMutation } from "@apollo/client";
-import {Button, Checkbox, Form, Modal, notification, Space} from "antd";
+import { Button, Checkbox, Form, Modal, Space, notification } from "antd";
 import _ from "lodash";
 import React, { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -8,12 +8,18 @@ import {createStructuredSelector} from "reselect";
 import { INSERT_NEW_BILL } from "../../graphql/bills.queries";
 import { UPDATE_INVENTORY_LINES } from "../../graphql/inventory.queries";
 import { UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries";
-import {QUERY_JOB_LBR_ADJUSTMENTS, UPDATE_JOB,} from "../../graphql/jobs.queries";
+import {
+  QUERY_JOB_LBR_ADJUSTMENTS,
+  UPDATE_JOB,
+} from "../../graphql/jobs.queries";
 import { MUTATION_MARK_RETURN_RECEIVED } from "../../graphql/parts-orders.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectBillEnterModal } from "../../redux/modals/modals.selectors";
-import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
@@ -31,8 +37,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("billEnter")),
-    insertAuditTrail: ({jobid, billid, operation, type}) =>
+  insertAuditTrail: ({ jobid, billid, operation }) =>
-        dispatch(insertAuditTrail({jobid, billid, operation, type })),
+    dispatch(insertAuditTrail({ jobid, billid, operation })),
 });
 
 const Templates = TemplateList("job_special");
@@ -88,7 +94,6 @@ function BillEnterModalContainer({
       location,
       outstanding_returns,
       inventory,
-            federal_tax_exempt,
       ...remainingValues
     } = values;
 
@@ -165,7 +170,7 @@ function BillEnterModalContainer({
             mod_lbr_ty: key,
             hours: adjustmentsToInsert[key].toFixed(1),
           }),
-                type: "jobmodifylbradj",});
+        });
       });
 
       const jobUpdate = client.mutate({
@@ -314,7 +319,6 @@ function BillEnterModalContainer({
       operation: AuditTrailMapping.billposted(
         r1.data.insert_bills.returning[0].invoice_number
       ),
-        type: "billposted",
     });
 
     if (enterAgain) {

client/src/components/bill-form-lines-extended/bill-form-lines-extended.component.jsx

@@ -4,7 +4,6 @@ import {useTranslation} from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { alphaSort } from "../../utils/sorters";
 import BillFormItemsExtendedFormItem from "./bill-form-lines.extended.formitem.component";
-
 export default function BillFormLinesExtended({
   lineData,
   discount,

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

@@ -27,21 +27,7 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({});
 
-export function BillFormComponent({
+export function BillFormComponent({bodyshop, disabled, form, vendorAutoCompleteOptions, lineData, responsibilityCenters, loadLines, billEdit, disableInvNumber, job, loadOutstandingReturns, loadInventory, preferredMake}) {
-                                      bodyshop,
-                                      disabled,
-                                      form,
-                                      vendorAutoCompleteOptions,
-                                      lineData,
-                                      responsibilityCenters,
-                                      loadLines,
-                                      billEdit,
-                                      disableInvNumber,
-                                      job,
-                                      loadOutstandingReturns,
-                                      loadInventory,
-                                      preferredMake
-                                  }) {
 
     const {t} = useTranslation();
     const client = useApolloClient();

client/src/components/bill-form/bill-form.container.jsx

@@ -79,5 +79,4 @@ export function BillFormContainer({
     </>
   );
 }
-
 export default connect(mapStateToProps, null)(BillFormContainer);

client/src/components/bill-form/bill-form.lines.component.jsx

@@ -1,6 +1,16 @@
 import { DeleteFilled, DollarCircleFilled } from "@ant-design/icons";
 import {useSplitTreatments} from "@splitsoftware/splitio-react";
-import {Button, Form, Input, InputNumber, Select, Space, Switch, Table, Tooltip,} from "antd";
+import {
+  Button,
+  Form,
+  Input,
+  InputNumber,
+  Select,
+  Space,
+  Switch,
+  Table,
+  Tooltip,
+} from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";

client/src/components/bill-mark-exported-button/bill-mark-exported-button.component.jsx

@@ -1,14 +1,18 @@
-import {gql, useMutation} from "@apollo/client";
+import { useMutation } from "@apollo/client";
 import { Button, notification } from "antd";
+import { gql } from "@apollo/client";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import {selectAuthLevel, selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
+import {
+  selectAuthLevel,
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
-
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   authLevel: selectAuthLevel,

client/src/components/bill-reexport-button/bill-reexport-button.component.jsx

@@ -1,13 +1,16 @@
-import {gql, useMutation} from "@apollo/client";
+import { useMutation } from "@apollo/client";
 import { Button, notification } from "antd";
+import { gql } from "@apollo/client";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import {selectAuthLevel, selectBodyshop,} from "../../redux/user/user.selectors";
+import {
+  selectAuthLevel,
+  selectBodyshop,
+} from "../../redux/user/user.selectors";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
-
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   authLevel: selectAuthLevel,

client/src/components/billline-add-inventory/billline-add-inventory.component.jsx

@@ -7,7 +7,10 @@ import React, {useState} from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { INSERT_INVENTORY_AND_CREDIT } from "../../graphql/inventory.queries";
-import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
 import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import queryString from "query-string";
 import { useLocation } from "react-router-dom";

client/src/components/bills-list-table/bills-list-table.component.jsx

@@ -58,7 +58,7 @@ export function BillsListTableComponent({
           <EditFilled />
         </Button>
       )}
-            <BillDeleteButton bill={record} jobid={job.id} />
+      <BillDeleteButton bill={record} />
       <BillDetailEditReturnComponent
         data={{ bills_by_pk: { ...record, jobid: job.id } }}
         disabled={
@@ -229,7 +229,6 @@ export function BillsListTableComponent({
     </Card>
   );
 }
-
 export default connect(
   mapStateToProps,
   mapDispatchToProps

client/src/components/bills-vendors-list/bills-vendors-list.component.jsx

@@ -3,7 +3,7 @@ import {QUERY_ALL_VENDORS} from "../../graphql/vendors.queries";
 import { useQuery } from "@apollo/client";
 import queryString from "query-string";
 import { useLocation, useNavigate } from "react-router-dom";
-import {Input, Table} from "antd";
+import { Table, Input } from "antd";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
 import AlertComponent from "../alert/alert.component";

client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx

@@ -3,7 +3,6 @@ import {Button, Form, InputNumber, Popover} from "antd";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { useTranslation } from "react-i18next";
 import { CalculatorFilled } from "@ant-design/icons";
-
 export default function CABCpvrtCalculator({ disabled, form }) {
   const [visibility, setVisibility] = useState(false);
 

client/src/components/card-payment-modal/card-payment-modal.component..jsx

@@ -1,13 +1,27 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { useLazyQuery, useMutation } from "@apollo/client";
-import {Button, Card, Col, Form, Input, notification, Row, Space, Spin, Statistic,} from "antd";
+import {
+  Button,
+  Card,
+  Col,
+  Form,
+  Input,
+  Row,
+  Space,
+  Spin,
+  Statistic,
+  notification,
+} from "antd";
 import axios from "axios";
 import dayjs from "../../utils/day";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import {INSERT_PAYMENT_RESPONSE, QUERY_RO_AND_OWNER_BY_JOB_PKS,} from "../../graphql/payment_response.queries";
+import {
+  INSERT_PAYMENT_RESPONSE,
+  QUERY_RO_AND_OWNER_BY_JOB_PKS,
+} from "../../graphql/payment_response.queries";
 import { INSERT_NEW_PAYMENT } from "../../graphql/payments.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
@@ -23,8 +37,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation, type}) =>
+  insertAuditTrail: ({ jobid, operation }) =>
-        dispatch(insertAuditTrail({jobid, operation, type})),
+    dispatch(insertAuditTrail({ jobid, operation })),
   toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment")),
 });
 
@@ -88,7 +102,7 @@ const CardPaymentModalComponent = ({
         insertAuditTrail({
           jobid: payment.jobid,
           operation: AuditTrailMapping.failedpayment(),
-                type: "failedpayment",})
+        })
       );
     });
   };
@@ -280,22 +294,24 @@ const CardPaymentModalComponent = ({
                   <Input
                     className="ipayfield"
                     data-ipayname="account"
-                                        type="hidden"
+                    //type="hidden"
                     value={
                       payments && data && data.jobs.length > 0
                         ? data.jobs.map((j) => j.ro_number).join(", ")
                         : null
                     }
+                    hidden
                   />
                   <Input
                     className="ipayfield"
                     data-ipayname="email"
-                                        type="hidden"
+                    // type="hidden"
                     value={
                       payments && data && data.jobs.length > 0
                         ? data.jobs.filter((j) => j.ownr_ea)[0]?.ownr_ea
                         : null
                     }
+                    hidden
                   />
                 </>
               );
@@ -323,8 +339,9 @@ const CardPaymentModalComponent = ({
                   <Input
                     className="ipayfield"
                     data-ipayname="amount"
-                                        type="hidden"
+                    //type="hidden"
                     value={totalAmountToCharge?.toFixed(2)}
+                    hidden
                   />
                   <Button
                     type="primary"

client/src/components/chat-affix/chat-affix.container.jsx

@@ -19,7 +19,7 @@ export function ChatAffixContainer({bodyshop, chatVisible}) {
       try {
         const r = await axios.post("/notifications/subscribe", {
           fcm_tokens: await getToken(messaging, {
-                        vapidKey: process.env.REACT_APP_FIREBASE_PUBLIC_VAPID_KEY,
+            vapidKey: import.meta.env.VITE_APP_FIREBASE_PUBLIC_VAPID_KEY,
           }),
           type: "messaging",
           imexshopid: bodyshop.imexshopid,
@@ -71,7 +71,6 @@ export function ChatAffixContainer({bodyshop, chatVisible}) {
         payload: (payload && payload.data && payload.data.data) || payload.data,
       });
     }
-
     let stopMessageListener, channel;
     try {
       stopMessageListener = onMessage(messaging, handleMessage);

client/src/components/chat-conversation-list/chat-conversation-list.styles.scss

@@ -3,12 +3,10 @@
   height: 100%;
   border: 1px solid gainsboro;
 }
-
 .chat-list-item {
   .ant-card-head {
     border: none;
   }
-
   &:hover {
     cursor: pointer;
     color: #ff7a00;

client/src/components/chat-conversation/chat-conversation.container.jsx

@@ -2,13 +2,15 @@ import {useMutation, useQuery, useSubscription} from "@apollo/client";
 import React, { useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import {CONVERSATION_SUBSCRIPTION_BY_PK, GET_CONVERSATION_DETAILS,} from "../../graphql/conversations.queries";
+import {
+  CONVERSATION_SUBSCRIPTION_BY_PK,
+  GET_CONVERSATION_DETAILS,
+} from "../../graphql/conversations.queries";
 import { MARK_MESSAGES_AS_READ_BY_CONVERSATION } from "../../graphql/messages.queries";
 import { selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
 import ChatConversationComponent from "./chat-conversation.component";
 import axios from "axios";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-
 const mapStateToProps = createStructuredSelector({
   selectedConversation: selectSelectedConversation,
   bodyshop: selectBodyshop,

client/src/components/chat-label/chat-label.component.jsx

@@ -4,7 +4,6 @@ import {Input, notification, Spin, Tag, Tooltip} from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_CONVERSATION_LABEL } from "../../graphql/conversations.queries";
-
 export default function ChatLabel({ conversation }) {
   const [loading, setLoading] = useState(false);
   const [editing, setEditing] = useState(false);

client/src/components/chat-media-selector/chat-media-selector.component.jsx

@@ -9,8 +9,7 @@ import {GET_DOCUMENTS_BY_JOB} from "../../graphql/documents.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import JobDocumentsGalleryExternal from "../jobs-documents-gallery/jobs-documents-gallery.external.component";
-import JobDocumentsLocalGalleryExternal
+import JobDocumentsLocalGalleryExternal from "../jobs-documents-local-gallery/jobs-documents-local-gallery.external.component";
-    from "../jobs-documents-local-gallery/jobs-documents-local-gallery.external.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 
 const mapStateToProps = createStructuredSelector({

client/src/components/chat-messages-list/chat-message-list.component.jsx

@@ -4,7 +4,12 @@ import i18n from "i18next";
 import dayjs from "../../utils/day";
 import React, { useEffect, useRef } from "react";
 import { MdDone, MdDoneAll } from "react-icons/md";
-import {AutoSizer, CellMeasurer, CellMeasurerCache, List,} from "react-virtualized";
+import {
+  AutoSizer,
+  CellMeasurer,
+  CellMeasurerCache,
+  List,
+} from "react-virtualized";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import "./chat-message-list.styles.scss";
 

client/src/components/chat-messages-list/chat-message-list.styles.scss

@@ -44,7 +44,6 @@
 .yours {
   align-items: flex-start;
 }
-
 .msgmargin {
   margin-top: 0.1rem;
   margin-bottom: 0.1rem;
@@ -67,7 +66,6 @@
   background: #eee;
   border-bottom-right-radius: 15px;
 }
-
 .yours .message.last:after {
   content: "";
   position: absolute;

client/src/components/chat-new-conversation/chat-new-conversation.component.jsx

@@ -5,7 +5,9 @@ import {useTranslation} from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { openChatByPhone } from "../../redux/messaging/messaging.actions";
-import PhoneFormItem, {PhoneItemFormatterValidation,} from "../form-items-formatted/phone-form-item.component";
+import PhoneFormItem, {
+  PhoneItemFormatterValidation,
+} from "../form-items-formatted/phone-form-item.component";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser

client/src/components/chat-open-button/chat-open-button.component.jsx

@@ -9,7 +9,6 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { searchingForConversation } from "../../redux/messaging/messaging.selectors";
-
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   searchingForConversation: searchingForConversation,
@@ -50,5 +49,4 @@ export function ChatOpenButton({
     </a>
   );
 }
-
 export default connect(mapStateToProps, mapDispatchToProps)(ChatOpenButton);

client/src/components/chat-popup/chat-popup.component.jsx

@@ -1,13 +1,24 @@
-import {InfoCircleOutlined, MessageOutlined, ShrinkOutlined, SyncOutlined,} from "@ant-design/icons";
+import {
+  InfoCircleOutlined,
+  MessageOutlined,
+  ShrinkOutlined,
+  SyncOutlined,
+} from "@ant-design/icons";
 import { useLazyQuery, useQuery } from "@apollo/client";
 import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd";
 import React, { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import {CONVERSATION_LIST_QUERY, UNREAD_CONVERSATION_COUNT,} from "../../graphql/conversations.queries";
+import {
+  CONVERSATION_LIST_QUERY,
+  UNREAD_CONVERSATION_COUNT,
+} from "../../graphql/conversations.queries";
 import { toggleChatVisible } from "../../redux/messaging/messaging.actions";
-import {selectChatVisible, selectSelectedConversation,} from "../../redux/messaging/messaging.selectors";
+import {
+  selectChatVisible,
+  selectSelectedConversation,
+} from "../../redux/messaging/messaging.selectors";
 import ChatConversationListComponent from "../chat-conversation-list/chat-conversation-list.component";
 import ChatConversationContainer from "../chat-conversation/chat-conversation.container";
 import ChatNewConversation from "../chat-new-conversation/chat-new-conversation.component";
@@ -129,5 +140,4 @@ export function ChatPopupComponent({
     </Badge>
   );
 }
-
 export default connect(mapStateToProps, mapDispatchToProps)(ChatPopupComponent);

client/src/components/chat-popup/chat-popup.styles.scss

@@ -13,7 +13,6 @@
     height: 100%;
   }
 }
-
 .chat-popup-info-icon {
   margin-right: 5px;
 }

client/src/components/chat-presets/chat-presets.component.jsx

@@ -31,7 +31,6 @@ export function ChatPresetsComponent({bodyshop, setMessage, className}) {
     </div>
   );
 }
-
 export default connect(
   mapStateToProps,
   mapDispatchToProps

client/src/components/chat-print-button/chat-print-button.component.jsx

@@ -42,5 +42,4 @@ export function ChatPrintButton({conversation}) {
     </Space>
   );
 }
-
 export default connect(mapStateToProps, mapDispatchToProps)(ChatPrintButton);

client/src/components/chat-send-message/chat-send-message.component.jsx

@@ -5,8 +5,14 @@ import {useTranslation} from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import {sendMessage, setMessage,} from "../../redux/messaging/messaging.actions";
+import {
-import {selectIsSending, selectMessage,} from "../../redux/messaging/messaging.selectors";
+  sendMessage,
+  setMessage,
+} from "../../redux/messaging/messaging.actions";
+import {
+  selectIsSending,
+  selectMessage,
+} from "../../redux/messaging/messaging.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import ChatMediaSelector from "../chat-media-selector/chat-media-selector.component";
 import ChatPresetsComponent from "../chat-presets/chat-presets.component";
@@ -104,7 +110,6 @@ function ChatSendMessageComponent({
     </div>
   );
 }
-
 export default connect(
   mapStateToProps,
   mapDispatchToProps

client/src/components/config-form-components/config-form-types.js

@@ -3,7 +3,6 @@ import Rate from "./rate/rate.component";
 import Slider from "./slider/slider.component";
 import Text from "./text/text.component";
 import Textarea from "./textarea/textarea.component";
-
 const e = {
   checkbox: CheckboxFormItem,
   slider: Slider,

client/src/components/conflict/conflict.component.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import {Button, Result} from "antd";
+import { Result, Button } from "antd";
 import { useTranslation } from "react-i18next";
 
 export default function ConflictComponent() {

client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx

@@ -1,5 +1,14 @@
 import { useMutation } from "@apollo/client";
-import {Button, Form, InputNumber, notification, Popover, Radio, Select, Space,} from "antd";
+import {
+  Button,
+  Form,
+  InputNumber,
+  notification,
+  Popover,
+  Radio,
+  Select,
+  Space,
+} from "antd";
 import axios from "axios";
 import dayjs from "../../utils/day";
 import React, { useState } from "react";
@@ -8,7 +17,10 @@ import {connect} from "react-redux";
 import { useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { INSERT_NEW_JOB } from "../../graphql/jobs.queries";
-import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -390,7 +402,6 @@ export function ContractConvertToRo({
     </div>
   );
 }
-
 export default connect(
   mapStateToProps,
   mapDispatchToProps

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

@@ -3,7 +3,6 @@ import {Button, notification} from "antd";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { GET_JOB_FOR_CC_CONTRACT } from "../../graphql/jobs.queries";
-
 export default function ContractCreateJobPrefillComponent({ jobId, form }) {
   const [call, { loading, error, data }] = useLazyQuery(
     GET_JOB_FOR_CC_CONTRACT

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

@@ -11,7 +11,9 @@ import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import FormDateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
-import InputPhone, {PhoneItemFormatterValidation,} from "../form-items-formatted/phone-form-item.component";
+import InputPhone, {
+  PhoneItemFormatterValidation,
+} from "../form-items-formatted/phone-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import ContractFormJobPrefill from "./contract-form-job-prefill.component";
 
@@ -66,30 +68,7 @@ export default function ContractFormComponent({
             <FormDateTimePicker />
           </Form.Item>
         )}
-                {create && (
+      </LayoutFormRow>
-                    <Form.Item
-                        shouldUpdate={(p, c) => p.scheduledreturn !== c.scheduledreturn}
-                    >
-                        {() => {
-                            const insuranceOver =
-                                selectedCar &&
-                                selectedCar.insuranceexpires &&
-                                dayjs(selectedCar.insuranceexpires)
-                                    .endOf("day")
-                                    .isBefore(dayjs(form.getFieldValue("scheduledreturn")));
-                            if (insuranceOver)
-                                return (
-                                    <Space direction="vertical" style={{color: "tomato"}}>
-                    <span>
-                      <WarningFilled style={{marginRight: ".3rem"}}/>
-                        {t("contracts.labels.insuranceexpired")}
-                    </span>
-                                    </Space>
-                                );
-                            return <></>;
-                        }}
-                    </Form.Item>
-                )}</LayoutFormRow>
       <LayoutFormRow grow>
         <Form.Item
           label={t("contracts.fields.kmstart")}
@@ -111,17 +90,16 @@ export default function ContractFormComponent({
           >
             {() => {
               const mileageOver =
-                                selectedCar && selectedCar.nextservicekm
+                selectedCar &&
-                                    ? selectedCar.nextservicekm <= form.getFieldValue("kmstart")
+                selectedCar.nextservicekm <= form.getFieldValue("kmstart");
-                                    : false;
+
               const dueForService =
                 selectedCar &&
                 selectedCar.nextservicedate &&
-                                dayjs(selectedCar.nextservicedate)
+                dayjs(selectedCar.nextservicedate).isBefore(
-                                    .endOf("day")
-                                    .isSameOrBefore(
                   dayjs(form.getFieldValue("scheduledreturn"))
                 );
+
               if (mileageOver || dueForService)
                 return (
                   <Space direction="vertical" style={{ color: "tomato" }}>

client/src/components/contract-job-block/contract-job-block.component.jsx

@@ -4,7 +4,6 @@ import {useTranslation} from "react-i18next";
 import { Link } from "react-router-dom";
 import DataLabel from "../data-label/data-label.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-
 export default function ContractJobBlock({ job }) {
   const { t } = useTranslation();
   return (

client/src/components/contract-jobs/contract-jobs.container.jsx

@@ -11,7 +11,6 @@ const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
 });
-
 export function ContractJobsContainer({ selectedJobState, bodyshop }) {
   const { loading, error, data } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
     variables: {
@@ -37,5 +36,4 @@ export function ContractJobsContainer({selectedJobState, bodyshop}) {
     />
   );
 }
-
 export default connect(mapStateToProps, null)(ContractJobsContainer);

client/src/components/contract-status-select/contract-status-select.component.jsx

@@ -1,7 +1,6 @@
-import React, {forwardRef, useEffect, useState} from "react";
+import React, { useState, useEffect, forwardRef } from "react";
 import { Select } from "antd";
 import { useTranslation } from "react-i18next";
-
 const { Option } = Select;
 
 const ContractStatusComponent = ({ value, onChange }, ref) => {

client/src/components/contracts-list/contracts-list.component.jsx

@@ -3,7 +3,7 @@ import {Button, Card, Input, Space, Table, Typography} from "antd";
 import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import {Link, useLocation, useNavigate} from "react-router-dom";
+import { Link, useNavigate, useLocation } from "react-router-dom";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";