Subversion Repositories SmartDukaan

Rev

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

Rev 13713 Rev 13733
Line 177... Line 177...
177
				continue;
177
				continue;
178
 
178
 
179
			row.getCell(SUB_ORDER_STATUS_INDEX).setCellType(Cell.CELL_TYPE_STRING);
179
			row.getCell(SUB_ORDER_STATUS_INDEX).setCellType(Cell.CELL_TYPE_STRING);
180
			String subOrderStatus = row.getCell(SUB_ORDER_STATUS_INDEX).getStringCellValue();
180
			String subOrderStatus = row.getCell(SUB_ORDER_STATUS_INDEX).getStringCellValue();
181
 
181
 
182
			if("VERIFIED".equalsIgnoreCase(subOrderStatus)){
182
			if("VERIFIED".equalsIgnoreCase(subOrderStatus) || "ORDER_FORM".equalsIgnoreCase(subOrderStatus)){
183
				try {
183
				try {
184
					Transaction txn = new Transaction();
184
					Transaction txn = new Transaction();
185
					txn.setShoppingCartid(user.getActiveCartId());
185
					txn.setShoppingCartid(user.getActiveCartId());
186
					txn.setCustomer_id(user.getUserId());
186
					txn.setCustomer_id(user.getUserId());
187
					txn.setCreatedOn(new Date().getTime());
187
					txn.setCreatedOn(new Date().getTime());
Line 247... Line 247...
247
					t_order.setCustomer_pincode(row.getCell(ZIPCODE_INDEX).getStringCellValue());
247
					t_order.setCustomer_pincode(row.getCell(ZIPCODE_INDEX).getStringCellValue());
248
					t_order.setTotal_amount(lineItem.getTotal_price());            	
248
					t_order.setTotal_amount(lineItem.getTotal_price());            	
249
					t_order.setTotal_weight(lineItem.getTotal_weight());
249
					t_order.setTotal_weight(lineItem.getTotal_weight());
250
					t_order.setLineitems(Collections.singletonList(lineItem));            
250
					t_order.setLineitems(Collections.singletonList(lineItem));            
251
					t_order.setStatus(OrderStatus.PAYMENT_PENDING);
251
					t_order.setStatus(OrderStatus.PAYMENT_PENDING);
-
 
252
					if("ORDER_FORM".equalsIgnoreCase(subOrderStatus)){
-
 
253
						t_order.setStatusDescription("In Process- Order Form");
-
 
254
					}else{
252
					t_order.setStatusDescription("In Process");
255
						t_order.setStatusDescription("In Process");
-
 
256
					}
253
					t_order.setCreated_timestamp(new Date().getTime());
257
					t_order.setCreated_timestamp(new Date().getTime());
254
					t_order.setOrderType(OrderType.B2C);
258
					t_order.setOrderType(OrderType.B2C);
255
					t_order.setCod(false);
259
					t_order.setCod(false);
256
					int slaDays = (int)row.getCell(SLA_DAYS_INDEX).getNumericCellValue();
260
					int slaDays = (int)row.getCell(SLA_DAYS_INDEX).getNumericCellValue();
257
					try {
261
					try {