diff --git a/project/VERSION b/project/VERSION index 0ea3a94..0c62199 100644 --- a/project/VERSION +++ b/project/VERSION @@ -1 +1 @@ -0.2.0 +0.2.1 diff --git a/project/apps/admin/package-lock.json b/project/apps/admin/package-lock.json index a415e4e..246156a 100644 --- a/project/apps/admin/package-lock.json +++ b/project/apps/admin/package-lock.json @@ -1,12 +1,12 @@ { "name": "@mercadodevida/admin", - "version": "0.2.0", + "version": "0.2.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@mercadodevida/admin", - "version": "0.2.0", + "version": "0.2.1", "dependencies": { "@lexical/history": "^0.49.0", "@lexical/html": "^0.49.0", diff --git a/project/apps/admin/package.json b/project/apps/admin/package.json index 87031b7..6f8b160 100644 --- a/project/apps/admin/package.json +++ b/project/apps/admin/package.json @@ -1,6 +1,6 @@ { "name": "@mercadodevida/admin", - "version": "0.2.0", + "version": "0.2.1", "private": true, "scripts": { "dev": "next dev --port 3001", diff --git a/project/apps/pos/package-lock.json b/project/apps/pos/package-lock.json index bda53d0..2e5182e 100644 --- a/project/apps/pos/package-lock.json +++ b/project/apps/pos/package-lock.json @@ -1,12 +1,12 @@ { "name": "mercadodevida-pos", - "version": "0.2.0", + "version": "0.2.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mercadodevida-pos", - "version": "0.2.0", + "version": "0.2.1", "dependencies": { "next": "^16.3.1", "react": "^19.2.8", diff --git a/project/apps/pos/package.json b/project/apps/pos/package.json index 9136a7f..fa230b1 100644 --- a/project/apps/pos/package.json +++ b/project/apps/pos/package.json @@ -1,6 +1,6 @@ { "name": "mercadodevida-pos", - "version": "0.2.0", + "version": "0.2.1", "private": true, "scripts": { "dev": "next dev --port 3002", diff --git a/project/frontend/package-lock.json b/project/frontend/package-lock.json index a1f31a0..b01a1d1 100644 --- a/project/frontend/package-lock.json +++ b/project/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "frontend", - "version": "0.2.0", + "version": "0.2.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "frontend", - "version": "0.2.0", + "version": "0.2.1", "dependencies": { "next": "16.3.1", "react": "19.2.8", diff --git a/project/frontend/package.json b/project/frontend/package.json index 99f4924..166848b 100644 --- a/project/frontend/package.json +++ b/project/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "0.2.0", + "version": "0.2.1", "private": true, "scripts": { "dev": "next dev", diff --git a/project/package-lock.json b/project/package-lock.json index c332194..a170cde 100644 --- a/project/package-lock.json +++ b/project/package-lock.json @@ -1,12 +1,12 @@ { "name": "mercadodevida-backend", - "version": "0.2.0", + "version": "0.2.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mercadodevida-backend", - "version": "0.2.0", + "version": "0.2.1", "dependencies": { "@fastify/cookie": "^11.1.2", "@fastify/cors": "^11.3.0", diff --git a/project/package.json b/project/package.json index 598163e..85991a1 100644 --- a/project/package.json +++ b/project/package.json @@ -1,6 +1,6 @@ { "name": "mercadodevida-backend", - "version": "0.2.0", + "version": "0.2.1", "private": true, "type": "module", "description": "mercadodevida vNext backend - modular monolith skeleton", diff --git a/project/src/modules/orders/api/orders.routes.ts b/project/src/modules/orders/api/orders.routes.ts index 2168ff2..9317261 100644 --- a/project/src/modules/orders/api/orders.routes.ts +++ b/project/src/modules/orders/api/orders.routes.ts @@ -547,7 +547,6 @@ export async function registerOrdersRoutes( FROM orders_orders o LEFT JOIN identity_users u ON u.id = o.user_id WHERE o.state = 'AWAITING_PAYMENT' - AND o.deleted_at IS NULL ORDER BY o.created_at ASC LIMIT 20`, ); diff --git a/project/src/modules/pos/api/pos.routes.ts b/project/src/modules/pos/api/pos.routes.ts index af7ac80..ee4d2fc 100644 --- a/project/src/modules/pos/api/pos.routes.ts +++ b/project/src/modules/pos/api/pos.routes.ts @@ -698,15 +698,15 @@ export async function registerPosRoutes(app: FastifyInstance, deps: PosRouteDeps [id], ), pool.query<{ method_code: string; method_name: string; total: string; count: string }>( - `SELECT pm.code AS method_code, pm.name AS method_name, + `SELECT pm.code AS method_code, pm.label AS method_name, COALESCE(SUM(pt.amount_cents), 0)::bigint AS total, COUNT(*)::int AS count FROM payments_transactions pt JOIN orders_orders o ON o.id = pt.order_id - LEFT JOIN pos_payment_methods pm ON pm.id = pt.provider_event_id + LEFT JOIN pos_payment_methods pm ON pm.id::text = pt.provider_event_id AND pm.store_id = o.store_id WHERE o.cash_session_id = $1 AND o.source = 'pos' AND pt.status = 'succeeded' - GROUP BY pm.code, pm.name`, + GROUP BY pm.code, pm.label`, [id], ), pool.query<{ items_count: string; unique_products: string }>( @@ -770,15 +770,15 @@ export async function registerPosRoutes(app: FastifyInstance, deps: PosRouteDeps [id], ), pool.query<{ method_code: string; method_name: string; total: string; count: string }>( - `SELECT pm.code AS method_code, pm.name AS method_name, + `SELECT pm.code AS method_code, pm.label AS method_name, COALESCE(SUM(pt.amount_cents), 0)::bigint AS total, COUNT(*)::int AS count FROM payments_transactions pt JOIN orders_orders o ON o.id = pt.order_id - LEFT JOIN pos_payment_methods pm ON pm.id = pt.provider_event_id + LEFT JOIN pos_payment_methods pm ON pm.id::text = pt.provider_event_id AND pm.store_id = o.store_id WHERE o.cash_session_id = $1 AND o.source = 'pos' AND pt.status = 'succeeded' - GROUP BY pm.code, pm.name`, + GROUP BY pm.code, pm.label`, [id], ), pool.query<{ items_count: string; unique_products: string }>( diff --git a/project/storefront/package-lock.json b/project/storefront/package-lock.json index 75bec62..91ce82a 100644 --- a/project/storefront/package-lock.json +++ b/project/storefront/package-lock.json @@ -1,12 +1,12 @@ { "name": "mercadodevida-storefront", - "version": "0.2.0", + "version": "0.2.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mercadodevida-storefront", - "version": "0.2.0", + "version": "0.2.1", "dependencies": { "@tailwindcss/postcss": "^4.1.17", "next": "^16.0.5", diff --git a/project/storefront/package.json b/project/storefront/package.json index aac2d5b..76f87ab 100644 --- a/project/storefront/package.json +++ b/project/storefront/package.json @@ -1,6 +1,6 @@ { "name": "mercadodevida-storefront", - "version": "0.2.0", + "version": "0.2.1", "private": true, "type": "module", "description": "mercadodevida customer storefront shell",