Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37297 26 m ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/oneassist/ 13 to 16 ew at 99 rs u to 20k  
37296 31 m amit /trunk/profitmandi-web/src/main/resources/ external api v2: docs - color removed from all record shapes  
37295 32 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ external api v2: never expose item color on partner APIs (filter at API layer; catalog.item untouched)  
37294 2 h 51 m ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ all active brand in hot deals  
37293 3 h 59 m amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/ Fix region-ALL (fofoId=0 sentinel) handling on RBM home

active-offers: regionId resolved via rows.get(0).getFofoId(), which is 0 for
region ALL, so selectByRetailerId(0) threw FOFOSTR_1000 'Fofo store not found'
(400) for every region-ALL user. Now filters fofoId>0, picks an active store,
and falls back to the caller's fofoId when a region resolves to nothing.

rbm-regions: dropdown now lists only regions holding an active retailer (with
activePartners count), which drops the ALL pseudo-region; users carrying the
sentinel get every live region as assignedRegionIds instead of an empty set.

rbm-dashboard: expand the sentinel like CsServiceImpl does (row region ->
its partners; region ALL -> all active stores) so the partners tile stops
reporting 0/1. Scope-wide batches limited to stores/targets/purchases/
last-billed; name, wallet and loan lookups now run only over the returned
slice. partners and alerts capped via ?limit (default 50, max 200) with
partnersReturned/totalAlerts/alertsReturned/limit added to summary. Partners
with no target this month rank after those actually missing a target, so the
capped slice is not filled by unset-target stores.
 
37292 23 h 58 m amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ Hot deals: javadoc matches reindex-based sync

syncHotDealFlags no longer mirrors model_hot_deal into tag_listing.hot_deals;
since r37276 hot_deal_b is derived from the active window at index time, so the
daily job re-indexes models whose window opened today or closed yesterday.
Comment-only, no behaviour change.
 
37291 1 d 4 h amit /trunk/profitmandi-web/src/main/resources/ external api v2: docs - parameters-at-a-glance table, per-endpoint optional/required params, clamp semantics  
37290 1 d 13 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Credit Note IRN: credit only the returned units, not the whole invoice

refundOrder persisted the CreditNote and its lines from the returned
inventory items, but then called generateCreditNoteIrn(invoiceNumber, ...),
which rebuilt the NIC payload by re-reading the original invoice - every
line at billed quantity. A 1-pc DOA return against NSDL37092 therefore
tried to register a CN covering the full invoice (2 phones + 27 carry
bags, Rs 26,664.27) against a Rs 13,332 wallet refund, and the legacy
4-digit HSN on the carry-bag line failed NIC validation with error 2311.

The wallet credit, the CreditNote row and its lines were always correct;
only the e-invoice payload was wrong.

- InvoiceService.getInvoicePdfModelForIrn: optional returnedQtyByOrderId
restricts the item list to the returned orders and prices each line at
the returned quantity. The existing single-arg method delegates with
null, so invoice PDF generation is unchanged. Margin-scheme, delivery
challan, IMEI-suffix and HSN handling apply to the reduced line as-is.
- GstProService.generateCreditNoteIrn: 4-arg overload taking the map; the
3-arg version delegates with null for whole-invoice returns.
- PurchaseReturnServiceImpl.refundOrder: passes orderReturnQtyMap, which
was already built for the ReturnOrderInfo rows.

Verified against the NIC sandbox using the real NSDL37092 rows: the old
payload is rejected with error 2311, the new payload is accepted
(DocTyp CRN, ItemCnt 1, MainHsnCode 85171300, TotInvVal 13331.99).

Not covered here: applyInvoiceReturnViaCreditNote still sends the whole
invoice, so an invoice partially returned earlier re-credits those units.
 
37289 1 d 19 h amit /trunk/profitmandi-dao/src/ external api v2: space-separated ram/storage pair in catalog titles (refurb naming)  
37288 1 d 21 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ all active brand in hot deals  
37287 1 d 21 h ranu /trunk/ warehouse access  
37286 1 d 22 h ranu /trunk/ warehouse access  
37285 1 d 22 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ warehouse access  
37284 1 d 23 h amit /trunk/profitmandi-dao/src/ external api v2: derive specs from catalog brand/model title (pair + lone-storage forms) as last resort; migration file marks applied state, legacy update() note  
37283 1 d 23 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ hot deals: cart/pricing availability reads date-windowed model_hot_deal instead of tag_listing.hot_deals  
37282 1 d 23 h amit /trunk/profitmandi-fofo/src/main/ hot deals: remove legacy tag_listing hot-deals endpoints and catalog-item UI (replaced by model_hot_deal admin flow)  
37281 1 d 23 h amit /trunk/profitmandi-dao/src/ external api v2: storeMaster visibility by fofo_type=FRANCHISE (drop internal flag check); spec derivation supports MB sizes (feature phones)  
37280 2 d 0 h amit /trunk/profitmandi-web/src/main/resources/ external api v2: document addedOn field for new-SKU partial sync  
37279 2 d 0 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ external api v2: addedOn (item first-added epoch) in catalogSkuMaster/catalogSkus rows  
37278 2 d 0 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ warehouse access  

Show All