Compare commits
10 Commits
feature/IO
...
feature/IO
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ddd816e7ca | ||
|
|
d646e5f285 | ||
|
|
ba683a2e8a | ||
|
|
5209c12b89 | ||
|
|
cd6e0dcde3 | ||
|
|
a2822f5592 | ||
|
|
eee135f4ef | ||
|
|
de92b2d47e | ||
|
|
5d7384aa8b | ||
|
|
bf18e687da |
@@ -239,12 +239,7 @@ export function JobsDetailHeaderActions({
|
||||
|
||||
setTimeTicketContext({
|
||||
actions: {},
|
||||
context: {
|
||||
jobId: job.id,
|
||||
created_by: currentUser.displayName
|
||||
? currentUser.email.concat(" | ", currentUser.displayName)
|
||||
: currentUser.email,
|
||||
},
|
||||
context: { jobId: job.id },
|
||||
});
|
||||
}}
|
||||
>
|
||||
|
||||
@@ -113,6 +113,8 @@ export function PartsOrderListTableComponent({
|
||||
id: pol.id,
|
||||
line_desc: pol.line_desc,
|
||||
quantity: pol.quantity,
|
||||
act_price: pol.act_price,
|
||||
oem_partno: pol.oem_partno,
|
||||
};
|
||||
}),
|
||||
},
|
||||
|
||||
@@ -79,6 +79,20 @@ export function PartsReceiveModalComponent({ bodyshop, form }) {
|
||||
>
|
||||
<Input />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
label={t("joblines.fields.oem_partno")}
|
||||
key={`${index}oem_partno`}
|
||||
name={[field.name, "oem_partno"]}
|
||||
>
|
||||
<Input disabled />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
label={t("joblines.fields.act_price")}
|
||||
key={`${index}act_price`}
|
||||
name={[field.name, "act_price"]}
|
||||
>
|
||||
<Input disabled />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
label={t("joblines.fields.location")}
|
||||
key={`${index}location`}
|
||||
|
||||
@@ -1040,7 +1040,7 @@ export const TemplateList = (type, context) => {
|
||||
disabled: false,
|
||||
rangeFilter: {
|
||||
object: i18n.t("reportcenter.labels.objects.jobs"),
|
||||
field: i18n.t("jobs.fields.date_open"),
|
||||
field: i18n.t("jobs.fields.date_invoiced"),
|
||||
},
|
||||
group: "jobs",
|
||||
},
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
DROP INDEX IF EXISTS "public"."parts_dispatch_employeeid";
|
||||
@@ -0,0 +1,2 @@
|
||||
CREATE INDEX "parts_dispatch_employeeid" on
|
||||
"public"."parts_dispatch" using btree ("employeeid");
|
||||
@@ -0,0 +1 @@
|
||||
DROP INDEX IF EXISTS "public"."parts_dispatch_dispatchid";
|
||||
@@ -0,0 +1,2 @@
|
||||
CREATE INDEX "parts_dispatch_dispatchid" on
|
||||
"public"."parts_dispatch_lines" using btree ("partsdispatchid");
|
||||
@@ -0,0 +1 @@
|
||||
DROP INDEX IF EXISTS "public"."parts_dispatch_line_accepted_at";
|
||||
@@ -0,0 +1,2 @@
|
||||
CREATE INDEX "parts_dispatch_line_accepted_at" on
|
||||
"public"."parts_dispatch_lines" using btree ("accepted_at");
|
||||
@@ -620,6 +620,7 @@ exports.QUERY_EMPLOYEE_PIN = `query QUERY_EMPLOYEE_PIN($shopId: uuid!, $employee
|
||||
employee_number
|
||||
id
|
||||
pin
|
||||
active
|
||||
}
|
||||
}`;
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ exports.techLogin = async (req, res) => {
|
||||
let technician;
|
||||
if (result.employees && result.employees[0]) {
|
||||
const dbRecord = result.employees[0];
|
||||
if (dbRecord.pin === pin) {
|
||||
if (dbRecord.pin === pin && dbRecord.active === true) {
|
||||
valid = true;
|
||||
delete dbRecord.pin;
|
||||
technician = dbRecord;
|
||||
|
||||
Reference in New Issue
Block a user