Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
37620 25 d 9 h amit /trunk/profitmandi-fofo/src/main/ Offer creation suggests only active models unless asked for all

/entity accepted activeOnly but always searched with false, so the offer
screen's model picker listed every catalog of the brand, delisted ones included.
It now honours the flag. The default becomes false so the pages that never pass
it keep their current results; the notification product search, which already
asked for active-only, now gets it.

Each item-criteria block gets an Include inactive checkbox, off by default.
Ticking Exclude ticks it too: a brand-level offer still pays on delisted models
partners hold stock of, and they cannot be excluded if they cannot be picked.
Inactive models are labelled, and reloading the list keeps picks still present.

The reload flag is now per block; the old global one let a brand change in one
block be consumed by opening another, leaving the first with a stale list.
Brand names are URL-encoded so a brand like Ai+ is not sent as 'Ai '.

Requires profitmandi-common r37619 for the inactive label.		  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
36452 160 d 8 h amit /trunk/profitmandi-fofo/src/main/webapp/ Add reference field to offer/scheme create forms and admin views  
/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/scheme-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.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/scheme_offer.js
35497 284 d 10 h ranu /trunk/profitmandi-fofo/src/main/ Laptop show on offer  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
35496 284 d 14 h ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ given laptop in category  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
33622 805 d 14 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/ Added scheme  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
33431 857 d 14 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fixed Order quantity availability  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
33320 889 d 9 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/ Fixed scheme offer added tablet  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
32979 960 d 10 h amit.gupta /trunk/ Fixed changes related to offer.  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TargetSlabEntity.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ItemCriteriaPayout.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/OfferTargetSlabRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
32021 1241 d 9 h amit.gupta /trunk/ Fixed additional scheme logic  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offer.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AmountModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.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/InventoryPayoutModel.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
31190 1417 d 9 h amit.gupta /trunk/ Added logic for Booster handling, New Partners are not allowed to participate in booster offers  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
30753 1535 d 11 h amit.gupta /trunk/ Added LED  
/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/ItemRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
30723 1541 d 9 h amit.gupta /trunk/ Fixed Create Offer Request Added Exclusion of Parnter.  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/PartnerCriteria.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.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/RetailerController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
30658 1566 d 14 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Added scheme in processing for specified scheme ids  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
30651 1568 d 9 h amit.gupta /trunk/ Added processing of sellin  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ItemCriteriaPayout.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/OfferRowModel.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/OfferRepository.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/OfferTargetSlabRepositoryImpl.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/PurchaseReturnController.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/offer_margin_detail_partner.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-partner.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
30601 1583 d 15 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Added velocity  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/performance-weekly.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/12dashboard34.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/chart-filter-lms.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-insurance.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-index-offer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-offer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-readonly.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/hygiene-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-aging.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-ledger-download.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/map-info.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/notify-order-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer-edit.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-grn.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listing-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/recharge-provider-wallet-add-money.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-download.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-partner.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/send-message.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/send-notification.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/team-commitment.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/unsettled-payments.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/upload-partner.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-edit.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/web-offer-edit.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/web-offer.vm
30485 1598 d 11 h tejbeer /trunk/ change  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/ckEditor.css
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/CHANGES.md
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/LICENSE.md
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/README.md
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/build-config.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/config.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/contents.css
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/lang
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/plugins
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/samples
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/skins
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/styles.js
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/FranchiseeVisit.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/offer_margin_detail_partner.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/ckeditor.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
29795 1733 d 15 h amit.gupta /trunk/ Added base Criteria flag  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offer.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
29171 1859 d 7 h amit.gupta /trunk/ Fixed offer for Fixed slab payout  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog/AmountType.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
28945 1882 d 17 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
28017 2039 d 8 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm

←Prev12Next→

Show All