| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 37859 |
15 h 15 m |
amit |
/trunk/profitmandi-web/src/main/ |
fix(payment): send partners back to app.smartdukaan.com after wallet top-up via CCAvenue
r34902 moved angular.app.url to https://smartdukaan.com/, which does not serve the
partner app, so the post-payment redirect to pages/home/payment-status/{id} returned 404.
The payment itself was recorded; only the landing page was broken.
Also drops the extra slash in the redirect format (base URL already ends in /) and adds
the trailing slash to the dev value to match. |
|
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
|
| 37733 |
15 d 21 h |
amit |
/trunk/profitmandi-web/src/main/ |
Remove dead third-party integrations: web
- PayU: /payu-pay and the payu-pay-response/cancelled handlers (bodies were
already commented out), PayuHandler, payment/ helpers, PayU POJOs, and the
PAYU PAY option served by checkout/payment-options.
PayuPayController stays: it holds the live CCAvenue, Razorpay and Pine Labs
callbacks.
- SmartPing: GET /click2call/{toMobile} (v1 + v2) and the caller-ID hook
/smartping/receipt + /v2/hookCallerID, which only logged
- HyperTrack: device location, partner location and geofence endpoints plus
HyperTrackService. The attendance endpoints (/getPunchHistory,
/employee/attendance) never called HyperTrack and are kept, moved to
EmployeeAttendanceController / V2EmployeeAttendanceController.
- Affiliate click-outs and live pricing (Amazon/Flipkart/Snapdeal via OMG):
ClicksController, LivePricingController and v2 wrappers. Live pricing was
already returning an empty list.
- Thriwe controller (fully commented out), SpiceMoney and FundFina v2 controllers
- Aramex branch of /track; tofee.* keys in dev/prod properties |
|
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/EmployeeAttendanceController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2EmployeeAttendanceController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ClicksController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/HyperTrackController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/HyperTrackService.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/ThriweController.java
/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/checkout/SmartPingReceiptModel.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/payment
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/PayuPayResponsePojo.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/AddClickReponse.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/LivePricingResponse.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/order/PayuPayPojo.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/order/PayuResponseParams.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2ClicksController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2HyperTrackController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2LivePricingController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2PayuPayResponseController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoFundFinaController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoSpiceMoneyController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LogisticsTrackingController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.java
/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/checkout/PayuPayController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2PayuPayController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2TicketChatActivityController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoWebHookController.java
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-web/src/main/resources/META-INF/payment-options.json
/trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
|
| 37069 |
85 d 16 h |
vikas |
/trunk/profitmandi-web/src/main/ |
Added revisit option |
|
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BeatTrackingController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2BeatTrackingController.java
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
|
| 36957 |
98 d 20 h |
aman |
/trunk/ |
Add AI assistant lead intake endpoint (POST /add/lead) tagging source=AI Assistant in Lead Management |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AiLeadRequest.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
/trunk/profitmandi-web/src/main/resources/META-INF/staging.properties
|
| 36852 |
112 d 19 h |
ranu |
/trunk/ |
code committed by some bug fix in pjp |
|
/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/BeatScheduleRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatScheduleRepositoryImpl.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BeatTrackingController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LocationTrackingController.java
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
|
| 35832 |
225 d 17 h |
amit |
/trunk/ |
Unify property loading: all modules use runtime profile with shared properties from dao, remove duplicated DB/Hibernate/HikariCP/integration keys from module files |
|
/trunk/profitmandi-cron/src/main/resources/META-INF/env.property
/trunk/profitmandi-cron/src/main/resources/META-INF/env.properties
/trunk/profitmandi-cron/build.gradle
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/config/DBConfig.java
/trunk/profitmandi-cron/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-cron/src/main/resources/META-INF/prod.properties
/trunk/profitmandi-cron/src/main/resources/META-INF/staging.properties
/trunk/profitmandi-dao/src/main/resources/shared-dev.properties
/trunk/profitmandi-dao/src/main/resources/shared-prod.properties
/trunk/profitmandi-dao/src/main/resources/shared-staging.properties
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
/trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
/trunk/profitmandi-web/src/main/resources/META-INF/staging.properties
|
| 35633 |
248 d 20 h |
amit |
/trunk/ |
Add hikari.keepaliveTime property to all environment configs |
|
/trunk/profitmandi-cron/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-cron/src/main/resources/META-INF/prod.properties
/trunk/profitmandi-cron/src/main/resources/META-INF/run.properties
/trunk/profitmandi-cron/src/main/resources/META-INF/staging.properties
/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
/trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
/trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
/trunk/profitmandi-web/src/main/resources/META-INF/staging.properties
|
| 35596 |
252 d 12 h |
amit |
/trunk/profitmandi-web/src/main/ |
Migrate from C3P0 to HikariCP connection pooling
- Update WebDBContextConfigure to use HikariDataSource instead of DriverManagerDataSource
- Replace C3P0 properties with HikariCP settings
- New settings: maximumPoolSize=20, minimumIdle=2, idleTimeout=30s, maxLifetime=30min |
|
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-web/src/main/resources/META-INF/env.property
/trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
/trunk/profitmandi-web/src/main/resources/META-INF/staging.properties
|
| 35448 |
291 d 10 h |
amit |
/trunk/profitmandi-web/src/main/resources/META-INF/ |
Add missing think.walnut.digital.recharge.balance.url property to all environments |
|
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
/trunk/profitmandi-web/src/main/resources/META-INF/staging.properties
|
| 35382 |
295 d 18 h |
amit |
/trunk/profitmandi-web/src/main/resources/META-INF/ |
Fixed DP its now purchase - price drop |
|
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
|
| 35079 |
375 d 21 h |
vikas |
/trunk/ |
Live Tracking and Shopify Products List Sync |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/LocationTrackingPath.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/config
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/config/RestTemplateConfig.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/controllers
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/controllers/FofoShopifyController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/controllers/ShopifyController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/controllers/ShopifyWebhookController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/models
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/models/ShopifySyncModel.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/repositories
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/services
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/services/FofoShopifyService.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/services/ShopifyGraphQLService.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/LocationTracking.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/model/CreateRefferalRequest.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/affiliate/AffiliateRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliate/AffiliateRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.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/LocationTrackingController.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/StoreController.java
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
|
| 34902 |
410 d 14 h |
vikas |
/trunk/ |
Affiliate Order |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/affiliate/AffiliateEarnings.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/AffiliateService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/AffiliateServiceImpl.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreatePendingOrderItem.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/affiliate/AffiliateLinks.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PendingOrderItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CartItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliateLink/AffiliateLinkRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliateLink/AffiliateLinkRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.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/StoreController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
/trunk/profitmandi-web/src/main/resources/META-INF/appsettings.json
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
/trunk/profitmandi-web/target/classes/META-INF/appsettings.json
/trunk/profitmandi-web/target/classes/META-INF/dev.properties
/trunk/profitmandi-web/target/classes/META-INF/prod.properties
|
| 33486 |
833 d 6 h |
amit.gupta |
/trunk/ |
Fixed endpoints for new static0 |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/solr/FofoSolr.java
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
|
| 29513 |
1804 d 16 h |
amit.gupta |
/trunk/profitmandi-web/src/main/resources/META-INF/ |
|
|
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
|
| 28252 |
1996 d 16 h |
amit.gupta |
/trunk/profitmandi-web/src/main/resources/META-INF/ |
|
|
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
|
| 28251 |
1996 d 16 h |
amit.gupta |
/trunk/profitmandi-web/src/main/resources/META-INF/ |
|
|
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
|
| 28242 |
1996 d 20 h |
amit.gupta |
/trunk/profitmandi-web/src/main/resources/META-INF/ |
|
|
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
|
| 27182 |
2185 d 15 h |
tejbeer |
/trunk/ |
changes |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RazorPayRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RazorPayRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/RazorpayPaymentService.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-dao/build.gradle
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderServiceImpl.java
/trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
|
| 27076 |
2205 d 18 h |
amit.gupta |
/trunk/profitmandi-web/src/main/resources/META-INF/ |
|
|
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
|
| 26920 |
2247 d 20 h |
amit.gupta |
/trunk/profitmandi-web/src/main/resources/META-INF/ |
|
|
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
|