SmartDukaan – /

Rev 36210 – rbm l1,l2,l3 layer introduce

ranu — Tue, 07 Apr 2026 17:56:54 +0530

ranu – 10 file(s) modified
rbm l1,l2,l3 layer introduce

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/auth/CollectionRemark.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerTargetAchievementModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmCallTargetModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TargetModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service/KnowlarityInsightsService.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm

Rev 36209 – brand commit will be noc required only eligible brand

ranu — Tue, 07 Apr 2026 15:49:07 +0530

ranu – 1 file(s) modified
brand commit will be noc required only eligible brand

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

Rev 36208 – GRN correction approval: validate IMEI count matches qty, suggest rejection ...

amit — Mon, 06 Apr 2026 20:18:42 +0530

amit – 1 file(s) modified
GRN correction approval: validate IMEI count matches qty, suggest rejection on mismatch

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

Rev 36207 – GRN correction approval: split space/comma-separated IMEIs in applyQtyCorrections for existing ...

amit — Mon, 06 Apr 2026 20:18:10 +0530

amit – 1 file(s) modified
GRN correction approval: split space/comma-separated IMEIs in applyQtyCorrections for existing requests

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

Rev 36206 – GRN correction: split space/comma-separated IMEIs in frontend, validate count, update ...

amit — Mon, 06 Apr 2026 20:14:06 +0530

amit – 2 file(s) modified
GRN correction: split space/comma-separated IMEIs in frontend, validate count, update placeholder text

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction-detail.vm

Rev 36205 – GRN correction: split space/comma-separated IMEIs, validate count matches qty

amit — Mon, 06 Apr 2026 20:13:56 +0530

amit – 1 file(s) modified
GRN correction: split space/comma-separated IMEIs, validate count matches qty

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

Rev 36204 – Skip negative/zero margin CN line items — reversals produce negative ...

amit — Mon, 06 Apr 2026 19:48:19 +0530

amit – 1 file(s) modified
Skip negative/zero margin CN line items — reversals produce negative amounts that NIC rejects. This was the root cause of the 27 'decimal validation' failures (not rounding, but negative values)

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

Rev 36203 – Move dedup check before sequence increment — avoids wasting CN ...

amit — Mon, 06 Apr 2026 19:41:33 +0530

amit – 1 file(s) modified
Move dedup check before sequence increment — avoids wasting CN numbers when re-running for the same month

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

Rev 36202 – CN date = date of execution (LocalDate.now), not end-of-month. File ...

amit — Mon, 06 Apr 2026 19:38:16 +0530

amit – 1 file(s) modified
CN date = date of execution (LocalDate.now), not end-of-month. File path still uses margin month for folder structure.

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

Rev 36201 – Chatbot for RBM only: Inject SmartChat

vikas — Mon, 06 Apr 2026 19:33:48 +0530

vikas – 1 file(s) modified
Chatbot for RBM only: Inject SmartChat

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm

Rev 36200 – error correctly will show

ranu — Mon, 06 Apr 2026 19:30:55 +0530

ranu – 2 file(s) modified
error correctly will show

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/kommuno/RecordingService.java

Rev 36199 – Fix: add DUPIRN handling in credit note IRN generation (both ...

amit — Mon, 06 Apr 2026 19:30:33 +0530

amit – 1 file(s) modified
Fix: add DUPIRN handling in credit note IRN generation (both MARGINS and RETURNS overloads) — fetch existing IRN from NIC instead of failing

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

Rev 36198 – Add Download All CN summary report for FOFO_ADMIN: bulk CSV ...

amit — Mon, 06 Apr 2026 19:24:07 +0530

amit – 3 file(s) modified
Add Download All CN summary report for FOFO_ADMIN: bulk CSV with partner details, IRN, ack date per month

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/credit-note.vm

Rev 36197 – Add --recoverCreditNote and --resendCNReport CLI args for credit note recovery ...

amit — Mon, 06 Apr 2026 19:23:44 +0530

amit – 2 file(s) modified
Add --recoverCreditNote and --resendCNReport CLI args for credit note recovery and report resend

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

Rev 36196 – Credit Note improvements: recovery method, dual CSV reports (IMEI + ...

amit — Mon, 06 Apr 2026 19:23:36 +0530

amit – 3 file(s) modified
Credit Note improvements: recovery method, dual CSV reports (IMEI + CN summary), fix mail recipients (restore deena/neeraj/satish/amit for full mail, amit/ranu for summary text-only), add IRN+AckDate to CSV, performance fixes (bulk queries replacing N+1), source-based descriptions (Schemes/Offers vs Price Drop per HSN), safe CGST+SGST/IGST grouping

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/InventoryMarginModel.java

Rev 36195 – Chatbot for RBM only: Inject SmartChat

vikas — Mon, 06 Apr 2026 18:21:03 +0530

vikas – 2 file(s) modified
Chatbot for RBM only: Inject SmartChat

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm

Rev 36194 – Chatbot for RBM only: Inject SmartChat

vikas — Mon, 06 Apr 2026 18:09:42 +0530

vikas – 4 file(s) modified
Chatbot for RBM only: Inject SmartChat

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/shopify/ShopifyProductMapper.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm

Rev 36193 – Added Motorola Brand and some email in bi report

ranu — Mon, 06 Apr 2026 17:08:30 +0530

ranu – 1 file(s) modified
Added Motorola Brand and some email in bi report

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

Rev 36192 – agent insights tracking

ranu — Mon, 06 Apr 2026 16:05:54 +0530

ranu – 1 file(s) modified
agent insights tracking

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service/KnowlarityInsightsService.java

Rev 36191 – agent insights tracking

ranu — Mon, 06 Apr 2026 15:54:57 +0530

ranu – 1 file(s) modified
agent insights tracking

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm

Rev 36190 – agent insights tracking

ranu — Mon, 06 Apr 2026 13:16:28 +0530

ranu – 5 file(s) modified
agent insights tracking

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/AgentDailyInsight.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/AgentDailyInsightRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/AgentDailyInsightRepositoryImpl.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/service/KnowlarityInsightsService.java

Rev 36189 – Revert rerenderCNs - downloadCN already re-renders on the fly

amit — Sat, 04 Apr 2026 15:17:15 +0530

amit – 2 file(s) modified
Revert rerenderCNs - downloadCN already re-renders on the fly

Rev 36188 – Revert rerenderCNs CLI option - downloadCN already re-renders on the ...

amit — Sat, 04 Apr 2026 15:17:09 +0530

amit – 2 file(s) modified
Revert rerenderCNs CLI option - downloadCN already re-renders on the fly

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

Rev 36187 – Add --rerenderCNs CLI option to re-generate old CN PDFs with ...

amit — Sat, 04 Apr 2026 14:35:44 +0530

amit – 2 file(s) modified
Add --rerenderCNs CLI option to re-generate old CN PDFs with new format

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

Rev 36186 – Add rerenderCNs method to re-generate old CN PDFs with new ...

amit — Sat, 04 Apr 2026 14:35:00 +0530

amit – 2 file(s) modified
Add rerenderCNs method to re-generate old CN PDFs with new format, persist hsnCode on CreditNoteLine

Rev 36185 – Persist and restore hsnCode on CreditNoteLine for CN re-rendering ...

amit — Sat, 04 Apr 2026 14:31:01 +0530

amit – 2 file(s) modified
Persist and restore hsnCode on CreditNoteLine for CN re-rendering

- Add hsn_code column to CreditNoteLine entity
- Save hsnCode when persisting CN lines in issueMonthlyMarginsCN
- Read hsnCode back in getCreditNotePdfModel for downloadCN/sendCnMails
- Earlier CNs without hsn_code will render with blank HSN (nullable column)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/CreditNoteLine.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteServiceImpl.java

Rev 36184 – Fix Credit Note IRN generation for monthly margins - ...

amit — Sat, 04 Apr 2026 13:44:05 +0530

amit – 6 file(s) modified
Fix Credit Note IRN generation for monthly margins

- Add hsnCode to InventoryMarginModel, update 3 named queries to select ii.hsnCode
- Group CN items by taxRate+HSN, set hsnCode on CustomOrderItem
- Add getGenIrnRequest/getItemList overloads in GstProService for credit notes
- Fix IndexOutOfBoundsException from orders-items mismatch in generateCreditNoteIrn
- Wrap fofo and vendor loops in try-catch so one CN failure does not abort the process
- Send summary email with failure details to amit.gupta and ranu.rajput

~ /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/SchemeInOut.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDropIMEI.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/InventoryMarginModel.java

Rev 36183 – Credit Note PDF fixes: null guard on msAddDataCell, doc-type-aware labels ...

amit — Sat, 04 Apr 2026 13:43:42 +0530

amit – 1 file(s) modified
Credit Note PDF fixes: null guard on msAddDataCell, doc-type-aware labels (invoice/credit note/challan), conditional Order Id column, HSN code support

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java

Rev 36182 – weekly rating system live on calling module

ranu — Fri, 03 Apr 2026 18:30:34 +0530

ranu – 1 file(s) modified
weekly rating system live on calling module

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm

Rev 36181 – weekly rating system live on calling module

ranu — Fri, 03 Apr 2026 18:17:32 +0530

ranu – 2 file(s) modified
weekly rating system live on calling module

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmCallTargetModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java

Rev 36180 – weekly rating system live on calling module

ranu — Thu, 02 Apr 2026 23:30:37 +0530

ranu – 3 file(s) modified
weekly rating system live on calling module

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/knowlarity/dto
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/knowlarity/dto/AgentInsightsDTO.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/knowlarity/dto/AgentInsightsSummaryDTO.java

Rev 36179 – weekly rating system live on calling module

ranu — Thu, 02 Apr 2026 23:22:40 +0530

ranu – 6 file(s) modified
weekly rating system live on calling module

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ActivationType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/knowlarity/KnowlarityAgentInsightsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.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/service/KnowlarityInsightsService.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm

Rev 36178 – Validate from/to items have same itemType in GRN correction request ...

amit — Thu, 02 Apr 2026 22:36:27 +0530

amit – 1 file(s) modified
Validate from/to items have same itemType in GRN correction request

Prevents GRN corrections between SERIALIZED and NON_SERIALIZED items which
would corrupt inventory data (e.g. assigning bulk qty to a serialized item
or vice versa). Validation runs at request submission time.

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

Rev 36177 – Fix currency format for negative amounts and use explicit symbol ...

amit — Thu, 02 Apr 2026 20:13:49 +0530

amit – 1 file(s) modified
Fix currency format for negative amounts and use explicit symbol removal

Previous regex fix missed negative amounts like -Rs.500.50. Now uses explicit
replace("Rs.", "") for Java 8 en_IN locale with ₹ fallback for newer JDKs.
Handles both positive (Rs.17,618.00) and negative (-Rs.500.50) correctly.

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java

Rev 36176 – Simplify invoice currency format fix for Java 8 compatibility ...

amit — Thu, 02 Apr 2026 20:11:23 +0530

amit – 1 file(s) modified
Simplify invoice currency format fix for Java 8 compatibility

Use single regex replaceFirst to strip any non-numeric prefix (Rs., ₹, etc.)
instead of getCurrency().getSymbol() which may return a different symbol than
what format() produces on Java 8.

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java

Rev 36175 – Fix leading dot in invoice currency formatting indianCurrencyFormat.format() produces ...

amit — Thu, 02 Apr 2026 20:10:11 +0530

amit – 1 file(s) modified
Fix leading dot in invoice currency formatting

indianCurrencyFormat.format() produces 'Rs.17,618.00' and the regex [^0-9,.]
was keeping the dot from 'Rs.' resulting in '.17,618.00'. Now strips the
currency symbol properly using getCurrency().getSymbol() with a fallback
regex to remove any remaining non-numeric prefix.

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java

Rev 36174 – Fix OOS false positive for dummy serialized items in warehouse ...

amit — Thu, 02 Apr 2026 20:04:04 +0530

amit – 1 file(s) modified
Fix OOS false positive for dummy serialized items in warehouse management

Serialized items without serial numbers (e.g. dummy items with bulk qty) were
always classified as out-of-stock because the ageing query requires
currentQuantity=1 and a serial number join. Added fallback to scan-based
availability check when ageing returns empty, so items with physical stock
correctly show as in-stock.

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

Rev 36173 – Fix second QR NPE for DCs in getInvoicePdfModel — same ...

amit — Thu, 02 Apr 2026 19:32:50 +0530

amit – 1 file(s) modified
Fix second QR NPE for DCs in getInvoicePdfModel — same DC skip needed in both QR code paths

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java

Rev 36172 – Skip IRN/QR code generation for DC challans in PDF - ...

amit — Thu, 02 Apr 2026 19:23:28 +0530

amit – 1 file(s) modified
Skip IRN/QR code generation for DC challans in PDF - DCs have no IRN, null QR was causing NPE

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java

Rev 36171 – Handle GSP102 auth token expired/missing: evict cache and retry, same ...

amit — Thu, 02 Apr 2026 19:06:35 +0530

amit – 1 file(s) modified
Handle GSP102 auth token expired/missing: evict cache and retry, same as GSP752

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