diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 970bef3ff..b52de475e 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1009,6 +1009,27 @@
+
+ smspaymentreminder
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
suggesteddates
false
@@ -1516,6 +1537,27 @@
+
+ failedpayment
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
jobassignmentchange
false
@@ -8389,6 +8431,27 @@
ssbuckets
+
+ color
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
gte
false
@@ -18947,6 +19010,325 @@
+
+ job_payments
+
+
+ buttons
+
+
+ goback
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ proceedtopayment
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ refundpayment
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+
+
+ notifications
+
+
+ error
+
+
+ description
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ title
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+
+
+
+
+ titles
+
+
+ amount
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ dateOfPayment
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ descriptions
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ payer
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ payername
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ paymentid
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ paymenttype
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ refundamount
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ transactionid
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+
+
+
joblines
@@ -32119,6 +32501,27 @@
+
+ entercardpayment
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
enterpayment
false
@@ -32350,6 +32753,27 @@
+
+ paymentremindersms
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
phonebook
false
@@ -34158,6 +34582,179 @@
+
+ type
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ types
+
+
+ customer
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ general
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ office
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ paint
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ parts
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ shop
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ supplement
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+
updatedat
false
@@ -40461,6 +41058,27 @@
+
+ cardcolor
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
cardsettings
false
@@ -40671,6 +41289,27 @@
+
+ legend
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
note
false
diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
index 108a3e89f..b48deb3b5 100644
--- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
+++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
@@ -219,13 +219,15 @@ export function JobsConvertButton({
)}
-
-
-
+ {bodyshop.region_config.toLowerCase().startsWith("ca") && (
+
+
+
+ )}
-
-
-
+ {bodyshop.region_config.toLowerCase().startsWith("ca") && (
+
+
+
+ )}
-
-
-
-
-
+ {bodyshop.region_config.toLowerCase().startsWith("ca") && (
+
+
+
+
+
+ )}
-
-
-
-
-
-
+ {bodyshop.region_config === "CA_BC" && (
+
+
+
+
+
+
+ )}
-
-
-
+ {bodyshop.region_config.toLowerCase().startsWith("ca") && (
+
+
+
+ )}
),
},
+ {
+ title: t("notes.fields.type"),
+ dataIndex: "type",
+ key: "type",
+ width: 120,
+ filteredValue: filter?.type || null,
+ filters: [
+ { value: "general", text: t("notes.fields.types.general") },
+ { value: "customer", text: t("notes.fields.types.customer") },
+ { value: "shop", text: t("notes.fields.types.shop") },
+ { value: "office", text: t("notes.fields.types.office") },
+ { value: "parts", text: t("notes.fields.types.parts") },
+ { value: "paint", text: t("notes.fields.types.paint") },
+ {
+ value: "supplement",
+ text: t("notes.fields.types.supplement"),
+ },
+ ],
+ onFilter: (value, record) => value.includes(record.type),
+ render: (text, record) => t(`notes.fields.types.${record.type}`),
+ },
{
title: t("notes.fields.text"),
dataIndex: "text",
@@ -106,7 +127,7 @@ export function JobNotesComponent({
title: t("notes.actions.actions"),
dataIndex: "actions",
key: "actions",
- width: 150,
+ width: 200,
render: (text, record) => (