Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37126 1 d 3 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Password override persistence + bulk download/upload (dev/staging): PasswordOverride repo, resetPasswordById returns stored value, ExcelUtils password-override read/write  
37120 4 d 5 h vikas /trunk/ Added leads in Beat Creation  
37112 5 d 5 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/ Source trial-registration GST duplicate check from fofo_store instead of counter/privatedealuser: add FofoStoreRepository.existsByGstNumber, remove now-dead PrivateDealUserRepository.isActiveByGst (last reader of Counter.gstin)  
37110 5 d 6 h aman /trunk/ Business-agreement e-sign gate between Full Stock Payment and PO creation

New AGREEMENT_ESIGN onboarding stage, verified by Legal (Gaurav Sharma):
- Hard-blocks first PO creation until the e-sign is verified (BulkOrderService),
mirroring the existing Full Stock Payment block.
- Agreement E-Sign panel (Partner Acquisition menu) listing FSP-done partners who
have not yet created their first PO: upload signed agreement + Gaurav-only verify.
- New agreement_esign table/entity + repository for the signed doc and audit trail.
- Timeline grid column + stepper stage for the new event.

Prod DB (separate, with sign-off): CREATE TABLE user.agreement_esign;
INSERT auth.menu + auth.menu_category rows for the panel.
 
37102 5 d 7 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Remove dead Counter/PrivateDealUser code: drop unused isFofo, bulkShipmentAmountLimit, verifiedOn, documentVerified fields and accessors; remove dead selectByIds repo methods; drop redundant Counter/PrivateDealUser repository injections in OrderServiceImpl and InvoiceService  
37098 5 d 10 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ Align CatalogRepository.selectCatalog signature with impl param order (brand, modelNumber, modelName)

Interface declared (brand, modelName, modelNumber) while CatalogRepositoryImpl
binds equalsMap keys off its own params (brand, modelNumber, modelName). The lone
caller, ItemLoaderService.addItem, passes impl order, so lookups worked by accident.
Any new caller trusting the interface signature would have silently swapped
modelName/modelNumber and minted phantom catalogs on lookup miss.

Names only; binary signature (String,String,String) is unchanged, so behaviour and
all callers are unaffected.
 
37089 7 d 8 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ Optimize partnerPerformance data access: fofoId-scoped + month-bucketed query variants

- Order: fofoId-scoped billing-avg named queries (replace all-partner scan+filter)
- MonthlyTarget: selectByDatesAndFofoId batches 7 per-month lookups into one
- SchemeInOut/OfferPayout: month-bucketed ...ByMonth earnings queries collapsing the
per-month loop; new MonthlyBrandIncomeModel / MonthlyOfferPayoutModel
All additive; existing shared queries and their callers unchanged.
 
37055 11 d 9 h ranu /trunk/ allocation of hid and opening stock suggested qty logic updated as per tarun sir  
37038 13 d 4 h vikas /trunk/ Beat Report: Gaurav Mathur can see all sales employees data, also added past discussions  
37033 14 d 8 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ Offer report: treat catalogIds as authoritative in item criteria

When an offer item criteria specifies catalogIds, match exactly those catalog
ids and skip the brand/category(smartWatch,led)/hsn(smartPhone,featuredPhone)
filters. Previously smartWatch/led ANDed a categoryId filter unconditionally, so
a catalog wrongly flagged smartWatch (e.g. Oppo ENCO Buds, offer 9661) matched
zero items and the download report came back empty despite real purchases.
 
37030 14 d 8 h amit /trunk/profitmandi-dao/src/main/ Add credit block/unblock audit log (dao): CreditBlockLog entity/enum/repo + blockCredit/unblockCredit/getCreditBlockLogs service methods  
36999 19 d 5 h amit /trunk/profitmandi-dao/src/main/ Price-hike deduction (self-contained): revert hike logic from price-drop flow + remove deduct_on_hike flag; add GRN hook (PurchaseServiceImpl, before schemes) and on-demand executor endpoint that debit under-charged units billed in the hike's [affected_on, created_on] window. Idempotent per (hike, imei).  
36984 20 d 5 h aman /trunk/ Lead Management: (1) fix date-range CSV download to mirror the on-screen view - all statuses in range PLUS follow-ups - so it no longer returns empty or 500s on empty windows; guard empty result set. (2) Add global lead search (name/mobile/outlet/city across ALL leads, any status/date) wired to the existing lead-table search box (Enter = search all). Bump JS cache version to 369.  
36981 20 d 8 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ changeList  
36980 20 d 8 h ranu /trunk/ optimize bi report  
36972 20 d 10 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ changeList  
36971 21 d 3 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ Surface active flagship models as a 'flagship' Solr label (prepended, shows first) in catalog indexing; add no-arg selectActiveFlagshipCatalogIds  
36967 21 d 5 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ Add date-range query methods for approved HID allocations (filter by approval date)  
36958 21 d 8 h amit /trunk/profitmandi-dao/src/main/ Flagship credit: fire interest-free limits at billing + per-IMEI conversion

- createLoanForBilling now detects flagship lines inside the billing transaction (fixes the
REQUIRES_NEW visibility bug where flagship detection re-queried uncommitted invoice_number and
never fired). Creates one combined flagship limit (is_flagship=1, limit_block=1, 30-day deadline)
plus one transaction.loan_imei row per device.
- convertFlagshipOnSale / IMEI activation now convert only the sold device's slice (matched by IMEI),
so same-model siblings and other billing tranches keep their interest-free window; full convert at
30-day expiry. Lock order aligned (loan -> loan_imei) to avoid sale/expiry deadlock.
- New transaction.loan_imei table + LoanImei entity/repository (migration_loan_imei_table.sql).
- selectAllLoansByInvoice: PurchaseReturn now settles BOTH the real loan and the flagship limit on a
flagship-invoice return (prevents credit leak from a stranded limit).
- Cap guard (flagship credit never exceeds amount drawn) and robust limit settlement (paisa threshold
instead of exact float equality).
 
36957 21 d 9 h aman /trunk/ Add AI assistant lead intake endpoint (POST /add/lead) tagging source=AI Assistant in Lead Management  

Show All