SmartDukaan – /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/

Rev 37070 – Add StringUtils.normalizeWhitespace for input whitespace normalization (T9.5 sanitizer dependency)

amit — Mon, 13 Jul 2026 18:32:52 +0530

amit – 1 file(s) modified
Add StringUtils.normalizeWhitespace for input whitespace normalization (T9.5 sanitizer dependency)

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

Rev 37066 – Modular invoice/note PDF generation: extract DocumentRenderer + reusable sections + ...

amit — Fri, 10 Jul 2026 19:55:22 +0530

amit – 60 file(s) modified
Modular invoice/note PDF generation: extract DocumentRenderer + reusable sections + two-axis tax abstraction out of PdfUtils (now thin shims); folded per-tax invoice columns; note Invoice-Ref + type detection; golden-image test harness

~ /trunk/profitmandi-common
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/DocumentData.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/DocumentDataAdapter.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/DocumentRenderer.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/PdfContext.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/section
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/section/FooterSection.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/section/HeaderSection.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/section/ItemsTableSection.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/section/PartiesSection.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/section/Section.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/section/SummarySection.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/Styles.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/support
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/support/Assets.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/support/CancelledStamp.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/support/Formatting.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/support/SectionHelpers.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/tax
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/tax/InterStateTaxColumns.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/tax/IntraStateTaxColumns.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/tax/TaxColumns.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/tax/TaxColumnsFactory.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/document/tax/TaxTotals.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
+ /trunk/profitmandi-common/src/test
+ /trunk/profitmandi-common/src/test/java
+ /trunk/profitmandi-common/src/test/java/com
+ /trunk/profitmandi-common/src/test/java/com/spice
+ /trunk/profitmandi-common/src/test/java/com/spice/profitmandi
+ /trunk/profitmandi-common/src/test/java/com/spice/profitmandi/common
+ /trunk/profitmandi-common/src/test/java/com/spice/profitmandi/common/document
+ /trunk/profitmandi-common/src/test/java/com/spice/profitmandi/common/document/DocumentDataAdapterTest.java
+ /trunk/profitmandi-common/src/test/java/com/spice/profitmandi/common/document/golden
+ /trunk/profitmandi-common/src/test/java/com/spice/profitmandi/common/document/golden/GoldenCreditNoteTest.java
+ /trunk/profitmandi-common/src/test/java/com/spice/profitmandi/common/document/golden/GoldenDebitNoteTest.java
+ /trunk/profitmandi-common/src/test/java/com/spice/profitmandi/common/document/golden/GoldenInvoiceV1Test.java
+ /trunk/profitmandi-common/src/test/java/com/spice/profitmandi/common/document/golden/GoldenInvoiceV2Test.java
+ /trunk/profitmandi-common/src/test/java/com/spice/profitmandi/common/document/golden/GoldenPdfHarness.java
+ /trunk/profitmandi-common/src/test/java/com/spice/profitmandi/common/document/golden/PdfFixtures.java
+ /trunk/profitmandi-common/src/test/java/com/spice/profitmandi/common/document/golden/SampleDocumentGeneratorTest.java
+ /trunk/profitmandi-common/src/test/java/com/spice/profitmandi/common/document/tax
+ /trunk/profitmandi-common/src/test/java/com/spice/profitmandi/common/document/tax/TaxColumnsTest.java
+ /trunk/profitmandi-common/src/test/resources
+ /trunk/profitmandi-common/src/test/resources/golden
+ /trunk/profitmandi-common/src/test/resources/golden/cn-inter-p0.png
+ /trunk/profitmandi-common/src/test/resources/golden/cn-intra-p0.png
+ /trunk/profitmandi-common/src/test/resources/golden/dn-inter-p0.png
+ /trunk/profitmandi-common/src/test/resources/golden/dn-intra-p0.png
+ /trunk/profitmandi-common/src/test/resources/golden/dn-po-suppressed-p0.png
+ /trunk/profitmandi-common/src/test/resources/golden/v1-inter-p0.png
+ /trunk/profitmandi-common/src/test/resources/golden/v1-intra-p0.png
+ /trunk/profitmandi-common/src/test/resources/golden/v1-margin-p0.png
+ /trunk/profitmandi-common/src/test/resources/golden/v2-dc-p0.png
+ /trunk/profitmandi-common/src/test/resources/golden/v2-inter-p0.png
+ /trunk/profitmandi-common/src/test/resources/golden/v2-intra-p0.png
+ /trunk/profitmandi-common/src/test/resources/golden/v2-margin-p0.png
+ /trunk/profitmandi-common/src/test/resources/golden/v2-multiorder-p0.png
+ /trunk/profitmandi-common/src/test/resources/golden/v2-po-orderdate-p0.png

Rev 37062 – Revert PdfUtils to pre-refactor version (r36674) to unbreak trunk; modular ...

amit — Fri, 10 Jul 2026 16:51:26 +0530

amit – 1 file(s) modified
Revert PdfUtils to pre-refactor version (r36674) to unbreak trunk; modular doc-generation refactor still in progress

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

Rev 37052 – Delegate invoice/note PDF rendering to DocumentRenderer; add poNumber/orderDate to InvoicePdfModel; ...

amit — Fri, 10 Jul 2026 12:17:31 +0530

amit – 3 file(s) modified
Delegate invoice/note PDF rendering to DocumentRenderer; add poNumber/orderDate to InvoicePdfModel; add pdfbox test dep + captureGolden flag for golden-image tests

~ /trunk/profitmandi-common/build.gradle
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/InvoicePdfModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java

Rev 36674 – Add irnErrorMessage to InvoicePdfModel and show e-invoice error on PDF ...

amit — Mon, 25 May 2026 19:30:58 +0530

amit – 2 file(s) modified
Add irnErrorMessage to InvoicePdfModel and show e-invoice error on PDF where IRN would appear

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/InvoicePdfModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.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 36572 – fix: add debit note PDF labels, HDFC UTR duplicate lock, ...

amit — Sat, 16 May 2026 14:40:08 +0530

amit – 3 file(s) modified
fix: add debit note PDF labels, HDFC UTR duplicate lock, AJAX error handlers in common.js

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js

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 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 36145 – Credit Note label support: CREDIT NOTE DETAILS / CN No: ...

amit — Thu, 02 Apr 2026 11:22:09 +0530

amit – 1 file(s) modified
Credit Note label support: CREDIT NOTE DETAILS / CN No: for credit note documents

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

Rev 36138 – Delivery Challan: show CHALLAN DETAILS and Challan No instead of ...

amit — Wed, 01 Apr 2026 18:40:46 +0530

amit – 1 file(s) modified
Delivery Challan: show CHALLAN DETAILS and Challan No instead of INVOICE DETAILS and Invoice No

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

Rev 36137 – Indian currency formatting: lakh/crore amount in words + Indian comma ...

amit — Wed, 01 Apr 2026 18:37:42 +0530

amit – 1 file(s) modified
Indian currency formatting: lakh/crore amount in words + Indian comma style (1,25,129.00) for all money fields in invoice table and summary

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

Rev 36120 – Widen Order Id column, compact E-Way Bill format matching invoice ...

amit — Tue, 31 Mar 2026 19:48:40 +0530

amit – 2 file(s) modified
Widen Order Id column, compact E-Way Bill format matching invoice style

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

Rev 36119 – Invoice PDF fixes: unified Rate column, per-unit gross sale for ...

amit — Tue, 31 Mar 2026 18:39:03 +0530

amit – 1 file(s) modified
Invoice PDF fixes: unified Rate column, per-unit gross sale for margin qty>1, Tax+Total columns, Tax Rate header, remove whitespace in summary

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

Rev 36116 – Unified invoice PDF generation (generateInvoiceV2) for both margin and regular ...

amit — Tue, 31 Mar 2026 18:20:49 +0530

amit – 1 file(s) modified
Unified invoice PDF generation (generateInvoiceV2) for both margin and regular invoices

- New clean layout: Logo+Title+QR header, Supplier/Invoice/Buyer sections, 10-col item table
- Margin: subtitle, declaration, Gross Sale/Margin columns, GST on Margin summary
- Regular: Rate/Taxable columns, Total GST summary, no declaration
- Shared: Tax Rate col, Tax+Total cols, payment, credit terms, IRN/QR, EWB, cancellation
- Old generateAndWrite() preserved for debit notes and credit notes

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

Rev 36111 – Update margin scheme invoice PDF to match GST compliant format ...

amit — Tue, 31 Mar 2026 15:22:58 +0530

amit – 1 file(s) modified
Update margin scheme invoice PDF to match GST compliant format per Rule 32(5)

- Title: TAX INVOICE with margin scheme subtitle
- No purchase price disclosed on invoice
- Columns: S.No, Description, HSN, Qty, Gross Sale Value, Taxable Value (Margin), Tax Rate, Tax Amount
- Declaration box with Section 2(27) and Rule 32(5) reference
- Summary: Total Selling Price, GST on Margin, Total Invoice Value
- Labels: Buyer Details / Supplier Details per GST terminology

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

Rev 36109 – Separate margin scheme invoice PDF generation from regular invoice flow ...

amit — Tue, 31 Mar 2026 12:56:57 +0530

amit – 1 file(s) modified
Separate margin scheme invoice PDF generation from regular invoice flow

- Add generateMarginSchemeInvoice() with proper margin scheme table format:
S.No | Description | HSN | Qty | Purchase Price | Selling Price | Margin | GST on Margin | Invoice Total
- Title: INVOICE OF SUPPLY (MARGIN SCHEME)
- Remove margin-specific logic from generateAndWrite() (regular invoice path)
- IRN, E-Way Bill, and cancellation stamp logic intact in both paths

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

Rev 36045 – Remove debug sysout, fix auto-generated note to say Delivery Challan ...

amit — Mon, 23 Mar 2026 18:58:23 +0530

amit – 1 file(s) modified
Remove debug sysout, fix auto-generated note to say Delivery Challan for DCs

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

Rev 36044 – Debug: add sysout in PdfUtils to trace title rendering

amit — Mon, 23 Mar 2026 18:42:21 +0530

amit – 1 file(s) modified
Debug: add sysout in PdfUtils to trace title rendering

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

Rev 36037 – Fix Delivery Challan PDF: use dynamic title and DC No ...

amit — Mon, 23 Mar 2026 16:38:34 +0530

amit – 2 file(s) modified
Fix Delivery Challan PDF: use dynamic title and DC No label instead of hardcoded TAX INVOICE

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

Rev 35827 – Fix SAX parse error: change invalid
to
in ...

amit — Sat, 21 Feb 2026 18:22:30 +0530

amit – 1 file(s) modified
Fix SAX parse error: change invalid </br> to <br/> in offer notification HTML

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/offer/formatting/HtmlModelFormatter.java

Rev 35799 – Add margin scheme (Rule 32(5) CGST) support in invoice PDFs ...

amit — Thu, 19 Feb 2026 19:48:44 +0530

amit – 3 file(s) modified
Add margin scheme (Rule 32(5) CGST) support in invoice PDFs and text invoices

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

Rev 35436 – Handle non-compliant strings in parseRaw method - First word treated ...

amit — Fri, 19 Dec 2025 13:43:38 +0530

amit – 1 file(s) modified
Handle non-compliant strings in parseRaw method - First word treated as brand (map key), rest as value - Gracefully handle strings without parentheses - Updated toHtml() to handle empty RAM/storage

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/offer/formatting/HtmlModelFormatter.java

Rev 35398 – Added html formatter

amit — Wed, 17 Dec 2025 01:44:56 +0530

amit – 3 file(s) modified
Added html formatter

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/offer
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/offer/formatting
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/offer/formatting/HtmlModelFormatter.java

Rev 35204 – Fixed changes related to downloading file at home page

amit — Wed, 15 Oct 2025 16:37:50 +0530

amit – 2 file(s) modified
Fixed changes related to downloading file at home page

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/SaholicInventoryServiceImpl.java

Rev 35102 – Added csvn report

amit — Thu, 02 Oct 2025 09:15:38 +0530

amit – 4 file(s) modified
Added csvn report

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WarehouseItemAgeingModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/PurSaleServiceImpl.java

Rev 35100 – Update

amit — Tue, 30 Sep 2025 15:14:19 +0530

amit – 1 file(s) modified
Update

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

Rev 35035 – Update

amit — Wed, 17 Sep 2025 17:55:24 +0530

amit – 1 file(s) modified
Update

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

Rev 35028 – donotcommit

amit — Wed, 17 Sep 2025 08:47:19 +0530

amit – 2 file(s) modified
donotcommit

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/InvoiceFormatter.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PrinterType.java

Rev 35027 – donotcommit

amit — Wed, 17 Sep 2025 07:51:37 +0530

amit – 1 file(s) modified
donotcommit

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

Rev 35025 – donotcommit

amit — Wed, 17 Sep 2025 07:01:56 +0530

amit – 1 file(s) modified
donotcommit

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

Rev 35024 – Fixed invoice related changes, Added Credit terms

amit — Wed, 17 Sep 2025 06:57:30 +0530

amit – 4 file(s) modified
Fixed invoice related changes, Added Credit terms

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/InvoicePdfModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java

Rev 34859 – Web Pages Management

vikas — Wed, 06 Aug 2025 18:04:55 +0530

vikas – 12 file(s) modified
Web Pages Management

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/StringUtils.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/Page.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/page
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/page/PageModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/page/PageRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/page/PageRepositoryImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PagesController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/pages.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pages
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pages/index.vm

Rev 34835 – Added Export Report, And Update total distance

vikas — Thu, 31 Jul 2025 19:48:30 +0530

vikas – 10 file(s) modified
Added Export Report, And Update total distance

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/CsvUtil.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/StringUtils.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/GenericRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LocationTrackingService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LocationTrackingServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LocationTrackingController.java

Rev 34813 – Partner Dashboard Analysis

aman — Mon, 21 Jul 2025 18:02:35 +0530

aman – 21 file(s) modified
Partner Dashboard Analysis

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/StringUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOpeningStock.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/SaholicInventoryCIS.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BrandCountByStatus.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOpeningStockRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOpeningStockRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/SaholicInventoryService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/SaholicInventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerPendingTasksController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/monthly-credited-income.vm

Rev 34805 – icici insurance policy phase one uploaded

ranu — Thu, 17 Jul 2025 20:11:01 +0530

ranu – 16 file(s) modified
icici insurance policy phase one uploaded

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomFofoOrderItem.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/IciciPolicyTrackerRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/IciciPolicyTrackerRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/AfinityQuoteResponseModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/PaymentTaggingResponseModel.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/PaymentTaggingResponseModel.java@34804)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/PaymentTaggingResponseModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 34769 – Location Tracking - Calculate distance and ETA for Admin App ...

vikas.jangra — Wed, 09 Jul 2025 19:57:45 +0530

vikas.jangra – 10 file(s) modified
Location Tracking - Calculate distance and ETA for Admin App and call option

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/CsvUtil.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/StringUtils.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/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/service/LocationTrackingService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LocationTrackingServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/kommuno/RecordingService.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/TicketChatActivityController.java

Rev 34761 – Location Tracking - Calculate distance and ETA for Admin App

vikas.jangra — Tue, 08 Jul 2025 13:20:40 +0530

vikas.jangra – 4 file(s) modified
Location Tracking - Calculate distance and ETA for Admin App

SmartDukaan – /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/

Rev 37070 – Add StringUtils.normalizeWhitespace for input whitespace normalization (T9.5 sanitizer dependency)

Rev 37066 – Modular invoice/note PDF generation: extract DocumentRenderer + reusable sections + ...

Rev 37062 – Revert PdfUtils to pre-refactor version (r36674) to unbreak trunk; modular ...

Rev 37052 – Delegate invoice/note PDF rendering to DocumentRenderer; add poNumber/orderDate to InvoicePdfModel; ...

Rev 36674 – Add irnErrorMessage to InvoicePdfModel and show e-invoice error on PDF ...

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

Rev 36572 – fix: add debit note PDF labels, HDFC UTR duplicate lock, ...

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

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

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

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

Rev 36145 – Credit Note label support: CREDIT NOTE DETAILS / CN No: ...

Rev 36138 – Delivery Challan: show CHALLAN DETAILS and Challan No instead of ...

Rev 36137 – Indian currency formatting: lakh/crore amount in words + Indian comma ...

Rev 36120 – Widen Order Id column, compact E-Way Bill format matching invoice ...

Rev 36119 – Invoice PDF fixes: unified Rate column, per-unit gross sale for ...

Rev 36116 – Unified invoice PDF generation (generateInvoiceV2) for both margin and regular ...

Rev 36111 – Update margin scheme invoice PDF to match GST compliant format ...

Rev 36109 – Separate margin scheme invoice PDF generation from regular invoice flow ...

Rev 36045 – Remove debug sysout, fix auto-generated note to say Delivery Challan ...

Rev 36044 – Debug: add sysout in PdfUtils to trace title rendering

Rev 36037 – Fix Delivery Challan PDF: use dynamic title and DC No ...

Rev 35827 – Fix SAX parse error: change invalid to in ...

Rev 35799 – Add margin scheme (Rule 32(5) CGST) support in invoice PDFs ...

Rev 35436 – Handle non-compliant strings in parseRaw method - First word treated ...

Rev 35398 – Added html formatter

Rev 35204 – Fixed changes related to downloading file at home page

Rev 35102 – Added csvn report

Rev 35100 – Update

Rev 35035 – Update

Rev 35028 – donotcommit

Rev 35027 – donotcommit

Rev 35025 – donotcommit

Rev 35024 – Fixed invoice related changes, Added Credit terms

Rev 34859 – Web Pages Management

Rev 34835 – Added Export Report, And Update total distance

Rev 34813 – Partner Dashboard Analysis

Rev 34805 – icici insurance policy phase one uploaded

Rev 34769 – Location Tracking - Calculate distance and ETA for Admin App ...

Rev 34761 – Location Tracking - Calculate distance and ETA for Admin App

Rev 35827 – Fix SAX parse error: change invalid
to
in ...