Subversion Repositories SmartDukaan

Rev

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

Rev 8241 Rev 8259
Line 1... Line 1...
1
package in.shop2020.support.controllers;
1
package in.shop2020.support.controllers;
2
 
2
 
3
import java.io.File;
-
 
4
import java.io.FileInputStream;
-
 
5
import java.text.SimpleDateFormat;
-
 
6
import java.util.ArrayList;
-
 
7
import java.util.Collection;
-
 
8
import java.util.Collections;
-
 
9
import java.util.Date;
-
 
10
import java.util.List;
-
 
11
 
-
 
12
import in.shop2020.logistics.PickUpType;
-
 
13
import in.shop2020.model.v1.catalog.CatalogService;
-
 
14
import in.shop2020.model.v1.catalog.CatalogServiceException;
-
 
15
import in.shop2020.model.v1.catalog.EbayItem;
-
 
16
import in.shop2020.model.v1.catalog.Item;
-
 
17
import in.shop2020.model.v1.inventory.InventoryService;
-
 
18
import in.shop2020.model.v1.inventory.InventoryServiceException;
-
 
19
import in.shop2020.model.v1.inventory.Warehouse;
-
 
20
import in.shop2020.model.v1.order.EbayOrder;
3
import in.shop2020.model.v1.order.EbayOrder;
21
import in.shop2020.model.v1.order.LineItem;
-
 
22
import in.shop2020.model.v1.order.Order;
4
import in.shop2020.model.v1.order.Order;
23
import in.shop2020.model.v1.order.OrderSource;
-
 
24
import in.shop2020.model.v1.order.OrderStatus;
5
import in.shop2020.model.v1.order.OrderStatus;
25
import in.shop2020.model.v1.order.OrderType;
-
 
26
import in.shop2020.model.v1.order.SourceDetail;
-
 
27
import in.shop2020.model.v1.order.Transaction;
6
import in.shop2020.model.v1.order.Transaction;
28
import in.shop2020.model.v1.order.TransactionService;
7
import in.shop2020.model.v1.order.TransactionService;
29
import in.shop2020.model.v1.order.TransactionStatus;
-
 
30
import in.shop2020.model.v1.order.TransactionService.Client;
-
 
31
import in.shop2020.model.v1.user.Address;
-
 
32
import in.shop2020.model.v1.user.User;
8
import in.shop2020.model.v1.user.User;
33
import in.shop2020.payments.Attribute;
-
 
34
import in.shop2020.payments.Payment;
9
import in.shop2020.payments.Payment;
35
import in.shop2020.payments.PaymentException;
10
import in.shop2020.payments.PaymentException;
36
import in.shop2020.payments.PaymentStatus;
11
import in.shop2020.payments.PaymentStatus;
37
import in.shop2020.thrift.clients.CatalogClient;
-
 
38
import in.shop2020.thrift.clients.InventoryClient;
12
import in.shop2020.support.utils.ReportsUtils;
39
import in.shop2020.thrift.clients.PaymentClient;
13
import in.shop2020.thrift.clients.PaymentClient;
40
import in.shop2020.thrift.clients.TransactionClient;
14
import in.shop2020.thrift.clients.TransactionClient;
41
import in.shop2020.thrift.clients.UserClient;
15
import in.shop2020.thrift.clients.UserClient;
-
 
16
 
-
 
17
import java.io.File;
-
 
18
import java.io.FileInputStream;
42
import in.shop2020.support.utils.ReportsUtils;
19
import java.util.Collection;
-
 
20
import java.util.Date;
43
 
21
 
44
import javax.servlet.http.HttpServletRequest;
22
import javax.servlet.http.HttpServletRequest;
45
import javax.servlet.http.HttpSession;
23
import javax.servlet.http.HttpSession;
46
 
24
 
47
import org.apache.commons.io.FileUtils;
25
import org.apache.commons.io.FileUtils;
Line 190... Line 168...
190
        	order.setCustomer_name(user.getName());
168
        	order.setCustomer_name(user.getName());
191
        	if (order.getCustomer_mobilenumber()== null || order.getCustomer_mobilenumber() == "") {
169
        	if (order.getCustomer_mobilenumber()== null || order.getCustomer_mobilenumber() == "") {
192
        		order.setCustomer_mobilenumber(user.getMobileNumber());
170
        		order.setCustomer_mobilenumber(user.getMobileNumber());
193
        	}
171
        	}
194
        	order.setCustomer_address1(row.getCell(ADDR1_INDEX).getStringCellValue());
172
        	order.setCustomer_address1(row.getCell(ADDR1_INDEX).getStringCellValue());
-
 
173
        	Cell address2Cell = row.getCell(ADDR2_INDEX);
-
 
174
        	if(address2Cell != null && address2Cell.getCellType() != Cell.CELL_TYPE_BLANK) {
195
        	order.setCustomer_address2(row.getCell(ADDR2_INDEX).getStringCellValue());
175
        		order.setCustomer_address2(row.getCell(ADDR2_INDEX).getStringCellValue());
-
 
176
        	}
196
        	order.setCustomer_city(row.getCell(CITY_INDEX).getStringCellValue());
177
        	order.setCustomer_city(row.getCell(CITY_INDEX).getStringCellValue());
197
        	order.setCustomer_state(row.getCell(STATE_INDEX).getStringCellValue());
178
        	order.setCustomer_state(row.getCell(STATE_INDEX).getStringCellValue());
198
        	row.getCell(PINCODE_INDEX).setCellType(Cell.CELL_TYPE_STRING);
179
        	row.getCell(PINCODE_INDEX).setCellType(Cell.CELL_TYPE_STRING);
199
        	order.setCustomer_pincode(row.getCell(PINCODE_INDEX).getStringCellValue());
180
        	order.setCustomer_pincode(row.getCell(PINCODE_INDEX).getStringCellValue());
200
        	
181