Skip to content

fix(warehouse): correct label extension, surface print errors, revert… #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thesleepyniko wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −5
Open

fix(warehouse): correct label extension, surface print errors, revert… #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions resolution-frontend/src/routes/api/fulfillment/get-label/+server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ export const POST: RequestHandler = async (event) => {
throw error(409, 'Order has already been shipped or is not in APPROVED status');
}

try {
// Total weight always comes from items. Dimensions come from the packaging
// record chosen at estimate time so the carrier request matches the quote.
// Fall back to item-derived dims for legacy orders without packaging info.
Expand Down Expand Up @@ -365,4 +366,13 @@ export const POST: RequestHandler = async (event) => {
packingSlipBase64,
shippingMethod
});
} catch (e) {
await db.update(warehouseOrder)
.set({ status: 'APPROVED', updatedAt: new Date() })
.where(and(
eq(warehouseOrder.id, orderId),
eq(warehouseOrder.status, 'SHIPPED')
));
Comment on lines +370 to +375
throw e;
}
};
23 changes: 18 additions & 5 deletions resolution-frontend/src/routes/app/warehouse/fulfillment/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@
return name || creator.email;
}

function labelDownloadName(labelUrl: string | null, fulfillmentId: string | number): string {
const ext = labelUrl?.startsWith('data:image/png') ? 'png' : 'pdf';
return `label-${fulfillmentId}.${ext}`;
}

const statuses = ['ESTIMATED', 'APPROVED', 'SHIPPED', 'CANCELLED'];

const filteredOrders = $derived(() => {
Expand Down Expand Up @@ -100,7 +105,7 @@
} catch { qzStatus = 'error'; }
}

async function printAll(result: { labelUrl: string | null; packingSlipBase64: string }) {
async function printAll(orderId: string, result: { labelUrl: string | null; packingSlipBase64: string }) {
if (!qz || qzStatus !== 'connected') return;
const settings = getQZSettings();
if (!settings.printer) { alert('No printer selected. Go to Settings to configure.'); return; }
Expand All @@ -113,15 +118,23 @@
if (result.labelUrl) {
const base64Data = result.labelUrl.replace(/^data:(application\/pdf|image\/png);base64,/, '');
const format = result.labelUrl.startsWith('data:image/png') ? 'image' : 'pdf';
await qz.print(config(), [{ type: 'pixel', format, flavor: 'base64', data: base64Data }]);
try {
await qz.print(config(), [{ type: 'pixel', format, flavor: 'base64', data: base64Data }]);
} catch (e: any) {
labelErrors[orderId] = `Label print failed: ${e?.message || e}`;
}
}

// Print packing slip
if (result.packingSlipBase64) {
const rawText = decodeURIComponent(escape(atob(result.packingSlipBase64)));
const escapedText = rawText.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
const html = `<pre style="font-family:monospace;font-size:11px;padding:10px;white-space:pre-wrap;">${escapedText}</pre>`;
await qz.print(config(), [{ type: 'html', format: 'plain', data: html }]);
try {
await qz.print(config(), [{ type: 'html', format: 'plain', data: html }]);
} catch (e: any) {
labelErrors[orderId] = `Packing slip print failed: ${e?.message || e}`;
}
Comment on lines +133 to +137
}
}

Expand Down Expand Up @@ -311,14 +324,14 @@
{/if}
</div>
<div class="label-actions">
<button type="button" class="action-btn print-btn" onclick={() => printAll(labelResults[order.id])}>
<button type="button" class="action-btn print-btn" onclick={() => printAll(order.id, labelResults[order.id])}>
🖨️ Print
</button>
{#if labelResults[order.id].labelUrl}
<a
class="action-btn download-btn"
href={labelResults[order.id].labelUrl}
download={`label-${order.fulfillmentId}.pdf`}
download={labelDownloadName(labelResults[order.id].labelUrl, order.fulfillmentId)}
>📥 Label</a>
{/if}
{#if labelResults[order.id].packingSlipBase64}
Expand Down