Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
33845 585 d 22 h tejus.lohani /trunk/ new flow of Onboarding process and wod-fin report ,  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/ServiceType.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WodFinMappingModel.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loi-form.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wod-fin-mapping-report.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-form.vm
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/brandFee/BrandFeeCollection.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerOnBoardingPanel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PaymentOption.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiForm.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/StoreTimeline.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/onBorading/onBoardingFormEnums/LoiStatus.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LoiFormModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/StoreTimelineModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/brandFee/BrandFeeCollectionRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerDealerRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerDealerRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerOnBoardingPanelRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerOnBoardingPanelRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PaymentOptionRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PaymentOptionRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ServiceConfigRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ServiceConfigRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiBrandCommitmentRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiBrandCommitmentRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiDocRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiDocsRepositoryImpl.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/dao/repository/transaction/TransactionRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/TransactionRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletHistoryRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletHistoryRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/LoiFormRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/LoiFormRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/StoreTimelinetbRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/StoreTimelinetbRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig/ServiceConfigServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.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/LoiFormController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auto-Loi.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding_timeline.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-billing-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pendingForm.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/onboarding-form.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
33618 657 d 16 h tejus.lohani /trunk/ add functionality to add followUp date brand wise and add brand in followUp mail  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/BrandWiseFollowUp.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/BrandWiseFollowUpRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/BrandWiseFollowUpRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerServiceComment.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ServiceConfigRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ServiceConfigRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig/ServiceConfigServiceImpl.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/ServiceApplicableModel.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/finance-service-row.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/finance-services.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
30492 1449 d 14 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
29898 1572 d 21 h manish /trunk/profitmandi-fofo/src/main/webapp/resources/js/ commit  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
29803 1584 d 22 h manish /trunk/profitmandi-fofo/src/main/webapp/resources/js/ commit  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
29779 1589 d 23 h manish /trunk/profitmandi-fofo/src/main/webapp/resources/js/ commit  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
29764 1591 d 18 h manish /trunk/profitmandi-fofo/src/main/webapp/resources/js/ commit  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
29064 1720 d 19 h manish /trunk/ commit  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/service-not-applicable-by-partner-modal.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ServiceBrandsConfig.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/FinanceServicesModel.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/finance-services.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
29058 1721 d 18 h manish /trunk/profitmandi-fofo/src/main/ changes  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/finance-services.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
29051 1722 d 17 h manish /trunk/ changes  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-service-deActivate-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-service-modal.vm
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomRetailer.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ServiceBrandsConfig.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/ApplicableServiceType.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/finance-services.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
29050 1722 d 22 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/resources/js/ k  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
28830 1744 d 0 h amit.gupta /trunk/profitmandi-fofo/src/main/ Added update on partner finance services  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceApplicableModel.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
28757 1750 d 19 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
27755 1920 d 16 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Fixed live with on  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/add-wallet-request.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/authUser.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/banner-listing.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
/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/feature.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/focused_model.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/hygiene.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory-listing.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/notification-panel.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-pending-order.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/product-detail.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/promoter-info.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/punch-in-out.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/refferal.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.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/send-notification.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet-edit.js
27754 1920 d 17 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Fixed live with on  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/add-wallet-request.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/authUser.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/banner-listing.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/contact.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/feature.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/franchisee-visit.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/hygiene.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory-listing.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/item.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/jio-recharge.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/live_demo_billing.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/login.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/map-index.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/notification-panel.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-pending-order.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/product-detail.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/promoter-info.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/punch-in-out.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/refferal.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/role.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/send-message.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/send-notification.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/unsettled-payments.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/user-profile.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/vendor.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet-edit.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/web-listing.js
24329 2704 d 23 h govind /trunk/profitmandi-fofo/src/main/webapp/ financial Service  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
24317 2708 d 19 h govind /trunk/ financial service  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerBrandService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ServiceBrandsConfig.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/ApplicableServiceType.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/PartnerStatusType.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ServiceConfigRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ServiceConfigRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig/ServiceConfigService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig/ServiceConfigServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-brands-to-service.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-partner-brand-service-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-partner-service-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/added-brands.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin-partner-services.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brands-service.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-service.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/service-brands.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/images/Not-allowed-sign.jpg
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm