Subversion Repositories SmartDukaan

Rev

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

Rev 13102 Rev 13324
Line 103... Line 103...
103
103
104 
    private List<RechargeOrder> rechargeOrders = new ArrayList<RechargeOrder>();
 104 
    private List<RechargeOrder> rechargeOrders = new ArrayList<RechargeOrder>();
105 
    private String amazonId;
 105 
    private String amazonId;
106 
    private long bulkOrderEnquiryCount;
 106 
    private long bulkOrderEnquiryCount;
107 
    private PrivateDealUser privateDealUser;
 107 
    private PrivateDealUser privateDealUser;
- 
 
 108 
    private String masterOrderId;
108
109
109 
 
 110 
 
110 
    public PrivateDealUser getPrivateDealUser() {
 111 
    public PrivateDealUser getPrivateDealUser() {
111 
        return privateDealUser;
 112 
        return privateDealUser;
112 
    }
 113 
    }
Line 136... Line 137...
136 
                transactionServiceClient = new TransactionClient().getClient();
 137 
                transactionServiceClient = new TransactionClient().getClient();
137 
                setOrders(transactionServiceClient.getOrdersByAmazonOrderCode(amazonId));
 138 
                setOrders(transactionServiceClient.getOrdersByAmazonOrderCode(amazonId));
138 
                return "orders-index";
 139 
                return "orders-index";
139 
            }
 140 
            }
140
141
- 
 
 142 
            if(masterOrderId!=null && !masterOrderId.isEmpty()){
- 
 
 143 
            	transactionServiceClient = new TransactionClient().getClient();
- 
 
 144 
                setOrders(transactionServiceClient.getGroupOrdersByLogisticsTxnId(masterOrderId));
- 
 
 145 
                return "orders-index";
- 
 
 146 
            }
- 
 
 147
141 
            if (deviceNumber != null && !deviceNumber.isEmpty()) {
 148 
            if (deviceNumber != null && !deviceNumber.isEmpty()) {
142 
                transactionServiceClient = new TransactionClient().getClient();
 149 
                transactionServiceClient = new TransactionClient().getClient();
143 
                rechargeOrders = transactionServiceClient.getRechargeOrdersForDevice(deviceNumber);
 150 
                rechargeOrders = transactionServiceClient.getRechargeOrdersForDevice(deviceNumber);
144 
                setRechargeOrders(rechargeOrders);
 151 
                setRechargeOrders(rechargeOrders);
145 
                return "recharge-orders-result-index";
 152 
                return "recharge-orders-result-index";
Line 769... Line 776...
769 
    public long getBulkOrderEnquiryCount() {
 776 
    public long getBulkOrderEnquiryCount() {
770 
        return bulkOrderEnquiryCount;
 777 
        return bulkOrderEnquiryCount;
771 
    }
 778 
    }
772 
 
 779 
 
773 
 
 780 
 
- 
 
 781 
	public String getMasterOrderId() {
- 
 
 782 
		return masterOrderId;
- 
 
 783 
	}
- 
 
 784 
 
- 
 
 785 
	public void setMasterOrderId(String masterOrderId) {
- 
 
 786 
		this.masterOrderId = masterOrderId;
- 
 
 787 
	}
- 
 
 788
- 
 
 789
- 
 
 790 
 
774 
}
 791 
}
775 

            792