| Line 912... |
Line 912... |
| 912 |
}
|
912 |
}
|
| 913 |
|
913 |
|
| 914 |
private PdfPTable getProviderTable(Order order, Provider provider, Font barCodeFont, double totalWeight) {
|
914 |
private PdfPTable getProviderTable(Order order, Provider provider, Font barCodeFont, double totalWeight) {
|
| 915 |
PdfPTable providerInfoTable = new PdfPTable(1);
|
915 |
PdfPTable providerInfoTable = new PdfPTable(1);
|
| 916 |
providerInfoTable.getDefaultCell().setBorder(Rectangle.NO_BORDER);
|
916 |
providerInfoTable.getDefaultCell().setBorder(Rectangle.NO_BORDER);
|
| - |
|
917 |
if (order.getLogistics_provider_id()==1L){
|
| - |
|
918 |
PdfPCell spnCell = new PdfPCell(new Phrase("SPN: 08611123323", helvetica22));
|
| - |
|
919 |
spnCell.setHorizontalAlignment(Element.ALIGN_LEFT);
|
| - |
|
920 |
spnCell.setBorder(Rectangle.NO_BORDER);
|
| - |
|
921 |
providerInfoTable.addCell(spnCell);
|
| - |
|
922 |
}
|
| 917 |
if(order.isLogisticsCod()){
|
923 |
if(order.isLogisticsCod()){
|
| 918 |
PdfPCell deliveryTypeCell = new PdfPCell(new Phrase("COD ", helvetica22));
|
924 |
PdfPCell deliveryTypeCell = new PdfPCell(new Phrase("COD ", helvetica22));
|
| 919 |
deliveryTypeCell.setHorizontalAlignment(Element.ALIGN_RIGHT);
|
925 |
deliveryTypeCell.setHorizontalAlignment(Element.ALIGN_RIGHT);
|
| 920 |
deliveryTypeCell.setBorder(Rectangle.NO_BORDER);
|
926 |
deliveryTypeCell.setBorder(Rectangle.NO_BORDER);
|
| 921 |
providerInfoTable.addCell(deliveryTypeCell);
|
927 |
providerInfoTable.addCell(deliveryTypeCell);
|
| Line 1011... |
Line 1017... |
| 1011 |
}
|
1017 |
}
|
| 1012 |
if(order.getLogistics_provider_id()!=7L && order.getLogistics_provider_id()!=46L){
|
1018 |
if(order.getLogistics_provider_id()!=7L && order.getLogistics_provider_id()!=46L){
|
| 1013 |
providerInfoTable.addCell(new Phrase("AWB Date : " + DateFormat.getDateInstance(DateFormat.MEDIUM).format(awbDate), helvetica8));
|
1019 |
providerInfoTable.addCell(new Phrase("AWB Date : " + DateFormat.getDateInstance(DateFormat.MEDIUM).format(awbDate), helvetica8));
|
| 1014 |
}
|
1020 |
}
|
| 1015 |
providerInfoTable.addCell(new Phrase("Weight : " + weightFormat.format(totalWeight) + " Kg", helvetica8));
|
1021 |
providerInfoTable.addCell(new Phrase("Weight : " + weightFormat.format(totalWeight) + " Kg", helvetica8));
|
| - |
|
1022 |
if (order.getLogistics_provider_id()==1L){
|
| - |
|
1023 |
providerInfoTable.addCell(new Phrase("Dimensions(Cms) : " + "200 X 200 X 200", helvetica8));
|
| - |
|
1024 |
providerInfoTable.addCell(new Phrase("Pieces : " + "1", helvetica8));
|
| - |
|
1025 |
}
|
| 1016 |
if(order.getSource() == OrderSource.EBAY.getValue()){
|
1026 |
if(order.getSource() == OrderSource.EBAY.getValue()){
|
| 1017 |
EbayOrder ebayOrder = null;
|
1027 |
EbayOrder ebayOrder = null;
|
| 1018 |
try {
|
1028 |
try {
|
| 1019 |
ebayOrder = tsc.getClient().getEbayOrderByOrderId(order.getId());
|
1029 |
ebayOrder = tsc.getClient().getEbayOrderByOrderId(order.getId());
|
| 1020 |
} catch (TException e) {
|
1030 |
} catch (TException e) {
|
| Line 1385... |
Line 1395... |
| 1385 |
billingAddress = userClient.getBillingAddressForUser(userId);
|
1395 |
billingAddress = userClient.getBillingAddressForUser(userId);
|
| 1386 |
}
|
1396 |
}
|
| 1387 |
|
1397 |
|
| 1388 |
private PdfPTable getCustomerAddressTable(Order order, String destCode, boolean showPaymentMode, Font font, boolean forInvoce, boolean billingAdd){
|
1398 |
private PdfPTable getCustomerAddressTable(Order order, String destCode, boolean showPaymentMode, Font font, boolean forInvoce, boolean billingAdd){
|
| 1389 |
PdfPTable customerTable = new PdfPTable(1);
|
1399 |
PdfPTable customerTable = new PdfPTable(1);
|
| 1390 |
customerTable.addCell(new Phrase("Deliver To :",font));
|
1400 |
//customerTable.addCell(new Phrase("Deliver To :",font));
|
| 1391 |
if(forInvoce || order.getPickupStoreId() == 0){
|
1401 |
if(forInvoce || order.getPickupStoreId() == 0){
|
| 1392 |
in.shop2020.model.v1.user.UserContextService.Client userClient = usc.getClient();
|
1402 |
in.shop2020.model.v1.user.UserContextService.Client userClient = usc.getClient();
|
| 1393 |
try {
|
1403 |
try {
|
| 1394 |
if(billingAdd && userClient.isPrivateDealUser(order.getCustomer_id())){
|
1404 |
if(billingAdd && userClient.isPrivateDealUser(order.getCustomer_id())){
|
| 1395 |
setBillingAddress(order.getCustomer_id(), userClient);
|
1405 |
setBillingAddress(order.getCustomer_id(), userClient);
|
| Line 1402... |
Line 1412... |
| 1402 |
customerTable.addCell(new Phrase(billingAddress.getCity() + "," + billingAddress.getState(), font));
|
1412 |
customerTable.addCell(new Phrase(billingAddress.getCity() + "," + billingAddress.getState(), font));
|
| 1403 |
customerTable.addCell(new Phrase(billingAddress.getPin(), font));
|
1413 |
customerTable.addCell(new Phrase(billingAddress.getPin(), font));
|
| 1404 |
customerTable.addCell(new Phrase("Phone : " + (billingAddress.getPhone()== null ? "" : billingAddress.getPhone()), font));
|
1414 |
customerTable.addCell(new Phrase("Phone : " + (billingAddress.getPhone()== null ? "" : billingAddress.getPhone()), font));
|
| 1405 |
*/
|
1415 |
*/
|
| 1406 |
}else{
|
1416 |
}else{
|
| - |
|
1417 |
customerTable.addCell(new Phrase("Deliver To:", font));
|
| 1407 |
customerTable.addCell(new Phrase(order.getCustomer_name(), font));
|
1418 |
customerTable.addCell(new Phrase(order.getCustomer_name(), font));
|
| 1408 |
if(order.getSource() == OrderSource.HOMESHOP18.getValue()){
|
1419 |
if(order.getSource() == OrderSource.HOMESHOP18.getValue()){
|
| 1409 |
HsOrder hsOrder = null;
|
1420 |
HsOrder hsOrder = null;
|
| 1410 |
try {
|
1421 |
try {
|
| 1411 |
hsOrder = tsc.getClient().getHomeShopOrder(order.getId(), null, null).get(0);
|
1422 |
hsOrder = tsc.getClient().getHomeShopOrder(order.getId(), null, null).get(0);
|