Subversion Repositories SmartDukaan

Rev

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

Rev 7190 Rev 7199
Line 76... Line 76...
76 
                	serialNumberBox.setText(order.getImeiNumber()+"");
 76 
                	serialNumberBox.setText(order.getImeiNumber()+"");
77 
				}
 77 
				}
78 
            }
 78 
            }
79 
		}
 79 
		}
80
80
81 
		if(billingType == BillingType.OURS && order.getFreebieItemId()!=0) {
 81 
		if((billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL) && order.getFreebieItemId()!=0) {
82 
			vpanel.add(getHorizontalPanel(freebieWarehouseLabel, freebieWarehouseBox));
 82 
			vpanel.add(getHorizontalPanel(freebieWarehouseLabel, freebieWarehouseBox));
83 
		}
 83 
		}
84 
 
 84 
 
85 
		if(billingType == BillingType.OURS_EXTERNAL || billingType == BillingType.EXTERNAL){
 85 
		if(billingType == BillingType.OURS_EXTERNAL || billingType == BillingType.EXTERNAL){
86 
			vpanel.add(getHorizontalPanel(billNumberLabel, billNumber));
 86 
			vpanel.add(getHorizontalPanel(billNumberLabel, billNumber));
Line 153... Line 153...
153 
					serialNumberBox.setText("");
 153 
					serialNumberBox.setText("");
154 
					errorLabel.setText( quantity + " more items need to be scanned. Scan next item.");
 154 
					errorLabel.setText( quantity + " more items need to be scanned. Scan next item.");
155 
					return;
 155 
					return;
156 
				}
 156 
				}
157
157
158 
				if(billingType == BillingType.OURS) {
 158 
				if(billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL) {
159 
					if(freebieWarehouseBox.getText()!=null && freebieWarehouseBox.getText()!="") {
 159 
					if(freebieWarehouseBox.getText()!=null && freebieWarehouseBox.getText()!="") {
160 
						freebieWarehouseId = Long.parseLong(freebieWarehouseBox.getText());
 160 
						freebieWarehouseId = Long.parseLong(freebieWarehouseBox.getText());
161 
					}
 161 
					}
162 
				}
 162 
				}
163
163