Commit 40e7abdc authored by Volker Krause's avatar Volker Krause
Browse files

Fix merging of flight reservations with different IATA BCBP data

That can happen, so we need to compare the content there. That happens
automatically though, as the post-processor unpacks the BCBP data to
other fields anyway, so we can just skip this here.
parent 41ef01c1
......@@ -102,7 +102,10 @@ bool MergeUtil::isSame(const QVariant& lhs, const QVariant& rhs)
if (conflictIfPresent(lhsTicket.ticketedSeat().seatNumber(), rhsTicket.ticketedSeat().seatNumber(), Qt::CaseInsensitive)) {
return false;
if (conflictIfPresent(lhsTicket.ticketTokenData(), rhsTicket.ticketTokenData())) {
// flight ticket tokens (IATA BCBP) can differ, so we need to compare the relevant bits in them manually
// this however happens automatically as they are unpacked to other fields by post-processing
// so we can simply skip this here for flights
if (!JsonLd::isA<FlightReservation>(lhs) && 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