Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
35838 78 d 14 h ranu /trunk/profitmandi-fofo/src/main/ wallet added on branwise page  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-brandwise-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-stock.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
35775 85 d 14 h ranu /trunk/profitmandi-fofo/src/main/ imei wise margin / modal wise margin  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-imei-results-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-model-modal.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-imei-history-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
35771 86 d 12 h ranu /trunk/ imei wise margin  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/InStockItemDetailModel.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-readonly.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-brandwise-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-stock-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-stock.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/published-offers.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-brandwise-detail.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
35505 134 d 16 h ranu /trunk/profitmandi-fofo/src/main/ today offer modal done  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
35502 134 d 16 h ranu /trunk/profitmandi-fofo/src/main/ today offer modal done  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-brandwise-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-stock.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
35501 134 d 16 h ranu /trunk/ today offer modal done  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CatalogBrief.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerCriteriaPojo.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PayoutSlabModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SchemeOfferModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayCatalogOfferModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayOfferGroupKey.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayOfferModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WebOfferModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today-fofo-offer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today-offer-list.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today-offer.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Catalog.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemCriteriaRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemCriteriaRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardService.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-brandwise-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-stock.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
31170 1272 d 11 h amit.gupta /trunk/ Fixed Duplicate imeis while rolling out additional schemes and Added Region wise schemes  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/SchemeRegion.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRegionRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRegionRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Region.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseInventoryItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateSchemeRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ActivatedImeiRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ActivatedImeiRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-scheme.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-warehouse.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
30252 1505 d 10 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Fixed ahead issue  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
29951 1560 d 9 h amit.gupta /trunk/profitmandi-fofo/src/main/ Fixed Price Circular  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-partner-pincode.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-price-circular.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
28142 1868 d 16 h tejbeer /trunk/ change  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/categorywise-circular.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
28134 1869 d 14 h tejbeer /trunk/profitmandi-fofo/src/main/ change  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-partner.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
28102 1876 d 18 h tejbeer /trunk/ price circular change  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PriceCircularModel.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-price-circular.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan.vm