Subversion Repositories SmartDukaan

Rev

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

Rev 31685 Rev 31730
Line 794... Line 794...
794
 
794
 
795
		if (fofoStore != null) {
795
		if (fofoStore != null) {
796
			fofoStore.setCounterSize(updateRetailerRequest.getCountersize());
796
			fofoStore.setCounterSize(updateRetailerRequest.getCountersize());
797
			fofoStore.setMinimumInvestment(updateRetailerRequest.getMinInvestment());
797
			fofoStore.setMinimumInvestment(updateRetailerRequest.getMinInvestment());
798
			fofoStore.setWarehouseId(updateRetailerRequest.getWarehouseId());
798
			fofoStore.setWarehouseId(updateRetailerRequest.getWarehouseId());
-
 
799
			fofoStore.setCounterPotential(updateRetailerRequest.getCounterPotential());
799
			fofoStore.setFofoType(updateRetailerRequest.getFofoType());
800
			fofoStore.setFofoType(updateRetailerRequest.getFofoType());
800
 
801
 
801
		} else {
802
		} else {
802
			int retailerAddressId = retailerRegisteredAddressRepository.selectAddressIdByRetailerId(retailerId);
803
			int retailerAddressId = retailerRegisteredAddressRepository.selectAddressIdByRetailerId(retailerId);
803
			Address retailerAddress = addressRepository.selectById(retailerAddressId);
804
			Address retailerAddress = addressRepository.selectById(retailerAddressId);
Line 818... Line 819...
818
 
819
 
819
			fofoStore = new FofoStore();
820
			fofoStore = new FofoStore();
820
			fofoStore.setId(retailerId);
821
			fofoStore.setId(retailerId);
821
			fofoStore.setCounterSize(updateRetailerRequest.getCountersize());
822
			fofoStore.setCounterSize(updateRetailerRequest.getCountersize());
822
			fofoStore.setMinimumInvestment(updateRetailerRequest.getMinInvestment());
823
			fofoStore.setMinimumInvestment(updateRetailerRequest.getMinInvestment());
-
 
824
 
-
 
825
			fofoStore.setCounterPotential(updateRetailerRequest.getCounterPotential());
823
			fofoStore.setWarehouseId(updateRetailerRequest.getWarehouseId());
826
			fofoStore.setWarehouseId(updateRetailerRequest.getWarehouseId());
824
			String latestStoreCode = fofoStoreRepository.selectLatestStore().getCode();
827
			String latestStoreCode = fofoStoreRepository.selectLatestStore().getCode();
825
			int latestCodeCounter = Integer.parseInt(latestStoreCode.replaceAll("[A-Z]", ""));
828
			int latestCodeCounter = Integer.parseInt(latestStoreCode.replaceAll("[A-Z]", ""));
826
			String fofoStoreCode = StringUtils.generateFofoStoreSequence(
829
			String fofoStoreCode = StringUtils.generateFofoStoreSequence(
827
					districtMaster.getStateShortName() + districtMaster.getShortName(), latestCodeCounter + 1);
830
					districtMaster.getStateShortName() + districtMaster.getShortName(), latestCodeCounter + 1);