Subversion Repositories SmartDukaan

Rev

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

Rev 5504 Rev 5516
Line 871... Line 871...
871
        
871
        
872
        Map<String, VoucherItemMapping> voucherMap = new HashMap<String, VoucherItemMapping>();
872
        Map<String, VoucherItemMapping> voucherMap = new HashMap<String, VoucherItemMapping>();
873
        VoucherItemMapping voucher;
873
        VoucherItemMapping voucher;
874
        if(tVoucherMappings != null) {
874
        if(tVoucherMappings != null) {
875
            for(in.shop2020.model.v1.catalog.VoucherItemMapping tvoucher : tVoucherMappings) {
875
            for(in.shop2020.model.v1.catalog.VoucherItemMapping tvoucher : tVoucherMappings) {
876
            	voucher = new VoucherItemMapping(tvoucher.getAmount(), tvoucher.getVoucherType());
876
            	voucher = new VoucherItemMapping(tvoucher.getAmount(), VoucherType.findByValue((int) tvoucher.getVoucherType()).name());
877
            	voucherMap.put(tvoucher.getVoucherType(), voucher);
877
            	voucherMap.put(VoucherType.findByValue((int) tvoucher.getVoucherType()).name(), voucher);
878
            }
878
            }
879
        }
879
        }
880
 
880
 
881
        Item item = new Item(thriftItem.getId(),
881
        Item item = new Item(thriftItem.getId(),
882
                thriftItem.getProductGroup(),
882
                thriftItem.getProductGroup(),
Line 1090... Line 1090...
1090
        }
1090
        }
1091
        return brandsList;
1091
        return brandsList;
1092
	}
1092
	}
1093
 
1093
 
1094
	@Override
1094
	@Override
1095
	public boolean deleteVoucher(Long catalogItemId, String voucherType) {
1095
	public boolean deleteVoucher(Long catalogItemId, Long voucherType) {
1096
		try{
1096
		try{
1097
            CatalogClient catalogServiceClient = new CatalogClient();
1097
            CatalogClient catalogServiceClient = new CatalogClient();
1098
            InventoryService.Client catalogClient = catalogServiceClient.getClient();
1098
            InventoryService.Client catalogClient = catalogServiceClient.getClient();
1099
 
1099
 
1100
            return catalogClient.deleteVoucherForItem(catalogItemId, voucherType);
1100
            return catalogClient.deleteVoucherForItem(catalogItemId, voucherType);
Line 1104... Line 1104...
1104
        }
1104
        }
1105
        return false;
1105
        return false;
1106
	}
1106
	}
1107
 
1107
 
1108
	@Override
1108
	@Override
1109
	public boolean addVoucher(Long catalogItemId, String voucherType, long voucherAmount) {
1109
	public boolean addVoucher(Long catalogItemId, Long voucherType, long voucherAmount) {
1110
		try{
1110
		try{
1111
            CatalogClient catalogServiceClient = new CatalogClient();
1111
            CatalogClient catalogServiceClient = new CatalogClient();
1112
            InventoryService.Client catalogClient = catalogServiceClient.getClient();
1112
            InventoryService.Client catalogClient = catalogServiceClient.getClient();
1113
 
1113
 
1114
            return catalogClient.addupdateVoucherForItem(catalogItemId, voucherType, voucherAmount);
1114
            return catalogClient.addupdateVoucherForItem(catalogItemId, voucherType, voucherAmount);
Line 1118... Line 1118...
1118
        }
1118
        }
1119
		return false;
1119
		return false;
1120
	}
1120
	}
1121
 
1121
 
1122
	@Override
1122
	@Override
1123
	public List<String> getvoucherTypes() {
1123
	public Map<Long, String> getvoucherTypes() {
1124
		List<String> voucherType = new ArrayList<String>();
1124
		Map<Long, String> voucherType = new HashMap<Long, String>();
1125
		for(VoucherType voucher : VoucherType.values())
1125
		for(VoucherType voucher : VoucherType.values())
1126
		{
1126
		{
1127
			voucherType.add(voucher.name());
1127
			voucherType.put((long) voucher.getValue(), voucher.name());
1128
		}
1128
		}
1129
		return voucherType;
1129
		return voucherType;
1130
	}
1130
	}
1131
 
1131
 
1132
}
1132
}
1133
1133