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

IO-969 Phonebook insert error fix.

Browse Source
This commit is contained in:
Patrick Fic
2021-04-29 11:29:26 -07:00
parent 1bda972094
commit 4982e3ce4e
7 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
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
@@ -27072,6 +27072,48 @@
<folder_node> <folder_node>
<name>fields</name> <name>fields</name>
<children> <children>
<concept_node>
<name>address1</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>
<name>address2</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>category</name> <name>category</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -27303,48 +27345,6 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>street1</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>
<name>street2</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>
</children> </children>
</folder_node> </folder_node>
<folder_node> <folder_node>

4
client/src/components/phonebook-form/phonebook-form.component.jsx
View File

@@ -58,10 +58,10 @@ export default function PhonebookFormComponent({
<Form.Item label={t("phonebook.fields.category")} name="category"> <Form.Item label={t("phonebook.fields.category")} name="category">
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item label={t("phonebook.fields.street1")} name="street1"> <Form.Item label={t("phonebook.fields.address1")} name="address1">
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item label={t("phonebook.fields.street2")} name="street2"> <Form.Item label={t("phonebook.fields.address2")} name="address2">
<Input /> <Input />
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow>

6
client/src/index.js
View File

@@ -14,8 +14,8 @@ import AppContainer from "./App/App.container";
import LoadingSpinner from "./components/loading-spinner/loading-spinner.component"; import LoadingSpinner from "./components/loading-spinner/loading-spinner.component";
import "./index.css"; import "./index.css";
import { persistor, store } from "./redux/store"; import { persistor, store } from "./redux/store";
import * as serviceWorkerRegistration from "./serviceWorkerRegistration";
import reportWebVitals from "./reportWebVitals"; import reportWebVitals from "./reportWebVitals";
import * as serviceWorkerRegistration from "./serviceWorkerRegistration";
import "./translations/i18n"; import "./translations/i18n";
import "./utils/CleanAxios"; import "./utils/CleanAxios";
require("dotenv").config(); require("dotenv").config();
@@ -55,7 +55,7 @@ ReactDOM.render(
const onServiceWorkerUpdate = (registration) => { const onServiceWorkerUpdate = (registration) => {
console.log("onServiceWorkerUpdate", registration); console.log("onServiceWorkerUpdate", registration);
const key = `open${Date.now()}`;
const btn = ( const btn = (
<Button <Button
type="primary" type="primary"
@@ -79,7 +79,7 @@ const onServiceWorkerUpdate = (registration) => {
description: i18n.t("general.messages.newversionmessage"), description: i18n.t("general.messages.newversionmessage"),
duration: 0, duration: 0,
btn, btn,
key, key: "updateavailable",
}); });
}; };

6
client/src/pages/phonebook/phonebook.page.component.jsx
View File

@@ -99,9 +99,9 @@ export function PhonebookPageComponent({ bodyshop }) {
render: (text, record) => <ChatOpenButton phone={text} />, render: (text, record) => <ChatOpenButton phone={text} />,
}, },
{ {
title: t("phonebook.fields.street1"), title: t("phonebook.fields.address1"),
dataIndex: "street1", dataIndex: "address1",
key: "street1", key: "address1",
}, },
{ {
title: t("phonebook.fields.city"), title: t("phonebook.fields.city"),

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

@@ -1623,6 +1623,8 @@
"saving": "Error saving phonebook entry. {{error}}" "saving": "Error saving phonebook entry. {{error}}"
}, },
"fields": { "fields": {
"address1": "Street 1",
"address2": "Street 2",
"category": "Category", "category": "Category",
"city": "City", "city": "City",
"company": "Company", "company": "Company",
@@ -1633,9 +1635,7 @@
"lastname": "Last Name", "lastname": "Last Name",
"phone1": "Phone 1", "phone1": "Phone 1",
"phone2": "Phone 2", "phone2": "Phone 2",
"state": "state", "state": "state"
"street1": "Street 1",
"street2": "Street 2"
}, },
"labels": { "labels": {
"vendorcategory": "Vendor" "vendorcategory": "Vendor"

6
client/src/translations/es/common.json
View File

@@ -1623,6 +1623,8 @@
"saving": "" "saving": ""
}, },
"fields": { "fields": {
"address1": "",
"address2": "",
"category": "", "category": "",
"city": "", "city": "",
"company": "", "company": "",
@@ -1633,9 +1635,7 @@
"lastname": "", "lastname": "",
"phone1": "", "phone1": "",
"phone2": "", "phone2": "",
"state": "", "state": ""
"street1": "",
"street2": ""
}, },
"labels": { "labels": {
"vendorcategory": "" "vendorcategory": ""

6
client/src/translations/fr/common.json
View File

@@ -1623,6 +1623,8 @@
"saving": "" "saving": ""
}, },
"fields": { "fields": {
"address1": "",
"address2": "",
"category": "", "category": "",
"city": "", "city": "",
"company": "", "company": "",
@@ -1633,9 +1635,7 @@
"lastname": "", "lastname": "",
"phone1": "", "phone1": "",
"phone2": "", "phone2": "",
"state": "", "state": ""
"street1": "",
"street2": ""
}, },
"labels": { "labels": {
"vendorcategory": "" "vendorcategory": ""