Subversion Repositories SmartDukaan

Rev

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

Rev 31144 Rev 31238
Line 649... Line 649...
649
					} else {
649
					} else {
650
						return null;
650
						return null;
651
					}
651
					}
652
				}));
652
				}));
653
		inventoryService.addActivatedImeis(imeisActivationMap);
653
		inventoryService.addActivatedImeis(imeisActivationMap);
654
		model.addAttribute("response", true);
654
		model.addAttribute("response1", true);
655
		return "response";
655
		return "response";
656
	}
656
	}
657
 
657
 
658
	private List<CSVRecord> readFile(MultipartFile file) throws Exception {
658
	private List<CSVRecord> readFile(MultipartFile file) throws Exception {
659
		List<CSVRecord> records = null;
659
		List<CSVRecord> records = null;
Line 680... Line 680...
680
		}
680
		}
681
		tagRanking.setFeature(itemFeatureDatatModel.getFeature());
681
		tagRanking.setFeature(itemFeatureDatatModel.getFeature());
682
		tagRanking.setRankPoints(itemFeatureDatatModel.getRankPoints());
682
		tagRanking.setRankPoints(itemFeatureDatatModel.getRankPoints());
683
 
683
 
684
		tagRankingRepository.persist(tagRanking);
684
		tagRankingRepository.persist(tagRanking);
685
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
685
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
686
		return "response";
686
		return "response";
687
	}
687
	}
688
 
688
 
689
	@RequestMapping(value = "/removeFeature", method = RequestMethod.DELETE)
689
	@RequestMapping(value = "/removeFeature", method = RequestMethod.DELETE)
690
	public String removeTagRankingEnteries(HttpServletRequest request,
690
	public String removeTagRankingEnteries(HttpServletRequest request,
691
			@RequestParam(name = "id", defaultValue = "0") int id, Model model) throws Exception {
691
			@RequestParam(name = "id", defaultValue = "0") int id, Model model) throws Exception {
692
 
692
 
693
		tagRankingRepository.deleteById(id);
693
		tagRankingRepository.deleteById(id);
694
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
694
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
695
		return "response";
695
		return "response";
696
	}
696
	}
697
 
697
 
698
	@RequestMapping(value = "/getDemolistbyfofoId", method = RequestMethod.GET)
698
	@RequestMapping(value = "/getDemolistbyfofoId", method = RequestMethod.GET)
699
	public String DemoListbyFofoId(HttpServletRequest request,
699
	public String DemoListbyFofoId(HttpServletRequest request,
Line 753... Line 753...
753
 
753
 
754
		LiveDemoSerialNumber liveDemoSerialNumber = new LiveDemoSerialNumber();
754
		LiveDemoSerialNumber liveDemoSerialNumber = new LiveDemoSerialNumber();
755
		liveDemoSerialNumber.setSerialNumber(serial_number);
755
		liveDemoSerialNumber.setSerialNumber(serial_number);
756
 
756
 
757
		liveDemoBillingRespository.persist(liveDemoSerialNumber);
757
		liveDemoBillingRespository.persist(liveDemoSerialNumber);
758
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
758
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
759
		return "response";
759
		return "response";
760
	}
760
	}
761
 
761
 
762
	@RequestMapping(value = "/getInProcessOrder", method = RequestMethod.GET)
762
	@RequestMapping(value = "/getInProcessOrder", method = RequestMethod.GET)
763
	public String getInProcessOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
763
	public String getInProcessOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
Line 832... Line 832...
832
 
832
 
833
		Order order = orderRepository.selectById(orderId);
833
		Order order = orderRepository.selectById(orderId);
834
		if (order != null) {
834
		if (order != null) {
835
			order.setStatus(OrderStatus.CANCELLED_DUE_TO_LOW_INVENTORY);
835
			order.setStatus(OrderStatus.CANCELLED_DUE_TO_LOW_INVENTORY);
836
 
836
 
837
			model.addAttribute("response", mvcResponseSender.createResponseString(true));
837
			model.addAttribute("response1", mvcResponseSender.createResponseString(true));
838
 
838
 
839
		} else {
839
		} else {
840
			model.addAttribute("response", mvcResponseSender.createResponseString(false));
840
			model.addAttribute("response1", mvcResponseSender.createResponseString(false));
841
 
841
 
842
		}
842
		}
843
		return "response";
843
		return "response";
844
	}
844
	}
845
 
845
 
Line 887... Line 887...
887
						if (notifyOrder.getStatus() == NotifyStatus.pending) {
887
						if (notifyOrder.getStatus() == NotifyStatus.pending) {
888
							notifyOrder.setStatus(NotifyStatus.rejected);
888
							notifyOrder.setStatus(NotifyStatus.rejected);
889
						}
889
						}
890
					}
890
					}
891
					sendCancellationNotificationToPartner(order, orderCancellationModel.getReason());
891
					sendCancellationNotificationToPartner(order, orderCancellationModel.getReason());
892
					model.addAttribute("response", mvcResponseSender.createResponseString(true));
892
					model.addAttribute("response1", mvcResponseSender.createResponseString(true));
893
 
893
 
894
				}
894
				}
895
			}
895
			}
896
		} catch (TransactionServiceException | TException e) {
896
		} catch (TransactionServiceException | TException e) {
897
			model.addAttribute("response", mvcResponseSender.createResponseString(false));
897
			model.addAttribute("response1", mvcResponseSender.createResponseString(false));
898
 
898
 
899
		}
899
		}
900
 
900
 
901
		return "response";
901
		return "response";
902
	}
902
	}
Line 1046... Line 1046...
1046
 
1046
 
1047
			// notificationService.sendWhatsappMessage(message.getNotifyMessages(), title,
1047
			// notificationService.sendWhatsappMessage(message.getNotifyMessages(), title,
1048
			// address.getPhoneNumber());
1048
			// address.getPhoneNumber());
1049
 
1049
 
1050
		}
1050
		}
1051
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
1051
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
1052
		return "response";
1052
		return "response";
1053
	}
1053
	}
1054
 
1054
 
1055
	@RequestMapping(value = "/getAllNotifyOrder", method = RequestMethod.GET)
1055
	@RequestMapping(value = "/getAllNotifyOrder", method = RequestMethod.GET)
1056
	public String getAllNotifyOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
1056
	public String getAllNotifyOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
Line 1170... Line 1170...
1170
			sendNotificationModel.setUserIds(Arrays.asList(userId));
1170
			sendNotificationModel.setUserIds(Arrays.asList(userId));
1171
			notificationService.sendNotification(sendNotificationModel);
1171
			notificationService.sendNotification(sendNotificationModel);
1172
 
1172
 
1173
		}
1173
		}
1174
 
1174
 
1175
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
1175
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
1176
		return "response";
1176
		return "response";
1177
	}
1177
	}
1178
 
1178
 
1179
	@RequestMapping(value = "/getNotifiedCancelOrder", method = RequestMethod.GET)
1179
	@RequestMapping(value = "/getNotifiedCancelOrder", method = RequestMethod.GET)
1180
	public String getNotifiedCancelOrder(HttpServletRequest request, Model model) throws Exception {
1180
	public String getNotifiedCancelOrder(HttpServletRequest request, Model model) throws Exception {
Line 1240... Line 1240...
1240
		List<NotifyCancel> ncs = notifyCancelOrderRepository.selectByOrderIds(orderIds);
1240
		List<NotifyCancel> ncs = notifyCancelOrderRepository.selectByOrderIds(orderIds);
1241
		for (NotifyCancel nc : ncs) {
1241
		for (NotifyCancel nc : ncs) {
1242
			nc.setCancellation(true);
1242
			nc.setCancellation(true);
1243
		}
1243
		}
1244
 
1244
 
1245
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
1245
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
1246
		return "response";
1246
		return "response";
1247
	}
1247
	}
1248
 
1248
 
1249
	@RequestMapping(value = "/getProducts", method = RequestMethod.GET)
1249
	@RequestMapping(value = "/getProducts", method = RequestMethod.GET)
1250
	public String getProducts(HttpServletRequest request, Model model)
1250
	public String getProducts(HttpServletRequest request, Model model)
Line 1255... Line 1255...
1255
 
1255
 
1256
	@RequestMapping(value = "/getProductInfo", method = RequestMethod.GET)
1256
	@RequestMapping(value = "/getProductInfo", method = RequestMethod.GET)
1257
	public String getProductInfo(HttpServletRequest request, long catalogId, Model model) throws Exception {
1257
	public String getProductInfo(HttpServletRequest request, long catalogId, Model model) throws Exception {
1258
		ContentPojo cp = mongoClient.getEntityById(catalogId);
1258
		ContentPojo cp = mongoClient.getEntityById(catalogId);
1259
		model.addAttribute("cp", cp);
1259
		model.addAttribute("cp", cp);
1260
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
1260
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
1261
		return "product-info";
1261
		return "product-info";
1262
	}
1262
	}
1263
 
1263
 
1264
	@RequestMapping(value = "/getProductCompareInfo", method = RequestMethod.GET)
1264
	@RequestMapping(value = "/getProductCompareInfo", method = RequestMethod.GET)
1265
	public String getProductCompareInfo(HttpServletRequest request, @RequestParam List<Long> catalogIds, Model model)
1265
	public String getProductCompareInfo(HttpServletRequest request, @RequestParam List<Long> catalogIds, Model model)
Line 1804... Line 1804...
1804
 
1804
 
1805
		notificationService.sendNotification(sendNotificationModel);
1805
		notificationService.sendNotification(sendNotificationModel);
1806
 
1806
 
1807
		notificationService.sendWhatsappMessage(message, title, address.getPhoneNumber());
1807
		notificationService.sendWhatsappMessage(message, title, address.getPhoneNumber());
1808
 
1808
 
1809
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
1809
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
1810
		return "response";
1810
		return "response";
1811
	}
1811
	}
1812
 
1812
 
1813
	@RequestMapping(value = "/highDemandItem", method = RequestMethod.GET)
1813
	@RequestMapping(value = "/highDemandItem", method = RequestMethod.GET)
1814
	public String highDemandItem(HttpServletRequest request, Model model) throws Exception {
1814
	public String highDemandItem(HttpServletRequest request, Model model) throws Exception {
Line 1845... Line 1845...
1845
			hdi.setCreateTimestamp(LocalDateTime.now());
1845
			hdi.setCreateTimestamp(LocalDateTime.now());
1846
			hdi.setUpdateTimestamp(LocalDateTime.now());
1846
			hdi.setUpdateTimestamp(LocalDateTime.now());
1847
			highDemandItemsRepository.persist(hdi);
1847
			highDemandItemsRepository.persist(hdi);
1848
		}
1848
		}
1849
 
1849
 
1850
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
1850
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
1851
		return "response";
1851
		return "response";
1852
	}
1852
	}
1853
 
1853
 
1854
	@RequestMapping(value = "/removeHighDemandItem", method = RequestMethod.DELETE)
1854
	@RequestMapping(value = "/removeHighDemandItem", method = RequestMethod.DELETE)
1855
	public String removeHighDemandItem(HttpServletRequest request,
1855
	public String removeHighDemandItem(HttpServletRequest request,
1856
			@RequestParam(name = "id", defaultValue = "0") int id, Model model) throws Exception {
1856
			@RequestParam(name = "id", defaultValue = "0") int id, Model model) throws Exception {
1857
		highDemandItemsRepository.deleteById(id);
1857
		highDemandItemsRepository.deleteById(id);
1858
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
1858
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
1859
		return "response";
1859
		return "response";
1860
	}
1860
	}
1861
 
1861
 
1862
	@GetMapping(value = "/imei")
1862
	@GetMapping(value = "/imei")
1863
	public String getImei(HttpServletRequest request, Model model, @RequestParam int fofoId, @RequestParam String query)
1863
	public String getImei(HttpServletRequest request, Model model, @RequestParam int fofoId, @RequestParam String query)
Line 1866... Line 1866...
1866
		List<String> serialNumber = inventoryItemRepository.selectAllByFofoId(fofoId, query).stream()
1866
		List<String> serialNumber = inventoryItemRepository.selectAllByFofoId(fofoId, query).stream()
1867
				.map(x -> x.getSerialNumber()).collect(Collectors.toList());
1867
				.map(x -> x.getSerialNumber()).collect(Collectors.toList());
1868
		LOGGER.info("serialNumber" + serialNumber);
1868
		LOGGER.info("serialNumber" + serialNumber);
1869
		LOGGER.info("query" + query);
1869
		LOGGER.info("query" + query);
1870
 
1870
 
1871
		model.addAttribute("response", mvcResponseSender.createResponseString(serialNumber));
1871
		model.addAttribute("response1", mvcResponseSender.createResponseString(serialNumber));
1872
 
1872
 
1873
		return "response";
1873
		return "response";
1874
	}
1874
	}
1875
 
1875
 
1876
	@Autowired
1876
	@Autowired
Line 1887... Line 1887...
1887
 
1887
 
1888
		} catch (Exception e) {
1888
		} catch (Exception e) {
1889
			isImei = false;
1889
			isImei = false;
1890
		}
1890
		}
1891
 
1891
 
1892
		model.addAttribute("response", objectMapper.writeValueAsString(isImei));
1892
		model.addAttribute("response1", objectMapper.writeValueAsString(isImei));
1893
		return "response";
1893
		return "response";
1894
	}
1894
	}
1895
 
1895
 
1896
	@RequestMapping(value = "/createCombo", method = RequestMethod.GET)
1896
	@RequestMapping(value = "/createCombo", method = RequestMethod.GET)
1897
	public String createCombo(HttpServletRequest request, Model model) throws Exception {
1897
	public String createCombo(HttpServletRequest request, Model model) throws Exception {
Line 1938... Line 1938...
1938
 
1938
 
1939
			}
1939
			}
1940
 
1940
 
1941
		}
1941
		}
1942
 
1942
 
1943
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
1943
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
1944
 
1944
 
1945
		return "response";
1945
		return "response";
1946
 
1946
 
1947
	}
1947
	}
1948
 
1948
 
1949
	@RequestMapping(value = "/combo/remove", method = RequestMethod.POST)
1949
	@RequestMapping(value = "/combo/remove", method = RequestMethod.POST)
1950
	public String removeCombo(HttpServletRequest request, @RequestParam int id, Model model) throws Exception {
1950
	public String removeCombo(HttpServletRequest request, @RequestParam int id, Model model) throws Exception {
1951
		comboMappedModelRepository.deleteByEquals(id);
1951
		comboMappedModelRepository.deleteByEquals(id);
1952
		comboModelRepository.deleteById(id);
1952
		comboModelRepository.deleteById(id);
1953
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
1953
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
1954
 
1954
 
1955
		return "response";
1955
		return "response";
1956
 
1956
 
1957
	}
1957
	}
1958
}
1958
}