Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
37966 11 d 11 h ranu /trunk/profitmandi-fofo/src/main/ emi plans should be come via emi offer json from server  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/EmiCatalogController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
/trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
/trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/emi-catalog-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/emi-catalog-popup.vm
37869 31 d 6 h amit /trunk/profitmandi-fofo/src/main/ fix(fofo): GlitchTip quick wins - empty billing queue, regex search, upload dates

- /om/transactions: no crash when warehouse has no unbilled orders (#50);
/om/orderByTransaction returns "No pending orders" instead of querying with
no items (#88); JS skips detail load when there is no transaction.
- /om/transactions, /om/billedInvoice: warehouseId=0 fallback used a warehouse
id as a list index (authWarehouseIds.get(authWarehouseIds.get(0))).
- Item / vendor / retailer typeahead: substring match via contains() instead of
a regex built from user input, which threw PatternSyntaxException on "("
(#1932, #1375, #1700, #600, #1926, #1721, #1754).
- Billed-order shipping upload: time optional, dd-MM-yyyy[ HH:mm[:ss]],
missing parts default to 00 (#1976).
- IMEI activation upload: time optional, M/d/yyyy[ H:mm[:ss]], missing time =
00:00:00; every row validated, bad dates and duplicate IMEIs reported with
row numbers instead of a 500 (#1990).
- Bump JS version to 443.
 
/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/java/com/spice/profitmandi/web/controller/LogisticsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.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/VendorController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js
37846 33 d 5 h amit /trunk/profitmandi-fofo/src/main/ feat(warehouse): dashboards list ACTIVE warehouses only, warehouse-team screens ACTIVE+SUSPENDED (from BillingWarehouseService, WAREHOUSE_MAP gone); global $warehouseNames for labels of data rows in any state; Sellers & Warehouses screen: all-warehouse overview with status tabs, 3-state status, rename, stock/unshipped orders/stores/mapping usage, send stock alert; partner zone offers active warehouses only; brand stock 'All' = active warehouses (replaces r37838 loop); jsVersion 442  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ControllerSetup.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/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/LogisticsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/NotificationController.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/java/com/spice/profitmandi/web/controller/PlacementPlanController.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/ReturnPermissionHelper.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReturnToVendorController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SellerController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SupplierController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/RbmDrrDashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/provider/ProviderController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PoStockApprovalController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PurchaseOrderController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/WarehouseController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse_rider/WarehouseRiderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/activation-updation-timestamp.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brand-region-mapping-view.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-warehouse-item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-combo.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-listing-purchase-item.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/provider-tat-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/secondary-warehouse-billing-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/seller-warehouse-container.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/seller.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-activated-itemwise-model.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-datewise-debitnote.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-invoice-view.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-open-purchase-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-purchase-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-receive-new-invoice.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse_accessories_itemwsie_sale.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse_partner_itemwise_sale.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehousewise_accessoriesbrand_sale.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehousewise_activated_model.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehousewise_brand_partners_sale.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/seller.js
37593 57 d 4 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 89 d 6 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 99 d 10 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 120 d 10 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 130 d 8 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 170 d 9 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 172 d 8 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 175 d 10 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 194 d 9 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 245 d 11 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 270 d 3 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 388 d 6 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 497 d 4 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 529 d 8 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 670 d 10 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 716 d 8 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 717 d 4 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

Show All