Subversion Repositories SmartDukaan

Rev

Rev 35628 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 35628 Rev 35771
Line 52... Line 52...
52
import org.springframework.core.io.InputStreamResource;
52
import org.springframework.core.io.InputStreamResource;
53
import org.springframework.http.HttpHeaders;
53
import org.springframework.http.HttpHeaders;
54
import org.springframework.http.HttpStatus;
54
import org.springframework.http.HttpStatus;
55
import org.springframework.http.ResponseEntity;
55
import org.springframework.http.ResponseEntity;
56
import org.springframework.stereotype.Controller;
56
import org.springframework.stereotype.Controller;
-
 
57
import org.springframework.transaction.annotation.Transactional;
57
import org.springframework.ui.Model;
58
import org.springframework.ui.Model;
58
import org.springframework.web.bind.annotation.*;
59
import org.springframework.web.bind.annotation.*;
59
import org.springframework.web.multipart.MultipartFile;
60
import org.springframework.web.multipart.MultipartFile;
60
 
61
 
61
import javax.servlet.http.HttpServletRequest;
62
import javax.servlet.http.HttpServletRequest;
62
import javax.servlet.http.HttpServletResponse;
63
import javax.servlet.http.HttpServletResponse;
63
import org.springframework.transaction.annotation.Transactional;
-
 
64
import java.io.ByteArrayInputStream;
64
import java.io.ByteArrayInputStream;
65
import java.io.ByteArrayOutputStream;
65
import java.io.ByteArrayOutputStream;
66
import java.io.InputStream;
66
import java.io.InputStream;
67
import java.time.*;
67
import java.time.*;
68
import java.time.format.DateTimeFormatter;
68
import java.time.format.DateTimeFormatter;
Line 605... Line 605...
605
        return "response";
605
        return "response";
606
    }
606
    }
607
 
607
 
608
    @RequestMapping(value = "/getSchemesByImei", method = RequestMethod.GET)
608
    @RequestMapping(value = "/getSchemesByImei", method = RequestMethod.GET)
609
    public String getSchemesByImei(HttpServletRequest request,
609
    public String getSchemesByImei(HttpServletRequest request,
-
 
610
                                   @RequestParam(defaultValue = "") String searchImei,
610
                                   @RequestParam (defaultValue = "") String searchImei, Model model) throws ProfitMandiBusinessException {
611
                                   @RequestParam(defaultValue = "false") boolean modal, Model model) throws ProfitMandiBusinessException {
611
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
612
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
612
        if (org.apache.commons.lang3.StringUtils.isNotEmpty(searchImei)) {
613
        if (org.apache.commons.lang3.StringUtils.isNotEmpty(searchImei)) {
613
 
614
 
614
            List<Scheme> schemes = null;
615
            List<Scheme> schemes = null;
615
            List<SchemeInOut> schemeInOuts = null;
616
            List<SchemeInOut> schemeInOuts = null;
Line 684... Line 685...
684
            model.addAttribute("schemeInOut", schemeInOuts);
685
            model.addAttribute("schemeInOut", schemeInOuts);
685
            model.addAttribute("schemes", schemes);
686
            model.addAttribute("schemes", schemes);
686
            model.addAttribute("customRetailer", customRetailer);
687
            model.addAttribute("customRetailer", customRetailer);
687
            model.addAttribute("searchImei", searchImei);
688
            model.addAttribute("searchImei", searchImei);
688
        }
689
        }
-
 
690
        if (modal) {
-
 
691
            return "scheme-imei-history-modal";
-
 
692
        }
689
        return "scheme-imei-history";
693
        return "scheme-imei-history";
690
    }
694
    }
691
 
695
 
692
 
696
 
693
    @Autowired
697
    @Autowired