Subversion Repositories SmartDukaan

Rev

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

Rev 27045 Rev 27048
Line 871... Line 871...
871
		cust.setProfileImageId(customer.getProfileImageId());
871
		cust.setProfileImageId(customer.getProfileImageId());
872
		cust.setDob(customer.getDob());
872
		cust.setDob(customer.getDob());
873
		return responseSender.ok(cust);
873
		return responseSender.ok(cust);
874
	}
874
	}
875
 
875
 
876
	/*
-
 
877
	 * @RequestMapping(value = "/cancelPendingOrderItem", method =
876
	@RequestMapping(value = "/cancelPendingOrderItem", method = RequestMethod.POST)
878
	 * RequestMethod.POST) public ResponseEntity<?>
-
 
879
	 * cancelPendingOrderItem(HttpServletRequest request, @RequestParam int id,
877
	public ResponseEntity<?> cancelPendingOrderItem(HttpServletRequest request, @RequestParam int id,
880
	 * 
878
 
881
	 * @RequestParam String statusDescription) throws Exception {
879
			@RequestParam String statusDescription) throws Exception {
882
	 * 
880
 
883
	 * PendingOrderItem pendingOrderItem =
-
 
884
	 * pendingOrderItemRepository.selectById(id);
881
		PendingOrderItem pendingOrderItem = pendingOrderItemRepository.selectById(id);
885
	 * 
882
 
886
	 * PendingOrder pendingOrder =
-
 
887
	 * pendingOrderRepository.selectById(pendingOrderItem.getId()); if
883
		PendingOrder pendingOrder = pendingOrderRepository.selectById(pendingOrderItem.getId());
888
	 * (pendingOrderItem.getBilledTimestamp() == null) {
884
		if (pendingOrderItem.getBilledTimestamp() == null) {
889
	 * pendingOrderItem.setStatus(OrderStatus.CANCELLED);
885
			pendingOrderItem.setStatus(OrderStatus.CANCELLED);
890
	 * pendingOrderItem.setStatusDescription(statusDescription); List<OrderStatus>
886
			pendingOrderItem.setStatusDescription(statusDescription);
891
	 * status =
-
 
892
	 * pendingOrderItemRepository.selectByOrderId(pendingOrderItem.getOrderId())
887
			List<OrderStatus> status = pendingOrderItemRepository.selectByOrderId(pendingOrderItem.getOrderId())
893
	 * .stream().map(x -> x.getStatus()).collect(Collectors.toList());
888
					.stream().map(x -> x.getStatus()).collect(Collectors.toList());
894
	 * 
889
 
895
	 * if (!status.contains(OrderStatus.PENDING)) {
890
			if (!status.contains(OrderStatus.PENDING)) {
896
	 * pendingOrder.setStatus(OrderStatus.CLOSED); }
891
				pendingOrder.setStatus(OrderStatus.CLOSED);
897
	 * 
892
			}
-
 
893
 
898
	 * pendingOrderItemRepository.persist(pendingOrderItem); }
894
			pendingOrderItemRepository.persist(pendingOrderItem);
899
	 * 
895
		}
-
 
896
 
900
	 * return responseSender.ok(true);
897
		return responseSender.ok(true);
901
	 * 
898
 
902
	 * }
899
	}
903
	 */
-
 
904
 
900
 
905
}
901
}
906
 
902
 
907
class UserModel {
903
class UserModel {
908
	@JsonProperty(required = true)
904
	@JsonProperty(required = true)