Question: Do I have to wait for a listing to end before combining invoices for a buyer?
Yes, you have to wait for both listings to close. Once both listings end, you can click send invoice on either listing. When you do that, inside the invoice it will let you select all the purchases from that buyer to combine them.
