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

Merge branch 'release/2021-10-22' into test

Browse Source
This commit is contained in:
Patrick Fic
2021-10-21 11:42:33 -07:00
parent 7a025fff42 0b05be841d
commit 445c01499b
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx
View File

@@ -53,6 +53,7 @@ export function ContractConvertToRo({
const billingLines = []; const billingLines = [];
if (contractLength > 0) if (contractLength > 0)
billingLines.push({ billingLines.push({
manual_line:true,
unq_seq: 1, unq_seq: 1,
line_no: 1, line_no: 1,
line_ref: 1, line_ref: 1,
@@ -70,6 +71,7 @@ export function ContractConvertToRo({
contract.kmend - contract.kmstart - contract.dailyfreekm * contractLength; contract.kmend - contract.kmstart - contract.dailyfreekm * contractLength;
if (mileageDiff > 0) { if (mileageDiff > 0) {
billingLines.push({ billingLines.push({
manual_line:true,
unq_seq: 2, unq_seq: 2,
line_no: 2, line_no: 2,
line_ref: 2, line_ref: 2,
@@ -86,6 +88,7 @@ export function ContractConvertToRo({
if (values.refuelqty > 0) { if (values.refuelqty > 0) {
billingLines.push({ billingLines.push({
manual_line:true,
unq_seq: 3, unq_seq: 3,
line_no: 3, line_no: 3,
line_ref: 3, line_ref: 3,
@@ -101,6 +104,7 @@ export function ContractConvertToRo({
} }
if (values.applyCleanupCharge) { if (values.applyCleanupCharge) {
billingLines.push({ billingLines.push({
manual_line:true,
unq_seq: 4, unq_seq: 4,
line_no: 4, line_no: 4,
line_ref: 4, line_ref: 4,
@@ -117,6 +121,7 @@ export function ContractConvertToRo({
if (contract.damagewaiver) { if (contract.damagewaiver) {
//Add for cleanup fee. //Add for cleanup fee.
billingLines.push({ billingLines.push({
manual_line:true,
unq_seq: 5, unq_seq: 5,
line_no: 5, line_no: 5,
line_ref: 5, line_ref: 5,

15
server/scheduling/scheduling-job.js
View File

@@ -87,7 +87,10 @@ exports.job = async (req, res) => {
} else { } else {
//remove the date from the possible list. //remove the date from the possible list.
const appDate = moment(appointment.start).format("yyyy-MM-DD"); const appDate = moment(appointment.start).format("yyyy-MM-DD");
delete bucketMatrix[appDate]; bucketMatrix[appDate] = {
...bucketMatrix[appDate],
blocked: true,
};
} }
}); });
@@ -125,7 +128,9 @@ exports.job = async (req, res) => {
const possibleDates = []; const possibleDates = [];
const bucketMatrixKeys = Object.keys(bucketMatrix); const bucketMatrixKeys = Object.keys(bucketMatrix);
bucketMatrixKeys.forEach((bmkey) => { bucketMatrixKeys.forEach((bmkey) => {
const isShopOpen = workingdays[dayOfWeekMapper(moment(bmkey).day())]; const isShopOpen =
workingdays[dayOfWeekMapper(moment(bmkey).day())] &&
!bucketMatrix[bmkey].blocked;
if ( if (
JobBucket.target > bucketMatrix[bmkey].in - bucketMatrix[bmkey].out && JobBucket.target > bucketMatrix[bmkey].in - bucketMatrix[bmkey].out &&
@@ -134,7 +139,11 @@ exports.job = async (req, res) => {
possibleDates.push(new Date(bmkey).toISOString().substr(0, 10)); possibleDates.push(new Date(bmkey).toISOString().substr(0, 10));
}); });
res.json(possibleDates); if (possibleDates.length < 6) {
res.json(possibleDates);
} else {
res.json(possibleDates.slice(0, 5));
}
} catch (error) { } catch (error) {
logger.log("smart-scheduling-error", "ERROR", req.user.email, jobId, { logger.log("smart-scheduling-error", "ERROR", req.user.email, jobId, {
error, error,