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

Merged in feature/america (pull request #847)

Browse Source 
Feature/america
This commit is contained in:
Patrick Fic
2023-06-06 23:04:34 +00:00
parent a4abaed30a bccfc127f3
commit 9d503b12e6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/redux/user/user.sagas.js
View File

@@ -230,7 +230,7 @@ export function* onSendPasswordResetStart() {
export function* sendPasswordResetEmailSaga({ payload }) { export function* sendPasswordResetEmailSaga({ payload }) {
try { try {
yield sendPasswordResetEmail(auth, payload, { yield sendPasswordResetEmail(auth, payload, {
url: "https://imex.online/passwordreset", url: "https://romeonline.io/passwordreset",
}); });
yield put(sendPasswordResetSuccess()); yield put(sendPasswordResetSuccess());

2
server/job/job-totals.js
View File

@@ -277,7 +277,7 @@ async function CalculateRatesTotals({ job, client }) {
amount: Math.round((item.act_price || 0) * 100), amount: Math.round((item.act_price || 0) * 100),
}); });
} }
if (item.line_desc.toLowerCase().includes("hazardous waste")) { if (item.line_desc?.toLowerCase().includes("hazardous waste")) {
hasMahwLine = item; hasMahwLine = item;
} }