Subversion Repositories SmartDukaan

Rev

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

Rev 28377 Rev 28420
Line 69... Line 69...
69 
import com.spice.profitmandi.dao.entity.fofo.CustomerCreditNote;
 69 
import com.spice.profitmandi.dao.entity.fofo.CustomerCreditNote;
70 
import com.spice.profitmandi.dao.entity.fofo.CustomerReturnItem;
 70 
import com.spice.profitmandi.dao.entity.fofo.CustomerReturnItem;
71 
import com.spice.profitmandi.dao.entity.fofo.FofoLineItem;
 71 
import com.spice.profitmandi.dao.entity.fofo.FofoLineItem;
72 
import com.spice.profitmandi.dao.entity.fofo.FofoOrder;
 72 
import com.spice.profitmandi.dao.entity.fofo.FofoOrder;
73 
import com.spice.profitmandi.dao.entity.fofo.FofoOrderItem;
 73 
import com.spice.profitmandi.dao.entity.fofo.FofoOrderItem;
- 
 
 74 
import com.spice.profitmandi.dao.entity.fofo.Mou;
74 
import com.spice.profitmandi.dao.entity.fofo.PaymentOption;
 75 
import com.spice.profitmandi.dao.entity.fofo.PaymentOption;
75 
import com.spice.profitmandi.dao.entity.fofo.PendingOrder;
 76 
import com.spice.profitmandi.dao.entity.fofo.PendingOrder;
76 
import com.spice.profitmandi.dao.entity.fofo.PendingOrderItem;
 77 
import com.spice.profitmandi.dao.entity.fofo.PendingOrderItem;
77 
import com.spice.profitmandi.dao.entity.user.Address;
 78 
import com.spice.profitmandi.dao.entity.user.Address;
78 
import com.spice.profitmandi.dao.enumuration.dtr.PaymentOptionReferenceType;
 79 
import com.spice.profitmandi.dao.enumuration.dtr.PaymentOptionReferenceType;
Line 89... Line 90...
89 
import com.spice.profitmandi.dao.repository.fofo.CustomerRepository;
 90 
import com.spice.profitmandi.dao.repository.fofo.CustomerRepository;
90 
import com.spice.profitmandi.dao.repository.fofo.CustomerReturnItemRepository;
 91 
import com.spice.profitmandi.dao.repository.fofo.CustomerReturnItemRepository;
91 
import com.spice.profitmandi.dao.repository.fofo.FofoOrderItemRepository;
 92 
import com.spice.profitmandi.dao.repository.fofo.FofoOrderItemRepository;
92 
import com.spice.profitmandi.dao.repository.fofo.FofoOrderRepository;
 93 
import com.spice.profitmandi.dao.repository.fofo.FofoOrderRepository;
93 
import com.spice.profitmandi.dao.repository.fofo.FofoPartnerPaymentOptionRepository;
 94 
import com.spice.profitmandi.dao.repository.fofo.FofoPartnerPaymentOptionRepository;
- 
 
 95 
import com.spice.profitmandi.dao.repository.fofo.MouRepository;
94 
import com.spice.profitmandi.dao.repository.fofo.PaymentOptionRepository;
 96 
import com.spice.profitmandi.dao.repository.fofo.PaymentOptionRepository;
95 
import com.spice.profitmandi.dao.repository.fofo.PendingOrderItemRepository;
 97 
import com.spice.profitmandi.dao.repository.fofo.PendingOrderItemRepository;
96 
import com.spice.profitmandi.dao.repository.fofo.PendingOrderRepository;
 98 
import com.spice.profitmandi.dao.repository.fofo.PendingOrderRepository;
97 
import com.spice.profitmandi.dao.repository.fofo.PendingOrderService;
 99 
import com.spice.profitmandi.dao.repository.fofo.PendingOrderService;
98 
import com.spice.profitmandi.dao.repository.inventory.StateRepository;
 100 
import com.spice.profitmandi.dao.repository.inventory.StateRepository;
Line 210... Line 212...
210 
	private EmailService emailService;
 212 
	private EmailService emailService;
211 
 
 213 
 
212 
	@Autowired
 214 
	@Autowired
213 
	private SolrService commonSolrService;
 215 
	private SolrService commonSolrService;
214 
 
 216 
 
- 
 
 217 
	@Autowired
- 
 
 218 
	private MouRepository mouRepository;
- 
 
 219 
 
215 
	@RequestMapping(value = "/order")
 220 
	@RequestMapping(value = "/order")
216 
	public String orderIndex(HttpServletRequest request, @RequestParam(name = "cartData") String cartData, Model model)
 221 
	public String orderIndex(HttpServletRequest request, @RequestParam(name = "cartData") String cartData, Model model)
217 
			throws ProfitMandiBusinessException {
 222 
			throws ProfitMandiBusinessException {
218 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 223 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
219 
 
 224 
 
Line 901... Line 906...
901 
		model.addAttribute("insurancePolicies", insurancePolicies);
 906 
		model.addAttribute("insurancePolicies", insurancePolicies);
902 
		model.addAttribute("providerPolicyNameAndIdMap", providerPolicyNameAndIdMap);
 907 
		model.addAttribute("providerPolicyNameAndIdMap", providerPolicyNameAndIdMap);
903 
		return "insurance-details-paginated";
 908 
		return "insurance-details-paginated";
904 
	}
 909 
	}
905 
 
 910 
 
- 
 
 911 
	@GetMapping("/getMouForm")
- 
 
 912 
	public String getMouForm(HttpServletRequest request, Model model) throws Exception {
- 
 
 913 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
- 
 
 914 
 
- 
 
 915 
		Mou mou = mouRepository.selectByFofoId(loginDetails.getFofoId());
- 
 
 916 
		if (mou != null) {
- 
 
 917 
			model.addAttribute("response", mvcResponseSender.createResponseString(true));
- 
 
 918 
		} else {
- 
 
 919 
			model.addAttribute("response", mvcResponseSender.createResponseString(false));
- 
 
 920 
 
- 
 
 921 
		}
- 
 
 922 
		return "response";
- 
 
 923 
 
- 
 
 924 
	}
- 
 
 925 
 
906 
	@GetMapping("/pendingOrders")
 926 
	@GetMapping("/pendingOrders")
907 
	public String getPendingOrders(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
 927 
	public String getPendingOrders(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
908 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 928 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
909 
		boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
 929 
		boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
910 
		List<Integer> fofoIds = fofoStoreRepository.selectActiveStores().stream().map(x -> x.getId())
 930 
		Mou mou = mouRepository.selectByFofoId(loginDetails.getFofoId());
911 
				.collect(Collectors.toList());
 931 
		if (mou == null) {
912 
 
 - 
 
913 
		if (isAdmin) {
 932 
			mou = new Mou();
914 
			Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
 933 
			mou.setFofoId(loginDetails.getFofoId());
915 
			model.addAttribute("customRetailersMap", customRetailersMap);
 934 
			mou.setCreateTimestamp(LocalDateTime.now());
- 
 
 935 
			mouRepository.persist(mou);
916 
		}
 936 
		}
917 
		List<PendingOrderItem> pendingOrderItem = null;
 - 
 
918 
 
 937 
 
919 
		if (isAdmin) {
 938 
		List<PendingOrderItem> pendingOrderItem = null;
920 
 
 939 
 
921 
			pendingOrderItem = pendingOrderItemRepository.selectUnverifiedOrder(OrderStatus.PROCESSING);
 940 
		pendingOrderItem = pendingOrderItemRepository.selectOrderItemByStatusAndFofoId(OrderStatus.PROCESSING,
- 
 
 941 
				loginDetails.getFofoId());
922 
 
 942 
 
923 
		} else {
 - 
 
924 
			pendingOrderItem = pendingOrderItemRepository.selectOrderItemByStatusAndFofoId(OrderStatus.PROCESSING,
 - 
 
925 
					loginDetails.getFofoId());
 - 
 
926 
		}
 - 
 
927 
		Map<String, Object> map = null;
 943 
		Map<String, Object> map = null;
928 
 
 944 
 
929 
		if (isAdmin) {
 - 
 
930 
			map = pendingOrderService.getItemOrders(pendingOrderItem, 0);
 - 
 
931 
			model.addAttribute("partnerInventoryMap", map.get("partnerInventoryMap"));
 - 
 
932 
 
 - 
 
933 
		} else {
 - 
 
934 
			map = pendingOrderService.getItemOrders(pendingOrderItem, loginDetails.getFofoId());
 945 
		map = pendingOrderService.getItemOrders(pendingOrderItem, loginDetails.getFofoId());
935 
			model.addAttribute("inventoryMap", map.get("inventoryMap"));
 946 
		model.addAttribute("inventoryMap", map.get("inventoryMap"));
936 
		}
 - 
 
937 
 
 947 
 
938 
		model.addAttribute("pendingOrderItem", map.get("pendingOrderItem"));
 948 
		model.addAttribute("pendingOrderItem", map.get("pendingOrderItem"));
939 
 
 949 
 
940 
		LOGGER.info("partnerInventoryMap" + map.get("partnerInventoryMap"));
 950 
		LOGGER.info("partnerInventoryMap" + map.get("partnerInventoryMap"));
941 
		model.addAttribute("isAdmin", isAdmin);
 951 
		model.addAttribute("isAdmin", isAdmin);
Line 1237... Line 1247...
1237 
		return "response";
 1247 
		return "response";
1238 
	}
 1248 
	}
1239 
 
 1249 
 
1240 
	@RequestMapping(value = "/getOnlineOrder", method = RequestMethod.GET)
 1250 
	@RequestMapping(value = "/getOnlineOrder", method = RequestMethod.GET)
1241 
	public String cancelOrder(HttpServletRequest request, Model model) throws Exception {
 1251 
	public String cancelOrder(HttpServletRequest request, Model model) throws Exception {
1242 
		LocalDate date = LocalDate.now().minusDays(3);
 - 
 
1243 
		model.addAttribute("date", date);
 - 
 
1244 
		return "online-order";
 1252 
		return "online-order";
1245 
	}
 1253 
	}
1246 
 
 1254 
 
1247 
	@GetMapping("/getAllOrdersByStatus")
 1255 
	@GetMapping("/getAllOrdersByStatus")
1248 
	public String getAllOrdersByStatus(HttpServletRequest request, @RequestParam OrderStatus status,
 1256 
	public String getAllOrdersByStatus(HttpServletRequest request, @RequestParam OrderStatus status,
- 
 
 1257 
			@RequestParam(required = false) LocalDateTime startTime,
1249 
			@RequestParam LocalDate date, Model model) throws ProfitMandiBusinessException {
 1258 
			@RequestParam(required = false) LocalDateTime endTime, Model model) throws ProfitMandiBusinessException {
1250 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 1259 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
1251 
		boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
 1260 
		boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
1252 
 
 1261 
 
- 
 
 1262 
		LOGGER.info("startTime" + startTime);
- 
 
 1263 
 
1253 
		LOGGER.info("date" + date);
 1264 
		LOGGER.info("endTime" + endTime);
- 
 
 1265 
 
1254 
		List<Integer> fofoIds = fofoStoreRepository.selectActiveStores().stream().map(x -> x.getId())
 1266 
		List<Integer> fofoIds = fofoStoreRepository.selectActiveStores().stream().map(x -> x.getId())
1255 
				.collect(Collectors.toList());
 1267 
				.collect(Collectors.toList());
1256 
 
 1268 
 
1257 
		Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
 1269 
		Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
1258 
		model.addAttribute("customRetailersMap", customRetailersMap);
 1270 
		model.addAttribute("customRetailersMap", customRetailersMap);
1259 
 
 1271 
 
1260 
		List<PendingOrderItem> pendingOrderItem = null;
 1272 
		List<PendingOrderItem> pendingOrderItem = null;
- 
 
 1273 
		if (startTime == null) {
- 
 
 1274 
			pendingOrderItem = pendingOrderItemRepository.selectOrderItemByStatus(status);
- 
 
 1275 
		} else {
- 
 
 1276 
			List<OrderStatus> statusList = new ArrayList<>();
- 
 
 1277 
			if (status.equals(OrderStatus.DELIVERED)) {
- 
 
 1278 
				statusList.add(OrderStatus.SETTLED);
- 
 
 1279 
				statusList.add(OrderStatus.UNSETTLED);
- 
 
 1280 
			} else {
- 
 
 1281 
				statusList.add(status);
1261 
 
 1282 
			}
1262 
		pendingOrderItem = pendingOrderItemRepository.selectByStatusAndCreateTimestamp(Arrays.asList(status),
 1283 
			pendingOrderItem = pendingOrderItemRepository.selectByStatusAndCreateTimestamp(statusList, startTime,
1263 
				date.atStartOfDay(), LocalDateTime.now());
 1284 
					endTime);
1264 
 
 1285 
		}
1265 
		Map<String, Object> map = pendingOrderService.getItemOrders(pendingOrderItem, 0);
 1286 
		Map<String, Object> map = pendingOrderService.getItemOrders(pendingOrderItem, 0);
1266 
 
 1287 
 
1267 
		model.addAttribute("pendingOrderItem", map.get("pendingOrderItem"));
 1288 
		model.addAttribute("pendingOrderItem", map.get("pendingOrderItem"));
1268 
		model.addAttribute("partnerInventoryMap", map.get("partnerInventoryMap"));
 1289 
		model.addAttribute("partnerInventoryMap", map.get("partnerInventoryMap"));
1269 
 
 1290