Subversion Repositories SmartDukaan

Rev

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

Rev 20731 Rev 20767
Line 87... Line 87...
87 
//			    }
 87 
//			    }
88 
//			}
 88 
//			}
89 
//		});
 89 
//		});
90
90
91 
//		vpanel.add(getHorizontalPanel(jacketNumberLabel, jacketNumberBox));
 91 
//		vpanel.add(getHorizontalPanel(jacketNumberLabel, jacketNumberBox));
92 
		packageDimensions.addItem("L X B X H","0");
 92 
		packageDimensions.addItem("","");
- 
 
 93 
		packageDimensions.addItem("Box Size - 1","25 X 16 X 7");
- 
 
 94 
		packageDimensions.addItem("Box Size - 3","30 X 25 X 11");
93 
		packageDimensions.addItem("100 X 100 X 100","1");
 95 
		packageDimensions.addItem("Box Size A1","18 X 12.5 X 10");
94 
		packageDimensions.addItem("200 X 200 X 200","2");
 96 
		packageDimensions.addItem("Box size A2","20 X 17.5 X 12");
- 
 
 97 
		packageDimensions.addItem("Box Size A3","22 X 18 X 12");
95 
		vpanel.add(getHorizontalPanel(packageDimensionsLabel, packageDimensions));
 98 
		vpanel.add(getHorizontalPanel(packageDimensionsLabel, packageDimensions));
96 
 
 99 
 
97 
		vpanel.add(getHorizontalPanel(billedByLabel, new Label(user)));
 100 
		vpanel.add(getHorizontalPanel(billedByLabel, new Label(user)));
98
101
99 
		if (order.getPickFromWarehouse() != null && billTogetherOrdersMap.size()==1) {
 102 
		if (order.getPickFromWarehouse() != null && billTogetherOrdersMap.size()==1) {
Line 311... Line 314...
311 
			public void onClick(ClickEvent event) {
 314 
			public void onClick(ClickEvent event) {
312 
				long jacketNumber = 1;
 315 
				long jacketNumber = 1;
313 
				String itemNumber = "";
 316 
				String itemNumber = "";
314 
				String serialNumber = "";
 317 
				String serialNumber = "";
315 
				long freebieWhId = -1;
 318 
				long freebieWhId = -1;
316 
				int packageDimensionIndex = 0;
 319 
				String packageDimension = "";
317 
//				try {
 320 
//				try {
318 
//					jacketNumber = Long.parseLong(jacketNumberBox.getText());
 321 
//					jacketNumber = Long.parseLong(jacketNumberBox.getText());
319 
//				} catch(NumberFormatException nfe){
 322 
//				} catch(NumberFormatException nfe){
320 
//					nfe.printStackTrace();
 323 
//					nfe.printStackTrace();
321 
//				}
 324 
//				}
Line 324... Line 327...
324 
					errorLabel.setText("Invalid Jacket number.");
 327 
					errorLabel.setText("Invalid Jacket number.");
325 
					return;
 328 
					return;
326 
				}
 329 
				}
327
330
328 
				try{
 331 
				try{
329 
					packageDimensionIndex = Integer.valueOf(packageDimensions.getValue(packageDimensions.getSelectedIndex()));
 332 
					packageDimension = (packageDimensions.getValue(packageDimensions.getSelectedIndex()));
330 
					System.out.println("Package Dimensions "+packageDimensionIndex);
 333 
					System.out.println("Package Dimensions "+packageDimension);
331 
				}
 334 
				}
332 
				catch(Exception e){
 335 
				catch(Exception e){
333 
					e.printStackTrace();
 336 
					e.printStackTrace();
334 
				}
 337 
				}
335
338
336 
				if (packageDimensionIndex==0){
 339 
				if (packageDimension.isEmpty()){
337 
					errorLabel.setText("Invalid Package Dimensions");
 340 
					errorLabel.setText("Invalid Package Dimensions");
338 
					return;
 341 
					return;
339 
				}
 342 
				}
340
343
341 
				for(Long orderId : billTogetherOrdersMap.keySet()){
 344 
				for(Long orderId : billTogetherOrdersMap.keySet()){
Line 376... Line 379...
376 
				}
 379 
				}
377
380
378 
//				String invoiceType = !changeInvoiceType.isEnabled() ? "Individual" : changeInvoiceType.getValue() ? "BulkInvoice" : "Individual";
 381 
//				String invoiceType = !changeInvoiceType.isEnabled() ? "Individual" : changeInvoiceType.getValue() ? "BulkInvoice" : "Individual";
379 
				String invoiceType = "Individual";
 382 
				String invoiceType = "Individual";
380 
				setValuesInDesiredMaps(billTogetherOrdersMap);
 383 
				setValuesInDesiredMaps(billTogetherOrdersMap);
381 
				eventBus.fireEvent(new AddJacketNumberEvent(order, billNumber.getText(), jacketNumber, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, user, billingType, invoiceType, packageDimensions.getItemText(packageDimensionIndex)));
 384 
				eventBus.fireEvent(new AddJacketNumberEvent(order, billNumber.getText(), jacketNumber, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, user, billingType, invoiceType, packageDimension));
382 
				hide();
 385 
				hide();
383 
				clean();
 386 
				clean();
384 
			}
 387 
			}
385 
		});
 388 
		});
386
389