Subversion Repositories SmartDukaan

Rev

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

Rev 31784 Rev 31785
Line 476... Line 476...
476
        Utils.sendMailWithAttachments(mailSender, new String[]{"kuldeep.kumar@smartdukaan.com"}, null, "Invoices List", "PFA", attachments.toArray(new Attachment[attachments.size()]));
476
        Utils.sendMailWithAttachments(mailSender, new String[]{"kuldeep.kumar@smartdukaan.com"}, null, "Invoices List", "PFA", attachments.toArray(new Attachment[attachments.size()]));
477
        return new ResponseEntity<Boolean>(true, HttpStatus.OK);
477
        return new ResponseEntity<Boolean>(true, HttpStatus.OK);
478
    }
478
    }
479
 
479
 
480
    @RequestMapping(value = "/getInventoryItemAgingByInterval", method = RequestMethod.POST)
480
    @RequestMapping(value = "/getInventoryItemAgingByInterval", method = RequestMethod.POST)
481
    public String getInventoryItemAgingByInterval(HttpServletRequest request, @RequestBody List<Integer> intervals, Model model, @RequestParam(name = "searchContent", defaultValue = "") String searchContent, @RequestParam(name = "offset", defaultValue = "1000") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit) throws ProfitMandiBusinessException {
481
    public String getInventoryItemAgingByInterval(HttpServletRequest request, @RequestBody List<Integer> intervals, Model model,
-
 
482
                                                  @RequestParam(name = "searchContent", defaultValue = "") String searchContent,
-
 
483
                                                  @RequestParam(name = "offset", defaultValue = "0") int offset,
-
 
484
                                                  @RequestParam(name = "limit", defaultValue = "1000") int limit) throws ProfitMandiBusinessException {
482
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
485
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
483
        Map<String, Object> map = inventoryService.getPaginatedItemAgingByInterval(loginDetails.getFofoId(), intervals, searchContent, offset, limit);
486
        Map<String, Object> map = inventoryService.getPaginatedItemAgingByInterval(loginDetails.getFofoId(), intervals, searchContent, offset, limit);
484
        model.addAllAttributes(map);
487
        model.addAllAttributes(map);
485
        return "item-aging";
488
        return "item-aging";
486
    }
489
    }
Line 646... Line 649...
646
            model.addAttribute("liveDemo", inventoryItem1);
649
            model.addAttribute("liveDemo", inventoryItem1);
647
            CustomRetailer fofoIdsAndRetailerName = retailerService.getFofoRetailer(fofoId);
650
            CustomRetailer fofoIdsAndRetailerName = retailerService.getFofoRetailer(fofoId);
648
 
651
 
649
            model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
652
            model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
650
 
653
 
651
        }
-
 
652
 
-
 
653
        else {
654
        } else {
654
            model.addAttribute("customRetailers", customRetailers);
655
            model.addAttribute("customRetailers", customRetailers);
655
            model.addAttribute("liveDemo", inventoryItem1);
656
            model.addAttribute("liveDemo", inventoryItem1);
656
        }
657
        }
657
 
658
 
658
        return "live_demo_billing";
659
        return "live_demo_billing";
Line 834... Line 835...
834
            TagListing itemTagListing = tagListingRepository.selectByItemId(item.getId());
835
            TagListing itemTagListing = tagListingRepository.selectByItemId(item.getId());
835
 
836
 
836
            if (itemTagListing == null) {
837
            if (itemTagListing == null) {
837
                itemsIterator.remove();
838
                itemsIterator.remove();
838
 
839
 
839
            }
-
 
840
 
-
 
841
            else if (!itemTagListing.isActive()) {
840
            } else if (!itemTagListing.isActive()) {
842
                itemsIterator.remove();
841
                itemsIterator.remove();
843
 
842
 
844
            }
843
            }
845
        }
844
        }
846
 
845