Subversion Repositories SmartDukaan

Rev

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

Rev 7791 Rev 7842
Line 1... Line 1...
1
package in.shop2020.serving.controllers;
1
package in.shop2020.serving.controllers;
2
 
2
 
3
import in.shop2020.datalogger.EventType;
3
import in.shop2020.datalogger.EventType;
-
 
4
import in.shop2020.logistics.DeliveryType;
4
import in.shop2020.logistics.LogisticsService;
5
import in.shop2020.logistics.LogisticsService;
5
import in.shop2020.logistics.PickupStore;
6
import in.shop2020.logistics.PickupStore;
6
 
7
 
7
import in.shop2020.model.v1.catalog.Item;
8
import in.shop2020.model.v1.catalog.Item;
8
import in.shop2020.model.v1.user.Address;
9
import in.shop2020.model.v1.user.Address;
Line 28... Line 29...
28
import org.apache.struts2.convention.annotation.InterceptorRef;
29
import org.apache.struts2.convention.annotation.InterceptorRef;
29
import org.apache.struts2.convention.annotation.InterceptorRefs;
30
import org.apache.struts2.convention.annotation.InterceptorRefs;
30
import org.apache.struts2.convention.annotation.Result;
31
import org.apache.struts2.convention.annotation.Result;
31
import org.apache.struts2.convention.annotation.Results;
32
import org.apache.struts2.convention.annotation.Results;
32
import org.apache.thrift.TException;
33
import org.apache.thrift.TException;
33
import org.apache.thrift.transport.TTransportException;
-
 
34
import org.apache.velocity.VelocityContext;
34
import org.apache.velocity.VelocityContext;
35
 
35
 
36
@SuppressWarnings("serial")
36
@SuppressWarnings("serial")
37
@InterceptorRefs({
37
@InterceptorRefs({
38
    @InterceptorRef("myDefault"),
38
    @InterceptorRef("myDefault"),
Line 309... Line 309...
309
					itemdetail.put("CATALOG_ID", item.getCatalogItemId() + "");
309
					itemdetail.put("CATALOG_ID", item.getCatalogItemId() + "");
310
					itemdetail.put("ITEM_QUANTITY", ((int)line.getQuantity())+"");
310
					itemdetail.put("ITEM_QUANTITY", ((int)line.getQuantity())+"");
311
					itemdetail.put("MRP", formattingUtils.formatPrice(item.getMrp()));
311
					itemdetail.put("MRP", formattingUtils.formatPrice(item.getMrp()));
312
					itemdetail.put("SELLING_PRICE", formattingUtils.formatPrice(item.getSellingPrice()));
312
					itemdetail.put("SELLING_PRICE", formattingUtils.formatPrice(item.getSellingPrice()));
313
					itemdetail.put("TOTAL_PRICE", formattingUtils.formatPrice((item.getSellingPrice()*line.getQuantity())));
313
					itemdetail.put("TOTAL_PRICE", formattingUtils.formatPrice((item.getSellingPrice()*line.getQuantity())));
314
					itemdetail.put("SHIPPING_TIME", EstimateController.checkValidDeliveryEstimate(line.getEstimate()));
314
					itemdetail.put("SHIPPING_TIME", EstimateController.getDeliveryDateString(line.getEstimate(), DeliveryType.PREPAID));
315
					itemdetail.put("BEST_DEAL_TEXT", item.getBestDealText());
315
					itemdetail.put("BEST_DEAL_TEXT", item.getBestDealText());
316
					itemdetail.put("INSURANCE_AMOUNT", line.getInsuranceAmount() + "");
316
					itemdetail.put("INSURANCE_AMOUNT", line.getInsuranceAmount() + "");
317
					itemdetail.put("INSURER", line.getInsurer() + "");
317
					itemdetail.put("INSURER", line.getInsurer() + "");
318
					items.add(itemdetail);
318
					items.add(itemdetail);
319
					totalInsurance += line.getInsuranceAmount();
319
					totalInsurance += line.getInsuranceAmount();