Subversion Repositories SmartDukaan

Rev

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

Rev 9263 Rev 9264
Line 235... Line 235...
235 
				if(order.getJacketNumber()==0 && (billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL)) {
 235 
				if(order.getJacketNumber()==0 && (billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL)) {
236 
					JacketInfoBox box = new JacketInfoBox(eventbus, order, user, billingType, warehouses);
 236 
					JacketInfoBox box = new JacketInfoBox(eventbus, order, user, billingType, warehouses);
237 
					//box.clean();
 237 
					//box.clean();
238 
					box.center();
 238 
					box.center();
239 
				} else{
 239 
				} else{
- 
 
 240 
					String invoiceGenerationUrl = null;
240 
					if(warehouseID == 0) {
 241 
					if(warehouseID == 0) {
241 
						String invoiceGenerationUrl = GWT.getHostPageBaseURL() + "invoice/?id=" + order.getOrderId() + "&warehouse=" + order.getWarehouseId();
 242 
						invoiceGenerationUrl = GWT.getHostPageBaseURL() + "invoice/?id=" + order.getOrderId() + "&warehouse=" + order.getWarehouseId();
242 
					} else {
 243 
					} else {
243 
						String invoiceGenerationUrl = GWT.getHostPageBaseURL() + "invoice/?id=" + order.getOrderId() + "&warehouse=" + warehouseID;
 244 
						invoiceGenerationUrl = GWT.getHostPageBaseURL() + "invoice/?id=" + order.getOrderId() + "&warehouse=" + warehouseID;
244 
					}
 245 
					}
245 
					if(billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL)
 246 
					if(billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL)
246 
					    invoiceGenerationUrl += "&withBill=true";
 247 
					    invoiceGenerationUrl += "&withBill=true";
247 
					else
 248 
					else
248 
					    invoiceGenerationUrl += "&withBill=false";
 249 
					    invoiceGenerationUrl += "&withBill=false";