Subversion Repositories SmartDukaan

Rev

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

Rev 8049 Rev 8128
Line 347... Line 347...
347
	            LineItem lineitem = order.getLineitems().get(0);
347
	            LineItem lineitem = order.getLineitems().get(0);
348
	            detailedAwb.setProductName(lineitem.getBrand() + " " 
348
	            detailedAwb.setProductName(lineitem.getBrand() + " " 
349
	                                         + (lineitem.getModel_name() == null ? "" : lineitem.getModel_name()) + " " 
349
	                                         + (lineitem.getModel_name() == null ? "" : lineitem.getModel_name()) + " " 
350
	                                         + (lineitem.getModel_number() == null ? "" : lineitem.getModel_number()) + " " 
350
	                                         + (lineitem.getModel_number() == null ? "" : lineitem.getModel_number()) + " " 
351
	                                         + (lineitem.getColor() == null ? "" : lineitem.getColor()));
351
	                                         + (lineitem.getColor() == null ? "" : lineitem.getColor()));
-
 
352
	            if (order.getFreebieItemId() > 0) {
-
 
353
	                //If order has a freebie order attached with it
352
	            detailedAwb.setShipmentValue("" + (order.getTotal_amount()));
354
	                detailedAwb.setShipmentValue("" + (order.getTotal_amount()));
-
 
355
	            } else {
-
 
356
	                //else if the order is itself a split freebie order then we don't know how much was the selling price at the time of order
-
 
357
	                //so we set the transfer price as shipment value
-
 
358
	                if (lineitem.getExtra_info().contains("Freebie Order for Order ID")) {
-
 
359
	                    detailedAwb.setShipmentValue("" + (lineitem.getTransfer_price()));
-
 
360
	                } else {
-
 
361
	                    //Else set total amount
-
 
362
	                    detailedAwb.setShipmentValue("" + (order.getTotal_amount()));
-
 
363
	                }
-
 
364
	            }
353
	            
365
	            
354
	            tempList.add(detailedAwb);
366
	            tempList.add(detailedAwb);
355
 
367
 
356
	        } catch (TTransportException e) {
368
	        } catch (TTransportException e) {
357
	            setErrorMsg("Your request cannot be processed due to technical error. Please try later.");
369
	            setErrorMsg("Your request cannot be processed due to technical error. Please try later.");
Line 417... Line 429...
417
        for(AwbDetails awbDetail : awbDetailList) {
429
        for(AwbDetails awbDetail : awbDetailList) {
418
//          0  Airwaybill   1 Type    2 Reference Number  3 Sender / Store name 4 attention   5 address1    6 address2    7 address3    
430
//          0  Airwaybill   1 Type    2 Reference Number  3 Sender / Store name 4 attention   5 address1    6 address2    7 address3    
419
//          8 pincode    9 tel number     10 mobile number   11 Prod/SKU code    12 contents    13 weight  
431
//          8 pincode    9 tel number     10 mobile number   11 Prod/SKU code    12 contents    13 weight  
420
//          14 Declared Value   15 Collectable Value   
432
//          14 Declared Value   15 Collectable Value   
421
//          16 Vendor Code    17 Shipper Name    18 Return Address1    19 Return Address2    20 Return Address3     21 Return Pin  
433
//          16 Vendor Code    17 Shipper Name    18 Return Address1    19 Return Address2    20 Return Address3     21 Return Pin  
422
//          22 Length ( Cms )   23 Bredth ( Cms )      24 Height ( Cms )  
434
//          22 Length ( Cms )   23 Breadth ( Cms )      24 Height ( Cms )  
423
//          25 Pieces  26 Area_customer_code  27 Handover Date ( DD/MM/YYYY )   28 Handover Time ( 24 hrs format )  
435
//          25 Pieces  26 Area_customer_code  27 Handover Date ( DD/MM/YYYY )   28 Handover Time ( 24 hrs format )  
424
 
436
 
425
            serialNo++;
437
            serialNo++;
426
            Row contentRow = sheet.createRow((short)serialNo);
438
            Row contentRow = sheet.createRow((short)serialNo);
427
            
439