Subversion Repositories SmartDukaan

Rev

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

Rev 22037 Rev 22173
Line 59... Line 59...
59
	@Autowired
59
	@Autowired
60
	ResponseSender<?> responseSender;
60
	ResponseSender<?> responseSender;
61
 
61
 
62
	@Autowired
62
	@Autowired
63
	UserAccountRepository userAccountRepository;
63
	UserAccountRepository userAccountRepository;
-
 
64
	
-
 
65
	@Autowired
-
 
66
	ContentPojoPopulator contentPojoPopulator;
-
 
67
	
64
 
68
 
65
	@RequestMapping(value = ProfitMandiConstants.URL_CART, method=RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
69
	@RequestMapping(value = ProfitMandiConstants.URL_CART, method=RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
66
	@ApiImplicitParams({
70
	@ApiImplicitParams({
67
		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", 
71
		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", 
68
				required = true, dataType = "string", paramType = "header")
72
				required = true, dataType = "string", paramType = "header")
Line 123... Line 127...
123
						messagesArray.put(message);
127
						messagesArray.put(message);
124
						cartObj.put("cartMessagesMerged", cartObj.getInt("cartMessagesMerged") + 1);
128
						cartObj.put("cartMessagesMerged", cartObj.getInt("cartMessagesMerged") + 1);
125
					}
129
					}
126
				}
130
				}
127
			}
131
			}
128
			ProductPojo pp = ContentPojoPopulator.getShortContent(itemObj.getLong("catalogItemId"));
132
			ProductPojo pp = contentPojoPopulator.getShortContent(itemObj.getLong("catalogItemId"));
129
//			String productProperties = ContentServingService.getSnippet(Utils.PRODUCT_PROPERTIES_SNIPPET, pp.getId() +"", -1);
133
//			String productProperties = ContentServingService.getSnippet(Utils.PRODUCT_PROPERTIES_SNIPPET, pp.getId() +"", -1);
130
//			JSONObject productPropertiesInJson = new JSONObject(productProperties);
134
//			JSONObject productPropertiesInJson = new JSONObject(productProperties);
131
//			pp.setCategoryName(productPropertiesInJson.getString("categoryName"));
135
//			pp.setCategoryName(productPropertiesInJson.getString("categoryName"));
132
 
136
 
133
			if(itemObj.has("estimate")){
137
			if(itemObj.has("estimate")){