oops. still show outstanding payments for cancelled orders
authorkonrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Mon, 12 Jul 2010 19:20:57 +0000 (19:20 +0000)
committerkonrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Mon, 12 Jul 2010 19:20:57 +0000 (19:20 +0000)
git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@560 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33

src/mwin/orderstab.cpp

index 43e46ca..4379753 100644 (file)
@@ -120,11 +120,12 @@ static inline bool candoUpdateOrders(int omode,const MOOrderInfo&ord)
 {
        //show all?
        if(omode==ORDERALL)return true;
-       //do not show cancelled ones per default
-       if(ord.isCancelled())return false;
-       //select by mask
+       //select by mask: outstanding payments and refunds
        if((omode&ORDERPAY)!=0 && ord.needsPayment())return true;
        if((omode&ORDERREFUND)!=0 && ord.needsRefund())return true;
+       //do not show cancelled ones per default
+       if(ord.isCancelled())return false;
+       //select by mask: not yet sent and reserved...
        if((omode&ORDERUNSENT)!=0 && !ord.isSent())return true;
        if((omode&ORDERRESERVE)!=0 && ord.isReservation())return true;
        //no match: ignore the entry