Subversion Repositories SmartDukaan

Rev

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

Rev 10710 Rev 10761
Line 80... Line 80...
80
	private static final String VDELIVER = "VDELIVER";
80
	private static final String VDELIVER = "VDELIVER";
81
	private static final String OVERNITE_EXP = "Overnite Express";
81
	private static final String OVERNITE_EXP = "Overnite Express";
82
	private static final String BIBHA_CARGO =  "BIBHA CARGO AND COURIER PVT LTD";
82
	private static final String BIBHA_CARGO =  "BIBHA CARGO AND COURIER PVT LTD";
83
	private static final String FF_DELHI = "FF-Delhi";
83
	private static final String FF_DELHI = "FF-Delhi";
84
	private static final String FF_GURGAON = "FF-GURGAON";
84
	private static final String FF_GURGAON = "FF-GURGAON";
85
	private static final String TANVI_EXPRESS = "Tanvi Express ";
85
	private static final String TANVI_EXPRESS = "Tanvi Express";
-
 
86
	private static final String VELIX = "Velex Logistics Pvt. Ltd";
86
	private static String transactionId;
87
	private static String transactionId;
87
	private static long paymentId;
88
	private static long paymentId;
88
	private static final int SNAPDEAL_GATEWAY_ID = 18;
89
	private static final int SNAPDEAL_GATEWAY_ID = 18;
89
	private static Logger logger;
90
	private static Logger logger;
90
 
91
 
Line 359... Line 360...
359
				t_order.setLogistics_provider_id(39);
360
				t_order.setLogistics_provider_id(39);
360
			}
361
			}
361
			else if(order.getCourier().equalsIgnoreCase(FF_GURGAON)){
362
			else if(order.getCourier().equalsIgnoreCase(FF_GURGAON)){
362
				t_order.setLogistics_provider_id(40);
363
				t_order.setLogistics_provider_id(40);
363
			}
364
			}
364
			else if(order.getCourier().equalsIgnoreCase(TANVI_EXPRESS)){
365
			else if(order.getCourier().trim().equalsIgnoreCase(TANVI_EXPRESS)){
365
				t_order.setLogistics_provider_id(41);
366
				t_order.setLogistics_provider_id(41);
366
			}
367
			}
-
 
368
			else if(order.getCourier().trim().equalsIgnoreCase(VELIX)){
-
 
369
                t_order.setLogistics_provider_id(42);
-
 
370
            }
367
			
371
			
368
			else {
372
			else {
369
				logger.error("Error No Courier Match please add courier to our system for suborderid  " + order.getSuborderId() + "Courier Name " + order.getCourier());
373
				logger.error("Error No Courier Match please add courier to our system for suborderid  " + order.getSuborderId() + "Courier Name " + order.getCourier());
370
				sb.append(order.getSuborderId() + " Error No Courier Match " + order.getCourier() +"\n");
374
				sb.append(order.getSuborderId() + " Error No Courier Match " + order.getCourier() +"\n");
371
				continue;
375
				continue;