Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
36241 33 d 20 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ back date data ..........dashboard display on calling  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
36227 35 d 19 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ rbm l1,l2,l3 layer introduce  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
36195 37 d 19 h vikas /trunk/ Chatbot for RBM only: Inject SmartChat  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
36194 37 d 20 h vikas /trunk/ Chatbot for RBM only: Inject SmartChat  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/shopify/ShopifyProductMapper.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
36008 57 d 18 h aman /trunk/ Fix:Redesign the Po Approval page add total count, Add mail in bcc for testing , partnerpending task api response optimisation,  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/TransactionApprovalModel.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/FofoOpeningStockRepositoryImpl.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/service/TrialServiceImpl.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/AdminUser.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.java
/trunk/profitmandi-dao/src/main/resources/trial-activation-email.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.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/PartnerPendingTasksController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction/transaction-approvals.vm
35629 103 d 20 h amit /trunk/ Fixed SchemeService  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
/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/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
35587 110 d 20 h ranu /trunk/ code diploy for bulletins  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SalesThoughtConstants.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/post-bulletin.vm
35585 111 d 19 h ranu /trunk/ code updated by  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SalesThoughtConstants.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
35583 112 d 18 h ranu /trunk/ code updated by  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bulletin-list.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Bulletin.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BulletinOfferModal.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BulletinPostModel.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/SchemeRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/BulletinRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/BulletinRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferServiceImpl.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/DashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/post-bulletin.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/bulletin.js
35549 119 d 1 h ranu /trunk/ bulletin updated on dashboard and give access category department  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Bulletin.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BulletinOfferModal.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BulletinPostModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerBrief.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/BulletinRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/BulletinRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/post-bulletin.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/bulletin.js
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.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/SchemeRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferServiceImpl.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/FileUploadController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/mobile-brand-wise-report.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
35483 142 d 23 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Default null partnerType to Rising Star (PartnerType.NEW) in PartnerDetailModel.getPartnerType()  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerDetailModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
35482 142 d 23 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Default null partnerType to Rising Star (PartnerType.NEW) in getAllStatePartnerType  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
35481 142 d 23 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Fix NPE in getAllStatePartnerType - add null checks for PartnerDetailModel and partnerType  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
35394 148 d 12 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Improved performance  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PineLabs.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/ASTRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/ASTRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseInventoryItem.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/auth/AuthRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/AuthRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerCollectionRemarkRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerCollectionRemarkRepositoryImpl.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/cs/CsService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService1Impl.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/dtr/DistrictMasterRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/DistrictMasterRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoLineItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoLineItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/HygieneDataRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/HygieneDataRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/OfferPayoutRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/OfferPayoutRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PineLabsRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PineLabsRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/StateRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/StateRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/CounterRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/CounterRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/PurSaleServiceImpl.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/AdminUser.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerStatsServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/PineLabsPaymentService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.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/SchemeServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.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/RetailerServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseServiceImpl.java
35337 162 d 20 h aman /trunk/ Feat:Trial Feedback Api and Trial brand potential Api  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/TrialBrandPotential.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/TrialFeedbackForm.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/trialFeedbackForm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/trialFeedbackForm/CompetitivePricing.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/trialFeedbackForm/DashboardUsage.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/trialFeedbackForm/ImportantFeature.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/trialFeedbackForm/SupportTeamCommunication.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/trialFeedbackForm/SupportTeamRating.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/trialFeedbackForm/TopModelAvailability.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/trialFeedbackForm/TrialClarity.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TrialBrandPotentialRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TrialBrandPotentialRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TrialFeedbackFormRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TrialFeedbackFormRepositoryimpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/TrialService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/TrialServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/BrandCatalog.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/BrandsServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig/ServiceConfigServiceImpl.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TrialUserController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
35316 170 d 17 h ranu /trunk/ loan data showing  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/AgingSummary.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/StateWiseLoanSummary.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Loan.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
35189 212 d 19 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Fixed it  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
34779 307 d 23 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ method update indent tertiary report all warehouse show to rbm l2  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
34665 331 d 23 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ data read from partner stat  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
34601 353 d 5 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ partner stats location chnges  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java

←Prev12Next→

Show All