Subversion Repositories SmartDukaan

Rev

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

Rev 36374 Rev 36451
Line 181... Line 181...
181
        offer.setActivationBrands(createOfferRequest.getActivationBrands());
181
        offer.setActivationBrands(createOfferRequest.getActivationBrands());
182
        offer.setTerms(createOfferRequest.getTerms());
182
        offer.setTerms(createOfferRequest.getTerms());
183
        offer.setItemCriteria(gson.toJson(createOfferRequest.getItemCriteria()));
183
        offer.setItemCriteria(gson.toJson(createOfferRequest.getItemCriteria()));
184
        offer.setPartnerCriteria(gson.toJson(createOfferRequest.getPartnerCriteria()));
184
        offer.setPartnerCriteria(gson.toJson(createOfferRequest.getPartnerCriteria()));
185
        offer.setDiscount(createOfferRequest.isDiscount());
185
        offer.setDiscount(createOfferRequest.isDiscount());
-
 
186
        offer.setReference(createOfferRequest.getReference());
186
        offerRepository.persist(offer);
187
        offerRepository.persist(offer);
187
        createOfferRequest.setId(offer.getId());
188
        createOfferRequest.setId(offer.getId());
188
    }
189
    }
189
 
190
 
190
    @Override
191
    @Override
Line 320... Line 321...
320
        createOfferRequest.setItemCriteria(
321
        createOfferRequest.setItemCriteria(
321
                gson.fromJson(fromOffer.getItemCriteria(), com.spice.profitmandi.service.offers.ItemCriteria.class));
322
                gson.fromJson(fromOffer.getItemCriteria(), com.spice.profitmandi.service.offers.ItemCriteria.class));
322
        createOfferRequest.setPartnerCriteria(gson.fromJson(fromOffer.getPartnerCriteria(), PartnerCriteria.class));
323
        createOfferRequest.setPartnerCriteria(gson.fromJson(fromOffer.getPartnerCriteria(), PartnerCriteria.class));
323
        createOfferRequest.setId(fromOffer.getId());
324
        createOfferRequest.setId(fromOffer.getId());
324
        createOfferRequest.setCreatedOn(fromOffer.getCreatedTimestamp());
325
        createOfferRequest.setCreatedOn(fromOffer.getCreatedTimestamp());
-
 
326
        createOfferRequest.setReference(fromOffer.getReference());
325
        createOfferRequest.setItemCriteriaString(
327
        createOfferRequest.setItemCriteriaString(
326
                itemCriteriaRepository.getItemCriteriaDescription(createOfferRequest.getItemCriteria()));
328
                itemCriteriaRepository.getItemCriteriaDescription(createOfferRequest.getItemCriteria()));
327
        List<com.spice.profitmandi.dao.model.TargetSlab> targetSlabs = offerTargetSlabRepository
329
        List<com.spice.profitmandi.dao.model.TargetSlab> targetSlabs = offerTargetSlabRepository
328
                .getByOfferId(fromOffer.getId());
330
                .getByOfferId(fromOffer.getId());
329
        createOfferRequest.setPartnerCriteriaString(
331
        createOfferRequest.setPartnerCriteriaString(