Migrate to @orbito/api-lib 2.0.0 for single-company container model.
Remove companyId from handlers, models, cron jobs, and cross-module calls to match the v2 one-module-one-company architecture. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -1,8 +1,7 @@
|
||||
const { getFilters } = require('../../src/orders-filter-store');
|
||||
|
||||
// Zwraca zapisaną paginację / filtry listy zamówień (np. przed powrotem ze szczegółów).
|
||||
module.exports = async function(companyId, instanceId) {
|
||||
const filters = await getFilters(companyId, instanceId);
|
||||
module.exports = async function() {
|
||||
const filters = await getFilters();
|
||||
return {
|
||||
page: parseInt(filters.page, 10) || 1,
|
||||
perPage: parseInt(filters.perPage, 10) || 20,
|
||||
|
||||
@@ -3,32 +3,25 @@ const { searchOrders } = require('../../src/orders-api');
|
||||
const { normalizeFilterParams, FILTER_KEYS } = require('../../src/orders-filter-form');
|
||||
const { getFilters, mergeFilters, clearFilters } = require('../../src/orders-filter-store');
|
||||
|
||||
// orders.search — proxy do core/orders 'search' (tylko PrestaShop).
|
||||
// Akceptuje stary format: { searchQuery, paidOnly, pagination: { page, limit, sort } }
|
||||
// oraz pola filtrów (city, customerEmail lub filterCity, filterCustomerEmail z withData).
|
||||
// saveFilters: true — zapisuje filtry z żądania (np. przycisk Filtruj), żeby reload tabeli je zachował.
|
||||
// clearFilters: true — czyści zapisane filtry.
|
||||
module.exports = async function(companyId, instanceId, params, ctx) {
|
||||
module.exports = async function(params, ctx) {
|
||||
const input = { ...(params || {}) };
|
||||
|
||||
if (input.clearFilters) {
|
||||
clearFilters(companyId, instanceId);
|
||||
await clearFilters();
|
||||
delete input.clearFilters;
|
||||
Log.info(companyId, 'orders.search clearFilters', { instanceId });
|
||||
Log.info('orders.search clearFilters');
|
||||
}
|
||||
|
||||
if (input.saveFilters) {
|
||||
await mergeFilters(companyId, instanceId, input);
|
||||
await mergeFilters(input);
|
||||
delete input.saveFilters;
|
||||
Log.info(companyId, 'orders.search saveFilters', { instanceId, filters: await getFilters(companyId, instanceId) });
|
||||
Log.info('orders.search saveFilters', { filters: await getFilters() });
|
||||
}
|
||||
|
||||
const stored = await getFilters(companyId, instanceId);
|
||||
const stored = await getFilters();
|
||||
const normalizedInput = normalizeFilterParams(input);
|
||||
const merged = { ...stored, ...normalizedInput };
|
||||
|
||||
// Puste pola filtrów z żądania datatable (reload) nie mogą skasować
|
||||
// filtrów zapisanych przez saveFilters.
|
||||
for (const key of FILTER_KEYS) {
|
||||
if (normalizedInput[key] === '' && stored[key]) {
|
||||
merged[key] = stored[key];
|
||||
@@ -41,16 +34,14 @@ module.exports = async function(companyId, instanceId, params, ctx) {
|
||||
const storedPage = parseInt(stored.page, 10) || 1;
|
||||
const incomingPage = parseInt(merged.page, 10) || 1;
|
||||
|
||||
// Po powrocie ze szczegółów datatable startuje z page=1 — przywróć zapisaną stronę.
|
||||
// explicitPage=true oznacza świadomą zmianę strony w pagerze (nie nadpisuj).
|
||||
if (!explicitPage && !input.saveFilters && storedPage > 1 && incomingPage === 1) {
|
||||
merged.page = String(storedPage);
|
||||
}
|
||||
|
||||
const finalParams = normalizeFilterParams(merged);
|
||||
const result = await searchOrders(companyId, finalParams);
|
||||
const result = await searchOrders(finalParams);
|
||||
|
||||
await mergeFilters(companyId, instanceId, {
|
||||
await mergeFilters({
|
||||
page: String(finalParams.page || 1),
|
||||
perPage: String(finalParams.perPage || 20),
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user