Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
37493 36 d 11 h amit /trunk/profitmandi-fofo/src/main/ Fix: scheme item inline date edit fired N duplicate PUTs per click

scheme-details.vm is injected with .html(), which re-executes its inline
<script>, and a successful save re-injects it - so each load stacked another
$(document) handler for .edit/.cancel/.save-item-dates. One Save click then
fired N identical PUT /scheme/item/window, and PostInterceptor rejected all
but the first with 'Duplicate request.' (27 per click in prod today).
The stacked copies also carried a stale $scheme closure, so a save could
repaint the container with a previously viewed scheme.

Move the handlers to scheme.js (loaded once via include-scripts.vm) and read
the scheme id/window from data- attributes on the fragment root, keeping them
stateless. Fragment is now markup only.

Reuse cleanup while in here:
- configureMultiselect() replaces 3 near-identical multiselect configs
- loadBrandsByCategory/loadCatalogDescriptionByBrands take an optional
afterRender so the add-item modal reuses them instead of duplicating both
- toggleItemDateEdit()/initSingleDatePicker() collapse mirrored blocks
- SCHEME_DETAILS_CONTAINER single-sources the container id
- drop the template's duplicate toIsoDateTime (scheme.js already had it)
- updateSchemeItemWindow() now prefixes context like every other call

Bump jsVersion 409 -> 410.		  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
36421 162 d 6 h amit /trunk/profitmandi-fofo/src/main/webapp/ Feat:Scheme item date window — per-item start/end dates with inline editing, category→brand→model cascade in add-item modal, duplicate detection, full-width layout  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
35252 337 d 12 h aman /trunk/ Feat:Expire Schemes by ids and lead assign to bgc too  
/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/LeadController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update-schemes-page.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
34587 505 d 6 h vikas.jangra /trunk/profitmandi-fofo/src/main/ Scheme notification  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
34575 508 d 8 h vikas.jangra /trunk/ Liquidation/Bidding auto approval  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update-schemes-page.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/liquidation.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
32331 1150 d 13 h amit.gupta /trunk/ Added changes related to schemes  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-table.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/SchemeSummaryModel.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/price-circular-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-imei-history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-partner.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
32299 1161 d 8 h jai.hind /trunk/profitmandi-fofo/src/main/ In Finance Automate Process SellIn SellOut  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update-schemes-page.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
31762 1287 d 8 h tejbeer /trunk/ ticket and imei wise scheme related changes  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-imei-history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-categories.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-escalationtype.vm
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/TicketRelatedScheduledTask.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreatePositionModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/ActivityRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketSubCategoryRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketSubCategoryRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.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-position.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-ticket-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
30599 1582 d 5 h amit.gupta /trunk/profitmandi-fofo/src/main/ Fixed ahead issue  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-prebooking-listing.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/customer-offer.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/hygiene.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/map-index.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-target.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/prebooking.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/recharge.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/unsettled-payments.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet-edit.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/web-offers.js
30501 1595 d 11 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Fixed ahead issue  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
30492 1596 d 3 h amit.gupta /trunk/ Added Category option  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
30253 1652 d 4 h amit.gupta /trunk/ Fixed issue with Scheme  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
30148 1675 d 11 h amit.gupta /trunk/ Fixed scheme creation  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.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/OrderController.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/tag-listing-items-description.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-scheme.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
30122 1677 d 8 h amit.gupta /trunk/ Fixed issue  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomRetailer.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SchemeItems.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SchemeModel.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.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/java/com/spice/profitmandi/web/controller/TagListingController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/categorywise-circular.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update-schemes-page.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
30054 1691 d 9 h manish /trunk/profitmandi-fofo/src/main/webapp/resources/js/  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
29762 1738 d 13 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
29761 1738 d 13 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
29760 1738 d 13 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
29759 1738 d 13 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
29586 1787 d 12 h manish /trunk/profitmandi-fofo/src/main/webapp/resources/js/ commit  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js

←Prev12Next→

Show All