Subversion Repositories SmartDukaan

Rev

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

Rev 5442 Rev 5530
Line 52... Line 52...
52 
		}
 52 
		}
53 
 
 53 
 
54 
		vpanel.add(getHorizontalPanel(jacketNumberLabel, jacketNumberBox));      //Ask for the jacket number
 54 
		vpanel.add(getHorizontalPanel(jacketNumberLabel, jacketNumberBox));      //Ask for the jacket number
55 
		if(billingType == BillingType.OURS) {
 55 
		if(billingType == BillingType.OURS) {
56 
		    // Check if we need to suggest Hotspot warehouses ?
 56 
		    // Check if we need to suggest Hotspot warehouses ?
57 
	        vpanel.add(warehousePickSuggestion);
57 
	        vpanel.add(warehousePickSuggestion);
- 
 
 58 
	        if (order.isHasItemNumber()) {
58 
            vpanel.add(getHorizontalPanel(itemNumberLabel, itemNumberBox));          //Ask for the item number
 59 
	            vpanel.add(getHorizontalPanel(itemNumberLabel, itemNumberBox));          //Ask for the item number
- 
 
 60 
	        }
- 
 
 61 
 
59 
            if(order.isSerialized()) {
 62 
            if(order.isSerialized()) {
60 
                vpanel.add(getHorizontalPanel(serialNumberLabel, serialNumberBox));      //Ask for Serial number only in case of Handsets
 63 
                vpanel.add(getHorizontalPanel(serialNumberLabel, serialNumberBox));      //Ask for Serial number only in case of Handsets
61 
            }
 64 
            }
62 
		}
 65 
		}
63 
 
 66 
 
Line 90... Line 93...
90 
					errorLabel.setText("Invalid Jacket number.");
 93 
					errorLabel.setText("Invalid Jacket number.");
91 
					return;
 94 
					return;
92 
				}
 95 
				}
93 
 
 96 
 
94 
				if(billingType == BillingType.OURS){
 97 
				if(billingType == BillingType.OURS){
- 
 
 98 
				    if (order.isHasItemNumber()) {
95 
	                itemNumber = itemNumberBox.getText();
 99 
	                    itemNumber = itemNumberBox.getText();
96 
	                if(itemNumber==null || itemNumber.trim().isEmpty()){
 100 
	                    if(itemNumber==null || itemNumber.trim().isEmpty()){
97 
	                    errorLabel.setText("Item Number can't be left empty");
 101 
	                        errorLabel.setText("Item Number can't be left empty");
98 
	                    return;
 102 
	                        return;
99 
	                }
 103 
	                    }
100 
	                itemNumber = itemNumber.trim();
 104 
	                    itemNumber = itemNumber.trim();
101
105 
				    }
- 
 
 106 
 
102 
	                if(order.isSerialized()) {
 107 
	                if(order.isSerialized()) {
103 
	                    try {
 108 
	                    try {
104 
	                        serialNumber = serialNumberBox.getText();
 109 
	                        serialNumber = serialNumberBox.getText();
105 
	                    } catch(NumberFormatException nfe){
 110 
	                    } catch(NumberFormatException nfe){
106 
	                        nfe.printStackTrace();
 111 
	                        nfe.printStackTrace();