IO-70 Add basic functions of OEC.
This commit is contained in:
@@ -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
|
||||||
@@ -30837,6 +30837,27 @@
|
|||||||
</translation>
|
</translation>
|
||||||
</translations>
|
</translations>
|
||||||
</concept_node>
|
</concept_node>
|
||||||
|
<concept_node>
|
||||||
|
<name>oec</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>
|
||||||
@@ -31330,6 +31351,27 @@
|
|||||||
</translation>
|
</translation>
|
||||||
</translations>
|
</translations>
|
||||||
</concept_node>
|
</concept_node>
|
||||||
|
<concept_node>
|
||||||
|
<name>oec</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>orderhistory</name>
|
<name>orderhistory</name>
|
||||||
<definition_loaded>false</definition_loaded>
|
<definition_loaded>false</definition_loaded>
|
||||||
|
|||||||
@@ -228,7 +228,6 @@ export function PartsOrderModalContainer({
|
|||||||
id: insertResult.data.insert_parts_orders.returning[0].id,
|
id: insertResult.data.insert_parts_orders.returning[0].id,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
console.log("🚀 ~ file: parts-order-modal.container.jsx ~ line 231 ~ handleFinish ~ partsOrder", partsOrder)
|
|
||||||
|
|
||||||
const oecResponse = await axios.post(
|
const oecResponse = await axios.post(
|
||||||
"http://localhost:1337/oec/",
|
"http://localhost:1337/oec/",
|
||||||
@@ -240,11 +239,17 @@ export function PartsOrderModalContainer({
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
console.log(
|
|
||||||
"🚀 ~ file: parts-order-modal.container.jsx ~ line 232 ~ handleFinish ~ oecResponse",
|
if (oecResponse.data && oecResponse.data.success === false) {
|
||||||
oecResponse
|
notification.open({
|
||||||
);
|
type: "error",
|
||||||
return;
|
message: t("parts_orders.errors.oec", {
|
||||||
|
error: oecResponse.data.error,
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log("Error OEC.", error);
|
console.log("Error OEC.", error);
|
||||||
notification["error"]({
|
notification["error"]({
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ export const QUERY_PARTS_ORDER_OEC = gql`
|
|||||||
parts_orders_by_pk(id: $id) {
|
parts_orders_by_pk(id: $id) {
|
||||||
parts_order_lines {
|
parts_order_lines {
|
||||||
jobline {
|
jobline {
|
||||||
|
tran_code
|
||||||
act_price
|
act_price
|
||||||
db_ref
|
db_ref
|
||||||
db_price
|
db_price
|
||||||
@@ -70,6 +71,10 @@ export const QUERY_PARTS_ORDER_OEC = gql`
|
|||||||
quantity
|
quantity
|
||||||
}
|
}
|
||||||
job {
|
job {
|
||||||
|
bodyshop{
|
||||||
|
shopname
|
||||||
|
bill_tax_rates
|
||||||
|
}
|
||||||
ro_number
|
ro_number
|
||||||
clm_no
|
clm_no
|
||||||
asgn_no
|
asgn_no
|
||||||
|
|||||||
@@ -1833,7 +1833,8 @@
|
|||||||
"errors": {
|
"errors": {
|
||||||
"associatedbills": "This parts order cannot",
|
"associatedbills": "This parts order cannot",
|
||||||
"backordering": "Error backordering part {{message}}.",
|
"backordering": "Error backordering part {{message}}.",
|
||||||
"creating": "Error encountered when creating parts order. "
|
"creating": "Error encountered when creating parts order. ",
|
||||||
|
"oec": "Error creating EMS files for OEC. {{error}}"
|
||||||
},
|
},
|
||||||
"fields": {
|
"fields": {
|
||||||
"act_price": "Price",
|
"act_price": "Price",
|
||||||
@@ -1861,6 +1862,7 @@
|
|||||||
"email": "Send by Email",
|
"email": "Send by Email",
|
||||||
"inthisorder": "Parts in this Order",
|
"inthisorder": "Parts in this Order",
|
||||||
"newpartsorder": "New Parts Order",
|
"newpartsorder": "New Parts Order",
|
||||||
|
"oec": "Order via OEC",
|
||||||
"orderhistory": "Order History",
|
"orderhistory": "Order History",
|
||||||
"parts_orders": "Parts Orders",
|
"parts_orders": "Parts Orders",
|
||||||
"print": "Show Printed Form",
|
"print": "Show Printed Form",
|
||||||
|
|||||||
@@ -1833,7 +1833,8 @@
|
|||||||
"errors": {
|
"errors": {
|
||||||
"associatedbills": "",
|
"associatedbills": "",
|
||||||
"backordering": "",
|
"backordering": "",
|
||||||
"creating": "Se encontró un error al crear el pedido de piezas."
|
"creating": "Se encontró un error al crear el pedido de piezas.",
|
||||||
|
"oec": ""
|
||||||
},
|
},
|
||||||
"fields": {
|
"fields": {
|
||||||
"act_price": "",
|
"act_price": "",
|
||||||
@@ -1861,6 +1862,7 @@
|
|||||||
"email": "Enviar por correo electrónico",
|
"email": "Enviar por correo electrónico",
|
||||||
"inthisorder": "Partes en este pedido",
|
"inthisorder": "Partes en este pedido",
|
||||||
"newpartsorder": "",
|
"newpartsorder": "",
|
||||||
|
"oec": "",
|
||||||
"orderhistory": "Historial de pedidos",
|
"orderhistory": "Historial de pedidos",
|
||||||
"parts_orders": "",
|
"parts_orders": "",
|
||||||
"print": "Mostrar formulario impreso",
|
"print": "Mostrar formulario impreso",
|
||||||
|
|||||||
@@ -1833,7 +1833,8 @@
|
|||||||
"errors": {
|
"errors": {
|
||||||
"associatedbills": "",
|
"associatedbills": "",
|
||||||
"backordering": "",
|
"backordering": "",
|
||||||
"creating": "Erreur rencontrée lors de la création de la commande de pièces."
|
"creating": "Erreur rencontrée lors de la création de la commande de pièces.",
|
||||||
|
"oec": ""
|
||||||
},
|
},
|
||||||
"fields": {
|
"fields": {
|
||||||
"act_price": "",
|
"act_price": "",
|
||||||
@@ -1861,6 +1862,7 @@
|
|||||||
"email": "Envoyé par email",
|
"email": "Envoyé par email",
|
||||||
"inthisorder": "Pièces dans cette commande",
|
"inthisorder": "Pièces dans cette commande",
|
||||||
"newpartsorder": "",
|
"newpartsorder": "",
|
||||||
|
"oec": "",
|
||||||
"orderhistory": "Historique des commandes",
|
"orderhistory": "Historique des commandes",
|
||||||
"parts_orders": "",
|
"parts_orders": "",
|
||||||
"print": "Afficher le formulaire imprimé",
|
"print": "Afficher le formulaire imprimé",
|
||||||
|
|||||||
@@ -2160,6 +2160,7 @@
|
|||||||
- sublet_completed
|
- sublet_completed
|
||||||
- sublet_ignored
|
- sublet_ignored
|
||||||
- tax_part
|
- tax_part
|
||||||
|
- tran_code
|
||||||
- unq_seq
|
- unq_seq
|
||||||
- updated_at
|
- updated_at
|
||||||
select_permissions:
|
select_permissions:
|
||||||
@@ -2221,6 +2222,7 @@
|
|||||||
- sublet_completed
|
- sublet_completed
|
||||||
- sublet_ignored
|
- sublet_ignored
|
||||||
- tax_part
|
- tax_part
|
||||||
|
- tran_code
|
||||||
- unq_seq
|
- unq_seq
|
||||||
- updated_at
|
- updated_at
|
||||||
filter:
|
filter:
|
||||||
@@ -2293,6 +2295,7 @@
|
|||||||
- sublet_completed
|
- sublet_completed
|
||||||
- sublet_ignored
|
- sublet_ignored
|
||||||
- tax_part
|
- tax_part
|
||||||
|
- tran_code
|
||||||
- unq_seq
|
- unq_seq
|
||||||
- updated_at
|
- updated_at
|
||||||
filter:
|
filter:
|
||||||
@@ -2305,7 +2308,16 @@
|
|||||||
_eq: X-Hasura-User-Id
|
_eq: X-Hasura-User-Id
|
||||||
- active:
|
- active:
|
||||||
_eq: true
|
_eq: true
|
||||||
check: null
|
check:
|
||||||
|
job:
|
||||||
|
bodyshop:
|
||||||
|
associations:
|
||||||
|
_and:
|
||||||
|
- user:
|
||||||
|
authid:
|
||||||
|
_eq: X-Hasura-User-Id
|
||||||
|
- active:
|
||||||
|
_eq: true
|
||||||
delete_permissions:
|
delete_permissions:
|
||||||
- role: user
|
- role: user
|
||||||
permission:
|
permission:
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
-- Could not auto-generate a down migration.
|
||||||
|
-- Please write an appropriate down migration for the SQL below:
|
||||||
|
-- alter table "public"."joblines" add column "tran_code" text
|
||||||
|
-- null;
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
alter table "public"."joblines" add column "tran_code" text
|
||||||
|
null;
|
||||||
Reference in New Issue
Block a user