Subversion Repositories SmartDukaan

Rev

Rev 168 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 168 Rev 192
Line 29... Line 29...
29 
				Client c = client.getClient();
 29 
				Client c = client.getClient();
30 
				Transaction t = c.getTransaction(request.getOrder().getTransactionId());
 30 
				Transaction t = c.getTransaction(request.getOrder().getTransactionId());
31
31
32
32
33 
				if(t.getShipmentInfo() == null){
 33 
				if(t.getShipmentInfo() == null){
34 
					return new ShipOrderResponse(request.getOrder(), false, "Already shipped");
 34 
					return new ShipOrderResponse(request.getOrder(), false, "Already shipped", request.isInfoRequest());
35
35
36 
				}else{
 36 
				}else{
37 
					if(t.getShipmentInfo().getShipments() == null){
 37 
					if(t.getShipmentInfo().getShipments() == null){
38 
						return new ShipOrderResponse(request.getOrder(), false, "Already shipped");
 38 
						return new ShipOrderResponse(request.getOrder(), false, "Already shipped", request.isInfoRequest());
39 
					}
 39 
					}
40
40
41 
					if(t.getShipmentInfo().getShipments().size() == 0){
 41 
					if(t.getShipmentInfo().getShipments().size() == 0){
42 
						return new ShipOrderResponse(request.getOrder(), false, "Already shipped");
 42 
						return new ShipOrderResponse(request.getOrder(), false, "Already shipped", request.isInfoRequest());
43 
					}
 43 
					}
44 
				}
 44 
				}
45
45
46
46
47 
				if(t.getTransactionStatus() == TransactionStatus.SHIPPED){
 47 
				if(t.getTransactionStatus() == TransactionStatus.SHIPPED){
48 
					return new ShipOrderResponse(request.getOrder(), false, "Already Shipped");
 48 
					return new ShipOrderResponse(request.getOrder(), false, "Already Shipped", request.isInfoRequest());
49 
				}
 49 
				}
50
50
51 
				if(c.setShippingTracker(request.getOrder().getTransactionId(), t.getShipmentInfo().getShipments().get(0).getId(), request.getTracker(), request.getAirwayBillNo(), request.getProvider())){
 51 
				if(c.setShippingTracker(request.getOrder().getTransactionId(), t.getShipmentInfo().getShipments().get(0).getId(), request.getTracker(), request.getAirwayBillNo(), request.getProvider())){
52 
					return new ShipOrderResponse(request.getOrder(), true, "Added shipping info");
 52 
					return new ShipOrderResponse(request.getOrder(), true, "Added shipping info", request.isInfoRequest());
53 
				}
 53 
				}
54
54
55 
			}catch(Exception e){
 55 
			}catch(Exception e){
56 
				System.out.println(e);
 56 
				System.out.println(e);
57 
			}
 57 
			}
Line 64... Line 64...
64 
				Client c = client.getClient();
 64 
				Client c = client.getClient();
65 
				Transaction t = c.getTransaction(request.getOrder().getTransactionId());
 65 
				Transaction t = c.getTransaction(request.getOrder().getTransactionId());
66
66
67
67
68 
				if(t.getShipmentInfo() == null){
 68 
				if(t.getShipmentInfo() == null){
69 
					return new ShipOrderResponse(request.getOrder(), false, "Already shipped");
 69 
					return new ShipOrderResponse(request.getOrder(), false, "Already shipped", request.isInfoRequest());
70
70
71 
				}else{
 71 
				}else{
72 
					if(t.getShipmentInfo().getShipments() == null){
 72 
					if(t.getShipmentInfo().getShipments() == null){
73 
						return new ShipOrderResponse(request.getOrder(), false, "Already shipped");
 73 
						return new ShipOrderResponse(request.getOrder(), false, "Already shipped", request.isInfoRequest());
74 
					}
 74 
					}
75
75
76 
					if(t.getShipmentInfo().getShipments().size() == 0){
 76 
					if(t.getShipmentInfo().getShipments().size() == 0){
77 
						return new ShipOrderResponse(request.getOrder(), false, "Already shipped");
 77 
						return new ShipOrderResponse(request.getOrder(), false, "Already shipped", request.isInfoRequest());
78 
					}
 78 
					}
79 
				}
 79 
				}
80
80
81
81
82 
				if(t.getTransactionStatus() == TransactionStatus.SHIPPED){
 82 
				if(t.getTransactionStatus() == TransactionStatus.SHIPPED){
83 
					return new ShipOrderResponse(request.getOrder(), false, "Already Shipped");
 83 
					return new ShipOrderResponse(request.getOrder(), false, "Already Shipped", request.isInfoRequest());
84 
				}
 84 
				}
85
85
86 
				//change status
 86 
				//change status
87 
				c.setShippingDate(request.getOrder().getTransactionId(), t.getShipmentInfo().getShipments().get(0).getId(), new Date().getTime());
 87 
				c.setShippingDate(request.getOrder().getTransactionId(), t.getShipmentInfo().getShipments().get(0).getId(), new Date().getTime());
88 
				c.changeShippingStatus(request.getOrder().getTransactionId(), t.getShipmentInfo().getShipments().get(0).getId(), ShipmentStatus.SHIPPED, "Shipment has been shipped");
 88 
				c.changeShippingStatus(request.getOrder().getTransactionId(), t.getShipmentInfo().getShipments().get(0).getId(), ShipmentStatus.SHIPPED, "Shipment has been shipped");
89 
				c.changeTransactionStatus(request.getOrder().getTransactionId(), TransactionStatus.SHIPPED, "Order has been shipped");
 89 
				c.changeTransactionStatus(request.getOrder().getTransactionId(), TransactionStatus.SHIPPED, "Order has been shipped");
90 
				return new ShipOrderResponse(request.getOrder(), true, "Order has been shipped sucessfully");
 90 
				return new ShipOrderResponse(request.getOrder(), true, "Order has been shipped sucessfully", request.isInfoRequest());
91
91
92 
			}catch(Exception e){
 92 
			}catch(Exception e){
93 
				System.out.println(e);
 93 
				System.out.println(e);
94 
			}
 94 
			}
95
95