| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 36451 |
3 d 17 h |
amit |
/trunk/profitmandi-dao/src/main/ |
Add reference field to catalog.offer and catalog.scheme for payout collation |
|
/trunk/profitmandi-dao/src/main/resources/sql/add_reference_to_offer_scheme.sql
/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/Scheme.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateSchemeRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
|
| 36397 |
8 d 20 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
Scheme item windowing: add startDate/endDate per scheme_item.
Each fofo.scheme_item row now carries an optional [start_date, end_date]
window so the same (scheme_id, catalog_id) pair can be applicable for
different date ranges. Backward compatible: NULL window = always active.
- SchemeItem entity: composite (schemeId, catalogId) PK -> surrogate
long id (IDENTITY), unique (catalog_id, scheme_id, start_date, end_date),
audit cols (updatedBy, updatedOn).
- Scheme + TagListing named queries: gated by
'(si.start_date is null or :onDate between si.start_date and si.end_date)'.
- SchemeItemRepository: + selectById, selectBySchemeId,
existsOverlapping (half-open, with self-exclude), selectItemsOutsideWindow.
- SchemeService: + updateSchemeItemWindow / addSchemeItemWithDates /
clampSchemeItems with containment + overlap validation; drop dead
getTotalMargin.
- SchemeServiceImpl.processSchemeOut: pin scheme resolution to each
IMEI's GRN billing date (Purchase -> Order.billingTimestamp via
PurchaseService.getBillingDateOfPurchase) instead of fofoOrder
createTimestamp, aligning OUT with the existing IN behaviour. |
|
/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/TagListing.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/repository/fofo/SchemeItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeItemRepositoryImpl.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
|
| 36374 |
11 d 19 h |
ranu |
/trunk/ |
schemes and offer for v2 version |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.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/offers/OfferService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoOfferController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoSchemeController.java
|
| 35099 |
217 d 19 h |
amit |
/trunk/ |
Fixed dashboard |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
|
| 34752 |
305 d 11 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
Fixed Activation Scheme Logic |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
|
| 34697 |
315 d 17 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ |
Fixed |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
|
| 32310 |
1003 d 12 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ |
Fixe |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
|
| 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
|
| 31698 |
1152 d 19 h |
tejbeer |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ |
|
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
|
| 31696 |
1152 d 19 h |
tejbeer |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ |
|
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
|
| 31695 |
1152 d 20 h |
tejbeer |
/trunk/ |
|
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
|
| 31657 |
1161 d 11 h |
tejbeer |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ |
|
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
|
| 31652 |
1161 d 12 h |
tejbeer |
/trunk/ |
|
|
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.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/repository/catalog/CustomerOfferItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferItemRepositoryImpl.java
|
| 31651 |
1161 d 12 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/dao/entity/catalog/Scheme.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/repository/catalog/CustomerOfferItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java
/trunk/profitmandi-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/catalog/TagListingRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.java
|
| 31441 |
1208 d 19 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ |
Added logic to handle zip download |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
|
| 31170 |
1264 d 17 h |
amit.gupta |
/trunk/ |
Fixed Duplicate imeis while rolling out additional schemes and Added Region wise schemes |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/SchemeRegion.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRegionRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRegionRepositoryImpl.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/TagListing.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/fofo/ActivatedImei.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/CreateSchemeRequest.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/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/dao/repository/fofo/ActivatedImeiRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ActivatedImeiRepositoryImpl.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/SchemeService.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
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-scheme.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-warehouse.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
|
| 30896 |
1346 d 16 h |
amit.gupta |
/trunk/ |
Added Logic to automate schemes |
|
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.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/catalog/Scheme.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/repository/catalog/SchemeRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
|
| 30640 |
1420 d 18 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ |
Added isWithinRange method to Scheme.java |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
|
| 30454 |
1445 d 21 h |
amit.gupta |
/trunk/ |
Fixed scheme issue |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateSchemeRequest.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/create-scheme.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-scheme.js
|
| 30121 |
1522 d 19 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
Fixed scheme issue |
|
/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/Item.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/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/TagListing.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.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/repository/catalog/ItemRepository.java
/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/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/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/dao/repository/fofo/InventoryItemRepositoryImpl.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/SchemeItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/FofoAvailabilityInfo.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/PriceCircularItemModel.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/PricingServiceImpl.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
|