SmartDukaan – /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 37780 – feat(partner-access): demo partner access page + validation - Demo ...

amit — Fri, 25 Sep 2026 13:17:10 +0530

amit – 10 file(s) modified
feat(partner-access): demo partner access page + validation

- Demo Partner Access page (Admin Control): grant partners to a Sales person,
list and revoke active grants; server-guarded by canManage
- Partner access dropdown: position partners + active demo partners "(Demo)";
shared cached mapping is copied, never mutated
- /login-as-partner-readonly: partner must be in caller's positions or demo
grants (was unchecked; Partner access is its only caller)
- /mobileapp?emailId=: Sales position holders get the partner app token only
for position/demo partners; other admins (Partner Info) unchanged
- DemoPartnerAccessTest (5, local DB, rolled back)
- jsVersion 437

Needs dao r37779 and migration_demo_partner_access.sql applied.

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DemoPartnerAccessController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/demo-partner-access.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/demo-partner-access.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-readonly-info.vm
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/service/cs
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/service/cs/DemoPartnerAccessTest.java

Rev 37692 – LMS + Airtel Calling

vikas — Thu, 17 Sep 2026 18:12:13 +0530

vikas – 9 file(s) modified
LMS + Airtel Calling

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LmsDashboardService.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LmsDashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LmsLeadController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lms-dashboard.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-record.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lms-dashboard-standalone.vm

Rev 37526 – offer circular: scope config screen, resolve screen, web offer sync ...

amit — Thu, 03 Sep 2026 17:44:48 +0530

amit – 17 file(s) modified
offer circular: scope config screen, resolve screen, web offer sync (fofo)

Screens (each its own endpoint, under the OFFER CIRCULAR menu):
- /offerCircularScope - add/edit divisions, take a brand in or out of scope,
register label aliases. 'Remove' is in_scope=0 + a required reason, never a
DELETE: offer.division_id is an FK and the history would go with it.
- /offerCircularResolve - the product queue, split out of the review screen. The
editor was a <td colspan=6> pretending to be a form, which is why it never
aligned; it is now master-detail. Naming and Coverage are separate tabs because
an alias cannot answer a bundle at all - the coverage panel says so and offers
the two answers that ARE safe (ignore, or reclassify as naming).

Ingest:
- ScopeConfig resolves division aliases and carries the canonical label on
Decision. insertOffer and ProductAliases.find use it; offer_raw_row keeps the
verbatim label, being the source of truth for re-parsing.
- CircularIngestRunner publishes to dtr.web_offer after the document is marked
PUBLISHED, in its own transaction with exceptions swallowed - a circular that
parsed correctly must stay published even if the web sync fails.

Review screen:
- the ingest summary was a raw Map.toString() inside a nowrap span and ran off
the card; now parsed into chips with the drop reasons behind a disclosure.

jsVersion -> 417 (merged with r37525's 412; cssVersion 53 kept from that commit).

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferCircularController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferCircularScopeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/offercircular/CircularIngestRunner.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/offercircular/CircularIngestService.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/offercircular/ScopeConfig.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/offercircular/WebOfferSyncService.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/offer-circular-resolve.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/offer-circular-review.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/offer-circular-scope.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer-circular-resolve.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer-circular-review.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer-circular-scope.vm
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/web/offercircular/ScopeConfigTest.java
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/web/offercircular/WebOfferSyncServiceTest.java

Rev 37331 – Add offer circular review and curation screen Shows the ...

amit — Tue, 18 Aug 2026 00:19:29 +0530

amit – 5 file(s) modified
Add offer circular review and curation screen

Shows the nine verbatim PDF columns beside what the parser made of them, uploads a
new monthly circular, and resolves the products the matcher could not.

Upload deliberately does not parse - it stores the PDF, sha256-deduped, and
registers it DRAFT, so an upload can never half-populate the offer tables. The cron
ingest job picks it up from there.

The curation queue groups by distinct (division, raw text) because that is the
product_alias key: one answer clears every row carrying that text, on this circular
and on every later one. On the Aug'26 circular that turns 152 unresolved rows into
106 decisions. Three actions mirror product_alias.action - PIN to a catalog id,
REWRITE to the catalog's spelling and match again, or IGNORE.

- Writes product_alias only, so nothing the screen does can set manually_curated
and lock a circular against re-ingest. Coverage decisions, which do need that,
are listed but visibly parked rather than offered a naming answer.
- A saved decision changes nothing until re-ingest, because aliases are read at
ingest time; the queue says so and the re-ingest button puts the document back
to DRAFT for the scheduler. The portal cannot run the ingest itself - that lives
in profitmandi-cron, which fofo does not depend on.
- The closest rejected match is shown for context and never pre-selected. Four new
OnePlus models each "nearly" matched a 2015 OnePlus 2 at 0.80-0.84, and offering
that as a suggestion invites a reviewer to confirm it. Where the catalog has no
such SKU the search says so and steers to IGNORE.
- aliasExport emits every decision as replayable SQL, because the portal writes to
one database and environments would otherwise drift apart silently.

Access is an email allowlist AND the admin role. Both are enforced in the
controller; the sidebar entry repeats the allowlist because visibility in auth.menu
is role-driven and cannot express a per-email rule.

No jsVersion bump: offer-circular-review.js is a new file that was never cached,
so it needs no cache-buster, and churning that shared counter only conflicts with
whoever is mid-edit on it.

+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferCircularController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/offer-circular-review.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer-circular-review.vm

Rev 37222 – external api v2: Technology > External API Clients admin screen ...

amit — Tue, 04 Aug 2026 16:04:16 +0530

amit – 6 file(s) modified
external api v2: Technology > External API Clients admin screen (read-only client/store/category mappings), jsVersion 392

Rev 37212 – Hot Deals: Category-team page under Catalog menu - brand-wise hot ...

amit — Tue, 04 Aug 2026 13:02:06 +0530

amit – 6 file(s) modified
Hot Deals: Category-team page under Catalog menu - brand-wise hot deal models with inline date editing (manage-hot-deals)

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/HotDealController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/hot-deals.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/hot-deals-table.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/hot-deals.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 36877 – Location Tracking Dashboard: Add BeatJourneyController

vikas — Fri, 19 Jun 2026 15:00:54 +0530

vikas – 6 file(s) modified
Location Tracking Dashboard: Add BeatJourneyController

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BeatJourneyService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BeatJourneyServiceImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatJourneyController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-journey.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-journey.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 36645 – Added Beat Report

vikas — Sat, 23 May 2026 12:24:51 +0530

vikas – 12 file(s) modified
Added Beat Report

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/LocationTracking.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LocationTrackingModel.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/dtr/NotificationCampaignRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationCampaignRepositoryImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatReportController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-report.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-report-data.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-report-user-detail.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 36618 – route plan map

ranu — Thu, 21 May 2026 11:12:29 +0530

ranu – 2 file(s) modified
route plan map

+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 36563 – Flagship credit: admin UI for date-wise flagship model management, jsVersion ...

amit — Sat, 16 May 2026 13:23:47 +0530

amit – 5 file(s) modified
Flagship credit: admin UI for date-wise flagship model management, jsVersion bump to 338

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/flagship.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/manage-flagship.vm

Rev 36394 – Add IMEI net-margin modal on order-index billing panel. New ...

amit — Mon, 27 Apr 2026 14:14:14 +0530

amit – 6 file(s) modified
Add IMEI net-margin modal on order-index billing panel.

New /getImeiNetMarginModal endpoint: given an IMEI, derives the
purchase-billed date from the IMEI's purchase order
(InventoryItem.purchaseId -> Purchase.purchaseReference -> Order.billingTimestamp),
fetches schemes applicable on that date via PriceCircular, and shows
per-scheme contribution, NLC, and net margin in a slim modal.

Effective DP = inventory_item.unit_price - max(0, price_drop_amount)
to match SchemeServiceImpl.createSchemeInOut/PriceCircularService.getPayouts.
Offers are intentionally excluded. Per-IMEI price-drop history is
shown for reference.

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/imei-net-margin.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/imei-net-margin-modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 36152 – Feat:Request Panel for brand dealer registration,Admin panel for managing WOD ...

aman — Thu, 02 Apr 2026 12:13:18 +0530

aman – 19 file(s) modified
Feat:Request Panel for brand dealer registration,Admin panel for managing WOD request templates

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FinServiceDocument.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FinServiceRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FinServiceTemplate.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceDocumentRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceDocumentRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceRequestRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceRequestRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceTemplateRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceTemplateRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteServiceImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/FinServiceController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/wod-request.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fin-service
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fin-service/fin-service-list.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fin-service/fin-service-panel.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fin-service/wod-template-edit.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fin-service/wod-template-list.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 35629 – Fixed SchemeService

amit — Fri, 30 Jan 2026 17:56:02 +0530

amit – 5 file(s) modified
Fixed SchemeService

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 35549 – bulletin updated on dashboard and give access category department

ranu — Thu, 15 Jan 2026 12:55:23 +0530

ranu – 23 file(s) modified
bulletin updated on dashboard and give access category department

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Bulletin.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BulletinOfferModal.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BulletinPostModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerBrief.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/BulletinRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/BulletinRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/FileUploadController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/bulletin.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/mobile-brand-wise-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/post-bulletin.vm

Rev 35503 – Shopify : Orders

vikas — Tue, 30 Dec 2025 13:28:11 +0530

vikas – 15 file(s) modified
Shopify : Orders

Rev 35396 – Improveed offer logic

amit — Wed, 17 Dec 2025 01:40:54 +0530

amit – 6 file(s) modified
Improveed offer logic

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/performance.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/published-offers.vm

Rev 35289 – Added trial franchisee feature

amit — Sat, 15 Nov 2025 09:38:54 +0530

amit – 18 file(s) modified
Added trial franchisee feature

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/TrialForm.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/trialUser/TrialOnBoarding.java@35288)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/trialUser
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialFormRepository.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialOnboardingRepository.java@35288)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialFormRepositoryImpl.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialOnboardingRepositoryImpl.java@35288)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialOnboardingRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialOnboardingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TrialController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/trial-form.js (copied from /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js@35270)
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/trial-form.vm (copied from /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-detail.vm@35270)

Rev 35268 – Added scratch offer removed Scratch as directry

aman — Mon, 10 Nov 2025 16:28:46 +0530

aman – 5 file(s) modified
Added scratch offer removed Scratch as directry

+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scratch
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scratch/offer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scratch/editScratchOffer.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scratch/scratchOffer.vm

Rev 34881 – Feat:Affiliate Service

aman — Tue, 12 Aug 2025 17:48:03 +0530

aman – 25 file(s) modified
Feat:Affiliate Service

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/affiliate
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/affiliate/AffiliateGift.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/affiliate/AffiliateLinks.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/affiliate/AffiliateProduct.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Customer.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/affiliate
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/affiliate/AffiliateLinksModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliate
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliate/AffiliateRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliate/AffiliateRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliateGift
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliateGift/AffiliateGiftRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliateGift/AffiliateGiftRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliateLink
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliateLink/AffiliateLinkRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliateLink/AffiliateLinkRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepositoryImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/affiliate
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/affiliate/AffiliateController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/affiliate
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/affiliate/affiliate.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/affiliate
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/affiliate/affiliate.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

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 34814 – Category Management

vikas — Mon, 21 Jul 2025 19:59:24 +0530

vikas – 8 file(s) modified
Category Management

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Category.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/CategoryModel.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/catalog/CategoryController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/categories.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/categories.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 34505 – code committed for placement dashboard view

ranu — Wed, 30 Apr 2025 15:49:54 +0530

ranu – 10 file(s) modified
code committed for placement dashboard view

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/analysis-dashboard.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/foco-sale-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-account-statement.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-brandwise-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-loan-statement.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-stock.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm

Rev 34474 – Scratch Offer

aman.kumar — Thu, 24 Apr 2025 19:31:42 +0530

aman.kumar – 33 file(s) modified
Scratch Offer

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/ScratchOffer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PendingOrderItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/scratch
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/scratch/GiftEntity.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/scratch/OfferEntity.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/scratch/ScratchRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/scratch/ScratchResponse.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/scratch
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ScratchOfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ScratchOfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/scratch
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/scratch/GiftRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/scratch/GiftRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/scratch/SeasonalOfferRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/scratch/SeasonalOfferRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ScratchService.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/FileUploadController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/scratch
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/scratch/ScratchController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebListingController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/Scratch
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/Scratch/offer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/Scratch
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/Scratch/editScratchOffer.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/Scratch/gifts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/Scratch/scratchOffer.vm

Rev 34387 – Liquidation/Bidding initial work

vikas.jangra — Tue, 08 Apr 2025 18:52:56 +0530

vikas.jangra – 12 file(s) modified
Liquidation/Bidding initial work

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Liquidation.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/repository/catalog/LiquidationRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/LiquidationRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/LiquidationModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/SaholicInventoryServiceImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/catalog/LiquidationController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/liquidation.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/liquidation.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 34258 – sweet alert swal js locally stored

ranu — Mon, 03 Mar 2025 11:47:09 +0530

ranu – 4 file(s) modified
sweet alert swal js locally stored

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sweetalert2@11.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm

Rev 34149 – New panel for partner Brand commitments , add commitment , ...

tejus.lohani — Tue, 21 Jan 2025 17:11:29 +0530

tejus.lohani – 17 file(s) modified
New panel for partner Brand commitments , add commitment , update commitment and view partner commitments, Now in DMS code panel team only view commitment instead of update mean it read only

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiBrandCommitment.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerBrandCommitmentModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiBrandCommitmentRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiBrandCommitmentRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BrandCommitmentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/brand-commitment.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-dealer-mapping.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brand-commitment
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brand-commitment/brand-commitment-panel.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brand-commitment/partner-commitments.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-dealer-mapping-index.vm

Rev 33988 – now old chart.min.js chart use as chart1 instead of chart ...

tejus.lohani — Fri, 22 Nov 2024 17:44:53 +0530

tejus.lohani – 1 file(s) modified
now old chart.min.js chart use as chart1 instead of chart , and now chart.js chart use as chart

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

Rev 33973 – Added super catalogs

tejus.lohani — Thu, 21 Nov 2024 19:04:32 +0530

tejus.lohani – 37 file(s) modified
Added super catalogs

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/SuperCatalog.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/SuperCatalogMapping.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SuperCatalogMappingRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SuperCatalogMappingRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SuperCatalogRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SuperCatalogRepositoryImpl.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/solr/FofoSolr.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/SuperCatalogModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/SuperCatalogRequestModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/FofoCatalogResponse.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/provider/OxigenRechargeProviderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/provider/ThinkWalnutDigitalRechargeProviderServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/reportico
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/reportico/ReporticoService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/reportico/ReporticoServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/SshServer/SSHService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/SshServer/SSHServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReporticoController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SuperCatalogController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/super_catalog.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/super
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/super/edit.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/super/index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/content.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/reportico
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/reportico/content.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/reportico/index.vm

Rev 33879 – new verification process introduce and like two-step verification soft approve ...

tejus.lohani — Fri, 18 Oct 2024 14:26:19 +0530

tejus.lohani – 24 file(s) modified
new verification process introduce and like two-step verification soft approve and then final approve and at the time of soft approval , approver need to upload required brand NOC or mark not receive/not required , In partner Acquisition option add one new panel add for NOC upload and soft approve

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerOnBoardingPanel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/BrandCommit.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiBrandCommitment.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/PartnerVerificationApprovalStatus.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/StoreTimelineModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerOnboardingVerificationRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/BrandCommitRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/BrandCommitRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiBrandCommitmentRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiBrandCommitmentRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/NocRequiredBrandRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/FileUploadController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/loi-form.js (copied from /trunk/profitmandi-fofo/src/main/webapp/resources/js/onboarding-form.js@33878)
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/onboarding-form.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-dealer-mapping.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auto-Loi.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/nocRequiredUploadForm.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-verification-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-verification.vm

Rev 33869 – give hard_limit field in sd credit panal for tarun sir

tejus.lohani — Mon, 14 Oct 2024 16:13:37 +0530

tejus.lohani – 3 file(s) modified
give hard_limit field in sd credit panal for tarun sir

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auto-Loi.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pendingForm.vm

Rev 33661 – suggested po and upsell js with include script commit

ranu — Mon, 12 Aug 2024 11:38:45 +0530

ranu – 2 file(s) modified
suggested po and upsell js with include script commit

+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/suggested-monthly-po.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 33609 – cdn js download

ranu — Wed, 24 Jul 2024 17:42:56 +0530

ranu – 1 file(s) modified
cdn js download

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

Rev 33580 – toastify.js updated

ranu — Tue, 16 Jul 2024 20:23:22 +0530

ranu – 3 file(s) modified
toastify.js updated

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/toastify.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 33577 – fix Some bugs,Improve some Vm,Show pending LoiForm how fill the ...

tejus.lohani — Tue, 16 Jul 2024 12:05:48 +0530

tejus.lohani – 16 file(s) modified
fix Some bugs,Improve some Vm,Show pending LoiForm how fill the form and correct some spelling mistakes

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiForm.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiDocMasterRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiDocMasterRepositoryImple.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/LoiFormRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/LoiFormRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/OtpProcessor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/onboarding-form.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auto-Loi.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loiForm/document-upload.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-form.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pendingForm.vm

Rev 33540 – commit similarModel related file

tejus.lohani — Fri, 05 Jul 2024 11:58:42 +0530

tejus.lohani – 5 file(s) modified
commit similarModel related file

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SimilarModelController.java
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/similar-items.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/similar-model.js (copied from /trunk/profitmandi-fofo/src/main/webapp/resources/js/similar-items.js@33539)
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/similarModel/similar-model.vm

Rev 33539 – add similar js

tejus.lohani — Fri, 05 Jul 2024 11:36:58 +0530

tejus.lohani – 1 file(s) modified
add similar js

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

Rev 33507 – These files are related to Loi form and LOI form ...

tejus.lohani — Sat, 29 Jun 2024 18:04:35 +0530

tejus.lohani – 55 file(s) modified
These files are related to Loi form and LOI form data flow to the required tables

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/brandFee
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/brandFee/BrandFeeCollection.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/BillingAddress.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiDoc.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiDocMaster.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiForm.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiFormData.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/onBorading
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/onBorading/onBoardingFormEnums
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/onBorading/onBoardingFormEnums/FeePaymentStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/onBorading/onBoardingFormEnums/LoiStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/onBorading/onBoardingFormEnums/OnboardingPaymentMode.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/onBorading/onBoardingFormEnums/StoreType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/GstAddressModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LoiFormModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/brandFee
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/brandFee/BrandFeeCollectionRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/brandFee/BrandFeeCollectionRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/brandFee/BrandFeeRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/brandFee/BrandFeeRepositoryImpl.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/repository/onboarding
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiDocMasterRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiDocMasterRepositoryImple.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiDocRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiDocsRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/BillingAddressRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/BillingAddressRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/LoiFormRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/LoiFormRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/brandFee
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/brandFee/BrandFeeCollectionService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/brandFee/BrandFeeCollectionServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/brandFee/BrandFeeServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LoiDocModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/entity/GstDetails.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/onboarding-form.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auto-Loi.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loiForm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loiForm/brand-fee-collection.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loiForm/completed-loi-form.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loiForm/document-upload.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding-document-upload.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-form.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/payment-collection-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pendingForm.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/smartdukan_logo.jpg

Rev 33443 – print resource and order cancel by partner and cron dao ...

ranu — Thu, 13 Jun 2024 15:52:49 +0530

ranu – 21 file(s) modified
print resource and order cancel by partner and cron dao mail shoot for Live Demo

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrintResource.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrintResourceRegion.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/LiveDemoOrderLineItemModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PrintResourceModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrintResourceRegionRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrintResourceRegionRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrintResourceRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrintResourceRepositoryImpl.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-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java
~ /trunk/profitmandi-fofo/src/main/resources/messages_en.properties
~ /trunk/profitmandi-fofo/src/main/resources/message_en.properties
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/print-resource.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/all-print-resource.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner_print_resource.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/print-resource.vm

Rev 33257 – warehouse billing phase 1 for testing

ranu — Tue, 23 Apr 2024 18:21:49 +0530

ranu – 14 file(s) modified
warehouse billing phase 1 for testing

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/TransactionShipmentSequence.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/model/WarehouseItemQtyModel.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/warehouse/WarehouseServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/billed-invoice.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/billed-order-invoice.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/orders-by-invoices.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-management.vm

Rev 33245 – added signature

ranu — Sat, 20 Apr 2024 13:45:36 +0530

ranu – 27 file(s) modified
added signature

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/FocusedModelRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/FocusedModelRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemCriteriaRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemCriteriaRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsuranceProviderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsuranceProviderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoLineItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoLineItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.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/repository/inventory/ItemAvailabilityCacheRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/ItemAvailabilityCacheRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/solr/FofoSolr.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/FofoUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/ItemLedgerService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/ItemLedgerServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm