Subversion Repositories SmartDukaan

Rev

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

Rev 16582 Rev 18070
Line 640... Line 640...
640
    public String changeShippingAddress() {
640
    public String changeShippingAddress() {
641
        try {
641
        try {
642
            TransactionClient transactionServiceClient = new TransactionClient();
642
            TransactionClient transactionServiceClient = new TransactionClient();
643
            in.shop2020.model.v1.order.TransactionService.Client transactionClient
643
            in.shop2020.model.v1.order.TransactionService.Client transactionClient
644
            = transactionServiceClient.getClient();
644
            = transactionServiceClient.getClient();
645
            transactionClient.changeShippingAddress(orderId, line1, line2, city, state, pin);
-
 
646
            in.shop2020.model.v1.order.Order t_order = transactionClient.getOrder(orderId);
645
            in.shop2020.model.v1.order.Order t_order = transactionClient.getOrder(orderId);
-
 
646
            transactionClient.changeShippingAddress(orderId, line1, line2, city, state, pin);
-
 
647
            /*
647
            Warehouse warehouse = getWareHouseForOrder(t_order.getWarehouse_id());			
648
            Warehouse warehouse = getWareHouseForOrder(t_order.getWarehouse_id());			
648
            if(t_order.getLogistics_provider_id()==7L){
649
            if(t_order.getLogistics_provider_id()==7L){
649
                FedExShipAccountInfo fedexAccountInfo = FedExShipAccountInfo.getFedExInfo(warehouse.getLogisticsLocation());
650
                FedExShipAccountInfo fedexAccountInfo = FedExShipAccountInfo.getFedExInfo(warehouse.getLogisticsLocation());
650
                ProcessShipmentReply  processShipmentReply = ShipWebServiceClient.getShipmentCreationReply(t_order,fedexAccountInfo.getClientDetail(),fedexAccountInfo.getWad(),fedexAccountInfo.getEndPointAddress());
651
                ProcessShipmentReply  processShipmentReply = ShipWebServiceClient.getShipmentCreationReply(t_order,fedexAccountInfo.getClientDetail(),fedexAccountInfo.getWad(),fedexAccountInfo.getEndPointAddress());
651
                CompletedShipmentDetail completedShipmentDetails = processShipmentReply.getCompletedShipmentDetail();
652
                CompletedShipmentDetail completedShipmentDetails = processShipmentReply.getCompletedShipmentDetail();
Line 697... Line 698...
697
                        }
698
                        }
698
                    }						
699
                    }						
699
                }
700
                }
700
                transactionClient.setOrderAttributes(t_order.getId(), attrList);
701
                transactionClient.setOrderAttributes(t_order.getId(), attrList);
701
                //End:-Added By Manish Sharma for FedEx Integration - Shipment Creation on 21-Aug-2013
702
                //End:-Added By Manish Sharma for FedEx Integration - Shipment Creation on 21-Aug-2013
702
 
703
				*/
703
            }
704
            }
704
        } catch(Exception e) {
705
        } catch(Exception e) {
705
            log.error("Unable to update address for orderId : " + orderId + "and address : " + 
706
            log.error("Unable to update address for orderId : " + orderId + "and address : " + 
706
                    line1 + ", " + line2+ ", " + city + ", " + state + ", " + pin, e);
707
                    line1 + ", " + line2+ ", " + city + ", " + state + ", " + pin, e);
707
        }
708
        }