| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 37593 |
6 d 0 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Show partners their aged Apple stock and why it lowers their credit limit
Apple handsets held past 30 days are deducted when the credit limit is
calculated, but nothing told the partner - they saw a limit drop with no
explanation. Adds a dashboard banner alongside the existing 'activated but not
billed' one, shown only when the partner actually has such stock (70 of 980
today), with the unit count, the value, and View Imeis for the detail.
- dashboard-aged-apple-stock.vm, parsed in dashboard1.vm under
#if($investments.aged_apple_qty > 0)
- count and value both read from the maintained partner_investment snapshot, so
the banner never runs its own query and always matches the amount the limit is
actually reduced by
- amount wrapped in <span class="currency"> so common.js formatCurrency() renders
it instead of a raw float
- /agedAppleImeis + aged-apple-imeis.vm list the units, excluding activated ones -
those are already deducted as activated stock and shown in their own banner, so
no handset appears in both
- click handler added to the existing activated-imeis.js rather than inline in the
fragment: an inline script in an AJAX-injected fragment re-registers
$(document).on on every load and stacks duplicate requests
- jsVersion 420 -> 421 |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/aged-apple-imeis.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-aged-apple-stock.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/activated-imeis.js
|
| 37285 |
38 d 2 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
warehouse access |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
|
| 37193 |
48 d 5 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
brand ai+ fixed |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
|
| 37056 |
69 d 5 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Publish FLAGSHIP_UPDATED event on flagship add/remove so the model's Solr listing is reindexed |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
|
| 36961 |
79 d 4 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Combo cancellation: wire combo cascade into FOFO cancelOrder with confirm flow; bump js version for cache-bust |
|
/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/inventory.js
|
| 36626 |
119 d 5 h |
amit |
/trunk/profitmandi-fofo/ |
Thrift cleanup: remove ThriftConfig from settings, clean Thrift imports
- Removed ThriftConfig from settings.gradle
- IndentController: removed Thrift client and type imports
- InventoryController: removed Thrift imports |
|
/trunk/profitmandi-fofo/settings.gradle
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
|
| 36598 |
121 d 3 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Flagship models: catalog-level typeahead with 70K min price filter, add menu_category access |
|
/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/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/flagship.js
|
| 36563 |
124 d 6 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Flagship credit: admin UI for date-wise flagship model management, jsVersion bump to 338 |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/manage-flagship.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/flagship.js
/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/WEB-INF/views/ftl/include-scripts.vm
|
| 36401 |
143 d 4 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Replace mailSender (SendGrid) with gmailRelaySender - SendGrid API key expired/revoked |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.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/java/com/spice/profitmandi/web/controller/RefferalController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java
|
| 35957 |
194 d 6 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Migrate SMTP calls to mailOutboxService in fofo controllers - mail outbox pattern |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
|
| 35726 |
218 d 23 h |
vikas |
/trunk/ |
Pinelabs offer discovery on billing and stock page |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/pinelabs/PinelabsOfferCacheService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/resources/message_en.properties
/trunk/profitmandi-fofo/src/main/resources/messages_en.properties
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-info.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
|
| 35210 |
337 d 1 h |
vikas |
/trunk/ |
Push Notifications Templates |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteServiceImpl.java
/trunk/profitmandi-dao/src/main/resources/partner-code-created.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
|
| 34733 |
446 d 0 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/ |
Fixed credit related changes |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
|
| 34614 |
478 d 4 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
tablet added in braND CATALOG for sku update |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
|
| 34098 |
619 d 6 h |
ranu |
/trunk/ |
eol-slow, slow-runn migartion |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/categoriesed-catalog-list.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/categoriesed-catalog.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catagorised-catalog-list.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catagorised-catalog.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/RbmAchievements.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/RbmTargets.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/inventory/CatalogMovingEnum.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/Our15DaysOldAgingStock.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmAchievementsModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmArrViewModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmTargetAndAchievementsModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmTargetsModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/Sold15daysOldAgingModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SoldCatalogsReportModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayAchievedMovementModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WarehouseMobileStockByMovementModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RbmAchievementsRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RbmTargetsRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.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/java/com/spice/profitmandi/web/controller/InventoryController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-target-achievement.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
|
| 33966 |
665 d 4 h |
aman.kumar |
/trunk/profitmandi-fofo/src/main/ |
$request changed with required name |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/focused-model-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/focused_model.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/high_demand_item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/hygiene-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/hygiene.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-wise-indent.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/itemwise-po.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-close-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-close.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead_activity_modal.vm
|
| 33957 |
666 d 0 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
categorisation movement method update |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
|
| 33952 |
666 d 3 h |
aman.kumar |
/trunk/ |
activated imei |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.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-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
|
| 33888 |
694 d 1 h |
ranu |
/trunk/ |
sku movement code phase one |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CategorisedCatalog.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/inventory/CatalogMovingEnum.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CategorisedCatalogListModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategorisedCatalogRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategorisedCatalogRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catagorised-catalog-list.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catagorised-catalog.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-movement-history.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Catalog.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/service/catalog/ItemLoaderService.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
|
| 33837 |
714 d 7 h |
tejus.lohani |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Always use equals |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
|