@things-factory/operato-mms 3.8.0 → 3.8.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-server/graphql/resolvers/shipping-provider/shipping-providers.js +1 -1
- package/dist-server/routers/etrax-router.js +2 -2
- package/dist-server/routers/etrax-router.js.map +1 -1
- package/package.json +4 -4
- package/server/graphql/resolvers/shipping-provider/shipping-providers.ts +1 -1
- package/server/routers/etrax-router.ts +2 -2
|
@@ -14,7 +14,7 @@ exports.shippingProviders = {
|
|
|
14
14
|
})})`;
|
|
15
15
|
}
|
|
16
16
|
let items = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).query(`
|
|
17
|
-
SELECT DISTINCT shipping_provider FROM marketplace_orders WHERE domain_id = '${domain.id}' AND marketplace_store_id = '${params.storeId}'
|
|
17
|
+
SELECT DISTINCT shipping_provider FROM marketplace_orders WHERE domain_id = '${domain.id}' AND marketplace_store_id = '${params.storeId}' AND shipping_provider IS NOT null AND shipping_provider != ''
|
|
18
18
|
` + statusFilter);
|
|
19
19
|
items = items.map(e => {
|
|
20
20
|
const { shipping_provider: shippingProvider } = e;
|
|
@@ -47,7 +47,7 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
47
47
|
Code: 302,
|
|
48
48
|
Message: 'Validate failed'
|
|
49
49
|
};
|
|
50
|
-
context.
|
|
50
|
+
context.body = JSON.stringify(resp);
|
|
51
51
|
return;
|
|
52
52
|
}
|
|
53
53
|
//TAS - Transporter Assignment Success
|
|
@@ -80,7 +80,7 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
80
80
|
Code: 200,
|
|
81
81
|
Message: 'Updated'
|
|
82
82
|
};
|
|
83
|
-
context.
|
|
83
|
+
context.body = JSON.stringify(resp);
|
|
84
84
|
//let orderShipping: MarketplaceOrderShipping = orderItemRepo.find({})
|
|
85
85
|
//await orderItemRepo.save(orderItem)
|
|
86
86
|
//await orderShippingRepo.save(orderShipping)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"etrax-router.js","sourceRoot":"","sources":["../../server/routers/etrax-router.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA+B;AAC/B,qCAAuC;AAEvC,qEAAyE;AACzE,qFAAoF;AACpF,uEAAmH;AAEnH,qHAAqH;AAErH,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,4BAA4B,CAAC,CAAA;AAC/C,QAAA,WAAW,GAAG,IAAI,oBAAM,EAAE,CAAA;AAEvC,mBAAW,CAAC,IAAI,CAAC,0BAA0B,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACnE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IACtC,MAAM,IAAI,GAAG,IAAA,uBAAa,EAAC,kCAAgB,CAAC,CAAA;IAC5C,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAA;IACxC,KAAK,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAA;IAE/C,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAA;IACnC,MAAM,aAAa,GAAG,WAAW,CAAC,SAAS,CAAA;IAC3C,MAAM,YAAY,GAAG,WAAW,CAAC,QAAQ,CAAA;IACzC,MAAM,UAAU,GAAG,WAAW,CAAC,UAAU,CAAA;IACzC,MAAM,UAAU,GAAG,WAAW,CAAC,UAAU,CAAA;IACzC,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAA;IACjC,MAAM,YAAY,GAAG,WAAW,CAAC,YAAY,CAAA,CAAC,gBAAgB;IAC9D,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAA;IAEjC,MAAM,YAAY,GAAG,YAAY,CAAA;IACjC,MAAM,GAAG,GAAqB,MAAM,IAAI,CAAC,OAAO,CAAC;QAC/C,KAAK,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE;KACvD,CAAC,CAAA;IACF,KAAK,CAAC,GAAG,CAAC,CAAA;IAEV,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAA;IAE/B,IAAI,YAAY,KAAK,EAAE,IAAI,SAAS,KAAK,EAAE,EAAE;QAC3C,8BAA8B;QAC9B,OAAM;KACP;IAED,MAAM,KAAK,GAAG,IAAI,uBAAK,CAAC,YAAY,CAAC,CAAA;IACrC,KAAK,CAAC,eAAe,EAAE,WAAW,CAAC,CAAA;IACnC,gBAAgB;IAChB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,SAAS,EAAE,eAAe,EAAE,aAAa,CAAC,CAAA;IACrF,KAAK,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAA;IAEpC,IAAI,CAAC,QAAQ,EAAE;QACb,qBAAqB;QACrB,MAAM,IAAI,GAAG;YACX,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,iBAAiB;SAC3B,CAAA;QACD,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"etrax-router.js","sourceRoot":"","sources":["../../server/routers/etrax-router.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-mms",
|
|
3
|
-
"version": "3.8.
|
|
3
|
+
"version": "3.8.1",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"@things-factory/notification": "^3.8.0",
|
|
67
67
|
"@things-factory/oauth2-client": "^3.8.0",
|
|
68
68
|
"@things-factory/pdf": "^3.7.5",
|
|
69
|
-
"@things-factory/product-base": "^3.8.
|
|
69
|
+
"@things-factory/product-base": "^3.8.1",
|
|
70
70
|
"@things-factory/resource-ui": "^3.8.0",
|
|
71
71
|
"@things-factory/scene-chartjs": "^3.7.5",
|
|
72
72
|
"@things-factory/scene-clock": "^3.7.5",
|
|
@@ -99,11 +99,11 @@
|
|
|
99
99
|
"@things-factory/scene-wheel-sorter": "^3.7.5",
|
|
100
100
|
"@things-factory/setting-ui": "^3.8.0",
|
|
101
101
|
"@things-factory/system-ui": "^3.8.0",
|
|
102
|
-
"@things-factory/warehouse-base": "^3.8.
|
|
102
|
+
"@things-factory/warehouse-base": "^3.8.1"
|
|
103
103
|
},
|
|
104
104
|
"devDependencies": {
|
|
105
105
|
"@things-factory/builder": "^3.7.5",
|
|
106
106
|
"@types/node-fetch": "^2.5.7"
|
|
107
107
|
},
|
|
108
|
-
"gitHead": "
|
|
108
|
+
"gitHead": "2f2534de2c0866a693f6ec9949b35a5a0e65065f"
|
|
109
109
|
}
|
|
@@ -17,7 +17,7 @@ export const shippingProviders = {
|
|
|
17
17
|
|
|
18
18
|
let items: any[] = await getRepository(MarketplaceOrder).query(
|
|
19
19
|
`
|
|
20
|
-
SELECT DISTINCT shipping_provider FROM marketplace_orders WHERE domain_id = '${domain.id}' AND marketplace_store_id = '${params.storeId}'
|
|
20
|
+
SELECT DISTINCT shipping_provider FROM marketplace_orders WHERE domain_id = '${domain.id}' AND marketplace_store_id = '${params.storeId}' AND shipping_provider IS NOT null AND shipping_provider != ''
|
|
21
21
|
` + statusFilter
|
|
22
22
|
)
|
|
23
23
|
|
|
@@ -51,7 +51,7 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
51
51
|
Code: 302,
|
|
52
52
|
Message: 'Validate failed'
|
|
53
53
|
}
|
|
54
|
-
context.
|
|
54
|
+
context.body = JSON.stringify(resp)
|
|
55
55
|
return
|
|
56
56
|
}
|
|
57
57
|
|
|
@@ -93,7 +93,7 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
93
93
|
Code: 200,
|
|
94
94
|
Message: 'Updated'
|
|
95
95
|
}
|
|
96
|
-
context.
|
|
96
|
+
context.body = JSON.stringify(resp)
|
|
97
97
|
//let orderShipping: MarketplaceOrderShipping = orderItemRepo.find({})
|
|
98
98
|
//await orderItemRepo.save(orderItem)
|
|
99
99
|
//await orderShippingRepo.save(orderShipping)
|