Subversion Repositories SmartDukaan

Rev

Rev 20422 | Rev 21246 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 20422 Rev 20432
Line 369... Line 369...
369 
                        pass
 369 
                        pass
370 
                    elif "shippingDetails-ongoing" in str(tr):
 370 
                    elif "shippingDetails-ongoing" in str(tr):
371 
                        status = MStore.ORDER_SHIPPED
 371 
                        status = MStore.ORDER_SHIPPED
372 
                    elif "delivery-complete" in str(tr):
 372 
                    elif "delivery-complete" in str(tr):
373 
                        status = MStore.ORDER_DELIVERED
 373 
                        status = MStore.ORDER_DELIVERED
- 
 
 374 
                        if cashbackStatus!=MStore.CB_NA:
374 
                        merchantsubOrder.cashBackStatus = MStore.CB_APPROVED
 375 
                            merchantsubOrder.cashBackStatus = MStore.CB_APPROVED
375 
                        merchantsubOrder.closed = True
 376 
                        merchantsubOrder.closed = True
376 
                    if "dead" in str(tr) or "shippingDetails-returnOngoing" in str(tr) or "shippingDetails-return" in str(tr):
 377 
                    if "dead" in str(tr) or "shippingDetails-returnOngoing" in str(tr) or "shippingDetails-return" in str(tr):
377 
                        status = MStore.ORDER_CANCELLED
 378 
                        status = MStore.ORDER_CANCELLED
378 
                        if merchantsubOrder.cashBackStatus != MStore.CB_NA:
379 
                        if merchantsubOrder.cashBackStatus != MStore.CB_NA:
379 
                            merchantsubOrder.cashBackStatus = MStore.CB_CANCELLED
 380 
                            merchantsubOrder.cashBackStatus = MStore.CB_CANCELLED