Admin related fixes
This commit is contained in:
1 parent
6c8dd1aebd
commit
238e9183a9
3 files changed
+5
-6
No files matched your search
@@ -3,7 +3,8 @@ export default async (req, res) => {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const orderService = req.scope.resolve("orderService")
|
const orderService = req.scope.resolve("orderService")
|
||||||
const order = await orderService.archive(id)
|
let order = await orderService.archive(id)
|
||||||
|
order = await orderService.decorate(order, [], ["region"])
|
||||||
res.json({ order })
|
res.json({ order })
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
throw error
|
throw error
|
||||||
|
|||||||
@@ -252,21 +252,19 @@ class OrderService extends BaseService {
|
|||||||
// Run all other registered events
|
// Run all other registered events
|
||||||
const completeOrderJob = await this.eventBus_.emit(
|
const completeOrderJob = await this.eventBus_.emit(
|
||||||
OrderService.Events.COMPLETED,
|
OrderService.Events.COMPLETED,
|
||||||
result
|
order
|
||||||
)
|
)
|
||||||
|
|
||||||
await completeOrderJob.finished().catch(error => {
|
await completeOrderJob.finished().catch(error => {
|
||||||
throw error
|
throw error
|
||||||
})
|
})
|
||||||
|
|
||||||
return this.orderModel_
|
return this.orderModel_.updateOne(
|
||||||
.updateOne(
|
|
||||||
{ _id: order._id },
|
{ _id: order._id },
|
||||||
{
|
{
|
||||||
$set: { status: "completed" },
|
$set: { status: "completed" },
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
.then(async result => {})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ class QueryBuilderService extends BaseService {
|
|||||||
if (_.isEmpty(search)) return
|
if (_.isEmpty(search)) return
|
||||||
|
|
||||||
const searchQuery = searchProperties.map(s => ({
|
const searchQuery = searchProperties.map(s => ({
|
||||||
[s]: new RegExp(search.q),
|
[s]: new RegExp(search.q, "i"),
|
||||||
}))
|
}))
|
||||||
|
|
||||||
return { $or: searchQuery }
|
return { $or: searchQuery }
|
||||||
|
|||||||
Reference in new issue
Block a user