Merge branch 'release/1.61.0'
This commit is contained in:
@@ -1,19 +0,0 @@
|
|||||||
{
|
|
||||||
"mcpServers": {
|
|
||||||
"serena": {
|
|
||||||
"command": "uvx",
|
|
||||||
"args": [
|
|
||||||
"--from",
|
|
||||||
"git+https://github.com/oraios/serena",
|
|
||||||
"serena",
|
|
||||||
"start-mcp-server",
|
|
||||||
"--enable-web-dashboard",
|
|
||||||
"false"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"context7": {
|
|
||||||
"type": "http",
|
|
||||||
"url": "https://mcp.context7.com/mcp"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -10,7 +10,7 @@ export interface PrintBarcodeData {
|
|||||||
locationName: string;
|
locationName: string;
|
||||||
billName: string;
|
billName: string;
|
||||||
barcodeImage: string;
|
barcodeImage: string;
|
||||||
yearMonth: string;
|
payedAmount?: number | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -46,7 +46,7 @@ export const fetchBarcodeDataForPrint = withUser(async (user: AuthenticatedUser,
|
|||||||
locationName: location.name,
|
locationName: location.name,
|
||||||
billName: bill.name,
|
billName: bill.name,
|
||||||
barcodeImage: bill.barcodeImage,
|
barcodeImage: bill.barcodeImage,
|
||||||
yearMonth: yearMonth
|
payedAmount: bill.payedAmount
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ export const PrintPreview: React.FC<PrintPreviewProps> = ({ data, year, month, t
|
|||||||
width: 69.6mm !important;
|
width: 69.6mm !important;
|
||||||
max-width: 69.6mm !important;
|
max-width: 69.6mm !important;
|
||||||
height: auto !important;
|
height: auto !important;
|
||||||
max-height: none !important;
|
max-height: 85px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.print-table {
|
.print-table {
|
||||||
@@ -70,9 +70,21 @@ export const PrintPreview: React.FC<PrintPreviewProps> = ({ data, year, month, t
|
|||||||
background: white !important;
|
background: white !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.print-table th {
|
||||||
|
padding: 8px 12px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.print-table td {
|
||||||
|
padding: 16px 12px !important;
|
||||||
|
}
|
||||||
|
|
||||||
.print-table thead tr {
|
.print-table thead tr {
|
||||||
background: #f5f5f5 !important;
|
background: #f5f5f5 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.print-table .space-y-1 > * + * {
|
||||||
|
margin-top: 0.5rem !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
`}</style>
|
`}</style>
|
||||||
|
|
||||||
@@ -117,15 +129,17 @@ export const PrintPreview: React.FC<PrintPreviewProps> = ({ data, year, month, t
|
|||||||
</td>
|
</td>
|
||||||
<td className="border-2 border-gray-800 px-3 py-4">
|
<td className="border-2 border-gray-800 px-3 py-4">
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<div className="font-bold text-sm text-gray-900">
|
|
||||||
📅 {item.yearMonth}
|
|
||||||
</div>
|
|
||||||
<div className="font-medium text-sm text-gray-800">
|
<div className="font-medium text-sm text-gray-800">
|
||||||
🏠 {item.locationName}
|
🏠 {item.locationName}
|
||||||
</div>
|
</div>
|
||||||
<div className="text-sm text-gray-700">
|
<div className="text-sm text-gray-700">
|
||||||
📋 {item.billName}
|
📋 {item.billName}
|
||||||
</div>
|
</div>
|
||||||
|
{item.payedAmount && (
|
||||||
|
<div className="text-sm text-gray-700">
|
||||||
|
💰 {(item.payedAmount / 100).toFixed(2)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td className="border-2 border-gray-800 px-3 py-1.5 text-center">
|
<td className="border-2 border-gray-800 px-3 py-1.5 text-center">
|
||||||
|
|||||||
Reference in New Issue
Block a user