Subversion Repositories SmartDukaan

Rev

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

Rev 7190 Rev 7239
Line 95... Line 95...
95
					  MANDATORY_BEST_DEAL_TEXT = "Best Deal Text",
95
					  MANDATORY_BEST_DEAL_TEXT = "Best Deal Text",
96
					  MANDATORY_BEST_DEAL_DETAIL_TEXT = "Best Deal Detail Text",
96
					  MANDATORY_BEST_DEAL_DETAIL_TEXT = "Best Deal Detail Text",
97
					  MANDATORY_BEST_DEAL_DETAIL_LINK = "Best Deal Detail Link",
97
					  MANDATORY_BEST_DEAL_DETAIL_LINK = "Best Deal Detail Link",
98
					  MANDATORY_BRAND = "Brand",
98
					  MANDATORY_BRAND = "Brand",
99
					  MANDATORY_MODEL_NO = "Model Number",
99
					  MANDATORY_MODEL_NO = "Model Number",
100
					  MANDATORY_MODEL_NAME = "Model Name";
100
					  MANDATORY_MODEL_NAME = "Model Name",
-
 
101
					  MANDATORY_FREEBIE_ITEM_ID = "Freebie Item Id";
-
 
102
    				
101
    
103
    
102
    private final String OPTIONAL_SELLING_PRICE = "Selling Price",	
104
    private final String OPTIONAL_SELLING_PRICE = "Selling Price",	
103
    				  OPTIONAL_VENDOR_PRICING = "Vendor Pricing",
105
    				  OPTIONAL_VENDOR_PRICING = "Vendor Pricing",
104
    				  OPTIONAL_PREFERRED_VENDOR = "Preferred Vendor",
106
    				  OPTIONAL_PREFERRED_VENDOR = "Preferred Vendor",
105
    				  OPTIONAL_PREFERRED_INSURER = "Preferred Insurer",
107
    				  OPTIONAL_PREFERRED_INSURER = "Preferred Insurer",
Line 1602... Line 1604...
1602
        }
1604
        }
1603
        if(item.isShowSellingPrice() != showSellingPrice.getValue()) {
1605
        if(item.isShowSellingPrice() != showSellingPrice.getValue()) {
1604
        	sb.append("\n-Coming Soon item pricing marked");
1606
        	sb.append("\n-Coming Soon item pricing marked");
1605
        }
1607
        }
1606
        if(!checkParameterIfEqual(newItem.getFreebieItemId(), item.getFreebieItemId())) {
1608
        if(!checkParameterIfEqual(newItem.getFreebieItemId(), item.getFreebieItemId())) {
-
 
1609
        	mandatoryChangedValMap.put(MANDATORY_FREEBIE_ITEM_ID, freebieItemId.getText().trim());
1607
            sb.append("\n-Freebie Item Id");
1610
            sb.append("\n-Freebie Item Id");
1608
        }
1611
        }
1609
        
1612
        
1610
        VendorPricings vendorPricings;
1613
        VendorPricings vendorPricings;
1611
        long vendorId;
1614
        long vendorId;
Line 2097... Line 2100...
2097
                	result.setWeight((Double)mandatoryChangedValMap.get(MANDATORY_WEIGHT));
2100
                	result.setWeight((Double)mandatoryChangedValMap.get(MANDATORY_WEIGHT));
2098
                }
2101
                }
2099
                if(mandatoryChangedValMap.containsKey(MANDATORY_MRP)){
2102
                if(mandatoryChangedValMap.containsKey(MANDATORY_MRP)){
2100
                	result.setMrp((Double)mandatoryChangedValMap.get(MANDATORY_MRP));
2103
                	result.setMrp((Double)mandatoryChangedValMap.get(MANDATORY_MRP));
2101
                }
2104
                }
-
 
2105
                if(mandatoryChangedValMap.containsKey(MANDATORY_FREEBIE_ITEM_ID)) {
-
 
2106
                	result.setFreebieItemId((Long)(mandatoryChangedValMap.get(MANDATORY_FREEBIE_ITEM_ID));
-
 
2107
                }
2102
                if(optionalChangedValMap.containsKey(OPTIONAL_PREFERRED_VENDOR)){
2108
                if(optionalChangedValMap.containsKey(OPTIONAL_PREFERRED_VENDOR)){
2103
                	result.setPreferredVendor((Long)optionalChangedValMap.get(OPTIONAL_PREFERRED_VENDOR));
2109
                	result.setPreferredVendor((Long)optionalChangedValMap.get(OPTIONAL_PREFERRED_VENDOR));
2104
                }
2110
                }
2105
                if(optionalChangedValMap.containsKey(OPTIONAL_PREFERRED_INSURER)){
2111
                if(optionalChangedValMap.containsKey(OPTIONAL_PREFERRED_INSURER)){
2106
                	result.setPreferredInsurer((Long)optionalChangedValMap.get(OPTIONAL_PREFERRED_INSURER));
2112
                	result.setPreferredInsurer((Long)optionalChangedValMap.get(OPTIONAL_PREFERRED_INSURER));