SmartDukaan – /

Rev 36655 – beat plan info commit

ranu — Sat, 23 May 2026 17:13:40 +0530

ranu – 5 file(s) modified
beat plan info commit

~ /trunk/profitmandi-dao/src/main/resources/sql/migration_lead_live_location.sql
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadGeoLocationController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-window.vm

Rev 36654 – Fix fixStuckLimitBlocks: hardcode 9 stuck loan IDs, release remaining limit ...

amit — Sat, 23 May 2026 16:28:50 +0530

amit – 1 file(s) modified
Fix fixStuckLimitBlocks: hardcode 9 stuck loan IDs, release remaining limit for cancelled orders

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 36653 – Enable e-invoice and EWB generation for DL (Delhi) GSTIN 07AACCN9802G1ZH ...

amit — Sat, 23 May 2026 16:25:26 +0530

amit – 1 file(s) modified
Enable e-invoice and EWB generation for DL (Delhi) GSTIN 07AACCN9802G1ZH — was explicitly disabled, causing 166+ orders with no IRN

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProAuthService.java

Rev 36652 – Fixed scroll in offers modal

amit — Sat, 23 May 2026 16:09:54 +0530

amit – 1 file(s) modified
Fixed scroll in offers modal

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 36651 – beat plan info commit

ranu — Sat, 23 May 2026 15:22:38 +0530

ranu – 3 file(s) modified
beat plan info commit

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-window.vm

Rev 36650 – beat plan info commit

ranu — Sat, 23 May 2026 14:21:21 +0530

ranu – 8 file(s) modified
beat plan info commit

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/resources/sql/migration_lead_live_location.sql
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebSecurityConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-window.vm

Rev 36649 – Reverted deleted files

vikas — Sat, 23 May 2026 12:57:00 +0530

vikas – 4 file(s) modified
Reverted deleted files

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpSaleAgentCollection.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpsellCallDetail.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpsellRazorpayPaymentStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpsellRazorpayPaymentStatusRepository.java

Rev 36648 – delete commit

ranu — Sat, 23 May 2026 12:38:57 +0530

ranu – 3 file(s) modified
delete commit

x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpSaleAgentCollection.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpsellCallDetail.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpsellRazorpayPaymentStatus.java

Rev 36647 – delete commit

ranu — Sat, 23 May 2026 12:31:17 +0530

ranu – 6 file(s) modified
delete commit

x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatPlan.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatPlanDay.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatPlanDayRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatPlanDayRepositoryImpl.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatPlanRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatPlanRepositoryImpl.java

Rev 36646 – delete commit

ranu — Sat, 23 May 2026 12:28:59 +0530

ranu – 1 file(s) modified
delete commit

x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpsellRazorpayPaymentStatusRepository.java

Rev 36645 – Added Beat Report

vikas — Sat, 23 May 2026 12:24:51 +0530

vikas – 12 file(s) modified
Added Beat Report

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/LocationTracking.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LocationTrackingModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/LocationTrackingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/LocationTrackingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationCampaignRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationCampaignRepositoryImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatReportController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-report.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-report-data.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-report-user-detail.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 36644 – route plan map

ranu — Sat, 23 May 2026 02:50:05 +0530

ranu – 18 file(s) modified
route plan map

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Beat.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatRoute.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatSchedule.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/LeadRoute.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatRouteRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatRouteRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatScheduleRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatScheduleRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRouteRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRouteRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/resources/sql/migration_lead_live_location.sql
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.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/LeadGeoLocationController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js

Rev 36643 – route plan map

ranu — Fri, 22 May 2026 20:30:01 +0530

ranu – 1 file(s) modified
route plan map

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/GeoLocationStatus.java

Rev 36642 – route plan map

ranu — Fri, 22 May 2026 20:18:47 +0530

ranu – 20 file(s) modified
route plan map

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/LeadLiveLocation.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/LeadVisitApproval.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateLeacdActivityRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadLiveLocationRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadLiveLocationRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadVisitApprovalRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadVisitApprovalRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/migration_lead_live_location.sql
+ /trunk/profitmandi-dao/src/main/resources/sql/migration_lead_visit_approval.sql
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebConfig.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/LeadGeoLocationController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-lead.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-geo-form.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-geo-pending.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-geo-review.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-geo-thankyou.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm

Rev 36641 – route plan map

ranu — Fri, 22 May 2026 19:55:27 +0530

ranu – 1 file(s) modified
route plan map

+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-bulk.vm

Rev 36640 – Fix NPE in addQuantity when inventory snapshot missing for partner ...

amit — Fri, 22 May 2026 19:29:00 +0530

amit – 2 file(s) modified
Fix NPE in addQuantity when inventory snapshot missing for partner warehouse - use addAvailability which creates snapshot if absent

~ /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

Rev 36639 – Add documentation to getInventoryForPriceDrop validation method Javadoc and inline ...

amit — Fri, 22 May 2026 17:02:29 +0530

amit – 1 file(s) modified
Add documentation to getInventoryForPriceDrop validation method

Javadoc and inline comments explaining the three eligibility checks:
purchase return, effective DP (hike-reversal guard), and billing timestamp.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java

Rev 36638 – fix: price drop processing - prevent incorrect credits and priceDropAmount ...

amit — Fri, 22 May 2026 16:05:13 +0530

amit – 1 file(s) modified
fix: price drop processing - prevent incorrect credits and priceDropAmount inflation

Two fixes in PriceDropServiceImpl:
1. Use approvedList instead of pendingList in updatePriceDrop call - rejected items
no longer get their priceDropAmount inflated when other items in the same batch
are approved
2. Add effectiveDP eligibility check for PENDING items - rejects IMEIs where
unitPrice - priceDropAmount <= newDp, preventing partners billed at pre-hike
price from receiving reversal drop credits. Check is skipped for APPROVED items
to allow legitimate re-processing and brand-driven rejections

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java

Rev 36637 – fix: use full item description in PO bulk upload instead ...

amit — Fri, 22 May 2026 16:02:08 +0530

amit – 1 file(s) modified
fix: use full item description in PO bulk upload instead of raw modelName

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PurchaseOrderController.java

Rev 36636 – Fix:Email letter head image

aman — Fri, 22 May 2026 15:55:41 +0530

aman – 2 file(s) modified
Fix:Email letter head image

~ /trunk/profitmandi-dao/src/main/resources/partner-code-created.vm
~ /trunk/profitmandi-dao/src/main/resources/welcome-email-hi.vm

Rev 36635 – Fix offer activation cache race: use activateOffers service, catch notification ...

amit — Thu, 21 May 2026 20:39:22 +0530

amit – 1 file(s) modified
Fix offer activation cache race: use activateOffers service, catch notification failures

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoOfferController.java

Rev 36634 – Fix offer activation cache race: use activateOffers service, catch notification ...

amit — Thu, 21 May 2026 20:39:21 +0530

amit – 1 file(s) modified
Fix offer activation cache race: use activateOffers service, catch notification failures

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java

Rev 36633 – Fix offer activation cache race: REQUIRES_NEW ensures DB commit before ...

amit — Thu, 21 May 2026 20:39:15 +0530

amit – 2 file(s) modified
Fix offer activation cache race: REQUIRES_NEW ensures DB commit before cache eviction, notification failures no longer rollback activation

~ /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

Rev 36632 – route plan map

ranu — Thu, 21 May 2026 20:39:02 +0530

ranu – 4 file(s) modified
route plan map

Rev 36631 – Delete dead WalletPaymentService.java (Thrift RPC, zero callers)

amit — Thu, 21 May 2026 17:28:33 +0530

amit – 1 file(s) modified
Delete dead WalletPaymentService.java (Thrift RPC, zero callers)

x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/payment/WalletPaymentService.java

Rev 36630 – Delete dead LogisticsService.java (Thrift RPC, zero callers)

amit — Thu, 21 May 2026 17:28:32 +0530

amit – 1 file(s) modified
Delete dead LogisticsService.java (Thrift RPC, zero callers)

x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/LogisticsService.java

Rev 36629 – fix: validate extend date is not before scheme start date ...

amit — Thu, 21 May 2026 16:49:25 +0530

amit – 1 file(s) modified
fix: validate extend date is not before scheme start date

extendAllSchemes and extendSchemeById now reject extend dates that would create inverted date ranges (end before start). Prevents bad scheme data that bypasses scheme_item date constraints.

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java

Rev 36628 – fix: /schemes/update endpoint now uses addSchemeItemWithDates to prevent duplicate scheme_item ...

amit — Thu, 21 May 2026 16:43:27 +0530

amit – 1 file(s) modified
fix: /schemes/update endpoint now uses addSchemeItemWithDates to prevent duplicate scheme_item rows

The old code directly persisted SchemeItem with NULL start_date/end_date, which bypassed the unique constraint (MySQL treats NULLs as distinct). Now uses the same service method as /addItemToScheme, which sets dates from scheme window and checks for overlapping entries before insert.

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java

Rev 36627 – Thrift cleanup: remove ThriftConfig from settings, clean unused Thrift imports ...

amit — Thu, 21 May 2026 14:46:21 +0530

amit – 3 file(s) modified
Thrift cleanup: remove ThriftConfig from settings, clean unused Thrift imports

- Removed ThriftConfig from settings.gradle
- TransactionRelatedTasks: removed unused Scan import
- POScheduler: removed unused PurchaseOrder import

~ /trunk/profitmandi-cron/settings.gradle
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/purchaseorder/POScheduler.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/TransactionRelatedTasks.java

Rev 36626 – Thrift cleanup: remove ThriftConfig from settings, clean Thrift imports ...

amit — Thu, 21 May 2026 14:46:20 +0530

amit – 3 file(s) modified
Thrift cleanup: remove ThriftConfig from settings, clean Thrift imports

- Removed ThriftConfig from settings.gradle
- IndentController: removed Thrift client and type imports
- InventoryController: removed Thrift imports

~ /trunk/profitmandi-fofo/settings.gradle
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java

Rev 36625 – Thrift cleanup: remove ThriftConfig from settings, clean dead Thrift code ...

amit — Thu, 21 May 2026 14:46:13 +0530

amit – 10 file(s) modified
Thrift cleanup: remove ThriftConfig from settings, clean dead Thrift code

- Removed ThriftConfig from settings.gradle
- LivePricingController: removed DtrClient RPC calls and Thrift imports
- RetailerController: replaced Thrift StateInfo with DAO State lookup
- TrackingController: removed TException import
- PayuHandler: removed dead getDescription/validatePaymentParams using Thrift types
- PayuPayResponseController: removed dead validatePaymentParams using Thrift Payment
- PaymentUtils: removed dead getPaymentType method and Thrift imports
- V2FofoIndentController, V2FofoInventoryController, V2HomeController: removed Thrift imports

~ /trunk/profitmandi-web/settings.gradle
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuHandler.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayResponseController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LivePricingController.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/TrackingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/payment/PaymentUtils.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoIndentController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoInventoryController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2HomeController.java

Rev 36624 – Thrift cleanup: migrate types, remove dead code, add moved files ...

amit — Thu, 21 May 2026 14:45:45 +0530

amit – 13 file(s) modified
Thrift cleanup: migrate types, remove dead code, add moved files

- Added Affiliate.java POJO (replaces Thrift struct)
- Moved from profitmandi-common: WalletHistoryModel, ExcelUtils, CustomOrder
- Removed dead createReturnTransaction method from ReturnService/Impl
- Removed dead getPartnerStockOnDate from InventoryService/Impl
- Replaced CatalogServiceException with Exception in PdfPoSheetGenerator
- Removed Thrift client imports from UserServiceImpl

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/common
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/common/model
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/common/model/CustomOrder.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/common/util
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/common/util/WalletHistoryModel.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-dao/src/main/java/com/spice/profitmandi/service/transaction/ReturnService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ReturnServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/UserServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PdfPoSheetGenerator.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/user/Affiliate.java

Rev 36623 – Remove ThriftConfig dependency and Thrift client wrappers - Removed ...

amit — Thu, 21 May 2026 14:45:24 +0530

amit – 8 file(s) modified
Remove ThriftConfig dependency and Thrift client wrappers

- Removed ThriftConfig from build.gradle dependency
- Deleted entire thrift/clients/ directory (16 RPC client files)
- Removed Thrift-dependent methods from Utils.java (getRechargeDisplayStatus, getOrderStatus, getWarehouseClient, etc.)
- Deleted dead code: HelperServiceUtils.java, OrderObject.java
- Moved to profitmandi-dao: WalletHistoryModel.java, ExcelUtils.java, CustomOrder.java

~ /trunk/profitmandi-common/build.gradle
x /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomOrder.java
x /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/HelperServiceUtils.java
x /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/mandii/OrderObject.java
x /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
x /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/WalletHistoryModel.java
x /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/thrift

Rev 36622 – route plan map

ranu — Thu, 21 May 2026 12:09:50 +0530

ranu – 4 file(s) modified
route plan map

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/AuthUserLocation.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/AuthUserLocationRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/AuthUserLocationRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/GeocodingService.java

Rev 36621 – route plan map

ranu — Thu, 21 May 2026 12:07:24 +0530

ranu – 10 file(s) modified
route plan map

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatPlan.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatPlanDay.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatPlanDayRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatPlanDayRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatPlanRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatPlanRepositoryImpl.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-window.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan.vm

Rev 36620 – refactor: remove Thrift RPC calls from RechargeController and OrderController ...

amit — Thu, 21 May 2026 12:03:46 +0530

amit – 3 file(s) modified
refactor: remove Thrift RPC calls from RechargeController and OrderController

- RechargeController: replaced TransactionClient.getRcgOrderStatus() in pollRechargeResult
with local DAO lookup via RechargeTransactionRepository. Gutted unused getAllDenominations,
myRecharges, getServiceProvider endpoints (return empty). Removed dead variable declarations.
- OrderController: deleted CancellableRequest method (Thrift-dependent, unused).
- V2OrderController: removed CancellableRequest wrapper, added direct JPA address creation.

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2OrderController.java

Rev 36619 – refactor: migrate Thrift enums/models to profitmandi-dao under in.shop2020 package ...

amit — Thu, 21 May 2026 12:03:35 +0530

amit – 37 file(s) modified
refactor: migrate Thrift enums/models to profitmandi-dao under in.shop2020 package

Moved 22 enum files and 2 model classes (Address, OrderStatusGroups) from ThriftConfig
to profitmandi-dao with same package structure. Stripped all org.apache.thrift dependencies
(TEnum interface, TBase, read/write/validate methods). OrderStatusGroups rewritten as clean
POJO keeping only constructor defaults and getter methods used by callers.

+ /trunk/profitmandi-dao/src/main/java/in
+ /trunk/profitmandi-dao/src/main/java/in/shop2020
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/config
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/logistics
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/logistics/DeliveryType.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/logistics/PickUpType.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/catalog
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/catalog/ItemCondition.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/catalog/status.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/inventory
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/inventory/InventoryType.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/inventory/WarehouseType.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/OrderStatusGroups.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/ReceivedReturnType.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/RechargeOrderStatus.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/RefundType.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/ReplacementShippingType.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/ReturnTransactionStatus.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/ReturnTxnResolutionStatus.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/TaxType.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/TransactionStatus.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/user
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/user/Address.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/user/CartStatus.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/payments
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/purchase
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/purchase/POStatus.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/purchase/TaxType.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/utils
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/warehouse
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/warehouse/ScanType.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/warehouse/TransferLotStatus.java

Rev 36618 – route plan map

ranu — Thu, 21 May 2026 11:12:29 +0530

ranu – 2 file(s) modified
route plan map

+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 36617 – Location Tracking Report: Add Travel Row and added Company Office ...

vikas — Thu, 21 May 2026 00:21:53 +0530

vikas – 1 file(s) modified
Location Tracking Report: Add Travel Row and added Company Office Repository Implementation

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LocationTrackingServiceImpl.java

Rev 36616 – Location Tracking Report: Add Travel Row and added Company Office ...

vikas — Thu, 21 May 2026 00:04:20 +0530

vikas – 1 file(s) modified
Location Tracking Report: Add Travel Row and added Company Office Repository Implementation

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LocationTrackingServiceImpl.java