Subversion Repositories SmartDukaan

Rev

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

Rev 31108 Rev 31238
Line 151... Line 151...
151
 
151
 
152
		warehouseMap.keySet().stream().filter(x -> warehouseMap.get(x) != null).forEach(x -> {
152
		warehouseMap.keySet().stream().filter(x -> warehouseMap.get(x) != null).forEach(x -> {
153
			response.put(new JSONObject().put("id", x).put("name", warehouseMap.get(x)));
153
			response.put(new JSONObject().put("id", x).put("name", warehouseMap.get(x)));
154
		});
154
		});
155
 
155
 
156
		LOGGER.info("response", response.toString());
156
		LOGGER.info("response1", response.toString());
157
 
157
 
158
		model.addAttribute("response", response.toString());
158
		model.addAttribute("response1", response.toString());
159
 
159
 
160
		return "response";
160
		return "response";
161
	}
161
	}
162
 
162
 
163
	@RequestMapping(value = "/billedOrderFileUploader", method = RequestMethod.POST)
163
	@RequestMapping(value = "/billedOrderFileUploader", method = RequestMethod.POST)
Line 350... Line 350...
350
			}
350
			}
351
		}
351
		}
352
 
352
 
353
		LOGGER.info("dispatchNotication" + dispatchNotication);
353
		LOGGER.info("dispatchNotication" + dispatchNotication);
354
		LOGGER.info("billedOrderList" + billedOrderList);
354
		LOGGER.info("billedOrderList" + billedOrderList);
355
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
355
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
356
		return "response";
356
		return "response";
357
 
357
 
358
	}
358
	}
359
 
359
 
360
	private BilledOrderListModel createBilleOrder(CSVRecord record) {
360
	private BilledOrderListModel createBilleOrder(CSVRecord record) {
Line 403... Line 403...
403
		pd.setPhone(providerDetailModel.getMobile());
403
		pd.setPhone(providerDetailModel.getMobile());
404
		pd.setProviderId(provider.getId());
404
		pd.setProviderId(provider.getId());
405
		pd.setActive(true);
405
		pd.setActive(true);
406
		pd.setType(DeliveryType.PREPAID);
406
		pd.setType(DeliveryType.PREPAID);
407
		providerDetailsRepository.persist(pd);
407
		providerDetailsRepository.persist(pd);
408
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
408
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
409
 
409
 
410
		return "response";
410
		return "response";
411
 
411
 
412
	}
412
	}
413
 
413
 
Line 490... Line 490...
490
					providerTat.setDeliveryTime(pt.getTat());
490
					providerTat.setDeliveryTime(pt.getTat());
491
				}
491
				}
492
 
492
 
493
			}
493
			}
494
		}
494
		}
495
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
495
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
496
		return "response";
496
		return "response";
497
 
497
 
498
	}
498
	}
499
 
499
 
500
	private ProviderTatModel createProviderTat(CSVRecord record) {
500
	private ProviderTatModel createProviderTat(CSVRecord record) {
Line 526... Line 526...
526
		ph.setDate(date);
526
		ph.setDate(date);
527
		ph.setHolidayDate(LocalDate.now().atStartOfDay());
527
		ph.setHolidayDate(LocalDate.now().atStartOfDay());
528
		ph.setOccasion(occassion);
528
		ph.setOccasion(occassion);
529
		publicHolidaysRepository.persist(ph);
529
		publicHolidaysRepository.persist(ph);
530
 
530
 
531
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
531
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
532
		return "response";
532
		return "response";
533
	}
533
	}
534
 
534
 
535
	@RequestMapping(value = "/downloadUploadShippingTemplate", method = RequestMethod.GET)
535
	@RequestMapping(value = "/downloadUploadShippingTemplate", method = RequestMethod.GET)
536
	public ResponseEntity<?> downloadUploadShippingTemplate(HttpServletRequest request, @RequestParam int warehouseId)
536
	public ResponseEntity<?> downloadUploadShippingTemplate(HttpServletRequest request, @RequestParam int warehouseId)
Line 702... Line 702...
702
							"No order available for " + ddm.getAirwayBIllNumber() + " airwaybill Number");
702
							"No order available for " + ddm.getAirwayBIllNumber() + " airwaybill Number");
703
 
703
 
704
				}
704
				}
705
			}
705
			}
706
		}
706
		}
707
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
707
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
708
		return "response";
708
		return "response";
709
 
709
 
710
	}
710
	}
711
 
711
 
712
	private DelayDayModel createDelayDay(CSVRecord record) {
712
	private DelayDayModel createDelayDay(CSVRecord record) {
Line 813... Line 813...
813
							"No order available for " + dl.getAirwayBillNumber() + " airwaybill Number");
813
							"No order available for " + dl.getAirwayBillNumber() + " airwaybill Number");
814
 
814
 
815
				}
815
				}
816
			}
816
			}
817
		}
817
		}
818
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
818
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
819
		return "response";
819
		return "response";
820
 
820
 
821
	}
821
	}
822
 
822
 
823
	private MarkDeliveredModel createMarkDeliveredModel(CSVRecord record) {
823
	private MarkDeliveredModel createMarkDeliveredModel(CSVRecord record) {
Line 905... Line 905...
905
				int userId = userAccountRepository.selectUserIdByRetailerId(orders.get(0).getRetailerId());
905
				int userId = userAccountRepository.selectUserIdByRetailerId(orders.get(0).getRetailerId());
906
				sendNotificationModel.setUserIds(Arrays.asList(userId));
906
				sendNotificationModel.setUserIds(Arrays.asList(userId));
907
				notificationService.sendNotification(sendNotificationModel);
907
				notificationService.sendNotification(sendNotificationModel);
908
			}
908
			}
909
		}
909
		}
910
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
910
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
911
 
911
 
912
		return "response";
912
		return "response";
913
	}
913
	}
914
 
914
 
915
	@RequestMapping(value = "/getAwbNumber", method = RequestMethod.GET)
915
	@RequestMapping(value = "/getAwbNumber", method = RequestMethod.GET)
916
	public String getAwbNumber(HttpServletRequest request, Model model) throws Exception {
916
	public String getAwbNumber(HttpServletRequest request, Model model) throws Exception {
917
 
917
 
918
		List<Order> orders = orderRepository.selectByInvoiceNumber("NSLCK7931");
918
		List<Order> orders = orderRepository.selectByInvoiceNumber("NSLCK7931");
919
 
919
 
920
		// blueDartService.getAirwayBillNo(orders.2);
920
		// blueDartService.getAirwayBillNo(orders.2);
921
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
921
		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
922
 
922
 
923
		return "response";
923
		return "response";
924
	}
924
	}
925
}
925
}