admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/2025-08-15' into feature/IO-3255-simplified-part-management

Browse Source
This commit is contained in:
Dave Richer
2025-08-12 13:51:59 -04:00
parent c4649b2fc6 2b40793c77
commit de6bb3d634
3 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
bodyshop_translations.babel
View File

@@ -1,4 +1,4 @@
<babeledit_project be_version="2.7.1" version="1.2"> <babeledit_project version="1.2" be_version="2.7.1">
<!-- <!--
BabelEdit project file BabelEdit project file
@@ -8472,6 +8472,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>responsibilitycenter</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>templates</name> <name>templates</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -65702,7 +65723,7 @@
<primary_language>en-US</primary_language> <primary_language>en-US</primary_language>
<configuration> <configuration>
<definitions>.</definitions> <definitions>.</definitions>
<indent>tab</indent> <indent>space2</indent>
<format>namespaced-json</format> <format>namespaced-json</format>
<support_arrays>true</support_arrays> <support_arrays>true</support_arrays>
</configuration> </configuration>

6
client/src/components/payment-expanded-row/payment-expanded-row.component.jsx
View File

@@ -16,10 +16,10 @@ import { useNotification } from "../../contexts/Notifications/notificationContex
const { confirm } = Modal; const { confirm } = Modal;
const openNotificationWithIcon = (type, t, notification) => { const openNotificationWithIcon = (type, t, notification, message) => {
notification[type]({ notification[type]({
message: t("job_payments.notifications.error.title"), message: t("job_payments.notifications.error.title"),
description: t("job_payments.notifications.error.description") description: t("job_payments.notifications.error.description", { message: message || "Unknown error." })
}); });
}; };
@@ -99,7 +99,7 @@ const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
}); });
if (refundResponse.data.status < 0) { if (refundResponse.data.status < 0) {
openNotificationWithIcon("error", t, notification); openNotificationWithIcon("error", t, notification, refundResponse.data.message);
return; return;
} }

4
client/src/translations/en_us/common.json
View File

@@ -1458,9 +1458,9 @@
}, },
"notifications": { "notifications": {
"error": { "error": {
"description": "Please try again. Make sure the refund amount does not exceeds the payment amount.", "description": "An error has occurred processing the refund: {{message}}",
"openingip": "Error connecting to IntelliPay service.", "openingip": "Error connecting to IntelliPay service.",
"title": "Error placing refund" "title": "Error issuing refund"
} }
}, },
"titles": { "titles": {