Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
36442 12 d 20 h amit /trunk/profitmandi-fofo/src/ Rename monitor type 'normal' to 'base' in controller, validator, UI, and tests  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CatalogMonitorTypeCsvValidator.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
/trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/web/controller/PlacementPlanControllerUploadTest.java
/trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/web/util/CatalogMonitorTypeCsvValidatorTest.java
/trunk/profitmandi-fofo/src/test/resources/catalog_monitor_type_10rows.csv
36404 16 d 19 h amit /trunk/profitmandi-fofo/src/ Add catalog monitor type upload, sample sheet, Placement Plan UI tagging (orange/yellow), Today PO csv column, placement-plan-statement.xlsx header coloring  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CatalogMonitorTypeCsvValidator.java
/trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/web
/trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/web/controller
/trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/web/controller/PlacementPlanControllerUploadTest.java
/trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/web/util
/trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/web/util/CatalogMonitorTypeCsvValidatorTest.java
/trunk/profitmandi-fofo/src/test/resources/catalog_monitor_type_10rows.csv
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
36080 48 d 14 h aman /trunk/profitmandi-fofo/src/main/ Fix:Replace "FOFO/FOCO/COCO" with "Partner" — Visual Only  
/trunk/profitmandi-fofo/src/main/resources/message_hi.properties
/trunk/profitmandi-fofo/src/main/resources/messages_en.properties
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/12dashboard34.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brand-commitment/brand-commitment-panel.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/credit-note.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/foco-sale-report.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/franchisee-account-creation.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/hid-allocation.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/map-info.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer-payout-dump-report.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-account-statement.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-collection-summary.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-loan-statement.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-indent-report.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending_fofo_order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop-report.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/requested-allocations.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-payout-report.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scratch/editScratchOffer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scratch/scratchOffer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update_PartnerCriteria.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-pending-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
30085 1538 d 16 h amit.gupta /trunk/ Fixed ahead issue  
/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/java/com/spice/profitmandi/web/controller/PlacementPlanController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
30082 1538 d 21 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fixed ahead issue  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
30080 1538 d 23 h amit.gupta /trunk/ Fixed ahead issue  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/solr/SolrService.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.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/PlacementPlanController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.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-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
29103 1715 d 16 h tejbeer /trunk/ change  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/OnBoardingRelatedSchelduleTask.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auth_user_partner_detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
28870 1739 d 1 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
28807 1746 d 10 h tejbeer /trunk/ change  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
28589 1766 d 22 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ chnage  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
28523 1779 d 19 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan.vm
28486 1796 d 14 h tejbeer /trunk/  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CurrentInventorySnapshot.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
28477 1796 d 19 h tejbeer /trunk/ chnage  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CurrentInventorySnapshot.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/SaholicInventoryCIS.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventoryCISRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventoryCISRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
28476 1797 d 12 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
28475 1797 d 12 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
28474 1797 d 13 h tejbeer /trunk/ chnage  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/FofoIdCatalogQtyModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CurrentInventorySnapshot.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/SaholicInventoryCIS.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventoryCISRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventoryCISRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/FofoUser.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
28085 1883 d 16 h tejbeer /trunk/ change  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/itemwise-po-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/itemwise-po.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SuggestedPoRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SuggestedPoRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
28057 1884 d 22 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
28053 1885 d 22 h tejbeer /trunk/ change  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-warehouse-item.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/SaholicInventoryCIS.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/FofoIdItemDetailModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventoryCISRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventoryCISRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
28036 1888 d 21 h tejbeer /trunk/ chnage  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CurrentInventorySnapshot.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-info.vm

Show All