Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
36877 32 d 11 h vikas /trunk/ Location Tracking Dashboard: Add BeatJourneyController  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BeatJourneyService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BeatJourneyServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatJourneyController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-journey.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-journey.js
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
36645 59 d 14 h vikas /trunk/ Added Beat Report  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatReportController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-report-data.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-report-user-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-report.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-report.js
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/LocationTracking.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LocationTrackingModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/LocationTrackingRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/LocationTrackingRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationCampaignRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationCampaignRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
36618 61 d 15 h ranu /trunk/profitmandi-fofo/src/main/ route plan map  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
36563 66 d 13 h amit /trunk/profitmandi-fofo/src/main/ Flagship credit: admin UI for date-wise flagship model management, jsVersion bump to 338  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/manage-flagship.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/flagship.js
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
36394 85 d 12 h amit /trunk/profitmandi-fofo/src/main/ Add IMEI net-margin modal on order-index billing panel.

New /getImeiNetMarginModal endpoint: given an IMEI, derives the
purchase-billed date from the IMEI's purchase order
(InventoryItem.purchaseId -> Purchase.purchaseReference -> Order.billingTimestamp),
fetches schemes applicable on that date via PriceCircular, and shows
per-scheme contribution, NLC, and net margin in a slim modal.

Effective DP = inventory_item.unit_price - max(0, price_drop_amount)
to match SchemeServiceImpl.createSchemeInOut/PriceCircularService.getPayouts.
Offers are intentionally excluded. Per-IMEI price-drop history is
shown for reference.
 
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/imei-net-margin-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/imei-net-margin.js
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
36152 110 d 14 h aman /trunk/ Feat:Request Panel for brand dealer registration,Admin panel for managing WOD request templates  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FinServiceDocument.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FinServiceRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FinServiceTemplate.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceDocumentRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceDocumentRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceRequestRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceRequestRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceTemplateRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceTemplateRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/FinServiceController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fin-service
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fin-service/fin-service-list.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fin-service/fin-service-panel.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fin-service/wod-template-edit.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fin-service/wod-template-list.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/wod-request.js
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
35629 172 d 8 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
35549 187 d 13 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
35503 203 d 13 h vikas /trunk/ Shopify : Orders  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/shopify
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/shopify/OrderResponseModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/shopify
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/shopify/ShopifyGraphQLService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/shopify/ShopifyService.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/shopify
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/shopify/ShopifyController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/shopify
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/shopify/order-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/shopify/orders.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/shopify
/trunk/profitmandi-fofo/src/main/webapp/resources/js/shopify/shopify.js
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ContentPojo.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
35396 217 d 1 h amit /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Improveed offer logic  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
/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
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/performance.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/published-offers.vm
35289 248 d 17 h amit /trunk/ Added trial franchisee feature  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/TrialForm.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialFormRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialFormRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TrialController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/trial-form.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/trial-form.js
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/trialUser
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialOnboardingRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialOnboardingRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.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/RetailerController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
35268 253 d 10 h aman /trunk/profitmandi-fofo/src/main/webapp/ Added scratch offer removed Scratch as directry  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scratch
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scratch/offer.js
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.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
34881 343 d 8 h aman /trunk/ Feat:Affiliate Service  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/affiliate
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/affiliate/AffiliateGift.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/affiliate/AffiliateLinks.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/affiliate/AffiliateProduct.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/affiliate
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/affiliate/AffiliateLinksModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliate
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliate/AffiliateRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliate/AffiliateRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliateGift
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliateGift/AffiliateGiftRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliateGift/AffiliateGiftRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliateLink
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliateLink/AffiliateLinkRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliateLink/AffiliateLinkRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/affiliate
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/affiliate/AffiliateController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/affiliate
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/affiliate/affiliate.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/affiliate
/trunk/profitmandi-fofo/src/main/webapp/resources/js/affiliate/affiliate.js
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Customer.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
34859 349 d 8 h vikas /trunk/ Web Pages Management  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/Page.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/page
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/page/PageModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/page/PageRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/page/PageRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PagesController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pages
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pages/index.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/pages.js
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/StringUtils.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
34814 365 d 6 h vikas /trunk/ Category Management  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/CategoryModel.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/catalog/CategoryController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/categories.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/categories.js
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Category.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
34505 447 d 10 h ranu /trunk/profitmandi-fofo/src/main/ code committed for placement dashboard view  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/analysis-dashboard.js
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.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/include-scripts.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-brandwise-detail.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/partner-stock.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm
34474 453 d 7 h aman.kumar /trunk/ Scratch Offer  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/scratch
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/scratch/GiftEntity.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/scratch/OfferEntity.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/scratch/ScratchRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/scratch/ScratchResponse.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/scratch
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/scratch
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/scratch/GiftRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/scratch/GiftRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/scratch/SeasonalOfferRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/scratch/SeasonalOfferRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ScratchService.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/scratch
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/scratch/ScratchController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/Scratch
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/Scratch/editScratchOffer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/Scratch/gifts.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/Scratch/scratchOffer.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/Scratch
/trunk/profitmandi-fofo/src/main/webapp/resources/js/Scratch/offer.js
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/ScratchOffer.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PendingOrderItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ScratchOfferRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ScratchOfferRepositoryImpl.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/FileUploadController.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/WebListingController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
34387 469 d 7 h vikas.jangra /trunk/ Liquidation/Bidding initial work  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Liquidation.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/LiquidationRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/LiquidationRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/LiquidationModel.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/catalog/LiquidationController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/liquidation.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/liquidation.js
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/SaholicInventoryCIS.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/SaholicInventoryServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
34258 505 d 14 h ranu /trunk/profitmandi-fofo/src/main/ sweet alert swal js locally stored  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/sweetalert2@11.js
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm
34149 546 d 9 h tejus.lohani /trunk/ New panel for partner Brand commitments , add commitment , update commitment and view partner commitments, Now in DMS code panel team only view commitment instead of update mean it read only  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerBrandCommitmentModel.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BrandCommitmentController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brand-commitment
/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/brand-commitment/partner-commitments.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/brand-commitment.js
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiBrandCommitment.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/service/loiForm/LoiFormServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.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/webapp/WEB-INF/views/ftl/include-scripts.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-dealer-mapping-index.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-dealer-mapping.js

Show All