Subversion Repositories SmartDukaan

Rev

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

Rev 2452 Rev 2509
Line 126... Line 126...
126
				lineItem.getExtra_info(),
126
				lineItem.getExtra_info(),
127
				t_order.getTotal_amount(), t_order.getTotal_weight(), t_order.getAirwaybill_no(),
127
				t_order.getTotal_amount(), t_order.getTotal_weight(), t_order.getAirwaybill_no(),
128
				t_order.getBilled_by(), t_order.getInvoice_number(), t_order.getJacket_number(),
128
				t_order.getBilled_by(), t_order.getInvoice_number(), t_order.getJacket_number(),
129
				-1, //FIXME This parameter should be lineItem.getImei_number()
129
				-1, //FIXME This parameter should be lineItem.getImei_number()
130
				t_order.getBatchNo(), t_order.getSerialNo(),
130
				t_order.getBatchNo(), t_order.getSerialNo(),
131
				false);
131
				false,
-
 
132
				t_order.isDoaFlag(),
-
 
133
				t_order.getPickupRequestNo());
132
		return order;
134
		return order;
133
	}
135
	}
134
 
136
 
135
	/**
137
	/**
136
	 * This method maps a given type to a list of statuses.
138
	 * This method maps a given type to a list of statuses.
Line 173... Line 175...
173
			statuses.add(OrderStatus.SHIPPED_TO_LOGST);
175
			statuses.add(OrderStatus.SHIPPED_TO_LOGST);
174
			break;
176
			break;
175
 
177
 
176
		case DELIVERED:
178
		case DELIVERED:
177
			statuses.add(OrderStatus.DELIVERY_SUCCESS);
179
			statuses.add(OrderStatus.DELIVERY_SUCCESS);
-
 
180
			statuses.add(OrderStatus.DOA_PICKUP_REQUESTED);
178
			break;
181
			break;
179
			
182
			
-
 
183
		case SALES_RETURN_AWAITED:
-
 
184
			statuses.add(OrderStatus.SALES_RETURN_IN_TRANSIT);
-
 
185
			break;
-
 
186
			
-
 
187
		case SALES_RETURNED:
-
 
188
			statuses.add(OrderStatus.SALES_RETURNED);
-
 
189
			break;
-
 
190
		
-
 
191
		case DOA_AWAITED:
-
 
192
			statuses.add(OrderStatus.DOA_RETURN_AUTHORIZED);
-
 
193
			statuses.add(OrderStatus.DOA_RETURN_IN_TRANSIT);
-
 
194
			break;
-
 
195
		
-
 
196
		case DOA_RETURNED:
-
 
197
			statuses.add(OrderStatus.DOA_RETURNED);
-
 
198
			
180
		default:
199
		default:
181
			break;
200
			break;
182
		}
201
		}
183
		return statuses;
202
		return statuses;
184
	}
203
	}