Subversion Repositories SmartDukaan

Rev

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

Rev 6561 Rev 6672
Line 191... Line 191...
191
        try{
191
        try{
192
			TransactionClient transactionServiceClient = new TransactionClient();
192
			TransactionClient transactionServiceClient = new TransactionClient();
193
			in.shop2020.model.v1.order.TransactionService.Client orderClient = transactionServiceClient.getClient();
193
			in.shop2020.model.v1.order.TransactionService.Client orderClient = transactionServiceClient.getClient();
194
			order = orderClient.getOrderForCustomer(orderId, userId);
194
			order = orderClient.getOrderForCustomer(orderId, userId);
195
			orderedOn = new Date(order.getCreated_timestamp());
195
			orderedOn = new Date(order.getCreated_timestamp());
196
			deliveryEstimate = new Date(order.getExpected_delivery_time());
196
			deliveryEstimate = new Date(order.getPromised_delivery_time());
197
			
197
			
198
			if(order.isCod()){
198
			if(order.isCod()){
199
				if(codCancellable.contains(order.getStatus())){
199
				if(codCancellable.contains(order.getStatus())){
200
					initiateOrderCancelation = true;
200
					initiateOrderCancelation = true;
201
				}
201
				}
Line 243... Line 243...
243
		context.put("isDelivered", order.getStatus().equals(OrderStatus.DELIVERY_SUCCESS));
243
		context.put("isDelivered", order.getStatus().equals(OrderStatus.DELIVERY_SUCCESS));
244
		context.put("isOpen", Groups.getShippedOrders().contains(order.getStatus()));
244
		context.put("isOpen", Groups.getShippedOrders().contains(order.getStatus()));
245
		context.put("order", order);
245
		context.put("order", order);
246
		context.put("orderedOn", dateformat.format(orderedOn));
246
		context.put("orderedOn", dateformat.format(orderedOn));
247
		context.put("fdaOn", dateformat1.format(new Date(order.getFirst_attempt_timestamp())));
247
		context.put("fdaOn", dateformat1.format(new Date(order.getFirst_attempt_timestamp())));
248
		context.put("deliveryEstimate", dateformat1.format(deliveryEstimate));
248
		context.put("promisedDeliveryDate", dateformat1.format(deliveryEstimate));
249
		context.put("deliveredOn", dateformat1.format(new Date(order.getDelivery_timestamp())));
249
		context.put("deliveredOn", dateformat1.format(new Date(order.getDelivery_timestamp())));
250
		context.put("addresses", addresses);
250
		context.put("addresses", addresses);
251
		context.put("defaultAddressId", defaultAddressId);
251
		context.put("defaultAddressId", defaultAddressId);
252
		context.put("userinfo", userinfo);
252
		context.put("userinfo", userinfo);
253
		context.put("initiateOrderCancelation", initiateOrderCancelation);
253
		context.put("initiateOrderCancelation", initiateOrderCancelation);