Subversion Repositories SmartDukaan

Rev

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

Rev 13276 Rev 13315
Line 83... Line 83...
83
83
84 
		vpanel.add(getHorizontalPanel(jacketNumberLabel, jacketNumberBox));
84 
		vpanel.add(getHorizontalPanel(jacketNumberLabel, jacketNumberBox));
85 
 
 85 
 
86 
		vpanel.add(getHorizontalPanel(billedByLabel, new Label(user)));
 86 
		vpanel.add(getHorizontalPanel(billedByLabel, new Label(user)));
87
87
88 
		if (order.getPickFromWarehouse() != null) {
 88 
		if (order.getPickFromWarehouse() != null && billTogetherOrdersMap.size()==1) {
89 
		    warehousePickSuggestion.setText("Pick from WH: " + order.getPickFromWarehouse());
 89 
		    warehousePickSuggestion.setText("Pick from WH: " + order.getPickFromWarehouse());
- 
 
 90 
		    vpanel.add(warehousePickSuggestion);
90 
		}
 91 
		}
91
- 
 
92 
		vpanel.add(warehousePickSuggestion);
 - 
 
93
92
94 
		//changeInvoiceType = new CheckBox("BulkInvoice");
 93 
		//changeInvoiceType = new CheckBox("BulkInvoice");
95 
		changeInvoiceType.setValue(false);
 94 
		changeInvoiceType.setValue(false);
- 
 
 95 
		if(!order.getSource().equals("WEBSITE")) {
- 
 
 96 
			changeInvoiceType.setEnabled(false);
- 
 
 97 
		}
96
98
97
99
98 
		vpanel.add(changeInvoiceType);
100 
		vpanel.add(changeInvoiceType);
99
101
100 
		if(billingType == BillingType.OURS_EXTERNAL || billingType == BillingType.EXTERNAL){
 102 
		if(billingType == BillingType.OURS_EXTERNAL || billingType == BillingType.EXTERNAL){
Line 339... Line 341...
339 
							}
 341 
							}
340 
						}
 342 
						}
341 
					}
 343 
					}
342 
				}
 344 
				}
343
345
344 
				String invoiceType = changeInvoiceType.getValue() ? "BulkInvoice" : "Individual";
 346 
				String invoiceType = !changeInvoiceType.isEnabled() ? "Individual" : changeInvoiceType.getValue() ? "BulkInvoice" : "Individual";
345 
				setValuesInDesiredMaps(billTogetherOrdersMap);
 347 
				setValuesInDesiredMaps(billTogetherOrdersMap);
346 
				eventBus.fireEvent(new AddJacketNumberEvent(order, billNumber.getText(), jacketNumber, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, user, billingType, invoiceType));
 348 
				eventBus.fireEvent(new AddJacketNumberEvent(order, billNumber.getText(), jacketNumber, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, user, billingType, invoiceType));
347 
				hide();
 349 
				hide();
348 
				clean();
 350 
				clean();
349 
			}
 351 
			}