Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
36408 16 d 17 h amit /trunk/profitmandi-fofo/src/main/ Sale-return reversal: controller wiring + UI for cancellability gate + INV reject + date filter

PurchaseReturnController:
/return/invoice/process — autoApprove now isIrnCancellable && !isShipped.
!isShipped guard restored: shipped goods route through manual approval
even within 24h, so the physical return goes through CN flow.
/return/invoice/reject/{proId} — new endpoint for finance to reject a
pending INV PRO (sale stands, no inventory/wallet/GST action).
/return/invoice — date filter (fromDate/toDate query params, default
last 30 days) backed by selectByWarehouseIdsAndDateRange. Limit
bumped to 200 to accommodate longer ranges.
receive-debit-note view — passes $requiresFinanceApproval so the
template can render the finance-approval banner when DN's IRN is
past the 24h window.

invoice-return.vm:
Added From/To date inputs + Apply button.
Added Reject button next to Approve & Refund for pending INV PROs.

receive-debit-note.vm:
Added one informational banner (#if $requiresFinanceApproval) above
the receipt form. No layout / JS / submit-URL change.

return.js:
#invoice-return-date-apply handler — POSTs the selected range to
/return/invoice and refreshes the table.
.reject-invoice-return handler — prompts for reason, calls the new
reject endpoint.

dev/staging/prod.properties: feature flag finance.receipt.approval.email.enabled
(default false, flip per env when mail infra is ready).		  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.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-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/receive-debit-note.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
36369 20 d 17 h vikas /trunk/profitmandi-fofo/src/main/ Fix: Sale purchase invoice item quantity calculation  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.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/webapp/WEB-INF/views/ftl/retailer-info.vm
35879 75 d 17 h ranu /trunk/profitmandi-fofo/ code commit for agent live status 2.0  
/trunk/profitmandi-fofo/build.gradle
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service/AgentLiveStatusService.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service/KnowlarityScraperService.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/webapp/WEB-INF/views/ftl/rbm_call_target.vm
35868 75 d 22 h ranu /trunk/profitmandi-fofo/src/main/ code commit for agent live status roll back  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service/AgentLiveStatusService.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service/KnowlarityScraperService.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/webapp/WEB-INF/views/ftl/rbm_call_target.vm
35867 75 d 23 h ranu /trunk/ code commit for agent live status  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service/AgentLiveStatusService.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service/KnowlarityScraperService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/SipMaster.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.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/webapp/WEB-INF/views/ftl/rbm_call_target.vm
35832 79 d 20 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 102 d 23 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
35597 106 d 15 h amit /trunk/profitmandi-fofo/src/main/resources/META-INF/ Migrate from C3P0 to HikariCP connection pooling

- Replace C3P0 properties with HikariCP settings
- New settings: maximumPoolSize=20, minimumIdle=2, idleTimeout=30s, maxLifetime=30min		  
/trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-fofo/src/main/resources/META-INF/env.property
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
/trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
35450 145 d 13 h amit /trunk/profitmandi-fofo/src/main/resources/META-INF/ Fixed  
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
35441 145 d 17 h amit /trunk/profitmandi-fofo/src/main/resources/META-INF/ Remove duplicate properties - now inherited from shared-*.properties in profitmandi-dao

🤖 Generated with Claude Code		  
/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
34546 365 d 20 h vikas.jangra /trunk/profitmandi-fofo/src/main/ Liquidation/Bidding push notification and Publish  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/catalog/LiquidationController.java
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/liquidation.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/liquidation.js
33498 685 d 0 h amit.gupta /trunk/profitmandi-fofo/src/main/resources/META-INF/ Fixed properties file  
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
33481 687 d 23 h amit.gupta /trunk/profitmandi-fofo/src/main/resources/META-INF/ Prod properties  
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
33480 687 d 23 h amit.gupta /trunk/profitmandi-fofo/src/main/resources/META-INF/ Production removed  
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
33478 688 d 3 h amit.gupta /trunk/profitmandi-fofo/src/main/resources/META-INF/ Changed db  
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
33463 692 d 1 h amit.gupta /trunk/profitmandi-fofo/src/main/ Fixed machine  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
33040 803 d 7 h amit.gupta /trunk/profitmandi-fofo/src/main/resources/META-INF/ Invoice contr  
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
32625 916 d 2 h amit.gupta /trunk/profitmandi-fofo/src/main/resources/META-INF/ removed tr  
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
32619 916 d 18 h amit.gupta /trunk/profitmandi-fofo/src/main/resources/META-INF/ removed tr  
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
31424 1218 d 15 h amit.gupta /trunk/profitmandi-fofo/src/main/resources/META-INF/ F  
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties

←Prev12Next→

Show All