| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 36536 |
21 h 51 m |
amit |
/trunk/profitmandi-fofo/src/main/ |
moveToBill: fix response unwrapping, auto-move qty=1 orders to warehouse with gross stock |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js
|
| 36532 |
1 d 5 h |
amit |
/trunk/ |
Fix moveToBill to use net availability, add bulk PO items upload UI with template download |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.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/PurchaseOrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-purchase-order-add-item.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 36520 |
3 d 2 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Add total quantity display on PO create page |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-purchase-order-add-item.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 36300 |
27 d 1 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ |
Bump JS version to 331 to bust cache for GRN correction auto-approve UI change |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
|
| 36247 |
32 d 10 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ |
Add gmailRelaySender bean for Google Workspace SMTP Relay |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
|
| 36234 |
34 d 5 h |
ranu |
/trunk/ |
back date data ..........dashboard display on calling |
|
/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-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po_rbm.vm
|
| 36231 |
34 d 23 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
any rbm can see activity his partner ticket |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/my-partner-tickets-content.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
|
| 36062 |
49 d 22 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ |
Add SMTP timeouts to mail senders to prevent thread hangs |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
|
| 36040 |
52 d 0 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
filter and some other requirement addded in tickets view |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-content.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
|
| 36035 |
52 d 2 h |
amit |
/trunk/ |
Fix app config |
|
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
|
| 35982 |
63 d 22 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Fix store deactivation/closure flow: deactivate first then ask closure separately, validate empty store code, bump jsVersion to 327 |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inactive-stores.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
|
| 35962 |
68 d 4 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Add store closure UI - close store with code confirmation from deactivation flow and inactive stores page. Bump jsVersion to 326. |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inactive-stores.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/store-investment.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
|
| 35886 |
74 d 23 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Admin offer management UI: manage partners modal, edit targets, JS handlers, bump version to 325 |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_partners.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
|
| 35857 |
77 d 0 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Add bulk publish all, delete offer UI/endpoints, offer cache eviction on activate, bump JS version |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_history.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
|
| 35842 |
79 d 1 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ |
Bump jsVersion to 323 |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
|
| 35841 |
79 d 1 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Remove 6-month date range restriction on leads fetch/download filter |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
|
| 35838 |
79 d 2 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
wallet added on branwise page |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-brandwise-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-stock.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
|
| 35832 |
80 d 1 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
|
| 35775 |
86 d 2 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
imei wise margin / modal wise margin |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-imei-results-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-model-modal.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-imei-history-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
|
| 35772 |
86 d 23 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ |
imei wise margin |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
|