Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
36064 49 d 12 h aman /trunk/ Fix:FULL_Stock flow , fin service mark unapplicable ,send invoice to whatsapp by default, update contact list ,Training mail issue  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreateOrderRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/OnboardingEmail.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/OnboardingEmailRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/OnboardingEmailRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.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/user/StoreTimelineTatService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.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/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/WalletController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-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/partner-onboarding-open.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-row-index.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
35504 134 d 19 h vikas /trunk/ Shopify Apis: Sync Products and Orders  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/controllers/ShopifyProductsController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/models/ProductInputModel.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/controllers/FofoShopifyController.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/controllers/ShopifyController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/services/FofoShopifyService.java
34550 365 d 15 h vikas.jangra /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Bidding push notifications added system users  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
34468 384 d 16 h vikas.jangra /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Liquidation/Bidding Report and whatsapp  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LiquidationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
34204 454 d 16 h tejus.lohani /trunk/ send invoice on what feature enhancement and whatApp message send api review,correction,optimization  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.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/WEB-INF/views/ftl/order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
33715 622 d 21 h ranu /trunk/ upsell phase one completed with whole code  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpSaleAgentCollection.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpSaleCall.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpSaleOrder.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpsellCallDetail.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/UpSaleCallStatus.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSaleAgentCollectionRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSaleAgentCollectionRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSaleCallRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSaleCallRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSaleOrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSaleOrderRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSellCallDetailRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSellCallDetailRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/UpSaleController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/up-sale-call.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/upsale-create-insurance-model.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/upsell-payment-confirmation.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/up-sale.js
/trunk/profitmandi-dao/build.gradle
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpsellRazorpayPaymentStatus.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/fofo/UpSellRazorpayPaymentStatusRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpsellRazorpayPaymentStatusRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/RazorpayPaymentService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/kommuno/KommunoService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.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/WebHookController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-pending-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/suggested-monthly-po.js
33415 711 d 20 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Fixed notification service  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
32854 848 d 15 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Added whatsapp notification fix  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/whatsapp/WhatsappMessageType.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
32405 980 d 17 h jai.hind /trunk/ Whatsapp Message  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/whatsapp
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/whatsapp/WhatsappMessage.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/whatsapp
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/whatsapp/WhatsappMessageRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/whatsapp/WhatsappMessageRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/whatsapp
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/whatsapp/WhatsappMessageService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/whatsapp/WhatsappMessageServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
32253 1019 d 17 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Fixed additional scheme logic  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
30989 1322 d 20 h tejbeer /trunk/ change  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.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/LogisticsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-index-offer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding_timeline.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sanction-request-row.vm
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
30859 1358 d 15 h tejbeer /trunk/ sddirect loan  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Loan.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LoanStatement.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/SDCreditRequirement.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/SanctionRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/CreditRisk.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/LoanReferenceType.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/SanctionStatus.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/DailyStatementModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SDCreditResponseOut.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SanctionRequestModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SdCreditRequirementModel.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/transaction/LoanStatementRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanStatementRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SDCreditRequirementRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SDCreditRequirementRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SanctionRequestRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SanctionRequestRepositoryImpl.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/user/SDCreditModel.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sanction-request-row.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sanction-request.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sd-credit-requirement-row.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sd-credit.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/sd-credit.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/mandii/AccountStatusResponseOut.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/CreditAccount.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/Gateway.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.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/WalletController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GatewayController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
30066 1542 d 14 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Fixed logic to purchase/sales based value  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
30025 1548 d 17 h amit.gupta /trunk/ Added notification for all credit  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/MessageType.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
29927 1565 d 21 h amit.gupta /trunk/ Added notifications for pricedrop and price change  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeCommission.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDrop.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/dtr/FofoStoreRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserAccountRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserAccountRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.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/PriceDropController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
29198 1709 d 15 h manish /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ changes  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
25822 2372 d 17 h amit.gupta /trunk/  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/slab/TargetSlabService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/slab/TargetSlabServiceImpl.java