| Line 253... |
Line 253... |
| 253 |
box.setPopupPosition(Window.getClientWidth()/10, Window.getClientHeight()/10);
|
253 |
box.setPopupPosition(Window.getClientWidth()/10, Window.getClientHeight()/10);
|
| 254 |
box.show();
|
254 |
box.show();
|
| 255 |
} else{
|
255 |
} else{
|
| 256 |
String invoiceGenerationUrl = null;
|
256 |
String invoiceGenerationUrl = null;
|
| 257 |
if(warehouseID == 0) {
|
257 |
if(warehouseID == 0) {
|
| 258 |
invoiceGenerationUrl = GWT.getHostPageBaseURL() + "invoice/?id=" + order.getOrderId() + "&warehouse=" + order.getWarehouseId() + "&withBill=true" + "&logisticsTxnId=" + order.getLogisticsTransactionId();
|
258 |
invoiceGenerationUrl = GWT.getHostPageBaseURL() + "invoice/?id=" + order.getOrderId() + "&warehouse=" + order.getWarehouseId() + "&withBill=true" ;
|
| - |
|
259 |
if(order.getLogisticsTransactionId()!=null){
|
| - |
|
260 |
invoiceGenerationUrl = invoiceGenerationUrl + "&logisticsTxnId=" + order.getLogisticsTransactionId();
|
| - |
|
261 |
}
|
| 259 |
} else {
|
262 |
} else {
|
| 260 |
invoiceGenerationUrl = GWT.getHostPageBaseURL() + "invoice/?id=" + order.getOrderId() + "&warehouse=" + warehouseID + "&logisticsTxnId=" + order.getLogisticsTransactionId();
|
263 |
invoiceGenerationUrl = GWT.getHostPageBaseURL() + "invoice/?id=" + order.getOrderId() + "&warehouse=" + warehouseID ;
|
| - |
|
264 |
if(order.getLogisticsTransactionId()!=null){
|
| - |
|
265 |
invoiceGenerationUrl = invoiceGenerationUrl + "&logisticsTxnId=" + order.getLogisticsTransactionId();
|
| - |
|
266 |
}
|
| 261 |
if(billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL)
|
267 |
if(billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL)
|
| 262 |
invoiceGenerationUrl += "&withBill=true";
|
268 |
invoiceGenerationUrl += "&withBill=true";
|
| 263 |
else
|
269 |
else
|
| 264 |
invoiceGenerationUrl += "&withBill=false";
|
270 |
invoiceGenerationUrl += "&withBill=false";
|
| 265 |
}
|
271 |
}
|