Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
36184 31 d 21 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Fix Credit Note IRN generation for monthly margins

- Add hsnCode to InventoryMarginModel, update 3 named queries to select ii.hsnCode
- Group CN items by taxRate+HSN, set hsnCode on CustomOrderItem
- Add getGenIrnRequest/getItemList overloads in GstProService for credit notes
- Fix IndexOutOfBoundsException from orders-items mismatch in generateCreditNoteIrn
- Wrap fofo and vendor loops in try-catch so one CN failure does not abort the process
- Send summary email with failure details to amit.gupta and ranu.rajput
 
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/OfferPayout.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/PriceDropIMEI.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/InventoryMarginModel.java
35378 144 d 15 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ Fixed DP its now purchase - price drop  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
34434 383 d 15 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ Fixed Scheme In Out  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInOutRepositoryImpl.java
34410 389 d 18 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ Fixed logic for Scheme in out  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInOutRepositoryImpl.java
34407 390 d 16 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ config  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
34256 429 d 0 h ranu /trunk/ hid live and cn attachement part live  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CurrentAvailableAndPurchaseQtyModel.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/FofoOpeningStock.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/OfferPayout.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/PriceDropIMEI.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/HidAllocationModel.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/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/SchemeInOutRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInOutRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropIMEIRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropIMEIRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/credit-note-list.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/hid-allocation-list.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
33459 684 d 15 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Fixed changes regarding credit issue  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/OfferPayout.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/PriceDropIMEI.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropIMEIRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropIMEIRepositoryImpl.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/pricing/PriceDropServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/InventoryPayoutModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/InventoryMarginModel.java
33376 720 d 16 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ Fixed issues related to margin  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
33375 720 d 16 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ Fixed Order quantity availability  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
32237 1014 d 18 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ Fixed additional scheme logic  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
32071 1072 d 15 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ Fixed logic for Smartdukaan Bags  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
31903 1096 d 23 h amit.gupta /trunk/ Added changes related to new scheme rollout policy  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TargetSlabEntity.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AmountModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ImeiMarginModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularItemModelNew.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/InventoryPayoutModel.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/paginated-item.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TargetSlab.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AmountMarginModel.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.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/model/CreateOfferRequest.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/OfferTargetSlabRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferTargetSlabRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.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/CatalogSchemeSummaryModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/CatalogSummaryModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/SchemeSummaryModel.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-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseInventoryService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseInventoryServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-price-circular.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm
31860 1102 d 20 h tejbeer /trunk/ change  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/a.sql
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CustomerWallet.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CustomerWalletHistory.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance-access.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/AuthUser.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/Menu.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/MenuCategory.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/BrandCatalog.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/BrandCategory.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Category.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ComboMappedModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ComboModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CustomerOffer.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CustomerOfferItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/FocusedModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/FocusedModelByPassRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/HighDemandItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ItemCriteria.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offer.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/OfferPartner.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offermargin.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/PinCodeTag.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/RangeItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/RangeItemPrice.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/RetailerScheme.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/RetailerTag.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/SamsungSpQty.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/SamsungUpgradeOffer.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/SchemeItemView.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/SchemeRegion.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/StateGstRate.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Tag.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagRanking.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TargetSlab.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Activity.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/ActivityAttachment.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/PartnerPosition.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/PartnerRegion.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Region.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Ticket.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/TicketAssigned.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/TicketCategory.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/TicketSubCategory.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/ActivationCode.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Api.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/BannerListing.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/BannerListingDetail.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Brand.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/BrandLimit.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Click.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/entity/dtr/DailyRecharge.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/DistrictMaster.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Document.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/DocumentUrl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/EmployeeAttendance.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/FundFinaPreApproval.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/GadgetCopsInsuranceCalc.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/GpsLocation.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/HypertrackKey.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/InsurancePolicy.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/InsuranceProvider.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/MobileAppSetting.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/NotBuyBack.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/NotificationCampaign.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/NotificationData.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Otp.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/PaymentOptionTransaction.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Permission.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/PolicyNumberGenerationSequence.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/ProviderCatalogMapping.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/PunchInOut.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/PushNotifications.java
/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/dtr/RechargeOperator.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeProvider.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeProviderCreditWalletHistory.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeRequestIdSequenceGeneration.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeTransaction.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RetailerAddress.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RetailerBlockBrands.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RetailerBrand.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RetailerBrandsLimit.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RetailerRegisteredAddress.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RoleApi.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/dtr/Shop.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/ShopAddress.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/SocialUser.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/ThirdPartyInvoiceSequence.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/UserCampaign.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/WebListing.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/WebOffer.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/WebOfferProduct.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/WebProductListing.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/BadInventorySnapshot.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CatalogFavourite.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CurrentPartnerDailyInvestment.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Customer.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CustomerAddress.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CustomerCreditNote.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CustomerReturnItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/DebitNote.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoKyc.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoLineItem.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/fofo/FofoOrderItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoPartnerPaymentOption.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoPayment.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStoreGeofence.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/HygieneData.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InActiveFofoStore.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Indent.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/IndentItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InventoryItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InvoiceNumberGenerationSequence.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/LiveDemoSerialNumber.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/LoanTransaction.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/MonthlyPlanned.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/MonthlyTarget.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Mou.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/OfferPayout.java
/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/PartnerDailyInvestment.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerDealerMapping.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerOnboardingTrainingPanel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerProblem.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/entity/fofo/PartnerTargetDetails.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerTypeChange.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerVerificationCheckboxes.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerVerificationpanel.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/fofo/PendingOrder.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/entity/fofo/PincodePartner.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PlannedDetail.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingListing.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingOrder.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Purchase.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PurchaseReturnItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ScanRecord.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/fofo/SchemeItem.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/entity/fofo/SuggestedPo.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SuggestedPoDetail.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/inventory/State.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/OneAssistPincodeMaster.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/Provider.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LineItem.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/entity/transaction/PriceDropIMEI.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/UserWallet.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/UserWalletHistory.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Address.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Attendance.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BrandPromoter.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Cart.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/CartLine.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Counter.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Device.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/FranchiseeActivity.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/FranchiseeVisit.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Lead.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/LeadActivity.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/LeadBrand.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/LeadDetail.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Location.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/entity/user/PrivateDealUser.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/PrivateDealUserAddressMapping.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Promoter.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Refferal.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/RefferalMonthlyAmount.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/User.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/VisitRequest.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/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/MonthlyTargetRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/MonthlyTargetRepositoryImpl.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/webapp/resources/js/retailer.js
31380 1219 d 21 h amit.gupta /trunk/ Added income calculator  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/OfferPayout.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/model/ImeiWiseIncomePairAndMapModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LastMonthFrontEndImeiModel.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/service/inventory/SaholicInventoryServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/last-month-credited-income.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/last-month-imei-wise-income.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/monthly-brand-wise-income.vm
31286 1235 d 18 h amit.gupta /trunk/ Removed unwanted files  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LastMonthBrandWiseIncomeModel.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/last-month-credited-income.vm
31281 1236 d 16 h amit.gupta /trunk/ Fixed config and margin calculations  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/MyBasicAuthenticationEntryPoint.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/MVCResponseSender.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/last-month-credited-income.vm
31008 1307 d 14 h amit.gupta /trunk/ Added CreditNote changes  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/CreditNote.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/CreditNoteLine.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/CreditNoteType.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.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/fofo/OfferPayout.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/PriceDropIMEI.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/SellerWarehouse.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SchemePayoutReportModel.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/fofo/ActivatedImeiRepositoryImpl.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
30243 1497 d 21 h tejbeer /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
30050 1536 d 20 h manish /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ commit  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
29927 1558 d 0 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

Show All