| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 36261 |
22 d 16 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ |
Fix JPQL: replace date() and string literals with typed :billingStartDate parameter, use NOT EXISTS instead of NOT IN |
|
/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/fofo/ActivatedImeiRepositoryImpl.java
|
| 36259 |
22 d 19 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ |
Fix: re-apply tertiary query, add NOT NULL guard in NOT IN subquery, @Transactional(readOnly) on repo reads, fix persist ordering in saveActivation |
|
/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/fofo/ActivatedImeiRepositoryImpl.java
|
| 36255 |
23 d 21 h |
vikas |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
ActivatedImei revert |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
|
| 36252 |
24 d 0 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ |
Add tertiary IMEI activation query, shared saveActivation method, fix date() query performance |
|
/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/fofo/ActivatedImeiRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ActivatedImeiRepositoryImpl.java
|
| 35595 |
98 d 13 h |
amit |
/trunk/profitmandi-dao/ |
Migrate from C3P0 to HikariCP connection pooling
- Replace C3P0 properties with HikariCP settings in all properties files
- Delete unused persistence.xml (was not referenced by any code)
- New settings: maximumPoolSize=20, minimumIdle=2, idleTimeout=30s, maxLifetime=30min |
|
/trunk/profitmandi-dao/src/main/resources/META-INF/persistence.xml
/trunk/profitmandi-dao/build.gradle /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/FofoUser.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java /trunk/profitmandi-dao/src/main/resources/META-INF/dev.properties /trunk/profitmandi-dao/src/main/resources/META-INF/prod.properties /trunk/profitmandi-dao/src/main/resources/META-INF/staging.properties
|
| 35536 |
117 d 18 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
Optimize fetchParnterStats() - fix N+1 query issues
Performance improvements:
- Use batch method getAuthUserAndEsclationByPartnerIds() instead of N+1 loop
- Add new batch method getInvestmentsForFofoStores() to replace N+1 getInvestment() calls
- Add batch query selectActivatedGrnPendingAmountByFofoIds in ActivatedImeiRepository
Before: ~900 queries for 100 stores
After: ~7 queries for 100 stores |
|
/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/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/PartnerInvestmentService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerStatsServiceImpl.java
|
| 35466 |
135 d 22 h |
amit |
/trunk/ |
Optimize getActivatedImeiUpdationDate endpoint
- Add 30-day date filter to reduce table scan
- Replace LineItemImeiView with direct LineItemImei table
- Merge results with master brands/warehouses to show all combinations
- Display '-' for missing timestamps instead of hiding rows |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ActivationImeiUpdationModel.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ActivatedImeiRepositoryImpl.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/activation-updation-timestamp.vm
|
| 35464 |
136 d 6 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ |
Optimize /getActivatedModelByBrand and related activation queries
- Add date range filtering in WHERE clause to use activation_timestamp index
- Replace concat(year,month) with direct date comparisons for better performance
- Optimize getAuthFofoIds to avoid unnecessary DB call when user found in cache
- Use anyMatch() instead of filter().count() for short-circuit evaluation |
|
/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/cs/CsService1Impl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ActivatedImeiRepositoryImpl.java
|
| 35458 |
136 d 14 h |
amit |
/trunk/ |
Revert @Transactional(readOnly=true) - keep @Transactional only at Controller level
Changes:
- profitmandi-web: Controllers use @Transactional(rollbackFor = Throwable.class) at class level, removed method-level @Transactional(readOnly = true)
- profitmandi-fofo: Controllers use @Transactional(rollbackFor = Throwable.class) at class level, removed method-level @Transactional
- profitmandi-dao: Removed @Transactional from services/repositories
Exceptions (called from interceptors, need own transaction):
- RoleManager: @Transactional(readOnly = true) - called from interceptor for auth
- PartnerTypeChangeServiceImpl.getBestPartner(): @Transactional - called from JWTUtil via interceptor
Fixed javax.transaction.Transactional to org.springframework.transaction.annotation.Transactional
Fixed rollbackOn to rollbackFor for Spring compatibility |
|
/trunk/profitmandi-dao/pinelabs.http
/trunk/profitmandi-dao /trunk/profitmandi-dao/build.gradle /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/GenericRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerTypeChangeServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsCustomerRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsOrderRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsPaymentMethodRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsRefundRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LocationTrackingServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/PurSaleServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/SaleRewardServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ScratchService.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/authentication/RoleManager.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/SchemeBlockedImeiServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/RechargeServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AccessManagementController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.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/CustomerController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/FofoController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InvoiceController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ItemLedgerController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.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/MapTrackController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MarginController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MongoMigrationController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerPendingTasksController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerTargetController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PaymentOptionController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PunchInOutController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ScanRecordController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TrialController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebHookController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebListingController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebOffersController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/logix/LogixController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/provider/ProviderController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/purchase_sale_ratio/PurSaleController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/spicemoney/SpiceMoneyController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse_rider/WarehouseRiderController.java /trunk/profitmandi-fofo/src/main/resources/META-INF/env.property /trunk/profitmandi-fofo/src/main/resources/log4j2.xml /trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/login.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BannerListingController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CustomerController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/FileUploaderController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GatewayController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/InsuranceController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MigrationController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PageController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SmartCartController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SolrSearchController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TrackingController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TrialUserController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/guest/GuestController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/scratch/ScratchController.java /trunk/profitmandi-web/src/main/resources/META-INF/env.property /trunk/profitmandi-web/src/main/resources/log4j2.xml
|
| 34641 |
336 d 20 h |
ranu |
/trunk/ |
bi report completed first commit |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/FofoInvestmentModel.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerWiseActivatedNotBilledTotal.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasksTest.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/transaction/Order.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/RbmTargetService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/kommuno/RecordingService.java
|
| 33952 |
531 d 19 h |
aman.kumar |
/trunk/ |
activated imei |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.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
|
| 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
|
| 30904 |
1346 d 1 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
Fixed commit |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
|
| 30896 |
1346 d 17 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
|
| 30823 |
1361 d 18 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
Fixed |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
|
| 30634 |
1422 d 15 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
Fetch activation of all imeis |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
|
| 30505 |
1440 d 19 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
Fixed ahead issue |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
|
| 30484 |
1441 d 20 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
Fixed ahead issue |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
|
| 30482 |
1441 d 21 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
Fixed ahead issue |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
|