From 758090f0d5d87efd6c92cec4dc4482ee4c7d9cd1 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Mon, 8 Feb 2021 12:15:42 -0800 Subject: [PATCH] Added reconciliation clear all IO-607 --- bodyshop_translations.babel | 63 +++++++------------ .../job-reconciliation-totals.component.jsx | 8 +++ client/src/translations/en_us/common.json | 3 +- client/src/translations/es/common.json | 3 +- client/src/translations/fr/common.json | 3 +- 5 files changed, 32 insertions(+), 48 deletions(-) diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 525f8ac33..277d3e368 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -14424,27 +14424,6 @@ - - date_closed - false - - - - - - en-US - false - - - es-MX - false - - - fr-CA - false - - - date_estimated false @@ -18940,6 +18919,27 @@ + + clear + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + joblinestotal false @@ -19535,27 +19535,6 @@ - - created_subtitle - false - - - - - - en-US - false - - - es-MX - false - - - fr-CA - false - - - creatednoclick false diff --git a/client/src/components/job-reconciliation-totals/job-reconciliation-totals.component.jsx b/client/src/components/job-reconciliation-totals/job-reconciliation-totals.component.jsx index a5786e911..a101c9fb9 100644 --- a/client/src/components/job-reconciliation-totals/job-reconciliation-totals.component.jsx +++ b/client/src/components/job-reconciliation-totals/job-reconciliation-totals.component.jsx @@ -82,6 +82,14 @@ export default function JobReconciliationTotals({ > {t("jobs.labels.reconciliation.byprice")} + {errors.length > 0 && (
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 3759066f8..05f076ac5 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -915,7 +915,6 @@ "clm_total": "Claim Total", "csr": "Customer Service Rep.", "customerowing": "Customer Owing", - "date_closed": "Closed", "date_estimated": "Date Estimated", "date_exported": "Exported", "date_invoiced": "Invoiced", @@ -1145,6 +1144,7 @@ "billlinestotal": "Bill Lines Total", "byassoc": "By Line Association", "byprice": "By Price", + "clear": "Clear All", "joblinestotal": "Job Lines Total", "multipleactprices": "${{act_price}} is the price for multiple job lines.", "multiplebilllines": "{{line_desc}} has 2 or more bill lines associated to it.", @@ -1176,7 +1176,6 @@ "closed": "Job closed successfully.", "converted": "Job converted successfully.", "created": "Job created successfully. Click to view.", - "created_subtitle": "Estimate Number {{est_number}} has been created.", "creatednoclick": "Job created successfully. ", "delete": "Job deleted successfully.", "deleted": "Job deleted successfully.", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index bd30fcb83..f91c2d312 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -915,7 +915,6 @@ "clm_total": "Reclamar total", "csr": "Representante de servicio al cliente.", "customerowing": "Cliente debido", - "date_closed": "Cerrado", "date_estimated": "Fecha estimada", "date_exported": "Exportado", "date_invoiced": "Facturado", @@ -1145,6 +1144,7 @@ "billlinestotal": "", "byassoc": "", "byprice": "", + "clear": "", "joblinestotal": "", "multipleactprices": "", "multiplebilllines": "", @@ -1176,7 +1176,6 @@ "closed": "", "converted": "Trabajo convertido con éxito.", "created": "Trabajo creado con éxito. Click para ver.", - "created_subtitle": "", "creatednoclick": "", "delete": "", "deleted": "Trabajo eliminado con éxito.", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 132df8ee7..cf3d24f34 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -915,7 +915,6 @@ "clm_total": "Total réclamation", "csr": "représentant du service à la clientèle", "customerowing": "Client propriétaire", - "date_closed": "Fermé", "date_estimated": "Date estimée", "date_exported": "Exportés", "date_invoiced": "Facturé", @@ -1145,6 +1144,7 @@ "billlinestotal": "", "byassoc": "", "byprice": "", + "clear": "", "joblinestotal": "", "multipleactprices": "", "multiplebilllines": "", @@ -1176,7 +1176,6 @@ "closed": "", "converted": "Travail converti avec succès.", "created": "Le travail a été créé avec succès. Clique pour voir.", - "created_subtitle": "", "creatednoclick": "", "delete": "", "deleted": "Le travail a bien été supprimé.",