diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 5082e9758..6bae095d9 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -420,6 +420,37 @@
+
+ bodyshop
+
+
+ errors
+
+
+ loading
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+
+
+
documents
@@ -1069,6 +1100,27 @@
+
+ changestatus
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
convert
false
diff --git a/client/src/App/App.js b/client/src/App/App.js
index 5bf9734bb..a552fb31b 100644
--- a/client/src/App/App.js
+++ b/client/src/App/App.js
@@ -28,14 +28,15 @@ const mapDispatchToProps = dispatch => ({
export default connect(
mapStateToProps,
mapDispatchToProps
-)(({ checkUserSession, currentUser }) => {
+)(({ checkUserSession, currentUser, setBodyshop }) => {
+
useEffect(() => {
checkUserSession();
return () => {};
}, [checkUserSession]);
- if (false)
- i18next.changeLanguage("en_US", (err, t) => {
+ if (currentUser && currentUser.language)
+ i18next.changeLanguage(currentUser.language, (err, t) => {
if (err)
return console.log("Error encountered when changing languages.", err);
});
diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
index 34719d9e3..aeae31c8b 100644
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -1,26 +1,41 @@
import {
Avatar,
+ Badge,
Button,
Checkbox,
Descriptions,
+ Dropdown,
+ Icon,
+ Menu,
notification,
PageHeader,
- Tag,
- Badge
+ Tag
} from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
import Moment from "react-moment";
+import { connect } from "react-redux";
import { Link } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
import CarImage from "../../assets/car.svg";
+import { selectBodyshop } from "../../redux/user/user.selectors";
import CurrencyFormatter from "../../utils/CurrencyFormatter";
-export default function JobsDetailHeader({
+const mapStateToProps = createStructuredSelector({
+ bodyshop: selectBodyshop
+});
+
+export default connect(
+ mapStateToProps,
+ null
+)(function JobsDetailHeader({
job,
mutationConvertJob,
refetch,
handleSubmit,
- scheduleModalState
+ scheduleModalState,
+ bodyshop,
+ updateJobStatus
}) {
const { t } = useTranslation();
const setscheduleModalVisible = scheduleModalState[1];
@@ -60,7 +75,26 @@ export default function JobsDetailHeader({
);
+ const statusmenu = (
+
+ );
+
const menuExtra = [
+
+
+ ,