Subversion Repositories SmartDukaan

Rev

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

Rev 3972 Rev 4008
Line 147... Line 147...
147 
                }
 147 
                }
148 
 
 148 
 
149 
                transactionServiceClient = new TransactionClient().getClient();
 149 
                transactionServiceClient = new TransactionClient().getClient();
150 
                orders.addAll(transactionServiceClient.getOrdersForTransaction(failedTransactionId, ticket.getCustomerId()));
 150 
                orders.addAll(transactionServiceClient.getOrdersForTransaction(failedTransactionId, ticket.getCustomerId()));
151 
            }
 151 
            }
- 
 
 152 
 
- 
 
 153 
            if (TicketCategory.DELAYED_DELIVERY.equals(ticket.getCategory())) {
- 
 
 154 
                log.info("Fetching orders for " + ticket.getCustomerId());
- 
 
 155 
                orders = new ArrayList<Order>();
- 
 
 156 
                transactionServiceClient = new TransactionClient().getClient();
- 
 
 157 
 
- 
 
 158 
                for (Order order : transactionServiceClient.getOrdersForCustomer(ticket.getCustomerId(), 0, 0, null)) {
- 
 
 159 
                    if (order.getExpected_delivery_time() > order.getPromised_delivery_time() && order.getExpected_delivery_time() > new Date().getTime()) {
- 
 
 160 
                        orders.add(order);
- 
 
 161 
                    }
- 
 
 162 
                }
- 
 
 163 
            }
152 
        } catch (TException e) {
 164 
        } catch (TException e) {
153 
            log.error("Error loading edit page", e);
 165 
            log.error("Error loading edit page", e);
154 
        } catch (NumberFormatException e) {
 166 
        } catch (NumberFormatException e) {
155 
            log.error("Error parsing orderId", e);
 167 
            log.error("Error parsing orderId", e);
156 
        } catch (TransactionServiceException e) {
 168 
        } catch (TransactionServiceException e) {
Line 312... Line 324...
312 
        }
 324 
        }
313 
 
 325 
 
314 
        return index();
 326 
        return index();
315 
    }
 327 
    }
316 
 
 328 
 
317 
    /**
 - 
 
318 
     * Returns tickets assigned to the current logged in agent
 - 
 
319 
     *
- 
 
320 
     * @return
 - 
 
321 
     */
 - 
 
322 
    public String getMyOpenTickets() {
 - 
 
323 
        try {
 - 
 
324 
            Agent agent = CRMAuthorizingRealm.getAgent(currentAgentEmailId);
 - 
 
325 
 
 - 
 
326 
            SearchFilter searchFilter = new SearchFilter();
 - 
 
327 
            searchFilter.setTicketAssigneeIds(Collections.singletonList(agent
 - 
 
328 
                    .getId()));
 - 
 
329 
            crmServiceClient = new CRMClient().getClient();
 - 
 
330 
            for (Ticket ticket : crmServiceClient.getTickets(searchFilter)) {
 - 
 
331 
                if (TicketStatus.OPEN.equals(ticket.getStatus())) {
 - 
 
332 
                    tickets.add(ticket);
 - 
 
333 
                }
 - 
 
334 
            }
 - 
 
335 
        } catch (TException e) {
 - 
 
336 
            String errorString = "Error getting tickets for "
 - 
 
337 
                    + currentAgentEmailId;
 - 
 
338 
            log.error(errorString, e);
 - 
 
339 
            addActionError(errorString);
 - 
 
340 
        }
 - 
 
341 
 
 - 
 
342 
        return index();
 - 
 
343 
    }
 - 
 
344 
 
 - 
 
345 
    public String getUnassignedTickets() {
 329 
    public String getUnassignedTickets() {
346 
        try {
 330 
        try {
347 
            crmServiceClient = new CRMClient().getClient();
 331 
            crmServiceClient = new CRMClient().getClient();
348 
            tickets = crmServiceClient.getUnassignedTickets();
 332 
            tickets = crmServiceClient.getUnassignedTickets();
349 
        } catch (TException e) {
 333 
        } catch (TException e) {
Line 557... Line 541...
557 
    public String getAddress(Order order) {
 541 
    public String getAddress(Order order) {
558 
        return ModelUtils.extractAddressFromOrder(order);
 542 
        return ModelUtils.extractAddressFromOrder(order);
559 
    }
 543 
    }
560 
 
 544 
 
561 
    public String getProductName(LineItem lineItem) {
 545 
    public String getProductName(LineItem lineItem) {
562 
        return ModelUtils.extractProductNameFromLineItem(lineItem);
 546 
        return ModelUtils.extractProductNameFromLineItem(lineItem) + " " + lineItem.getColor();
563 
    }
 547 
    }
564 
 
 548 
 
565 
    public ActivityType[] getActivityTypes() {
 549 
    public ActivityType[] getActivityTypes() {
566 
        return ActivityType.values();
 550 
        return ActivityType.values();
567 
    }
 551 
    }