Tom Butcher tom
tom pushed to main at farmcontrol/farmcontrol-ui 2026-06-23 23:33:38 +00:00
02b0d245ff Adjust margin properties in DashboardNavigation and DashboardWindowButtons components for improved layout consistency and spacing.
tom pushed to main at farmcontrol/farmcontrol-ui 2026-06-23 23:06:10 +00:00
86d656720c Update dev:electron script in package.json for improved environment variable handling and add msiWrapped configuration for Windows installer.
tom pushed to main at farmcontrol/farmcontrol-ui 2026-06-23 22:20:40 +00:00
1474b23b1e Fixed windows update installation.
tom pushed to main at farmcontrol/farmcontrol-api 2026-06-22 02:02:05 +00:00
759aa1017f Refactored login callback route handler to differentiate redirect behavior based on the redirect type, improving flexibility in response handling.
tom pushed to main at farmcontrol/farmcontrol-ui 2026-06-22 02:00:38 +00:00
657c1dd17e Add expandHeight prop to various Dashboard components for improved layout flexibility
tom pushed to main at farmcontrol/farmcontrol-ui 2026-06-21 23:41:09 +00:00
2c3cf9d02b Update various components in the Dashboard to include labelWidth adjustments for improved layout consistency. Components modified include NewAppPassword, NewCourierService, NewCourier, NewDocumentJob, NewDocumentSize, NewDocumentTemplate, NewMaterial, NewNoteType, NewProductCategory, NewProductSku, NewTaxRate, and NewVendor. These changes enhance user experience by ensuring better alignment and spacing in forms.
tom pushed to main at farmcontrol/farmcontrol-ui 2026-06-21 22:59:39 +00:00
2177870fc9 Enhance Filament and FilamentSku models by enforcing required fields for cost-related properties. Update NewFilamentSku and NewFilament components to reflect changes in default values and layout adjustments for better user experience. Modify FilamentInfo to utilize updated object data structure for filament selection.
0e8f4506cc Update padding in DashboardNavigation component to enhance layout consistency and improve user interaction.
Compare 2 commits »
tom pushed to main at farmcontrol/farmcontrol-api 2026-06-21 22:59:39 +00:00
efb3fdbcb9 Refactored filament recalculation logic to utilize filament SKUs instead of order items, improving efficiency. Updated allowed filters in the filament SKUs route to include 'costWithTax' and modified population logic in the service for better data retrieval.
tom pushed to main at farmcontrol/farmcontrol-ws 2026-06-21 22:59:37 +00:00
0748256ce8 Refactor filament schema recalculation logic to use filamentSku model instead of orderItem model. This change improves the efficiency of recalculating SKUs associated with a filament.
tom pushed to main at farmcontrol/farmcontrol-ui 2026-06-21 22:42:19 +00:00
8568a8a8ce Refactor AppUpdateProgress to conditionally display progress for the restart stage. Remove unnecessary detail display for the restart status, enhancing clarity in update management.
991c10d48a Refactor DashboardNavigation and WebAppSwitcher components to improve layout and user interaction. Adjust padding in DashboardNavigation and replace Tooltip with KeyboardShortcut in WebAppSwitcher for enhanced accessibility and streamlined code.
Compare 2 commits »
tom pushed to main at farmcontrol/farmcontrol-ui 2026-06-21 22:30:40 +00:00
8fbcc67230 Refactor Part and Product models to change 'disabled' property to 'readOnly' for margin fields. Implement value calculation for margin based on price and cost when priceMode is 'amount', enhancing data handling and user experience.
tom pushed to main at farmcontrol/farmcontrol-api 2026-06-21 22:17:11 +00:00
74a9139002 Removed 'fileName' field from part schema and corresponding route handlers to streamline data management and improve clarity in part creation and editing processes.
tom pushed to main at farmcontrol/farmcontrol-ui 2026-06-21 22:17:03 +00:00
156d2a8baf Update Part model to enforce required fields for cost, costWithTax, priceMode, price, margin, priceWithTax, and priceTaxRate. Remove fileName property and improve filter and sorter organization for better clarity and maintainability.
tom pushed to main at farmcontrol/farmcontrol-ui 2026-06-21 22:05:02 +00:00
8677691da3 Enhance isInstallComplete function in AppUpdateProgress to recognize additional completion messages, including 'successful' and 'restarting', improving accuracy of installation status detection during updates.
tom created branch development in farmcontrol/farmcontrol-ui 2026-06-21 21:39:50 +00:00
tom pushed to development at farmcontrol/farmcontrol-ui 2026-06-21 21:39:50 +00:00
tom pushed to main at farmcontrol/farmcontrol-ui 2026-06-21 21:37:07 +00:00
e0b409434d Remove useMessageContext import from NewGCodeFile, NewJob, and NewPrinter components to streamline code and improve maintainability.
tom pushed to main at farmcontrol/farmcontrol-ui 2026-06-21 21:35:24 +00:00
77611646aa Remove success message display for GCode file, job, and printer creation in NewGCodeFile, NewJob, and NewPrinter components to streamline user feedback during submission.
tom pushed to main at farmcontrol/farmcontrol-ws 2026-06-21 21:33:23 +00:00
4f9ed6039b Add fields for payment authorisation and decline tracking in payment schema
b1245595d9 Refactor UpdateManager to enhance filter matching logic, replacing listObjects calls with direct filter checks, and improve event emission for object updates. Added tests for reference filter matching.
3481b07a55 Refactor tax record model: moved taxRecord schema to finance directory and updated import path in models.js
Compare 3 commits »
tom pushed to main at farmcontrol/farmcontrol-api 2026-06-21 21:33:20 +00:00
f74b85bb88 Added authorisation and decline functionality for payments, including new route handlers and schema updates to track authorisation and decline timestamps. Updated payment cancellation logic to reflect changes in payment states.
2996b1670f Refactored tax record management by moving tax record schema and routes to the finance directory, enhancing organization. Implemented CRUD operations for tax records in the new service and added corresponding tests for route handlers.
Compare 2 commits »