Subversion Repositories SmartDukaan

Rev

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

Rev 6760 Rev 6777
Line 91... Line 91...
91
                      TABLE_INDEX_VOUCHERS_DEL_BUTTON = 3;
91
                      TABLE_INDEX_VOUCHERS_DEL_BUTTON = 3;
92
    
92
    
93
    private final String MANDATORY_MRP = "MRP",
93
    private final String MANDATORY_MRP = "MRP",
94
					  MANDATORY_WEIGHT = "Weight",
94
					  MANDATORY_WEIGHT = "Weight",
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",
-
 
97
					  MANDATORY_BEST_DEAL_DETAIL_LINK = "Best Deal Detail Link",
96
					  MANDATORY_BRAND = "Brand",
98
					  MANDATORY_BRAND = "Brand",
97
					  MANDATORY_MODEL_NO = "Model Number",
99
					  MANDATORY_MODEL_NO = "Model Number",
98
					  MANDATORY_MODEL_NAME = "Model Name";
100
					  MANDATORY_MODEL_NAME = "Model Name";
99
    
101
    
100
    private final String OPTIONAL_SELLING_PRICE = "Selling Price",	
102
    private final String OPTIONAL_SELLING_PRICE = "Selling Price",	
Line 128... Line 130...
128
    @UiField Label contentCategory, catalogItemId, productGroup;
130
    @UiField Label contentCategory, catalogItemId, productGroup;
129
    @UiField TextBox statusDesc, comments;
131
    @UiField TextBox statusDesc, comments;
130
    @UiField TextBox sellingPrice, mrp, weight;
132
    @UiField TextBox sellingPrice, mrp, weight;
131
    @UiField Label addedOn, retireDate, updatedOn;
133
    @UiField Label addedOn, retireDate, updatedOn;
132
    @UiField Label itemStatus;
134
    @UiField Label itemStatus;
133
    @UiField TextBox bestDealsText, bestDealsValue; 
135
    @UiField TextBox bestDealsText, bestDealsValue ,bestDealsDetailsText,bestDealsDetailsLink; 
134
    @UiField FlexTable headerAvailability, availabilityTable;
136
    @UiField FlexTable headerAvailability, availabilityTable;
135
    @UiField FlexTable headerVendorItemKey, tableVendorItemKey;
137
    @UiField FlexTable headerVendorItemKey, tableVendorItemKey;
136
    @UiField FlexTable headerVendorPrices, tableVendorPrices;
138
    @UiField FlexTable headerVendorPrices, tableVendorPrices;
137
    @UiField FlexTable headerSourcePrices, tableSourcePrices;
139
    @UiField FlexTable headerSourcePrices, tableSourcePrices;
138
    @UiField TextBox bestSellingRank;
140
    @UiField TextBox bestSellingRank;
Line 250... Line 252...
250
        addedOn.setText(Utils.getDisplayableDate(item.getAddedOn()));
252
        addedOn.setText(Utils.getDisplayableDate(item.getAddedOn()));
251
        retireDate.setText(Utils.getDisplayableDate(item.getRetireDate()));
253
        retireDate.setText(Utils.getDisplayableDate(item.getRetireDate()));
252
        updatedOn.setText(Utils.getDisplayableDate(item.getUpdatedOn()));
254
        updatedOn.setText(Utils.getDisplayableDate(item.getUpdatedOn()));
253
 
255
 
254
        bestDealsText.setText(item.getBestDealsText());
256
        bestDealsText.setText(item.getBestDealsText());
-
 
257
        bestDealsDetailsText.setText(item.getBestDealsDetailsText());
-
 
258
        bestDealsDetailsLink.setText(item.getBestDealsDetailsLink());
255
        bestDealsValue.setText(item.getBestDealsValue() != null ? item.getBestDealsValue()+"" : "");
259
        bestDealsValue.setText(item.getBestDealsValue() != null ? item.getBestDealsValue()+"" : "");
256
        bestSellingRank.setText(item.getBestSellingRank() != null ? item.getBestSellingRank()+"" : "");
260
        bestSellingRank.setText(item.getBestSellingRank() != null ? item.getBestSellingRank()+"" : "");
257
        defaultForEntity.setValue(item.isDefaultForEntity());
261
        defaultForEntity.setValue(item.isDefaultForEntity());
258
        risky.setValue(item.isRisky());
262
        risky.setValue(item.isRisky());
259
        
263
        
Line 1239... Line 1243...
1239
        } catch(Exception ex) {
1243
        } catch(Exception ex) {
1240
            Window.alert("Invalid start date format");
1244
            Window.alert("Invalid start date format");
1241
            return false;
1245
            return false;
1242
        }
1246
        }
1243
        newItem.setBestDealsText(bestDealsText.getText().trim());
1247
        newItem.setBestDealsText(bestDealsText.getText().trim());
-
 
1248
        newItem.setBestDealsDetailsText(bestDealsDetailsText.getText().trim());
-
 
1249
        newItem.setBestDealsDetailsLink(bestDealsDetailsLink.getText().trim());
1244
        Date comingSoonStartDt  = comingSoonStartDate.getValue();
1250
        Date comingSoonStartDt  = comingSoonStartDate.getValue();
1245
        Date expectedArrivalDt  = expectedArrivalDate.getValue();
1251
        Date expectedArrivalDt  = expectedArrivalDate.getValue();
1246
        if(comingSoonStartDt == null){
1252
        if(comingSoonStartDt == null){
1247
        	newItem.setComingSoonStartDate(null);
1253
        	newItem.setComingSoonStartDate(null);
1248
        }else {
1254
        }else {
Line 1484... Line 1490...
1484
        }
1490
        }
1485
        if(!checkParameterIfEqual(bestDealsText.getText().trim(), item.getBestDealsText())) {
1491
        if(!checkParameterIfEqual(bestDealsText.getText().trim(), item.getBestDealsText())) {
1486
        	mandatoryChangedValMap.put(MANDATORY_BEST_DEAL_TEXT, bestDealsText.getText().trim());
1492
        	mandatoryChangedValMap.put(MANDATORY_BEST_DEAL_TEXT, bestDealsText.getText().trim());
1487
            sb.append("\n-Best Deal Text");
1493
            sb.append("\n-Best Deal Text");
1488
        }
1494
        }
-
 
1495
        if(!checkParameterIfEqual(bestDealsDetailsText.getText().trim(), item.getBestDealsDetailsText())) {
-
 
1496
        	mandatoryChangedValMap.put(MANDATORY_BEST_DEAL_DETAIL_TEXT, bestDealsDetailsText.getText().trim());
-
 
1497
            sb.append("\n-Best Deal Detail Text");
-
 
1498
        }
-
 
1499
        if(!checkParameterIfEqual(bestDealsDetailsLink.getText().trim(), item.getBestDealsDetailsLink())) {
-
 
1500
        	mandatoryChangedValMap.put(MANDATORY_BEST_DEAL_DETAIL_LINK, bestDealsDetailsLink.getText().trim());
-
 
1501
            sb.append("\n-Best Deal Detail Link");
-
 
1502
        }
1489
        if(!checkParameterIfEqual(newItem.getBestDealsValue(), item.getBestDealsValue())) {
1503
        if(!checkParameterIfEqual(newItem.getBestDealsValue(), item.getBestDealsValue())) {
1490
            sb.append("\n-Best Deal Value");
1504
            sb.append("\n-Best Deal Value");
1491
        }
1505
        }
1492
        if(!checkParameterIfEqual(newItem.getBestSellingRank(), item.getBestSellingRank())) {
1506
        if(!checkParameterIfEqual(newItem.getBestSellingRank(), item.getBestSellingRank())) {
1493
            sb.append("\n-Best Selling Rank");
1507
            sb.append("\n-Best Selling Rank");
Line 1872... Line 1886...
1872
 
1886
 
1873
	@Override
1887
	@Override
1874
	public String getBestDealsText() {
1888
	public String getBestDealsText() {
1875
		return this.bestDealsText.getValue();
1889
		return this.bestDealsText.getValue();
1876
	}
1890
	}
-
 
1891
	
-
 
1892
	public void setBestDealsDetailsText(String bestDealsDetailsText) {
-
 
1893
		this.bestDealsDetailsText.setValue(bestDealsDetailsText);
-
 
1894
		
-
 
1895
	}
-
 
1896
	
-
 
1897
	public String getBestDealsDetailsText() {
-
 
1898
		return this.bestDealsDetailsText.getValue();
-
 
1899
	}
1877
 
1900
 
1878
	@Override
1901
	@Override
1879
	public Date getComingSoonStartDate() {
1902
	public Date getComingSoonStartDate() {
1880
		return this.comingSoonStartDate.getValue();
1903
		return this.comingSoonStartDate.getValue();
1881
	}
1904
	}
Line 1993... Line 2016...
1993
                	result.setBrand((String)mandatoryChangedValMap.get(MANDATORY_BRAND));
2016
                	result.setBrand((String)mandatoryChangedValMap.get(MANDATORY_BRAND));
1994
                }
2017
                }
1995
                if(mandatoryChangedValMap.containsKey(MANDATORY_BEST_DEAL_TEXT)){
2018
                if(mandatoryChangedValMap.containsKey(MANDATORY_BEST_DEAL_TEXT)){
1996
                	result.setBestDealsText((String)mandatoryChangedValMap.get(MANDATORY_BEST_DEAL_TEXT));
2019
                	result.setBestDealsText((String)mandatoryChangedValMap.get(MANDATORY_BEST_DEAL_TEXT));
1997
                }
2020
                }
-
 
2021
                if(mandatoryChangedValMap.containsKey(MANDATORY_BEST_DEAL_DETAIL_TEXT)){
-
 
2022
                	result.setBestDealsDetailsText((String)mandatoryChangedValMap.get(MANDATORY_BEST_DEAL_DETAIL_TEXT));
-
 
2023
                }
-
 
2024
                if(mandatoryChangedValMap.containsKey(MANDATORY_BEST_DEAL_DETAIL_LINK)){
-
 
2025
                	result.setBestDealsDetailsLink((String)mandatoryChangedValMap.get(MANDATORY_BEST_DEAL_DETAIL_LINK));
-
 
2026
                }
1998
                if(mandatoryChangedValMap.containsKey(MANDATORY_MODEL_NAME)){
2027
                if(mandatoryChangedValMap.containsKey(MANDATORY_MODEL_NAME)){
1999
                	result.setModelName((String)mandatoryChangedValMap.get(MANDATORY_MODEL_NAME));
2028
                	result.setModelName((String)mandatoryChangedValMap.get(MANDATORY_MODEL_NAME));
2000
                }
2029
                }
2001
                if(mandatoryChangedValMap.containsKey(MANDATORY_MODEL_NO)){
2030
                if(mandatoryChangedValMap.containsKey(MANDATORY_MODEL_NO)){
2002
                	result.setModelNumber((String)mandatoryChangedValMap.get(MANDATORY_MODEL_NO));
2031
                	result.setModelNumber((String)mandatoryChangedValMap.get(MANDATORY_MODEL_NO));