feat: integer cents money handling, order page fixes, and vendor filter persistence
Money Handling Architecture: - Store all monetary values as integer cents (€105.91 = 10591) - Add app/utils/money.py with Money class and conversion helpers - Add static/shared/js/money.js for frontend formatting - Update all database models to use _cents columns (Product, Order, etc.) - Update CSV processor to convert prices to cents on import - Add Alembic migration for Float to Integer conversion - Create .architecture-rules/money.yaml with 7 validation rules - Add docs/architecture/money-handling.md documentation Order Details Page Fixes: - Fix customer name showing 'undefined undefined' - use flat field names - Fix vendor info empty - add vendor_name/vendor_code to OrderDetailResponse - Fix shipping address using wrong nested object structure - Enrich order detail API response with vendor info Vendor Filter Persistence Fixes: - Fix orders.js: restoreSavedVendor now sets selectedVendor and filters - Fix orders.js: init() only loads orders if no saved vendor to restore - Fix marketplace-letzshop.js: restoreSavedVendor calls selectVendor() - Fix marketplace-letzshop.js: clearVendorSelection clears TomSelect dropdown - Align vendor selector placeholder text between pages 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -76,6 +76,15 @@ function adminOrders() {
|
||||
reason: ''
|
||||
},
|
||||
|
||||
// Mark as shipped modal
|
||||
showMarkAsShippedModal: false,
|
||||
markingAsShipped: false,
|
||||
shipForm: {
|
||||
tracking_number: '',
|
||||
tracking_url: '',
|
||||
shipping_carrier: ''
|
||||
},
|
||||
|
||||
// Debounce timer
|
||||
searchTimeout: null,
|
||||
|
||||
@@ -137,16 +146,64 @@ function adminOrders() {
|
||||
// Initialize Tom Select for vendor filter
|
||||
this.initVendorSelect();
|
||||
|
||||
// Load data in parallel
|
||||
await Promise.all([
|
||||
this.loadStats(),
|
||||
this.loadVendors(),
|
||||
this.loadOrders()
|
||||
]);
|
||||
// Check localStorage for saved vendor
|
||||
const savedVendorId = localStorage.getItem('orders_selected_vendor_id');
|
||||
if (savedVendorId) {
|
||||
adminOrdersLog.info('Restoring saved vendor:', savedVendorId);
|
||||
// Restore vendor after a short delay to ensure TomSelect is ready
|
||||
// restoreSavedVendor will call loadOrders() after setting the filter
|
||||
setTimeout(async () => {
|
||||
await this.restoreSavedVendor(parseInt(savedVendorId));
|
||||
}, 200);
|
||||
// Load stats and vendors, but not orders (restoreSavedVendor will do that)
|
||||
await Promise.all([
|
||||
this.loadStats(),
|
||||
this.loadVendors()
|
||||
]);
|
||||
} else {
|
||||
// No saved vendor - load all data including unfiltered orders
|
||||
await Promise.all([
|
||||
this.loadStats(),
|
||||
this.loadVendors(),
|
||||
this.loadOrders()
|
||||
]);
|
||||
}
|
||||
|
||||
adminOrdersLog.info('Orders initialization complete');
|
||||
},
|
||||
|
||||
/**
|
||||
* Restore saved vendor from localStorage
|
||||
*/
|
||||
async restoreSavedVendor(vendorId) {
|
||||
try {
|
||||
const vendor = await apiClient.get(`/admin/vendors/${vendorId}`);
|
||||
if (this.vendorSelectInstance && vendor) {
|
||||
// Add the vendor as an option and select it
|
||||
this.vendorSelectInstance.addOption({
|
||||
id: vendor.id,
|
||||
name: vendor.name,
|
||||
vendor_code: vendor.vendor_code
|
||||
});
|
||||
this.vendorSelectInstance.setValue(vendor.id, true);
|
||||
|
||||
// Set the filter state (this is the key fix!)
|
||||
this.selectedVendor = vendor;
|
||||
this.filters.vendor_id = vendor.id;
|
||||
|
||||
adminOrdersLog.info('Restored vendor:', vendor.name);
|
||||
|
||||
// Load orders with the vendor filter applied
|
||||
await this.loadOrders();
|
||||
}
|
||||
} catch (error) {
|
||||
adminOrdersLog.warn('Failed to restore saved vendor, clearing localStorage:', error);
|
||||
localStorage.removeItem('orders_selected_vendor_id');
|
||||
// Load unfiltered orders as fallback
|
||||
await this.loadOrders();
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Initialize Tom Select for vendor autocomplete
|
||||
*/
|
||||
@@ -168,7 +225,7 @@ function adminOrders() {
|
||||
valueField: 'id',
|
||||
labelField: 'name',
|
||||
searchField: ['name', 'vendor_code'],
|
||||
placeholder: 'All vendors...',
|
||||
placeholder: 'Search vendor by name or code...',
|
||||
allowEmptyOption: true,
|
||||
load: async (query, callback) => {
|
||||
try {
|
||||
@@ -198,9 +255,13 @@ function adminOrders() {
|
||||
const vendor = this.vendorSelectInstance.options[value];
|
||||
this.selectedVendor = vendor;
|
||||
this.filters.vendor_id = value;
|
||||
// Save to localStorage
|
||||
localStorage.setItem('orders_selected_vendor_id', value.toString());
|
||||
} else {
|
||||
this.selectedVendor = null;
|
||||
this.filters.vendor_id = '';
|
||||
// Clear from localStorage
|
||||
localStorage.removeItem('orders_selected_vendor_id');
|
||||
}
|
||||
this.pagination.page = 1;
|
||||
this.loadOrders();
|
||||
@@ -219,6 +280,8 @@ function adminOrders() {
|
||||
}
|
||||
this.selectedVendor = null;
|
||||
this.filters.vendor_id = '';
|
||||
// Clear from localStorage
|
||||
localStorage.removeItem('orders_selected_vendor_id');
|
||||
this.pagination.page = 1;
|
||||
this.loadOrders();
|
||||
},
|
||||
@@ -378,6 +441,76 @@ function adminOrders() {
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Open mark as shipped modal
|
||||
*/
|
||||
openMarkAsShippedModal(order) {
|
||||
this.selectedOrder = order;
|
||||
this.shipForm = {
|
||||
tracking_number: order.tracking_number || '',
|
||||
tracking_url: order.tracking_url || '',
|
||||
shipping_carrier: order.shipping_carrier || ''
|
||||
};
|
||||
this.showMarkAsShippedModal = true;
|
||||
},
|
||||
|
||||
/**
|
||||
* Mark order as shipped
|
||||
*/
|
||||
async markAsShipped() {
|
||||
if (!this.selectedOrder) return;
|
||||
|
||||
this.markingAsShipped = true;
|
||||
try {
|
||||
const payload = {};
|
||||
|
||||
if (this.shipForm.tracking_number) {
|
||||
payload.tracking_number = this.shipForm.tracking_number;
|
||||
}
|
||||
if (this.shipForm.tracking_url) {
|
||||
payload.tracking_url = this.shipForm.tracking_url;
|
||||
}
|
||||
if (this.shipForm.shipping_carrier) {
|
||||
payload.shipping_carrier = this.shipForm.shipping_carrier;
|
||||
}
|
||||
|
||||
await apiClient.post(`/admin/orders/${this.selectedOrder.id}/ship`, payload);
|
||||
|
||||
adminOrdersLog.info('Marked order as shipped:', this.selectedOrder.id);
|
||||
|
||||
this.showMarkAsShippedModal = false;
|
||||
this.selectedOrder = null;
|
||||
|
||||
Utils.showToast('Order marked as shipped successfully.', 'success');
|
||||
|
||||
await this.refresh();
|
||||
} catch (error) {
|
||||
adminOrdersLog.error('Failed to mark order as shipped:', error);
|
||||
Utils.showToast(error.message || 'Failed to mark as shipped.', 'error');
|
||||
} finally {
|
||||
this.markingAsShipped = false;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Download shipping label for an order
|
||||
*/
|
||||
async downloadShippingLabel(order) {
|
||||
try {
|
||||
const labelInfo = await apiClient.get(`/admin/orders/${order.id}/shipping-label`);
|
||||
|
||||
if (labelInfo.label_url) {
|
||||
// Open label URL in new tab
|
||||
window.open(labelInfo.label_url, '_blank');
|
||||
} else {
|
||||
Utils.showToast('No shipping label URL available for this order.', 'warning');
|
||||
}
|
||||
} catch (error) {
|
||||
adminOrdersLog.error('Failed to get shipping label:', error);
|
||||
Utils.showToast(error.message || 'Failed to get shipping label.', 'error');
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Get CSS class for status badge
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user