Subversion Repositories SmartDukaan

Rev

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

Rev 28978 Rev 29068
Line 1415... Line 1415...
1415
		return items.stream().collect(Collectors.toMap(itemIdFunction, itemFunction));
1415
		return items.stream().collect(Collectors.toMap(itemIdFunction, itemFunction));
1416
	}
1416
	}
1417
 
1417
 
1418
	private void setCustomerAddress(CustomerAddress customerAddress, CustomAddress customAddress) {
1418
	private void setCustomerAddress(CustomerAddress customerAddress, CustomAddress customAddress) {
1419
		customerAddress.setName(customAddress.getName());
1419
		customerAddress.setName(customAddress.getName());
-
 
1420
		customerAddress.setLastName(customAddress.getLastName());
1420
		customerAddress.setLine1(customAddress.getLine1());
1421
		customerAddress.setLine1(customAddress.getLine1());
1421
		customerAddress.setLine2(customAddress.getLine2());
1422
		customerAddress.setLine2(customAddress.getLine2());
1422
		customerAddress.setLandmark(customAddress.getLandmark());
1423
		customerAddress.setLandmark(customAddress.getLandmark());
1423
		customerAddress.setCity(customAddress.getCity());
1424
		customerAddress.setCity(customAddress.getCity());
1424
		customerAddress.setPinCode(customAddress.getPinCode());
1425
		customerAddress.setPinCode(customAddress.getPinCode());
Line 1534... Line 1535...
1534
		customer.setLastName(customCustomer.getLastName());
1535
		customer.setLastName(customCustomer.getLastName());
1535
		customer.setMobileNumber(customCustomer.getMobileNumber());
1536
		customer.setMobileNumber(customCustomer.getMobileNumber());
1536
		customer.setEmailId(customCustomer.getEmailId());
1537
		customer.setEmailId(customCustomer.getEmailId());
1537
		customerRepository.persist(customer);
1538
		customerRepository.persist(customer);
1538
		CustomerAddress customerAddress = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
1539
		CustomerAddress customerAddress = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
1539
		customerAddress.setName(customCustomer.getFirstName());
-
 
1540
		customerAddress.setLastName(customCustomer.getLastName());
-
 
1541
		if (!customerAddress.getState().equalsIgnoreCase(customCustomer.getAddress().getState())) {
1540
		if (!customerAddress.getState().equalsIgnoreCase(customCustomer.getAddress().getState())) {
1542
			List<FofoOrderItem> fofoOrderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
1541
			List<FofoOrderItem> fofoOrderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
1543
			resetTaxation(fofoOrder.getFofoId(), customerAddress, fofoOrderItems);
1542
			resetTaxation(fofoOrder.getFofoId(), customerAddress, fofoOrderItems);
1544
		}
1543
		}
1545
		this.setCustomerAddress(customerAddress, customCustomer.getAddress());
1544
		this.setCustomerAddress(customerAddress, customCustomer.getAddress());