WebSVN – SmartDukaan – Diff – /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java

     @UiField FlexTable headerVendorItemKey, tableVendorItemKey;
     @UiField FlexTable headerVendorPrices, tableVendorPrices;
     @UiField FlexTable headerSourcePrices, tableSourcePrices;
     @UiField TextBox bestSellingRank;
     @UiField TextBox expectedDelay;
-    @UiField CheckBox defaultForEntity, risky, warehouseStickiness;
+    @UiField CheckBox defaultForEntity, risky, warehouseStickiness, itemType, hasItemNo;
     @UiField DateBox startDate, expectedArrivalDate, comingSoonStartDate;
     @UiField FlexTable headerSimilarItems, tableSimilarItems;
-    @UiField ListBox preferredVendor, preferredWarehouse, defaultWarehouse;
+    @UiField ListBox preferredVendor;
     @UiField Button comingSoonButton;
     public ItemDetails(Item item){
         this();
         setItemDetails(item);
         initVendorKeysHeader();
         initVendorPricingHeader();
         initSourcePricingHeader();
         initSimilarItemList();
         preferredVendor.addItem("null");
-        preferredWarehouse.addItem("null");
-        defaultWarehouse.addItem("null");
         getConfigdataforPriceCompare();
+    }
     public void getConfigdataforPriceCompare(){
     	catalogService.getConfigdataforPriceCompare(new AsyncCallback<Map<String,String>>() {
         		index++;
             	preferredVendor.addItem(Utils.getVendorDesc(item.getPreferredVendor()));
             	preferredVendor.setSelectedIndex(index);
+        	}
+        }
-        index = 0;
-        preferredWarehouse.clear();
-        defaultWarehouse.clear();
-        preferredWarehouse.addItem("null");
-        defaultWarehouse.addItem("null");
-        for(Entry<Long, String> e : Utils.getAllShippingWarehouses().entrySet()) {
-            index++;
-            preferredWarehouse.addItem(e.getValue());
-            defaultWarehouse.addItem(e.getValue());
-            if (e.getKey().equals(item.getPreferredWarehouse())) {
-                preferredWarehouse.setSelectedIndex(index);
-            }
-            if (e.getKey().equals(item.getDefaultWarehouse())) {
-                defaultWarehouse.setSelectedIndex(index);
-            }
-        }
         mrp.setText(item.getMrp() != null ? item.getMrp()+"" : "");
         sellingPrice.setText(item.getSellingPrice() != null ? item.getSellingPrice()+"" : "");
         weight.setText(item.getWeight() != null ? item.getWeight()+"" : "");
         expectedDelay.setValue(item.getExpectedDelay()+"");
         warehouseStickiness.setValue(item.isWarehouseStickiness());
+        hasItemNo.setValue(item.isHasItemNo());
+        itemType.setValue(item.isItemType());
         startDate.setValue(new Date(item.getStartDate()));
         if(item.getComingSoonStartDate() != null){
         	comingSoonStartDate.setValue(new Date(item.getComingSoonStartDate()));
         }else {
         	comingSoonStartDate.setValue(null);
+            }
         } catch(NumberFormatException nfe) {
             Window.alert("Invalid expected delay");
             return false;
+        }
-        if(defaultWarehouse.getSelectedIndex() == 0) {
-            Window.alert("Invalid Warehouse Selected");
-        }
-        else {
-            newItem.setDefaultWarehouse(Utils.getWarehouseId(defaultWarehouse.getItemText(defaultWarehouse.getSelectedIndex())));
-        }
-        if(preferredWarehouse.getSelectedIndex() == 0) {
-            newItem.setPreferredWarehouse(null);
-        }
-        else {
-            newItem.setPreferredWarehouse(Utils.getWarehouseId(preferredWarehouse.getItemText(preferredWarehouse.getSelectedIndex())));
-        }
         if((item.getPreferredVendor() == null || item.getVendorPricesMap() == null || item.getVendorPricesMap().isEmpty()) && preferredVendor.getSelectedIndex() == 0) {
         	newItem.setPreferredVendor(item.getPreferredVendor());
+        }
     	else {
     		long vendorId = Utils.getVendorId(preferredVendor.getItemText(preferredVendor.getSelectedIndex()));
             newItem.setPreferredVendor(vendorId);
+    	}
         newItem.setWarehouseStickiness(warehouseStickiness.getValue());
+        newItem.setHasItemNo(hasItemNo.getValue());
+        newItem.setItemType(itemType.getValue());
         /*Create an instance of VendorPricings for each row in vendor pricing table. Set the vendor prices to the instance.
           Add the instance to map and set the map to the item instance created above.*/
         Map<Long, VendorPricings> vendorPrices = new HashMap<Long, VendorPricings>();
         VendorPricings v;
         	sb.append("\n-Coming Soon Start Date");
+        }
         if(!checkParameterIfEqual(newItem.getExpectedDelay(), item.getExpectedDelay())) {
             sb.append("\n-Expected Delay");
+        }
-        if(!checkParameterIfEqual(newItem.getPreferredWarehouse(), item.getPreferredWarehouse())) {
-            sb.append("\n-Preferred Warehouse");
-        }
-        if(!checkParameterIfEqual(newItem.getDefaultWarehouse(), item.getDefaultWarehouse())) {
-            sb.append("\n-Default Warehouse");
-        }
         if(item.isWarehouseStickiness() != warehouseStickiness.getValue()) {
             sb.append("\n-Warehouse Stickiness Flag");
+        }
         if(!checkParameterIfEqual(newItem.getPreferredVendor(), item.getPreferredVendor())) {
             sb.append("\n-Preferred Vendor");
+        }
+        if(item.isHasItemNo() != hasItemNo.getValue()) {
+            sb.append("\n-Has Item Number Flag");
+        }
+        if(item.isItemType() != itemType.getValue()) {
+            sb.append("\n-Has Serial Number Flag");
+        }
         VendorPricings vendorPricings;
         long vendorId;
         for(int row = 0; row < tableVendorPrices.getRowCount(); row++) {
             vendorId = Long.parseLong(tableVendorPrices.getText(row, TABLE_INDEX_PRICING_VENDORID));

Subversion Repositories SmartDukaan

(root)/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java – Rev 5309 → 5384