Subversion Repositories SmartDukaan

Rev

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

Rev 2782 Rev 3065
Line 80... Line 80...
80
	 *            The warehouse for which the orders should be marked as
80
	 *            The warehouse for which the orders should be marked as
81
	 *            manifested.
81
	 *            manifested.
82
	 * @param providerId
82
	 * @param providerId
83
	 *            The provider for which the orders should be marked as
83
	 *            The provider for which the orders should be marked as
84
	 *            manifested.
84
	 *            manifested.
-
 
85
	 * @param cod
-
 
86
	 *             Whether cod orders have to be marked as manifested
85
	 * @return True if everything goes fine, false otherwise.
87
	 * @return True if everything goes fine, false otherwise.
86
	 */
88
	 */
87
	public static boolean markOrdersAsManifested(long warehouseId, String providerId){
89
	public static boolean markOrdersAsManifested(long warehouseId, String providerId, boolean cod){
88
		try {
90
		try {
89
			long provider_id = Long.parseLong(providerId);
91
			long provider_id = Long.parseLong(providerId);
90
			TransactionServiceClient client = new TransactionServiceClient();
92
			TransactionServiceClient client = new TransactionServiceClient();
91
			Client c = client.getClient();
93
			Client c = client.getClient();
92
			return c.markOrdersAsManifested(warehouseId, provider_id);
94
			return c.markOrdersAsManifested(warehouseId, provider_id, cod);
93
		}catch(Exception e){
95
		}catch(Exception e){
94
			e.printStackTrace();
96
			e.printStackTrace();
95
			return false;
97
			return false;
96
		}
98
		}
97
	}
99
	}
Line 131... Line 133...
131
				t_order.getBilled_by(),
133
				t_order.getBilled_by(),
132
				t_order.getInvoice_number(),
134
				t_order.getInvoice_number(),
133
				t_order.getJacket_number(),
135
				t_order.getJacket_number(),
134
				lineItem.getItem_number(),
136
				lineItem.getItem_number(),
135
				lineItem.getImei_number(),
137
				lineItem.getImei_number(),
-
 
138
				t_order.getBatchNo(),
136
				t_order.getBatchNo(), t_order.getSerialNo(),
139
				t_order.getSerialNo(),
137
				false,
140
				false,
138
				t_order.isDoaFlag(),
141
				t_order.isDoaFlag(),
139
				t_order.getPickupRequestNo());
142
				t_order.getPickupRequestNo(),
-
 
143
				t_order.isCod());
140
		return order;
144
		return order;
141
	}
145
	}
142
 
146
 
143
	/**
147
	/**
144
	 * Queries the transction server to get the list of all return orders that
148
	 * Queries the transction server to get the list of all return orders that
Line 255... Line 259...
255
			statuses.add(OrderStatus.DOA_INVALID_REFUNDED);
259
			statuses.add(OrderStatus.DOA_INVALID_REFUNDED);
256
			statuses.add(OrderStatus.DOA_VALID_REFUNDED);
260
			statuses.add(OrderStatus.DOA_VALID_REFUNDED);
257
			statuses.add(OrderStatus.REFUNDED);
261
			statuses.add(OrderStatus.REFUNDED);
258
			break;
262
			break;
259
		
263
		
-
 
264
		case VERIFICATION_PENDING:
-
 
265
		    statuses.add(OrderStatus.INIT);
-
 
266
		    break;
260
		default:
267
		default:
261
			break;
268
			break;
262
		}
269
		}
263
		return statuses;
270
		return statuses;
264
	}
271
	}