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 23 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 22 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
35965 67 d 23 h amit /trunk/profitmandi-fofo/src/main/ Add bulk order approval report - new endpoint, view template, and JS handlers for date-filtered approval reporting  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction/bulk-order-approval-report.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
35487 141 d 21 h ranu /trunk/ place ment plan page show catalog status wise  
/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-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
33213 762 d 1 h tejus.lohani /trunk/ new feature -Bulk order and Approval add our System  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/LineItemModel.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/TransctionApprovalModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/TransactionApproval.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/TransactionApprovalStatus.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/TransactionApprovalRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/TransactionApprovalRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionApprovalServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/TransactionApprovalService.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bulk-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction/transaction-approvals.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update_PartnerCriteria.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/transaction-approval.js
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/BulkOrderModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
33172 774 d 21 h tejus.lohani /trunk/ add bulk order service in admin dashboard  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/BulkOrderModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bulk_order.vm
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ItemLoaderService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.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/webapp/resources/js/placement-plan.js
31330 1241 d 0 h tejbeer /trunk/ change  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/solr/SolrService.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/ContentController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
31322 1241 d 20 h tejbeer /trunk/profitmandi-fofo/src/main/  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
30722 1392 d 23 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Added scheme in processing for specified scheme ids  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
30721 1393 d 0 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Added scheme in processing for specified scheme ids  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
30720 1393 d 0 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Added scheme in processing for specified scheme ids  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
30080 1539 d 2 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 19 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
28477 1796 d 22 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
28474 1797 d 16 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 19 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
28020 1890 d 2 h tejbeer /trunk/ change  
/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/transaction/Order.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/FofoIdItemDetailModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/FofoIdQtyModel.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/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
28005 1891 d 19 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/WEB-INF/views/ftl/placement-plan.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm