Subversion Repositories SmartDukaan

Rev

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

Rev 34803 Rev 34850
Line 547... Line 547...
547
                    for (SchemeType rejectedCDType : rejectedCDTypes) {
547
                    for (SchemeType rejectedCDType : rejectedCDTypes) {
548
                        SchemeInOut sio = schemeInOutRepository.selectAllByType(rejectedCDType, inventoryItem.getId()).size() > 0 ?
548
                        SchemeInOut sio = schemeInOutRepository.selectAllByType(rejectedCDType, inventoryItem.getId()).size() > 0 ?
549
                                schemeInOutRepository.selectAllByType(rejectedCDType, inventoryItem.getId()).get(0) : null;
549
                                schemeInOutRepository.selectAllByType(rejectedCDType, inventoryItem.getId()).get(0) : null;
550
                        if (sio == null) continue;
550
                        if (sio == null) continue;
551
                        sio.setStatus(SchemePayoutStatus.REJECTED);
551
                        sio.setStatus(SchemePayoutStatus.REJECTED);
-
 
552
                        //Noone should change this
552
                        sio.setStatusDescription("Rejected due to free days availed");
553
                        sio.setStatusDescription("Rejected due to free days availed");
553
                        sio.setRolledBackTimestamp(LocalDateTime.now());
554
                        sio.setRolledBackTimestamp(LocalDateTime.now());
554
                        inventoryItemCashback -= sio.getAmount();
555
                        inventoryItemCashback -= sio.getAmount();
555
                    }
556
                    }
556
 
557
 
Line 659... Line 660...
659
                if (schemeSummaryModelToProcess.getAmountType().equals(AmountType.PERCENTAGE)) {
660
                if (schemeSummaryModelToProcess.getAmountType().equals(AmountType.PERCENTAGE)) {
660
                    //Check for rejected CashDiscounts dont continue if its ever rejected once
661
                    //Check for rejected CashDiscounts dont continue if its ever rejected once
661
                    if (SchemeType.CDS.contains(schemeSummaryModelToProcess.getSchemeType())) {
662
                    if (SchemeType.CDS.contains(schemeSummaryModelToProcess.getSchemeType())) {
662
                        List<SchemeInOut> cdSchemeInOuts = schemeInOutRepository.selectAllByType(schemeSummaryModelToProcess.getSchemeType(), inventoryItem.getId());
663
                        List<SchemeInOut> cdSchemeInOuts = schemeInOutRepository.selectAllByType(schemeSummaryModelToProcess.getSchemeType(), inventoryItem.getId());
663
                        LOGGER.info(cdSchemeInOuts);
664
                        LOGGER.info(cdSchemeInOuts);
-
 
665
                        if (!cdSchemeInOuts.isEmpty() && cdSchemeInOuts.get(0).getStatusDescription().equals("Rejected due to free days availed"))
664
                        if (!cdSchemeInOuts.isEmpty()) continue;
666
                            continue;
665
                    }
667
                    }
666
                    percentageToPay += schemeSummaryModelToProcess.getAmount();
668
                    percentageToPay += schemeSummaryModelToProcess.getAmount();
667
                } else {
669
                } else {
668
                    fixedToPay += schemeSummaryModelToProcess.getAmount();
670
                    fixedToPay += schemeSummaryModelToProcess.getAmount();
669
                }
671
                }