k1nq/TREK
1
0
Fork 0
mirror of https://github.com/mauriceboe/TREK.git synced 2026-06-19 21:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into feat/places-kmz-kml-import

Browse Source 
# Conflicts:
#	server/tests/integration/places.test.ts
This commit is contained in:
Yannis Biasutti
2026-04-07 21:07:42 +02:00
parent 81851d8367 c96360c7f8
commit 0e3e6df1f0
82 changed files with 12716 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/routes/reservations.ts
+1 -3
View File
@@ -13,6 +13,7 @@ import {
updateReservation,
deleteReservation,
} from '../services/reservationService';
import { createBudgetItem, updateBudgetItem, deleteBudgetItem } from '../services/budgetService';
const router = express.Router({ mergeParams: true });
@@ -53,7 +54,6 @@ router.post('/', authenticate, (req: Request, res: Response) => {
// Auto-create budget entry if price was provided
if (create_budget_entry && create_budget_entry.total_price > 0) {
try {
const { createBudgetItem } = require('../services/budgetService');
const budgetItem = createBudgetItem(tripId, {
name: title,
category: create_budget_entry.category || type || 'Other',
@@ -126,7 +126,6 @@ router.put('/:id', authenticate, (req: Request, res: Response) => {
if (!create_budget_entry || !create_budget_entry.total_price) {
const linked = db.prepare('SELECT id FROM budget_items WHERE trip_id = ? AND reservation_id = ?').get(tripId, id) as { id: number } | undefined;
if (linked) {
const { deleteBudgetItem } = require('../services/budgetService');
deleteBudgetItem(linked.id, tripId);
broadcast(tripId, 'budget:deleted', { id: linked.id }, req.headers['x-socket-id'] as string);
}
@@ -135,7 +134,6 @@ router.put('/:id', authenticate, (req: Request, res: Response) => {
// Auto-create or update budget entry if price was provided
if (create_budget_entry && create_budget_entry.total_price > 0) {
try {
const { createBudgetItem, updateBudgetItem } = require('../services/budgetService');
const itemName = title || current.title;
const existing = db.prepare('SELECT id FROM budget_items WHERE trip_id = ? AND reservation_id = ?').get(tripId, id) as { id: number } | undefined;
if (existing) {