Subversion Repositories SmartDukaan

Rev

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

Rev 5118 Rev 5217
Line 507... Line 507...
507 
 
 507 
 
508 
        if(item.getStartDate() != null) {
 508 
        if(item.getStartDate() != null) {
509 
            tItem.setStartDate(item.getStartDate());
 509 
            tItem.setStartDate(item.getStartDate());
510 
        }
 510 
        }
511
511
- 
 
 512 
        if(item.getExpectedArrivalDate() != null) {
- 
 
 513 
        	tItem.setExpectedArrivalDate(item.getExpectedArrivalDate());
- 
 
 514 
        } else {
- 
 
 515 
        	tItem.unsetComingSoonStartDate();
- 
 
 516 
        	tItem.unsetExpectedArrivalDate();
- 
 
 517 
        	if(status.COMING_SOON.equals(tItem.getItemStatus())){
- 
 
 518 
        		tItem.setItemStatus(status.IN_PROCESS);
- 
 
 519 
        	}
- 
 
 520 
        }
- 
 
 521 
 
- 
 
 522 
        if(item.getComingSoonStartDate() != null) {
- 
 
 523 
        	tItem.setComingSoonStartDate(item.getComingSoonStartDate());
- 
 
 524 
        } else {
- 
 
 525 
        	tItem.unsetComingSoonStartDate();
- 
 
 526 
        }
- 
 
 527
512 
        if(item.getRetireDate() != null) {
 528 
        if(item.getRetireDate() != null) {
513 
            tItem.setRetireDate(item.getRetireDate());
 529 
            tItem.setRetireDate(item.getRetireDate());
514 
        }
 530 
        }
515
531
516 
        tItem.setUpdatedOn(Calendar.getInstance().getTimeInMillis());
 532 
        tItem.setUpdatedOn(Calendar.getInstance().getTimeInMillis());
Line 850... Line 866...
850 
                thriftItem.isSetMrp() ? thriftItem.getMrp() : null,
 866 
                thriftItem.isSetMrp() ? thriftItem.getMrp() : null,
851 
                thriftItem.isSetSellingPrice() ? thriftItem.getSellingPrice() : null,
 867 
                thriftItem.isSetSellingPrice() ? thriftItem.getSellingPrice() : null,
852 
                thriftItem.isSetWeight() ? thriftItem.getWeight() : null,
 868 
                thriftItem.isSetWeight() ? thriftItem.getWeight() : null,
853 
                thriftItem.getAddedOn(),
 869 
                thriftItem.getAddedOn(),
854 
                thriftItem.getStartDate(),
 870 
                thriftItem.getStartDate(),
- 
 
 871 
                thriftItem.isSetComingSoonStartDate() ? thriftItem.getComingSoonStartDate() : null ,
- 
 
 872 
                thriftItem.isSetExpectedArrivalDate() ? thriftItem.getExpectedArrivalDate() : null ,
855 
                thriftItem.getRetireDate(),
 873 
                thriftItem.getRetireDate(),
856 
                thriftItem.getUpdatedOn(),
 874 
                thriftItem.getUpdatedOn(),
857 
                thriftItem.getItemStatus().name(),
 875 
                thriftItem.getItemStatus().name(),
858 
                thriftItem.getItemStatus().getValue(),
 876 
                thriftItem.getItemStatus().getValue(),
859 
                thriftItem.getStatus_description(),
 877 
                thriftItem.getStatus_description(),