BlueGrey
calm
Elegant
Català-Valencià – Catalan
中文 – Chinese (Simplified)
中文 – Chinese (Traditional)
Česky – Czech
Dansk – Danish
Nederlands – Dutch
English – English
Suomi – Finnish
Français – French
Deutsch – German
עברית – Hebrew
हिंदी – Hindi
Magyar – Hungarian
Bahasa Indonesia – Indonesian
Italiano – Italian
日本語 – Japanese
한국어 – Korean
Македонски – Macedonian
मराठी – Marathi
Norsk – Norwegian
Polski – Polish
Português – Portuguese
Português – Portuguese (Brazil)
Русский – Russian
Slovenčina – Slovak
Slovenščina – Slovenian
Español – Spanish
Svenska – Swedish
Türkçe – Turkish
Українська – Ukrainian
Oëzbekcha – Uzbek
Subversion Repositories
SmartDukaan
(root)
/
trunk
/
profitmandi-fofo
/
src
/
main
/
webapp
/
WEB-INF
/
views
/
ftl
/
analysisDashboard.vm
– Rev 37734
Rev
Hide changed files
|
Details
|
Compare with Previous
|
Blame
|
RSS feed
Filtering Options
From rev
To rev
Max revs
Search history for
Show All
Rev
Age
Author
Path
Log message
Diff
Changes
37734
17 d 14 h
amit
/trunk/profitmandi-fofo/src/
Remove dead third-party integrations: fofo
- SpiceMoney: controller, spiceform.vm, logo, the Quick Links popover on
analysisDashboard / dashboard-readonly (its button was already commented
out in dashboard1.vm) and the /spicemoney/callback auth exclusions
- FundFina controller and the /fundfina/** auth exclusions
- Wiseapp: the Quick Links popover on 12dashboard34 (its only entry) and logos
- SmartPing injection in WebHookController; the Knowlarity webhooks keep
working with the models now in kommuno/model
- Unused Toffee model reference in WarehouseController
- tofee.* keys, aramex.tracking.url and the PAYU PAY payment option in
main and test resources
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/FundFinaController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/spicemoney
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/spiceform.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/images/icons/provider-logos/spicemoney.jpg
/trunk/profitmandi-fofo/src/main/webapp/resources/images/icons/provider-logos/wise.jpeg
/trunk/profitmandi-fofo/src/main/webapp/resources/images/icons/provider-logos/wiseapp.jpg
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebSecurityConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebHookController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/WarehouseController.java
/trunk/profitmandi-fofo/src/main/resources/META-INF/payment-options.json
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/12dashboard34.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-readonly.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/up-sale-call.vm
/trunk/profitmandi-fofo/src/test/resources/META-INF/dev.properties
/trunk/profitmandi-fofo/src/test/resources/META-INF/payment-options.json
/trunk/profitmandi-fofo/src/test/resources/META-INF/prod.properties
/trunk/profitmandi-fofo/src/test/resources/META-INF/staging.properties
37427
43 d 7 h
ranu
/trunk/profitmandi-fofo/src/main/
src dashboard logic correction
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
37160
71 d 7 h
ranu
/trunk/
super retailer club going live
/trunk/profitmandi-fofo/src/main/webapp/resources/images/super-retailer-club-5.jpeg
/trunk/profitmandi-fofo/src/main/webapp/resources/images/super-retailer-club-scheme.pdf
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
36080
196 d 7 h
aman
/trunk/profitmandi-fofo/src/main/
Fix:Replace "FOFO/FOCO/COCO" with "Partner" — Visual Only
/trunk/profitmandi-fofo/src/main/resources/message_hi.properties
/trunk/profitmandi-fofo/src/main/resources/messages_en.properties
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/12dashboard34.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
/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/credit-note.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-readonly.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.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/franchisee-account-creation.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/hid-allocation.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/map-info.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer-payout-dump-report.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-collection-summary.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/pending-indent-report.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending_fofo_order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop-report.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/requested-allocations.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-payout-report.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
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update_PartnerCriteria.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-pending-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
35675
244 d 2 h
amit
/trunk/
Offer detail modal: add slab progress one-liner, clickable dashboard titles, reorder columns
- Set nextSlab/shortValue on ItemCriteriaPayout in getOfferMargins path (sellin + sellout/activation)
- Add slab progress message after table (next slab distance or max slab achieved)
- Reorder columns: Models | Target | Base Sale | Model Sale | Payout Rate | Est. Payout
- Make offer name on partner dashboard clickable to open detail modal
- Update JS selector from p.description-offer to .description-offer
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.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/published-offers.vm
35620
252 d 10 h
vikas
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/
separate
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
34528
520 d 10 h
ranu
/trunk/profitmandi-fofo/src/main/
given chart to analysis
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
34525
521 d 9 h
ranu
/trunk/profitmandi-fofo/src/main/
activated imeis given to dashboard
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysis-dashboard-activated-imeis.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/activated-imeis.js
34524
521 d 9 h
ranu
/trunk/profitmandi-fofo/src/main/
code commited for price and margin
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-price-circular.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-partner.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/analysis-dashboard.js
34513
525 d 10 h
ranu
/trunk/
code committed for ineligible brand
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/BrandsService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/BrandsServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
34509
526 d 7 h
ranu
/trunk/profitmandi-fofo/src/main/
for push log code updating
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/credit-note.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-collection-summary.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/analysis-dashboard.js
34508
526 d 8 h
ranu
/trunk/profitmandi-fofo/src/main/
code committed for price drop
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop-report.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/analysis-dashboard.js
34507
526 d 9 h
ranu
/trunk/profitmandi-fofo/src/main/
reports in analysis
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.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/scheme-payout-report.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/analysis-dashboard.js
34505
526 d 11 h
ranu
/trunk/profitmandi-fofo/src/main/
code committed for placement dashboard view
/trunk/profitmandi-fofo/src/main/webapp/resources/js/analysis-dashboard.js
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
/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
34490
528 d 7 h
ranu
/trunk/
get code for dashboard
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.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-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.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-stock-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-stock.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-brandwise-detail.js
34437
537 d 9 h
ranu
/trunk/profitmandi-fofo/src/main/
code commit for suggested po
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
/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-stock.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-brandwise-detail.js