Subversion Repositories SmartDukaan

Rev

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

Rev 22244 Rev 22250
Line 227... Line 227...
227
				continue;
227
				continue;
228
			}
228
			}
229
			cf.setDisplayName(getValidName(i.getBrand())+" "+getValidName(i.getModelName())+" "+getValidName(i.getModelNumber())+" "+getValidName(i.getColor()).replaceAll("\\s+", " "));
229
			cf.setDisplayName(getValidName(i.getBrand())+" "+getValidName(i.getModelName())+" "+getValidName(i.getModelNumber())+" "+getValidName(i.getColor()).replaceAll("\\s+", " "));
230
			cf.setItemType(i.getType());
230
			cf.setItemType(i.getType());
231
		}
231
		}
232
		Map<Integer, Float> mopPriceMap = pricingService.getPrivateDealPriceMopPriceNotFound(itemIds, loginDetails.getFofoId());
232
		Map<Integer, Float> mopPriceMap = pricingService.getPurchasePriceMopPriceNotFound(itemIds, loginDetails.getFofoId());
233
		model.addAttribute("cartObj", cartItems);
233
		model.addAttribute("cartObj", cartItems);
234
		model.addAttribute("mopPriceMap", mopPriceMap);
234
		model.addAttribute("mopPriceMap", mopPriceMap);
235
		return "order-index";
235
		return "order-index";
236
	}
236
	}
237
 
237
 
Line 602... Line 602...
602
				}
602
				}
603
			}
603
			}
604
			
604
			
605
			// mop price validation
605
			// mop price validation
606
			Map<Integer, Float> invalidMopItemIdPriceMap = new HashMap<>();
606
			Map<Integer, Float> invalidMopItemIdPriceMap = new HashMap<>();
607
			Map<Integer, Float> itemIdMopPriceMap = pricingService.getPrivateDealPriceMopPriceNotFound(itemIds, fofoDetails.getFofoId());
607
			Map<Integer, Float> itemIdMopPriceMap = pricingService.getPurchasePriceMopPriceNotFound(itemIds, fofoDetails.getFofoId());
608
			for(Map.Entry<Integer, Float> entry : itemIdMopPriceMap.entrySet()){
608
			for(Map.Entry<Integer, Float> entry : itemIdMopPriceMap.entrySet()){
609
				CustomFofoLineItem customFofoLineItem = customFofoLineItemMap.get(entry.getKey());
609
				CustomFofoLineItem customFofoLineItem = customFofoLineItemMap.get(entry.getKey());
610
				if(customFofoLineItem.getSellingPrice() < entry.getValue()){
610
				if(customFofoLineItem.getSellingPrice() < entry.getValue()){
611
					invalidMopItemIdPriceMap.put(entry.getKey(), customFofoLineItem.getSellingPrice());
611
					invalidMopItemIdPriceMap.put(entry.getKey(), customFofoLineItem.getSellingPrice());
612
				}
612
				}
Line 1071... Line 1071...
1071
			model.addAttribute("end",offset+limit);
1071
			model.addAttribute("end",offset+limit);
1072
		}
1072
		}
1073
		
1073
		
1074
		return "sale-history";
1074
		return "sale-history";
1075
	}
1075
	}
1076
	
-
 
1077
 
-
 
1078
 
1076
 
1079
}
1077
}