Subversion Repositories SmartDukaan

Rev

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

Rev 13146 Rev 13276
Line 247... Line 247...
247
			public void onClick(ClickEvent event) {
247
			public void onClick(ClickEvent event) {
248
				if(!printInvoice.isEnabled())
248
				if(!printInvoice.isEnabled())
249
					return;
249
					return;
250
				if(order.getJacketNumber()==0 && (billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL)) {
250
				if(order.getJacketNumber()==0 && (billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL)) {
251
					JacketInfoBox box = new JacketInfoBox(eventbus, order, user, billingType, warehouses, order.getBillTogetherOrdersMap());
251
					JacketInfoBox box = new JacketInfoBox(eventbus, order, user, billingType, warehouses, order.getBillTogetherOrdersMap());
252
					box.setPopupPosition(Window.getClientWidth()/10, Window.getClientHeight()/10);
252
					box.center();
253
					box.show();
253
					//box.show();
254
				} else{
254
				} else{
255
					String invoiceGenerationUrl = null;
255
					String invoiceGenerationUrl = null;
256
					if(warehouseID == 0) {
256
					if(warehouseID == 0) {
257
						invoiceGenerationUrl = GWT.getHostPageBaseURL() + "invoice/?id=" + order.getOrderId() + "&warehouse=" + order.getWarehouseId() + "&withBill=true";
257
						invoiceGenerationUrl = GWT.getHostPageBaseURL() + "invoice/?id=" + order.getOrderId() + "&warehouse=" + order.getWarehouseId() + "&withBill=true" + "&logisticsTxnId=" + order.getLogisticsTransactionId();
258
					} else {
258
					} else {
259
						invoiceGenerationUrl = GWT.getHostPageBaseURL() + "invoice/?id=" + order.getOrderId() + "&warehouse=" + warehouseID;
259
						invoiceGenerationUrl = GWT.getHostPageBaseURL() + "invoice/?id=" + order.getOrderId() + "&warehouse=" + warehouseID + "&logisticsTxnId=" + order.getLogisticsTransactionId();
260
						if(billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL)
260
						if(billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL)
261
						    invoiceGenerationUrl += "&withBill=true";
261
						    invoiceGenerationUrl += "&withBill=true";
262
						else
262
						else
263
						    invoiceGenerationUrl += "&withBill=false";
263
						    invoiceGenerationUrl += "&withBill=false";
264
					}
264
					}
Line 272... Line 272...
272
			@Override
272
			@Override
273
			public void onClick(ClickEvent event) {
273
			public void onClick(ClickEvent event) {
274
				if(!printAllInvoices.isEnabled()){
274
				if(!printAllInvoices.isEnabled()){
275
					return;
275
					return;
276
				}else{
276
				}else{
277
					String invoiceGenerationUrl = GWT.getHostPageBaseURL() + "invoice/?id=" + order.getOrderId() + "&printAll=true&warehouse=" + warehouseID;
277
					String invoiceGenerationUrl = GWT.getHostPageBaseURL() + "invoice/?id=" + order.getOrderId() + "&printAll=true&warehouse=" + warehouseID + "&logisticsTxnId=" + order.getLogisticsTransactionId();
278
					if(billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL)
278
					if(billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL)
279
					    invoiceGenerationUrl += "&withBill=true";
279
					    invoiceGenerationUrl += "&withBill=true";
280
					else
280
					else
281
					    invoiceGenerationUrl += "&withBill=false";
281
					    invoiceGenerationUrl += "&withBill=false";
282
					Window.open(invoiceGenerationUrl, "newWindowName", "window features.");
282
					Window.open(invoiceGenerationUrl, "newWindowName", "window features.");
Line 858... Line 858...
858
        orderDetails3.add(getHorizontalPanel("ORDER TYPE:       ", transaction.getOrderType()+""));
858
        orderDetails3.add(getHorizontalPanel("ORDER TYPE:       ", transaction.getOrderType()+""));
859
        if(transaction.getQuantity()>1)
859
        if(transaction.getQuantity()>1)
860
        	orderDetails3.add(getHorizontalPanel("BULK ORDER:          ", transaction.getQuantity()+""));
860
        	orderDetails3.add(getHorizontalPanel("BULK ORDER:          ", transaction.getQuantity()+""));
861
        if(transaction.getFreebieItemId()>0)
861
        if(transaction.getFreebieItemId()>0)
862
        	orderDetails3.add(getHorizontalPanel("FREEBIE ITEMID:       ", transaction.getFreebieItemId()+""));
862
        	orderDetails3.add(getHorizontalPanel("FREEBIE ITEMID:       ", transaction.getFreebieItemId()+""));
-
 
863
        if(transaction.getLogisticsTransactionId()!=null && !transaction.getLogisticsTransactionId().isEmpty()){
-
 
864
        	orderDetails3.add(getHorizontalPanel("MASTER ORDER ID:       ", transaction.getLogisticsTransactionId()+""));
-
 
865
        }
863
        
866
        
864
		orderDetails4.add(getHorizontalPanel("AIRWAY BILL NO:  ", transaction.getAirwayBillNo()));
867
		orderDetails4.add(getHorizontalPanel("AIRWAY BILL NO:  ", transaction.getAirwayBillNo()));
865
		orderDetails4.add(getHorizontalPanel("INVOICE NUMBER:  ", transaction.getInvoiceNumber()));
868
		orderDetails4.add(getHorizontalPanel("INVOICE NUMBER:  ", transaction.getInvoiceNumber()));
866
		orderDetails4.add(getHorizontalPanel("JACKET NUMBER:   ", transaction.getJacketNumber() + ""));
869
		orderDetails4.add(getHorizontalPanel("JACKET NUMBER:   ", transaction.getJacketNumber() + ""));
867
        orderDetails4.add(getHorizontalPanel("ITEM NO:         ", getDisplayNameForNullableString(transaction.getItemNumber())));
870
        orderDetails4.add(getHorizontalPanel("ITEM NO:         ", getDisplayNameForNullableString(transaction.getItemNumber())));