Commit 9310e211 authored by Volker Krause's avatar Volker Krause
Browse files

Fix ticket token comparison

This now considers two tokens with same content but different barcode type
equal, and more importantly, it doesn't accidentally merge two tickets with
different token types.
parent d52720b1
......@@ -102,10 +102,8 @@ bool MergeUtil::isSame(const QVariant& lhs, const QVariant& rhs)
if (conflictIfPresent(lhsTicket.ticketedSeat().seatNumber(), rhsTicket.ticketedSeat().seatNumber(), Qt::CaseInsensitive)) {
return false;
if (lhsTicket.ticketTokenType() == rhsTicket.ticketTokenType()) {
if (conflictIfPresent(lhsTicket.ticketToken(), rhsTicket.ticketToken())) {
return false;
if (conflictIfPresent(lhsTicket.ticketTokenData(), rhsTicket.ticketTokenData())) {
return false;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment