fix(Item): delete item with associated items entries.

This commit is contained in:
a.bouhuolia
2021-03-06 12:34:05 +02:00
parent 0f5b34f125
commit 32e5695950
3 changed files with 16 additions and 13 deletions

View File

@@ -52,7 +52,6 @@ export default class InventoryAdjustmentsController extends BaseController {
return router;
}
/**
* Validate list query schema
*/
@@ -236,11 +235,13 @@ export default class InventoryAdjustmentsController extends BaseController {
if (error instanceof ServiceError) {
if (error.errorType === 'INVENTORY_ADJUSTMENT_NOT_FOUND') {
return res.status(400).send({
errors: [{
type: 'INVENTORY_ADJUSTMENT.NOT.FOUND',
code: 100,
message: 'The inventory adjustment not found.'
}],
errors: [
{
type: 'INVENTORY_ADJUSTMENT.NOT.FOUND',
code: 100,
message: 'The inventory adjustment not found.',
},
],
});
}
if (error.errorType === 'NOT_FOUND') {

View File

@@ -581,8 +581,7 @@ export default class ItemsService implements IItemsService {
const ids = Array.isArray(itemId) ? itemId : [itemId];
const foundItemEntries = await ItemEntry.query()
.whereIn('item_id', ids)
.whereIn('reference_type', ['SaleInvoice', 'Bill']);
.whereIn('item_id', ids);
if (foundItemEntries.length > 0) {
throw new ServiceError(

View File

@@ -1,4 +1,4 @@
import { Service, Inject } from "typedi";
import { Service, Inject } from 'typedi';
import TenancyService from 'services/Tenancy/TenancyService';
@Service()
@@ -11,13 +11,16 @@ export default class SettingsService {
/**
* Increment next number based on the given find query.
* @param {number} tenantId
* @param {any} findQuery
* @param {number} tenantId
* @param {any} findQuery
*/
async incrementNextNumber(tenantId: number, findQuery: any): Promise<void> {
const settings = this.tenancy.settings(tenantId);
this.logger.info('[settings] increment the next number.', { tenantId, findQuery });
this.logger.info('[settings] increment the next number.', {
tenantId,
findQuery,
});
const currentNumber = settings.find(findQuery);
if (currentNumber) {
@@ -27,4 +30,4 @@ export default class SettingsService {
await settings.save();
}
}
}
}