Subversion Repositories SmartDukaan

Rev

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

Rev 12675 Rev 12889
Line 130... Line 130...
130
    private String isFbaPromotionActive;
130
    private String isFbaPromotionActive;
131
    private String isFbbPromotionActive;
131
    private String isFbbPromotionActive;
132
    private String fbaPromoPrice;
132
    private String fbaPromoPrice;
133
    private String fbbPromoPrice;
133
    private String fbbPromoPrice;
134
    private String promoItemId;
134
    private String promoItemId;
-
 
135
    private String fbgTaxCode;
-
 
136
    private String isFbg;
-
 
137
    private String fbgPrice;
-
 
138
    private String suppressFbgPriceUpdate;
-
 
139
    private String fbgPromoPrice;
-
 
140
    private String isFbgPromotionActive;
135
    
141
    
136
    public String getOtherCost() {
142
    public String getOtherCost() {
137
        return otherCost;
143
        return otherCost;
138
    }
144
    }
139
 
145
 
Line 311... Line 317...
311
        
317
        
312
        if (amazonlisted.getOtherCost()!=Double.valueOf(otherCost)){
318
        if (amazonlisted.getOtherCost()!=Double.valueOf(otherCost)){
313
            amazonlisted.setOtherCost(Double.valueOf(otherCost));
319
            amazonlisted.setOtherCost(Double.valueOf(otherCost));
314
            commit=true;
320
            commit=true;
315
        }
321
        }
-
 
322
        
-
 
323
        if(!StringUtils.equals(amazonlisted.getFbgtaxCode(), fbgTaxCode)){
-
 
324
            amazonlisted.setFbgtaxCode(fbgTaxCode);
-
 
325
            commit=true;
-
 
326
        }
-
 
327
 
-
 
328
        if(amazonlisted.isSuppressFbgPriceUpdate()!=Boolean.valueOf(suppressFbgPriceUpdate)){
-
 
329
            amazonlisted.setSuppressFbgPriceUpdate(Boolean.valueOf(suppressFbgPriceUpdate));
-
 
330
            commit=true;
-
 
331
        }
-
 
332
 
-
 
333
        if (amazonlisted.getFbgPrice()!=Double.valueOf(fbgPrice)){
-
 
334
            amazonlisted.setFbgPrice(Double.valueOf(fbgPrice));
-
 
335
            commit=true;
-
 
336
        }
-
 
337
 
-
 
338
        if (amazonlisted.isIsFbg()!=Boolean.valueOf(isFbg)){
-
 
339
            amazonlisted.setIsFbg(Boolean.valueOf(isFbg));
-
 
340
            commit=true;
-
 
341
        }
316
 
342
 
317
        if(commit){
343
        if(commit){
318
            CatalogClient.updateAmazonItemDetails(amazonlisted);
344
            CatalogClient.updateAmazonItemDetails(amazonlisted);
319
        }
345
        }
320
        else{
346
        else{
Line 338... Line 364...
338
        
364
        
339
        if(Boolean.valueOf(isFbbPromotionActive)){
365
        if(Boolean.valueOf(isFbbPromotionActive)){
340
            amazonlisted.setFbbPromoPrice(Double.valueOf(fbbPromoPrice));
366
            amazonlisted.setFbbPromoPrice(Double.valueOf(fbbPromoPrice));
341
        }
367
        }
342
        
368
        
-
 
369
        if(Boolean.valueOf(isFbgPromotionActive)){
-
 
370
            amazonlisted.setFbgPromoPrice(Double.valueOf(fbgPromoPrice));
-
 
371
        }
-
 
372
        
343
        catalogClient.updateAmazonItemDetails(amazonlisted);
373
        catalogClient.updateAmazonItemDetails(amazonlisted);
344
        return "index";
374
        return "index";
345
    }
375
    }
346
 
376
 
347
    public void upload() throws IOException, TException {
377
    public void upload() throws IOException, TException {
Line 472... Line 502...
472
            return null;
502
            return null;
473
        }
503
        }
474
    }
504
    }
475
 
505
 
476
    public Long getTimetoShip(String itemId) throws LogisticsServiceException, TException{
506
    public Long getTimetoShip(String itemId) throws LogisticsServiceException, TException{
477
        LogisticsClient logisticsClient = new LogisticsClient();
507
        //LogisticsClient logisticsClient = new LogisticsClient();
478
        return logisticsClient.getClient().getLogisticsInfo("110001", Long.valueOf(itemId), DeliveryType.COD, PickUpType.COURIER).getShippingTime();
508
        //return logisticsClient.getClient().getLogisticsInfo("110001", Long.valueOf(itemId), DeliveryType.COD, PickUpType.COURIER).getShippingTime();
-
 
509
        return 0L;
479
    }
510
    }
480
    
511
    
481
    
512
    
482
    public double getWanlcForItem(String itemId){
513
    public double getWanlcForItem(String itemId){
483
        InventoryClient inventoryServiceClient;
514
        InventoryClient inventoryServiceClient;
Line 1272... Line 1303...
1272
 
1303
 
1273
    public void setIsFbbPromotionActive(String isFbbPromotionActive) {
1304
    public void setIsFbbPromotionActive(String isFbbPromotionActive) {
1274
        this.isFbbPromotionActive = isFbbPromotionActive;
1305
        this.isFbbPromotionActive = isFbbPromotionActive;
1275
    }
1306
    }
1276
 
1307
 
-
 
1308
    public void setFbgTaxCode(String fbgTaxCode) {
-
 
1309
        this.fbgTaxCode = fbgTaxCode;
-
 
1310
    }
-
 
1311
 
-
 
1312
    public String getFbgTaxCode() {
-
 
1313
        return fbgTaxCode;
-
 
1314
    }
-
 
1315
 
-
 
1316
    public void setIsFbg(String isFbg) {
-
 
1317
        this.isFbg = isFbg;
-
 
1318
    }
-
 
1319
 
-
 
1320
    public String getIsFbg() {
-
 
1321
        return isFbg;
-
 
1322
    }
-
 
1323
 
-
 
1324
    public void setFbgPrice(String fbgPrice) {
-
 
1325
        this.fbgPrice = fbgPrice;
-
 
1326
    }
-
 
1327
 
-
 
1328
    public String getFbgPrice() {
-
 
1329
        return fbgPrice;
-
 
1330
    }
-
 
1331
 
-
 
1332
    public void setSuppressFbgPriceUpdate(String suppressFbgPriceUpdate) {
-
 
1333
        this.suppressFbgPriceUpdate = suppressFbgPriceUpdate;
-
 
1334
    }
-
 
1335
 
-
 
1336
    public String getSuppressFbgPriceUpdate() {
-
 
1337
        return suppressFbgPriceUpdate;
-
 
1338
    }
-
 
1339
 
-
 
1340
    public void setFbgPromoPrice(String fbgPromoPrice) {
-
 
1341
        this.fbgPromoPrice = fbgPromoPrice;
-
 
1342
    }
-
 
1343
 
-
 
1344
    public String getFbgPromoPrice() {
-
 
1345
        return fbgPromoPrice;
-
 
1346
    }
-
 
1347
 
-
 
1348
    public void setIsFbgPromotionActive(String isFbgPromotionActive) {
-
 
1349
        this.isFbgPromotionActive = isFbgPromotionActive;
-
 
1350
    }
-
 
1351
 
-
 
1352
    public String getIsFbgPromotionActive() {
-
 
1353
        return isFbgPromotionActive;
-
 
1354
    }
-
 
1355
 
1277
}
1356
}