| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 36135 |
8 m |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/ |
Include correction To Item IDs in itemMap so item names resolve in approval view |
|
| 36134 |
13 m |
amit |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
Fix item description: use getItemDescription() (brand+model+number+color) instead of just modelName |
|
| 36133 |
15 m |
amit |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
GRN correction approval: add GRN By column |
|
| 36132 |
22 m |
amit |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
GRN correction views: add invoice date, show item names in qty corrections, wrap JS in Velocity literal blocks |
|
| 36131 |
49 m |
amit |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
Fix Velocity parse error: wrap JS in literal block to prevent jQuery $ conflicts |
|
| 36130 |
57 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ |
Generate standalone EWB for Delivery Challans > 20K
GstProService.generateEwbForDeliveryChallan():
- Builds GENEWAYBILL payload from order data (seller, buyer, items, transport)
- docType=CHL, subSupplyType=8, transactionType=4 (intra-state same GSTIN)
- Zero GST, items aggregated by HSN
- Stores EWB number in einvoice_details table
- Skips if EWB already exists for the invoice
InvoiceService.saveInvoice():
- DC invoices with total > 20K trigger standalone EWB generation
- EWB failure is non-fatal (logged, doesn't block PDF generation) |
|
| 36129 |
1 h 19 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/ |
Refactor EWB API to use headers (consistent with e-invoice auth style)
Auth: params in headers (aspid, password, Gstin, Username, Ewbpwd)
Generate/Cancel: credentials in headers, action in query param
Extracted common ewbApiCall() with retry-on-GSP752 logic
getEwbApiHeaders() in GstProAuthService for reuse |
|
| 36128 |
1 h 48 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/ |
EWB auth with Redis cache (6h TTL) + auto-retry on token expiry
GstProAuthService: getEwbAuthToken() cached via redisCacheManager (6h TTL),
fetchEwbAuthToken() for direct API call on cache miss/eviction.
GstProService: getEwbToken() tries cache first, evicts and retries on failure.
generateStandaloneEwb/cancelEwb retry once on GSP752 (expired token) error. |
|
| 36127 |
1 h 54 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/ |
Add standalone E-Way Bill APIs for Delivery Challans
- getEwbAuthToken(): authenticate with EWB portal (separate from e-invoice auth)
- generateStandaloneEwb(): GENEWAYBILL action for DC documents
- cancelEwb(): CANEWB action with reason code 3 (order cancelled)
- Sandbox and production endpoints configured
- Uses existing RestClient, no external library needed
- Sandbox verified: auth, generate, cancel all working |
|
| 36126 |
4 h 4 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/ |
Change FOFO invoice PDF title from Retailer Invoice to Tax Invoice |
|
| 36125 |
4 h 52 m |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/ |
weekly rating system live on calling module |
|
| 36124 |
6 h 15 m |
ranu |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
weekly rating system live on calling module |
|
| 36123 |
6 h 18 m |
ranu |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
weekly rating system live on calling module |
|
| 36122 |
6 h 21 m |
ranu |
/trunk/profitmandi-fofo/src/main/webapp/ |
weekly rating system live on calling module |
|
| 36121 |
21 h 19 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/ |
Set orderId on CustomOrderItem for invoice PDF generation |
|
| 36120 |
21 h 19 m |
amit |
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ |
Widen Order Id column, compact E-Way Bill format matching invoice style |
|
| 36119 |
22 h 29 m |
amit |
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ |
Invoice PDF fixes: unified Rate column, per-unit gross sale for margin qty>1, Tax+Total columns, Tax Rate header, remove whitespace in summary |
|
| 36118 |
22 h 40 m |
ranu |
/trunk/ |
code for socket snapshot |
|
| 36117 |
22 h 47 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/ |
Route all invoice PDF generation to generateInvoiceV2 |
|
| 36116 |
22 h 47 m |
amit |
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ |
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 |
|