Subversion Repositories SmartDukaan

Rev

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

Rev 26721 Rev 26817
Line 34... Line 34...
34 
import org.springframework.web.bind.annotation.RequestBody;
 34 
import org.springframework.web.bind.annotation.RequestBody;
35 
import org.springframework.web.bind.annotation.RequestMapping;
 35 
import org.springframework.web.bind.annotation.RequestMapping;
36 
import org.springframework.web.bind.annotation.RequestMethod;
 36 
import org.springframework.web.bind.annotation.RequestMethod;
37 
import org.springframework.web.bind.annotation.RequestParam;
 37 
import org.springframework.web.bind.annotation.RequestParam;
38 
 
 38 
 
- 
 
 39 
import com.google.gson.Gson;
39 
import com.spice.profitmandi.common.enumuration.SearchType;
 40 
import com.spice.profitmandi.common.enumuration.SearchType;
40 
import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 41 
import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
41 
import com.spice.profitmandi.common.model.CartFofo;
 42 
import com.spice.profitmandi.common.model.CartFofo;
42 
import com.spice.profitmandi.common.model.CreateOrderRequest;
 43 
import com.spice.profitmandi.common.model.CreateOrderRequest;
43 
import com.spice.profitmandi.common.model.CreditNotePdfModel;
 44 
import com.spice.profitmandi.common.model.CreditNotePdfModel;
Line 109... Line 110...
109 
 
 110 
 
110 
	@Autowired
 111 
	@Autowired
111 
	private RoleManager roleManager;
 112 
	private RoleManager roleManager;
112 
 
 113 
 
113 
	@Autowired
 114 
	@Autowired
- 
 
 115 
	private Gson gson;
- 
 
 116
- 
 
 117 
	@Autowired
114 
	private CustomerReturnItemRepository customerReturnItemRepository;
 118 
	private CustomerReturnItemRepository customerReturnItemRepository;
115 
 
 119 
 
116 
	@Autowired
 120 
	@Autowired
117 
	private FofoOrderItemRepository fofoOrderItemRepository;
 121 
	private FofoOrderItemRepository fofoOrderItemRepository;
118 
 
 122 
 
Line 797... Line 801...
797 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 801 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
798 
		boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
 802 
		boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
799 
		List<Integer> fofoIds = fofoStoreRepository.selectActiveStores().stream().map(x -> x.getId())
 803 
		List<Integer> fofoIds = fofoStoreRepository.selectActiveStores().stream().map(x -> x.getId())
800 
				.collect(Collectors.toList());
 804 
				.collect(Collectors.toList());
801 
 
 805 
 
802 
		Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
 - 
 
803 
 
 - 
 
804 
		List<PendingOrder> pendingOrder = null;
 - 
 
805 
		if (isAdmin) {
 806 
		if(isAdmin) {
806 
			pendingOrder = pendingOrderRepository.selectAllByStatus("open");
 807 
			Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
807 
			model.addAttribute("customRetailersMap", customRetailersMap);
 808 
			model.addAttribute("customRetailersMap", customRetailersMap);
- 
 
 809 
		}
- 
 
 810 
		List<PendingOrder> pendingOrders = null;
- 
 
 811 
		if (isAdmin) {
- 
 
 812 
			pendingOrders = pendingOrderRepository.selectAllByStatus("open");
808 
		} else {
 813 
		} else {
809 
			pendingOrder = pendingOrderRepository.selectByFofoId(loginDetails.getFofoId(), "open");
 814 
			pendingOrders = pendingOrderRepository.selectByFofoId(loginDetails.getFofoId(), "open");
810 
		}
 815 
		}
- 
 
 816
- 
 
 817 
		List<Integer> customerIds = pendingOrders.stream().map(x->x.getCustomerId()).collect(Collectors.toList());
- 
 
 818 
		final Map<Integer, Customer> customersMap = customerRepository.selectAllByIds(customerIds).stream().collect(Collectors.toMap(x->x.getId(), x->x));
- 
 
 819 
		pendingOrders.stream().forEach(x->{
- 
 
 820 
			x.setCustomer(customersMap.get(x.getCustomerId()));
- 
 
 821 
		});
811 
		model.addAttribute("pendingOrder", pendingOrder);
 822 
		model.addAttribute("pendingOrder", pendingOrders);
812 
		model.addAttribute("isAdmin", roleManager.isAdmin(loginDetails.getRoleIds()));
 823 
		model.addAttribute("isAdmin", isAdmin);
813 
		return "pending_fofo_order";
 824 
		return "pending_fofo_order";
814 
	}
 825 
	}
815 
 
 826 
 
816 
	@GetMapping("/getPendingOrderItem")
 827 
	@GetMapping("/getPendingOrderItem")
817 
	public String getPendingOrderItem(HttpServletRequest request, @RequestParam int orderId, Model model)
 828 
	public String getPendingOrderItem(HttpServletRequest request, @RequestParam int orderId, Model model)
818 
			throws ProfitMandiBusinessException {
 829 
			throws ProfitMandiBusinessException {
819 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 830 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
820 
		Map<Integer, Item> itemMap = new HashMap<>();
 831 
		Map<Integer, Item> itemMap = new HashMap<>();
821 
		Map<Integer, CurrentInventorySnapshot> inventoryMap = new HashMap<>();
 832 
		Map<Integer, CurrentInventorySnapshot> inventoryMap = new HashMap<>();
- 
 
 833 
		PendingOrder pendingPO = pendingOrderRepository.selectById(orderId);
- 
 
 834 
		Customer customer = customerRepository.selectById(pendingPO.getCustomerId());
822 
		List<PendingOrderItem> pendingOrderItems = pendingOrderItemRepository.selectByOrderId(orderId);
 835 
		List<PendingOrderItem> pendingOrderItems = pendingOrderItemRepository.selectByOrderId(orderId);
823 
		for (PendingOrderItem pendingOrderItem : pendingOrderItems) {
 836 
		for (PendingOrderItem pendingOrderItem : pendingOrderItems) {
824 
			Item item = itemRepository.selectById(pendingOrderItem.getItemId());
 837 
			Item item = itemRepository.selectById(pendingOrderItem.getItemId());
825 
			CurrentInventorySnapshot cis = currentInventorySnapshotRepository
 838 
			CurrentInventorySnapshot cis = currentInventorySnapshotRepository
826 
					.selectByItemAndFofoId(pendingOrderItem.getItemId(), loginDetails.getFofoId());
 839 
					.selectByItemAndFofoId(pendingOrderItem.getItemId(), loginDetails.getFofoId());
Line 831... Line 844...
831 
 
 844 
 
832 
		LOGGER.info("inventoryMap" + inventoryMap);
 845 
		LOGGER.info("inventoryMap" + inventoryMap);
833 
		model.addAttribute("pendingOrderItems", pendingOrderItems);
 846 
		model.addAttribute("pendingOrderItems", pendingOrderItems);
834 
		model.addAttribute("itemMap", itemMap);
 847 
		model.addAttribute("itemMap", itemMap);
835 
		model.addAttribute("inventoryMap", inventoryMap);
 848 
		model.addAttribute("inventoryMap", inventoryMap);
- 
 
 849 
		model.addAttribute("pendingPO", gson.toJson(pendingPO));
- 
 
 850 
		model.addAttribute("pendingPOCustomer", gson.toJson(customer));
836 
		model.addAttribute("isAdmin", roleManager.isAdmin(loginDetails.getRoleIds()));
 851 
		model.addAttribute("isAdmin", roleManager.isAdmin(loginDetails.getRoleIds()));
837 
		return "pending-order-item";
 852 
		return "pending-order-item";
838 
	}
 853 
	}
839 
 
 854 
 
840 
	@RequestMapping(value = "/cancelPendingOrder", method = RequestMethod.POST)
 855 
	@RequestMapping(value = "/cancelPendingOrder", method = RequestMethod.POST)
Line 871... Line 886...
871 
		pendingOrderItemRepository.persist(pendingOrderItem);
 886 
		pendingOrderItemRepository.persist(pendingOrderItem);
872 
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
 887 
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
873 
 
 888 
 
874 
		return "response";
 889 
		return "response";
875 
	}
 890 
	}
- 
 
 891
876 
}
 892 
}