Subversion Repositories SmartDukaan

Rev

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

Rev 5110 Rev 5361
Line 49... Line 49...
49
		if (order.getPickFromWarehouse() != null) {
49
		if (order.getPickFromWarehouse() != null) {
50
		    warehousePickSuggestion.setText("Pick from WH: " + order.getPickFromWarehouse());
50
		    warehousePickSuggestion.setText("Pick from WH: " + order.getPickFromWarehouse());
51
		}
51
		}
52
 
52
 
53
		vpanel.add(getHorizontalPanel(jacketNumberLabel, jacketNumberBox));      //Ask for the jacket number
53
		vpanel.add(getHorizontalPanel(jacketNumberLabel, jacketNumberBox));      //Ask for the jacket number
54
		if(billingType == BillingType.OURS){
54
		if(billingType == BillingType.OURS) {
55
		    // Check if we need to suggest Hotspot warehouses ?
55
		    // Check if we need to suggest Hotspot warehouses ?
56
	        vpanel.add(warehousePickSuggestion);		    
56
	        vpanel.add(warehousePickSuggestion);		    
57
            vpanel.add(getHorizontalPanel(itemNumberLabel, itemNumberBox));          //Ask for the item number
57
            vpanel.add(getHorizontalPanel(itemNumberLabel, itemNumberBox));          //Ask for the item number
58
            if(order.isSerialized()) {
58
            if(order.isSerialized()) {
59
                vpanel.add(getHorizontalPanel(serialNumberLabel, serialNumberBox));      //Ask for Serial number only in case of Handsets
59
                vpanel.add(getHorizontalPanel(serialNumberLabel, serialNumberBox));      //Ask for Serial number only in case of Handsets
60
            }
60
            }
61
            else {
-
 
62
                for(Entry<Long, String> warehouse: warehouses.entrySet()){
-
 
63
                    warehouseBox.addItem(warehouse.getValue(), warehouse.getKey()+"");
-
 
64
                }
-
 
65
 
-
 
66
                vpanel.add(getHorizontalPanel(warehouseLabel, warehouseBox));                
-
 
67
            }
-
 
68
		}
61
		}
69
		
62
 
70
		vpanel.add(getHorizontalPanel(billedBy, new Label(user)));
63
		vpanel.add(getHorizontalPanel(billedBy, new Label(user)));
71
		vpanel.add(submitbutton);
64
		vpanel.add(submitbutton);
72
		
65
		
73
		setWidget(vpanel);
66
		setWidget(vpanel);
74
		setAutoHideEnabled(true);
67
		setAutoHideEnabled(true);
Line 95... Line 88...
95
				if(jacketNumber <= 0){
88
				if(jacketNumber <= 0){
96
					errorLabel.setText("Invalid Jacket number.");
89
					errorLabel.setText("Invalid Jacket number.");
97
					return;
90
					return;
98
				}
91
				}
99
 
92
 
100
				long fulfilmentWarehouseId = -1;
-
 
101
				if(billingType == BillingType.OURS){
93
				if(billingType == BillingType.OURS){
102
	                itemNumber = itemNumberBox.getText();
94
	                itemNumber = itemNumberBox.getText();
103
	                if(itemNumber==null || itemNumber.trim().isEmpty()){
95
	                if(itemNumber==null || itemNumber.trim().isEmpty()){
104
	                    errorLabel.setText("Item Number can't be left empty");
96
	                    errorLabel.setText("Item Number can't be left empty");
105
	                    return;
97
	                    return;
Line 115... Line 107...
115
	                    if(serialNumber == null){
107
	                    if(serialNumber == null){
116
	                        errorLabel.setText("Invalid Serial number");
108
	                        errorLabel.setText("Invalid Serial number");
117
	                        return;
109
	                        return;
118
	                    }
110
	                    }
119
	                }
111
	                }
120
	                else {
-
 
121
	                    try {
-
 
122
	                        fulfilmentWarehouseId = Long.parseLong(warehouseBox.getValue(warehouseBox.getSelectedIndex()));
-
 
123
	                    } catch(NumberFormatException nfe) {
-
 
124
	                        nfe.printStackTrace();
-
 
125
	                    }
-
 
126
 
-
 
127
	                    if(fulfilmentWarehouseId <= 0){
-
 
128
	                        errorLabel.setText("Invalid Warehouse");
-
 
129
	                        return;
-
 
130
	                    }	                    
-
 
131
	                }
-
 
132
				}
112
				}
133
 
113
 
134
				eventBus.fireEvent(new AddJacketNumberEvent(order, jacketNumber, serialNumber, itemNumber.trim(), user, billingType, fulfilmentWarehouseId));
114
				eventBus.fireEvent(new AddJacketNumberEvent(order, jacketNumber, serialNumber, itemNumber.trim(), user, billingType));
135
				hide();
115
				hide();
136
				clean();
116
				clean();
137
			}
117
			}
138
		});
118
		});
139
	}
119
	}