Compare commits
No commits in common. "250c40440865532a9e6a0b0ea4e7eaee865fad28" and "b4837c8b8cccc9f8200446ca2e4fbfd3e0315088" have entirely different histories.
250c404408
...
b4837c8b8c
@ -38,7 +38,6 @@ import { shipmentModel } from './inventory/shipment.schema.js';
|
|||||||
import { invoiceModel } from './finance/invoice.schema.js';
|
import { invoiceModel } from './finance/invoice.schema.js';
|
||||||
import { clientModel } from './sales/client.schema.js';
|
import { clientModel } from './sales/client.schema.js';
|
||||||
import { salesOrderModel } from './sales/salesorder.schema.js';
|
import { salesOrderModel } from './sales/salesorder.schema.js';
|
||||||
import { marketplaceModel } from './sales/marketplace.schema.js';
|
|
||||||
|
|
||||||
// Map prefixes to models and id fields
|
// Map prefixes to models and id fields
|
||||||
export const models = {
|
export const models = {
|
||||||
@ -316,11 +315,4 @@ export const models = {
|
|||||||
label: 'Sales Order',
|
label: 'Sales Order',
|
||||||
referenceField: '_reference',
|
referenceField: '_reference',
|
||||||
},
|
},
|
||||||
MKT: {
|
|
||||||
model: marketplaceModel,
|
|
||||||
idField: '_id',
|
|
||||||
type: 'marketplace',
|
|
||||||
label: 'Marketplace',
|
|
||||||
referenceField: '_reference',
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|||||||
@ -4,7 +4,6 @@ const { Schema } = mongoose;
|
|||||||
|
|
||||||
const partSchema = new mongoose.Schema({
|
const partSchema = new mongoose.Schema({
|
||||||
part: { type: Schema.Types.ObjectId, ref: 'part', required: true },
|
part: { type: Schema.Types.ObjectId, ref: 'part', required: true },
|
||||||
partSku: { type: Schema.Types.ObjectId, ref: 'partSku', required: true },
|
|
||||||
quantity: { type: Number, required: true },
|
quantity: { type: Number, required: true },
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@ -15,7 +15,6 @@ const clientSchema = new mongoose.Schema(
|
|||||||
{
|
{
|
||||||
_reference: { type: String, default: () => generateId()() },
|
_reference: { type: String, default: () => generateId()() },
|
||||||
name: { required: true, type: String },
|
name: { required: true, type: String },
|
||||||
marketplace: { type: mongoose.Schema.Types.ObjectId, ref: 'marketplace', required: false },
|
|
||||||
email: { required: false, type: String },
|
email: { required: false, type: String },
|
||||||
phone: { required: false, type: String },
|
phone: { required: false, type: String },
|
||||||
country: { required: false, type: String },
|
country: { required: false, type: String },
|
||||||
|
|||||||
@ -1,26 +0,0 @@
|
|||||||
import mongoose from 'mongoose';
|
|
||||||
import { generateId } from '../../utils.js';
|
|
||||||
|
|
||||||
const marketplaceSchema = new mongoose.Schema(
|
|
||||||
{
|
|
||||||
_reference: { type: String, default: () => generateId()() },
|
|
||||||
name: { required: true, type: String },
|
|
||||||
provider: {
|
|
||||||
type: String,
|
|
||||||
required: true,
|
|
||||||
enum: ['ebay', 'etsy', 'tiktokShop'],
|
|
||||||
},
|
|
||||||
active: { required: true, type: Boolean, default: true },
|
|
||||||
// Provider-specific API configuration (flexible for eBay, Etsy, TikTok Shop)
|
|
||||||
config: { type: mongoose.Schema.Types.Mixed, default: {} },
|
|
||||||
},
|
|
||||||
{ timestamps: true }
|
|
||||||
);
|
|
||||||
|
|
||||||
marketplaceSchema.virtual('id').get(function () {
|
|
||||||
return this._id;
|
|
||||||
});
|
|
||||||
|
|
||||||
marketplaceSchema.set('toJSON', { virtuals: true });
|
|
||||||
|
|
||||||
export const marketplaceModel = mongoose.model('marketplace', marketplaceSchema);
|
|
||||||
@ -18,7 +18,6 @@ const salesOrderSchema = new Schema(
|
|||||||
totalTaxAmount: { type: Number, required: true, default: 0 },
|
totalTaxAmount: { type: Number, required: true, default: 0 },
|
||||||
timestamp: { type: Date, default: Date.now },
|
timestamp: { type: Date, default: Date.now },
|
||||||
client: { type: Schema.Types.ObjectId, ref: 'client', required: true },
|
client: { type: Schema.Types.ObjectId, ref: 'client', required: true },
|
||||||
marketplace: { type: Schema.Types.ObjectId, ref: 'marketplace', required: false },
|
|
||||||
state: {
|
state: {
|
||||||
type: { type: String, required: true, default: 'draft' },
|
type: { type: String, required: true, default: 'draft' },
|
||||||
},
|
},
|
||||||
|
|||||||
@ -46,7 +46,6 @@ import {
|
|||||||
paymentRoutes,
|
paymentRoutes,
|
||||||
clientRoutes,
|
clientRoutes,
|
||||||
salesOrderRoutes,
|
salesOrderRoutes,
|
||||||
marketplaceRoutes,
|
|
||||||
userNotifierRoutes,
|
userNotifierRoutes,
|
||||||
notificationRoutes,
|
notificationRoutes,
|
||||||
odataRoutes,
|
odataRoutes,
|
||||||
@ -164,7 +163,6 @@ app.use('/invoices', invoiceRoutes);
|
|||||||
app.use('/payments', paymentRoutes);
|
app.use('/payments', paymentRoutes);
|
||||||
app.use('/clients', clientRoutes);
|
app.use('/clients', clientRoutes);
|
||||||
app.use('/salesorders', salesOrderRoutes);
|
app.use('/salesorders', salesOrderRoutes);
|
||||||
app.use('/marketplaces', marketplaceRoutes);
|
|
||||||
app.use('/notes', noteRoutes);
|
app.use('/notes', noteRoutes);
|
||||||
app.use('/usernotifiers', userNotifierRoutes);
|
app.use('/usernotifiers', userNotifierRoutes);
|
||||||
app.use('/notifications', notificationRoutes);
|
app.use('/notifications', notificationRoutes);
|
||||||
|
|||||||
@ -38,7 +38,6 @@ import invoiceRoutes from './finance/invoices.js';
|
|||||||
import paymentRoutes from './finance/payments.js';
|
import paymentRoutes from './finance/payments.js';
|
||||||
import clientRoutes from './sales/clients.js';
|
import clientRoutes from './sales/clients.js';
|
||||||
import salesOrderRoutes from './sales/salesorders.js';
|
import salesOrderRoutes from './sales/salesorders.js';
|
||||||
import marketplaceRoutes from './sales/marketplaces.js';
|
|
||||||
import noteRoutes from './misc/notes.js';
|
import noteRoutes from './misc/notes.js';
|
||||||
import userNotifierRoutes from './misc/usernotifiers.js';
|
import userNotifierRoutes from './misc/usernotifiers.js';
|
||||||
import notificationRoutes from './misc/notifications.js';
|
import notificationRoutes from './misc/notifications.js';
|
||||||
@ -88,7 +87,6 @@ export {
|
|||||||
paymentRoutes,
|
paymentRoutes,
|
||||||
clientRoutes,
|
clientRoutes,
|
||||||
salesOrderRoutes,
|
salesOrderRoutes,
|
||||||
marketplaceRoutes,
|
|
||||||
userNotifierRoutes,
|
userNotifierRoutes,
|
||||||
notificationRoutes,
|
notificationRoutes,
|
||||||
odataRoutes,
|
odataRoutes,
|
||||||
|
|||||||
@ -1,58 +0,0 @@
|
|||||||
import express from 'express';
|
|
||||||
import { isAuthenticated } from '../../keycloak.js';
|
|
||||||
import { getFilter, convertPropertiesString } from '../../utils.js';
|
|
||||||
|
|
||||||
const router = express.Router();
|
|
||||||
import {
|
|
||||||
listMarketplacesRouteHandler,
|
|
||||||
getMarketplaceRouteHandler,
|
|
||||||
editMarketplaceRouteHandler,
|
|
||||||
newMarketplaceRouteHandler,
|
|
||||||
deleteMarketplaceRouteHandler,
|
|
||||||
listMarketplacesByPropertiesRouteHandler,
|
|
||||||
getMarketplaceStatsRouteHandler,
|
|
||||||
getMarketplaceHistoryRouteHandler,
|
|
||||||
} from '../../services/sales/marketplaces.js';
|
|
||||||
|
|
||||||
// list of marketplaces
|
|
||||||
router.get('/', isAuthenticated, (req, res) => {
|
|
||||||
const { page, limit, property, search, sort, order } = req.query;
|
|
||||||
const allowedFilters = ['name', 'provider', 'active', 'createdAt', 'updatedAt'];
|
|
||||||
const filter = getFilter(req.query, allowedFilters);
|
|
||||||
listMarketplacesRouteHandler(req, res, page, limit, property, filter, search, sort, order);
|
|
||||||
});
|
|
||||||
|
|
||||||
router.get('/properties', isAuthenticated, (req, res) => {
|
|
||||||
let properties = convertPropertiesString(req.query.properties);
|
|
||||||
const allowedFilters = ['name', 'provider', 'active', 'createdAt', 'updatedAt'];
|
|
||||||
const filter = getFilter(req.query, allowedFilters, false);
|
|
||||||
listMarketplacesByPropertiesRouteHandler(req, res, properties, filter);
|
|
||||||
});
|
|
||||||
|
|
||||||
router.post('/', isAuthenticated, (req, res) => {
|
|
||||||
newMarketplaceRouteHandler(req, res);
|
|
||||||
});
|
|
||||||
|
|
||||||
// get marketplace stats
|
|
||||||
router.get('/stats', isAuthenticated, (req, res) => {
|
|
||||||
getMarketplaceStatsRouteHandler(req, res);
|
|
||||||
});
|
|
||||||
|
|
||||||
// get marketplaces history
|
|
||||||
router.get('/history', isAuthenticated, (req, res) => {
|
|
||||||
getMarketplaceHistoryRouteHandler(req, res);
|
|
||||||
});
|
|
||||||
|
|
||||||
router.get('/:id', isAuthenticated, (req, res) => {
|
|
||||||
getMarketplaceRouteHandler(req, res);
|
|
||||||
});
|
|
||||||
|
|
||||||
router.put('/:id', isAuthenticated, async (req, res) => {
|
|
||||||
editMarketplaceRouteHandler(req, res);
|
|
||||||
});
|
|
||||||
|
|
||||||
router.delete('/:id', isAuthenticated, async (req, res) => {
|
|
||||||
deleteMarketplaceRouteHandler(req, res);
|
|
||||||
});
|
|
||||||
|
|
||||||
export default router;
|
|
||||||
@ -98,7 +98,6 @@ export const editClientRouteHandler = async (req, res) => {
|
|||||||
address: req.body.address,
|
address: req.body.address,
|
||||||
active: req.body.active,
|
active: req.body.active,
|
||||||
tags: req.body.tags,
|
tags: req.body.tags,
|
||||||
marketplace: req.body.marketplace,
|
|
||||||
};
|
};
|
||||||
// Create audit log before updating
|
// Create audit log before updating
|
||||||
const result = await editObject({
|
const result = await editObject({
|
||||||
@ -129,7 +128,6 @@ export const newClientRouteHandler = async (req, res) => {
|
|||||||
address: req.body.address,
|
address: req.body.address,
|
||||||
active: req.body.active,
|
active: req.body.active,
|
||||||
tags: req.body.tags,
|
tags: req.body.tags,
|
||||||
marketplace: req.body.marketplace,
|
|
||||||
};
|
};
|
||||||
const result = await newObject({
|
const result = await newObject({
|
||||||
model: clientModel,
|
model: clientModel,
|
||||||
|
|||||||
@ -1,176 +0,0 @@
|
|||||||
import config from '../../config.js';
|
|
||||||
import { marketplaceModel } from '../../database/schemas/sales/marketplace.schema.js';
|
|
||||||
import log4js from 'log4js';
|
|
||||||
import mongoose from 'mongoose';
|
|
||||||
import {
|
|
||||||
deleteObject,
|
|
||||||
listObjects,
|
|
||||||
getObject,
|
|
||||||
editObject,
|
|
||||||
newObject,
|
|
||||||
listObjectsByProperties,
|
|
||||||
getModelStats,
|
|
||||||
getModelHistory,
|
|
||||||
} from '../../database/database.js';
|
|
||||||
const logger = log4js.getLogger('Marketplaces');
|
|
||||||
logger.level = config.server.logLevel;
|
|
||||||
|
|
||||||
export const listMarketplacesRouteHandler = async (
|
|
||||||
req,
|
|
||||||
res,
|
|
||||||
page = 1,
|
|
||||||
limit = 25,
|
|
||||||
property = '',
|
|
||||||
filter = {},
|
|
||||||
search = '',
|
|
||||||
sort = '',
|
|
||||||
order = 'ascend'
|
|
||||||
) => {
|
|
||||||
const result = await listObjects({
|
|
||||||
model: marketplaceModel,
|
|
||||||
page,
|
|
||||||
limit,
|
|
||||||
property,
|
|
||||||
filter,
|
|
||||||
search,
|
|
||||||
sort,
|
|
||||||
order,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (result?.error) {
|
|
||||||
logger.error('Error listing marketplaces.');
|
|
||||||
res.status(result.code).send(result);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.debug(`List of marketplaces (Page ${page}, Limit ${limit}). Count: ${result.length}.`);
|
|
||||||
res.send(result);
|
|
||||||
};
|
|
||||||
|
|
||||||
export const listMarketplacesByPropertiesRouteHandler = async (
|
|
||||||
req,
|
|
||||||
res,
|
|
||||||
properties = '',
|
|
||||||
filter = {}
|
|
||||||
) => {
|
|
||||||
const result = await listObjectsByProperties({
|
|
||||||
model: marketplaceModel,
|
|
||||||
properties,
|
|
||||||
filter,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (result?.error) {
|
|
||||||
logger.error('Error listing marketplaces.');
|
|
||||||
res.status(result.code).send(result);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.debug(`List of marketplaces. Count: ${result.length}`);
|
|
||||||
res.send(result);
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getMarketplaceRouteHandler = async (req, res) => {
|
|
||||||
const id = req.params.id;
|
|
||||||
const result = await getObject({
|
|
||||||
model: marketplaceModel,
|
|
||||||
id,
|
|
||||||
});
|
|
||||||
if (result?.error) {
|
|
||||||
logger.warn(`Marketplace not found with supplied id.`);
|
|
||||||
return res.status(result.code).send(result);
|
|
||||||
}
|
|
||||||
logger.debug(`Retrieved marketplace with ID: ${id}`);
|
|
||||||
res.send(result);
|
|
||||||
};
|
|
||||||
|
|
||||||
export const editMarketplaceRouteHandler = async (req, res) => {
|
|
||||||
const id = new mongoose.Types.ObjectId(req.params.id);
|
|
||||||
|
|
||||||
logger.trace(`Marketplace with ID: ${id}`);
|
|
||||||
|
|
||||||
const updateData = {
|
|
||||||
updatedAt: new Date(),
|
|
||||||
name: req.body.name,
|
|
||||||
provider: req.body.provider,
|
|
||||||
active: req.body.active,
|
|
||||||
config: req.body.config || {},
|
|
||||||
};
|
|
||||||
const result = await editObject({
|
|
||||||
model: marketplaceModel,
|
|
||||||
id,
|
|
||||||
updateData,
|
|
||||||
user: req.user,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (result.error) {
|
|
||||||
logger.error('Error editing marketplace:', result.error);
|
|
||||||
res.status(result.code).send(result);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.debug(`Edited marketplace with ID: ${id}`);
|
|
||||||
res.send(result);
|
|
||||||
};
|
|
||||||
|
|
||||||
export const newMarketplaceRouteHandler = async (req, res) => {
|
|
||||||
const newData = {
|
|
||||||
updatedAt: new Date(),
|
|
||||||
name: req.body.name,
|
|
||||||
provider: req.body.provider,
|
|
||||||
active: req.body.active !== false,
|
|
||||||
config: req.body.config || {},
|
|
||||||
};
|
|
||||||
const result = await newObject({
|
|
||||||
model: marketplaceModel,
|
|
||||||
newData,
|
|
||||||
user: req.user,
|
|
||||||
});
|
|
||||||
if (result.error) {
|
|
||||||
logger.error('No marketplace created:', result.error);
|
|
||||||
return res.status(result.code).send(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.debug(`New marketplace with ID: ${result._id}`);
|
|
||||||
res.send(result);
|
|
||||||
};
|
|
||||||
|
|
||||||
export const deleteMarketplaceRouteHandler = async (req, res) => {
|
|
||||||
const id = new mongoose.Types.ObjectId(req.params.id);
|
|
||||||
|
|
||||||
logger.trace(`Marketplace with ID: ${id}`);
|
|
||||||
|
|
||||||
const result = await deleteObject({
|
|
||||||
model: marketplaceModel,
|
|
||||||
id,
|
|
||||||
user: req.user,
|
|
||||||
});
|
|
||||||
if (result.error) {
|
|
||||||
logger.error('No marketplace deleted:', result.error);
|
|
||||||
return res.status(result.code).send(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.debug(`Deleted marketplace with ID: ${result._id}`);
|
|
||||||
res.send(result);
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getMarketplaceStatsRouteHandler = async (req, res) => {
|
|
||||||
const result = await getModelStats({ model: marketplaceModel });
|
|
||||||
if (result?.error) {
|
|
||||||
logger.error('Error fetching marketplace stats:', result.error);
|
|
||||||
return res.status(result.code).send(result);
|
|
||||||
}
|
|
||||||
logger.trace('Marketplace stats:', result);
|
|
||||||
res.send(result);
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getMarketplaceHistoryRouteHandler = async (req, res) => {
|
|
||||||
const from = req.query.from;
|
|
||||||
const to = req.query.to;
|
|
||||||
const result = await getModelHistory({ model: marketplaceModel, from, to });
|
|
||||||
if (result?.error) {
|
|
||||||
logger.error('Error fetching marketplace history:', result.error);
|
|
||||||
return res.status(result.code).send(result);
|
|
||||||
}
|
|
||||||
logger.trace('Marketplace history:', result);
|
|
||||||
res.send(result);
|
|
||||||
};
|
|
||||||
@ -40,7 +40,7 @@ export const listSalesOrdersRouteHandler = async (
|
|||||||
search,
|
search,
|
||||||
sort,
|
sort,
|
||||||
order,
|
order,
|
||||||
populate: ['client', 'marketplace'],
|
populate: ['client'],
|
||||||
});
|
});
|
||||||
|
|
||||||
if (result?.error) {
|
if (result?.error) {
|
||||||
@ -64,7 +64,7 @@ export const listSalesOrdersByPropertiesRouteHandler = async (
|
|||||||
model: salesOrderModel,
|
model: salesOrderModel,
|
||||||
properties,
|
properties,
|
||||||
filter,
|
filter,
|
||||||
populate: ['client', 'marketplace'],
|
populate: ['client'],
|
||||||
masterFilter,
|
masterFilter,
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -83,7 +83,7 @@ export const getSalesOrderRouteHandler = async (req, res) => {
|
|||||||
const result = await getObject({
|
const result = await getObject({
|
||||||
model: salesOrderModel,
|
model: salesOrderModel,
|
||||||
id,
|
id,
|
||||||
populate: ['client', 'marketplace'],
|
populate: ['client'],
|
||||||
});
|
});
|
||||||
if (result?.error) {
|
if (result?.error) {
|
||||||
logger.warn(`Sales Order not found with supplied id.`);
|
logger.warn(`Sales Order not found with supplied id.`);
|
||||||
@ -116,7 +116,6 @@ export const editSalesOrderRouteHandler = async (req, res) => {
|
|||||||
const updateData = {
|
const updateData = {
|
||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
client: req.body.client,
|
client: req.body.client,
|
||||||
marketplace: req.body.marketplace,
|
|
||||||
};
|
};
|
||||||
// Create audit log before updating
|
// Create audit log before updating
|
||||||
const result = await editObject({
|
const result = await editObject({
|
||||||
@ -141,7 +140,6 @@ export const editMultipleSalesOrdersRouteHandler = async (req, res) => {
|
|||||||
const updates = req.body.map((update) => ({
|
const updates = req.body.map((update) => ({
|
||||||
_id: update._id,
|
_id: update._id,
|
||||||
client: update.client,
|
client: update.client,
|
||||||
marketplace: update.marketplace,
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
if (!Array.isArray(updates)) {
|
if (!Array.isArray(updates)) {
|
||||||
@ -169,7 +167,6 @@ export const newSalesOrderRouteHandler = async (req, res) => {
|
|||||||
const newData = {
|
const newData = {
|
||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
client: req.body.client,
|
client: req.body.client,
|
||||||
marketplace: req.body.marketplace,
|
|
||||||
totalAmount: 0,
|
totalAmount: 0,
|
||||||
totalAmountWithTax: 0,
|
totalAmountWithTax: 0,
|
||||||
totalTaxAmount: 0,
|
totalTaxAmount: 0,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user