Subversion Repositories SmartDukaan

Rev

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

Rev 8910 Rev 9263
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
					if(warehouseID == 0) {
-
 
241
						String invoiceGenerationUrl = GWT.getHostPageBaseURL() + "invoice/?id=" + order.getOrderId() + "&warehouse=" + order.getWarehouseId();
-
 
242
					} else {
240
					String invoiceGenerationUrl = GWT.getHostPageBaseURL() + "invoice/?id=" + order.getOrderId() + "&warehouse=" + warehouseID;
243
						String invoiceGenerationUrl = GWT.getHostPageBaseURL() + "invoice/?id=" + order.getOrderId() + "&warehouse=" + warehouseID;
-
 
244
					}
241
					if(billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL)
245
					if(billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL)
242
					    invoiceGenerationUrl += "&withBill=true";
246
					    invoiceGenerationUrl += "&withBill=true";
243
					else
247
					else
244
					    invoiceGenerationUrl += "&withBill=false";
248
					    invoiceGenerationUrl += "&withBill=false";
245
					Window.open(invoiceGenerationUrl, "newWindowName", "window features.");
249
					Window.open(invoiceGenerationUrl, "newWindowName", "window features.");