Subversion Repositories SmartDukaan

Rev

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

Rev 4664 Rev 4666
Line 223... Line 223...
223
				t_order.getShipping_timestamp(),
223
				t_order.getShipping_timestamp(),
224
				t_order.getVerification_timestamp(),
224
				t_order.getVerification_timestamp(),
225
				t_order.getExpected_delivery_time(),
225
				t_order.getExpected_delivery_time(),
226
				t_order.getPromised_delivery_time(),
226
				t_order.getPromised_delivery_time(),
227
				t_order.getExpected_shipping_time(),
227
				t_order.getExpected_shipping_time(),
-
 
228
				t_order.getPromised_shipping_time(),
228
				t_order.getStatus().getValue(),
229
				t_order.getStatus().getValue(),
229
				t_order.getStatusDescription(),
230
				t_order.getStatusDescription(),
230
				lineItem.getItem_id(),
231
				lineItem.getItem_id(),
231
				lineItem.getProductGroup(),
232
				lineItem.getProductGroup(),
232
				lineItem.getBrand(),
233
				lineItem.getBrand(),
Line 348... Line 349...
348
		case DOA_REQUEST_AUTHORIZED:
349
		case DOA_REQUEST_AUTHORIZED:
349
			statuses.add(OrderStatus.DOA_REQUEST_AUTHORIZED);
350
			statuses.add(OrderStatus.DOA_REQUEST_AUTHORIZED);
350
			statuses.add(OrderStatus.DOA_PICKUP_REQUEST_RAISED);
351
			statuses.add(OrderStatus.DOA_PICKUP_REQUEST_RAISED);
351
			break;
352
			break;
352
 
353
 
-
 
354
		case LOST_IN_TRANSIT:
-
 
355
			statuses.add(OrderStatus.LOST_IN_TRANSIT);
-
 
356
			break;
-
 
357
			
353
		case DOA_LOST_IN_TRANSIT:
358
		case DOA_LOST_IN_TRANSIT:
354
			statuses.add(OrderStatus.DOA_LOST_IN_TRANSIT);
359
			statuses.add(OrderStatus.DOA_LOST_IN_TRANSIT);
355
			break;
360
			break;
356
		
361
		
357
		case DOA_RECEIVED_DAMAGED:
362
		case DOA_RECEIVED_DAMAGED: