Subversion Repositories SmartDukaan

Rev

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

Rev 3354 Rev 3359
Line 336... Line 336...
336
336
337 
        if(item.getWeight() != null) {
 337 
        if(item.getWeight() != null) {
338 
            tItem.setWeight(item.getWeight());
 338 
            tItem.setWeight(item.getWeight());
339 
        }
 339 
        }
340
340
341 
        if(item.getMop() != null) {
 341 
        if(item.getExpectedDelay() != null) {
342 
            tItem.setMop(item.getMop());
 342 
            tItem.setExpectedDelay(item.getExpectedDelay());
343 
        }
 343 
        }
344
344
345 
        if(item.getDealerPrice() != null) {
 - 
 
346 
            tItem.setDealerPrice(item.getDealerPrice());
 - 
 
347 
        }
 - 
 
348
- 
 
349 
        if(item.getTransferPrice() != null) {
 345 
        if(item.getPreferredWarehouse() != null) {
350 
            tItem.setTransferPrice(item.getTransferPrice());
 346 
            tItem.setPreferredWarehouse(item.getPreferredWarehouse());
351 
        }
 347 
        }
352
348
353 
        tItem.setBestDealText(item.getBestDealsText());
 349 
        tItem.setBestDealText(item.getBestDealsText());
354 
        if(item.getBestDealsValue() != null) {
 350 
        if(item.getBestDealsValue() != null) {
355 
            tItem.setBestDealValue(item.getBestDealsValue());
 351 
            tItem.setBestDealValue(item.getBestDealsValue());
Line 508... Line 504...
508
504
509 
            if(item.getSellingPrice() != null) {
 505 
            if(item.getSellingPrice() != null) {
510 
                tItem.setSellingPrice(item.getSellingPrice());
 506 
                tItem.setSellingPrice(item.getSellingPrice());
511 
            }
 507 
            }
512
508
513 
            if(item.getMop() != null) {
 - 
 
514 
                tItem.setMop(item.getMop());
 - 
 
515 
            }
 - 
 
516
- 
 
517 
            if(item.getDealerPrice() != null) {
 - 
 
518 
                tItem.setDealerPrice(item.getDealerPrice());
 - 
 
519 
            }
 - 
 
520
- 
 
521 
            if(item.getTransferPrice() != null) {
 - 
 
522 
                tItem.setTransferPrice(item.getTransferPrice());
 - 
 
523 
            }
 - 
 
524
- 
 
525 
            long rItemId;
 509 
            long rItemId;
526 
            if((rItemId = catalogClient_Prod.updateItem(tItem)) != item.getId()) {
 510 
            if((rItemId = catalogClient_Prod.updateItem(tItem)) != item.getId()) {
527 
                logger.error("Error updating item on production, returned Item Id: " + rItemId);
 511 
                logger.error("Error updating item on production, returned Item Id: " + rItemId);
528 
                return "Error updating item prices on production";
 512 
                return "Error updating item prices on production";
529 
            }
 513 
            }
Line 645... Line 629...
645 
                thriftItem.getComments(),
 629 
                thriftItem.getComments(),
646 
                thriftItem.getCatalogItemId(),
 630 
                thriftItem.getCatalogItemId(),
647 
                thriftItem.getFeatureId(),
 631 
                thriftItem.getFeatureId(),
648 
                thriftItem.getFeatureDescription(),
 632 
                thriftItem.getFeatureDescription(),
649 
                thriftItem.isSetMrp() ? thriftItem.getMrp() : null,
 633 
                thriftItem.isSetMrp() ? thriftItem.getMrp() : null,
650 
                thriftItem.getMop(),
 - 
 
651 
                thriftItem.isSetSellingPrice() ? thriftItem.getSellingPrice() : null,
 634 
                thriftItem.isSetSellingPrice() ? thriftItem.getSellingPrice() : null,
652 
                thriftItem.getDealerPrice(),
 - 
 
653 
                thriftItem.isSetWeight() ? thriftItem.getWeight() : null,
 635 
                thriftItem.isSetWeight() ? thriftItem.getWeight() : null,
654 
                thriftItem.getAddedOn(),
 636 
                thriftItem.getAddedOn(),
655 
                thriftItem.getStartDate(),
 637 
                thriftItem.getStartDate(),
656 
                thriftItem.getRetireDate(),
 638 
                thriftItem.getRetireDate(),
657 
                thriftItem.getUpdatedOn(),
 639 
                thriftItem.getUpdatedOn(),
Line 662... Line 644...
662 
                thriftItem.getBestDealText(),
 644 
                thriftItem.getBestDealText(),
663 
                thriftItem.isSetBestDealValue() ? thriftItem.getBestDealValue() : null,
 645 
                thriftItem.isSetBestDealValue() ? thriftItem.getBestDealValue() : null,
664 
                thriftItem.isSetBestSellingRank() ? thriftItem.getBestSellingRank() : null,
 646 
                thriftItem.isSetBestSellingRank() ? thriftItem.getBestSellingRank() : null,
665 
                thriftItem.isDefaultForEntity(),
 647 
                thriftItem.isDefaultForEntity(),
666 
                thriftItem.isRisky(),
 648 
                thriftItem.isRisky(),
- 
 
 649 
                thriftItem.isSetExpectedDelay() ? thriftItem.getExpectedDelay() : null,
- 
 
 650 
                thriftItem.isSetPreferredWarehouse() ? thriftItem.getPreferredWarehouse() : null,
667 
                (thriftItem.getItemInventory() != null ? thriftItem.getItemInventory().getAvailability() : null),
 651 
                (thriftItem.getItemInventory() != null ? thriftItem.getItemInventory().getAvailability() : null),
668 
                vendorPricingMap,
 652 
                vendorPricingMap,
669 
                vItemMap);
 653 
                vItemMap);
670 
        return item;
 654 
        return item;
671 
    }
 655 
    }