Subversion Repositories SmartDukaan

Rev

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

Rev 5098 Rev 5108
Line 596... Line 596...
596 
        	return;
 596 
        	return;
597 
		}
 597 
		}
598
598
599 
        Sheet sheet = wb.getSheetAt(0);
 599 
        Sheet sheet = wb.getSheetAt(0);
600
600
601 
        int indexOrderId = 7;
 - 
 
602 
        int indexAmount = 1;
 601 
        int indexAmount = 1;
- 
 
 602 
        int indexAWB = 0;
603
603
604 
        Row firstRow = sheet.getRow(0);
 604 
        Row firstRow = sheet.getRow(0);
605 
        logger.info("Cell count:" + firstRow.getPhysicalNumberOfCells());
 605 
        logger.info("Cell count:" + firstRow.getPhysicalNumberOfCells());
606
606
607 
        TransactionClient tsc;
 607 
        TransactionClient tsc;
Line 613... Line 613...
613 
        	in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
 613 
        	in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
614
614
615 
	    	for (Row row: sheet)	{
 615 
	    	for (Row row: sheet)	{
616 
	    		if(row.equals(firstRow))	continue;
 616 
	    		if(row.equals(firstRow))	continue;
617
617
- 
 
 618 
	    		try {
618 
	    		if(row.getCell(indexOrderId).getStringCellValue().equals(""))	break;
 619 
	    			if(row.getCell(indexAWB).getNumericCellValue() < 1)	break;
- 
 
 620 
				} catch (NullPointerException e) {
- 
 
 621 
					break;
- 
 
 622 
				}
- 
 
 623
- 
 
 624 
	    		long awb = (long) row.getCell(indexAWB).getNumericCellValue();
619
625
620 
	    		long orderId = Long.parseLong(row.getCell(indexOrderId).getStringCellValue());
 - 
 
621 
	    		double amount = row.getCell(indexAmount).getNumericCellValue();
 - 
 
622 
	    		logger.info("Aramex Settlement, Order Id: " + orderId + " Amount: " + amount);
 - 
 
623 
	    		try {
 626 
	    		try {
- 
 
 627 
		    		long orderId = transactionClient.getOrderForAwb(Long.toString(awb)).getId();
- 
 
 628 
		    		double amount = row.getCell(indexAmount).getNumericCellValue();
- 
 
 629 
		    		logger.info("Aramex Settlement, Order Id: " + orderId + " Amount: " + amount);
- 
 
 630
624 
					transactionClient.savePaymentSettlements(settlementDate, 4, orderId, 0.0, 0.0, amount);
 631 
					transactionClient.savePaymentSettlements(settlementDate, 4, orderId, 0.0, 0.0, amount);
625 
					countSuccessfulSaves += 1;
 632 
					countSuccessfulSaves += 1;
626
633
627 
				} catch (TransactionServiceException e) {
 634 
				} catch (TransactionServiceException e) {
628 
					logger.error("Transaction Service Exception while getting order for id, " + orderId, e);
 635 
					logger.error("Transaction Service Exception while getting order for AWB, " + awb, e);
629 
					addActionError("Transaction Service Exception while getting order for id, " + orderId);
636 
					addActionError("Transaction Service Exception while getting order for AWB, " + awb);
630 
				}
 637 
				}
631 
	    	}
 638 
	    	}
632 
        } catch (ParseException e) {
 639 
        } catch (ParseException e) {
633 
        	addActionError("Could not parse " + aramexSettlementDate);
 640 
        	addActionError("Could not parse " + aramexSettlementDate);
634 
        	logger.error("Could not parse " + aramexSettlementDate + " " + e);
 641 
        	logger.error("Could not parse " + aramexSettlementDate + " " + e);