SmartDukaan – /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/

Rev 36447 – DN lifecycle UI: acknowledge rejected return endpoint, status labels, JS ...

amit — Fri, 01 May 2026 23:49:24 +0530

amit – 3 file(s) modified
DN lifecycle UI: acknowledge rejected return endpoint, status labels, JS handler

- Add PUT /return/debit-note/reject/acknowledge/{debitNoteId} endpoint
- invoice-return.vm: Rejected-Pending Acknowledgment + Cancelled status labels, Acknowledge Receipt button
- return.js: click handler for acknowledge-rejected-return

Rev 36408 – Sale-return reversal: controller wiring + UI for cancellability gate + ...

amit — Mon, 27 Apr 2026 19:57:02 +0530

amit – 7 file(s) modified
Sale-return reversal: controller wiring + UI for cancellability gate + INV reject + date filter

PurchaseReturnController:
/return/invoice/process — autoApprove now isIrnCancellable && !isShipped.
!isShipped guard restored: shipped goods route through manual approval
even within 24h, so the physical return goes through CN flow.
/return/invoice/reject/{proId} — new endpoint for finance to reject a
pending INV PRO (sale stands, no inventory/wallet/GST action).
/return/invoice — date filter (fromDate/toDate query params, default
last 30 days) backed by selectByWarehouseIdsAndDateRange. Limit
bumped to 200 to accommodate longer ranges.
receive-debit-note view — passes $requiresFinanceApproval so the
template can render the finance-approval banner when DN's IRN is
past the 24h window.

invoice-return.vm:
Added From/To date inputs + Apply button.
Added Reject button next to Approve & Refund for pending INV PROs.

receive-debit-note.vm:
Added one informational banner (#if $requiresFinanceApproval) above
the receipt form. No layout / JS / submit-URL change.

return.js:
#invoice-return-date-apply handler — POSTs the selected range to
/return/invoice and refreshes the table.
.reject-invoice-return handler — prompts for reason, calls the new
reject endpoint.

dev/staging/prod.properties: feature flag finance.receipt.approval.email.enabled
(default false, flip per env when mail infra is ready).

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.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/resources/js/business/return.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/receive-debit-note.vm

Rev 36316 – Fix:Migrate legacy Purchase Return flow (Report + Bulk Create + ...

aman — Mon, 20 Apr 2026 19:00:06 +0530

aman – 9 file(s) modified
Fix:Migrate legacy Purchase Return flow (Report + Bulk Create + Debit Notes) into FOFO

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/DebitNoteType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInventoryItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js

Rev 36027 – Sale Returns: finance approval endpoint, invoice links in all views, ...

amit — Thu, 19 Mar 2026 19:52:58 +0530

amit – 7 file(s) modified
Sale Returns: finance approval endpoint, invoice links in all views, invoice map for INV: returns, purchase reference check fix

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-note-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes-table.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return-orders.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return-results.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return.vm

Rev 36022 – Sale Returns: invoice return flow with auto-approve, rename to Sale ...

amit — Wed, 18 Mar 2026 19:24:24 +0530

amit – 6 file(s) modified
Sale Returns: invoice return flow with auto-approve, rename to Sale Returns, role-based search results, Finance L2+ access

Rev 35998 – Invoice Return: controller endpoints, UI views (receive/refund/reject/details/search), JS handlers, role-based ...

amit — Sat, 14 Mar 2026 19:31:27 +0530

amit – 9 file(s) modified
Invoice Return: controller endpoints, UI views (receive/refund/reject/details/search), JS handlers, role-based access, dashboard menu

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-readonly.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-note-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes-table.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return-results.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/receive-debit-note.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/refund-debit-note.vm

Rev 34580 – intrasist data modification

ranu — Mon, 19 May 2025 14:55:40 +0530

ranu – 7 file(s) modified
intrasist data modification

~ /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/fofo/FofoOpeningStockRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/WarehouseIntransitDataModel.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/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/return-to-vendor.vm

Rev 34525 – activated imeis given to dashboard

ranu — Mon, 05 May 2025 18:07:03 +0530

ranu – 4 file(s) modified
activated imeis given to dashboard

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/activated-imeis.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysis-dashboard-activated-imeis.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm

Rev 34142 – DN request only mapped partner ,show only mapped partner

tejus.lohani — Fri, 17 Jan 2025 12:31:03 +0530

tejus.lohani – 4 file(s) modified
DN request only mapped partner ,show only mapped partner

Rev 33910 – Fixed logistcs changes

amit.gupta — Tue, 05 Nov 2024 13:45:39 +0530

amit.gupta – 6 file(s) modified
Fixed logistcs changes

~ /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/dao/config/WebDBContextConfigure.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/LogisticsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js

Rev 30828 – Fixed commit

amit.gupta — Tue, 16 Aug 2022 11:18:01 +0530

amit.gupta – 5 file(s) modified
Fixed commit

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PORowModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/InventoryWarehouse.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/warehouse
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/warehouse/warehouse.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 30466 – Fixed issues with activated imeis

amit.gupta — Sun, 22 May 2022 14:02:04 +0530

amit.gupta – 3 file(s) modified
Fixed issues with activated imeis

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/activated-imeis.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 30017 – Fixed minor issues with price circular

amit.gupta — Tue, 15 Feb 2022 09:31:01 +0530

amit.gupta – 22 file(s) modified
Fixed minor issues with price circular

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/BrandRegionMappingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/CCAvenuePaymentService.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/IndentController.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/RetailerController.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/WebOffersController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/focused_model.js
~ /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/focused_model.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_history.vm
x /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/send-po-notification.vm

Rev 29937 – OK

amit.gupta — Mon, 31 Jan 2022 18:51:37 +0530

amit.gupta – 2 file(s) modified
OK

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm

Rev 27763 – partner onboarding panel changes

tejbeer — Tue, 09 Feb 2021 18:23:03 +0530

tejbeer – 39 file(s) modified
partner onboarding panel changes

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreatePartnerOnBoardingPanel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerOnBoardingPanel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerOnBoardingPanelRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerOnBoardingPanelRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/PartnerOnboardingService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/PartnerOnboardingServiceImpl.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/PartnerOnBoardingPanelController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/AUTHORS.txt
/trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/images
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/images/ui-icons_444444_256x240.png
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/images/ui-icons_555555_256x240.png
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/images/ui-icons_777620_256x240.png
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/images/ui-icons_777777_256x240.png
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/images/ui-icons_cc0000_256x240.png
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/images/ui-icons_ffffff_256x240.png
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/index.html
x /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/jquery-ui-1.9.2.custom.min.js
x /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/jquery-ui-1.10.1.custom.css
x /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/jquery-ui-1.10.1.custom.min.css
x /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/jquery-ui-1.10.1.custom.min.js
x /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/jquery-ui-1.10.2.custom.min.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/jquery-ui.css
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/jquery-ui.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/jquery-ui.min.css
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/jquery-ui.min.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/jquery-ui.structure.css
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/jquery-ui.structure.min.css
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/jquery-ui.theme.css
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/jquery-ui.theme.min.css
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/LICENSE.txt
+ /trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/package.json
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/panel-listing.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/partner-onboarding-index.vm

Rev 27755 – Fixed live with on

amit.gupta — Mon, 08 Feb 2021 19:26:03 +0530

amit.gupta – 26 file(s) modified
Fixed live with on

Rev 27754 – Fixed live with on

amit.gupta — Mon, 08 Feb 2021 18:27:13 +0530

amit.gupta – 47 file(s) modified
Fixed live with on

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/add-wallet-request.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/authUser.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/banner-listing.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/contact.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/feature.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/franchisee-visit.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/hygiene.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory-listing.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/item.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/jio-recharge.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/live_demo_billing.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/login.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/map-index.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/notification-panel.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-pending-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-target.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/prebooking.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/product-detail.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/promoter-info.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/punch-in-out.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/recharge.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/refferal.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/role.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/send-message.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/send-notification.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/unsettled-payments.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/user-profile.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/vendor.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet-edit.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/web-listing.js

Rev 27171 – change

tejbeer — Sat, 10 Oct 2020 14:24:23 +0530

tejbeer – 13 file(s) modified
change

+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.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/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/content-upload.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/franchisee-visit.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/jquery.cloud9carousel.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/jquery.flipster.min.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/offers.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/swiper.min.js

Rev 26978 – change

tejbeer — Tue, 25 Aug 2020 18:14:34 +0530

tejbeer – 5 file(s) modified
change

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js

Rev 26825 –

amit.gupta — Thu, 16 Jul 2020 15:16:54 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/activated-imeis.js

Rev 26817 – Added Online sale

amit.gupta — Thu, 16 Jul 2020 11:46:15 +0530

amit.gupta – 30 file(s) modified
Added Online sale

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/StateGstRate.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TaxRate.java@26812)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TaxRate.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CustomerAddress.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PendingOrder.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/repository/catalog/StateGstRateRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/StateGstRateRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/CustomerService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/CustomerServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderService.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/CustomerController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/activated-imeis.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-order-item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending_fofo_order.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java

Rev 26814 –

amit.gupta — Tue, 14 Jul 2020 19:32:56 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/activated-imeis.js

Rev 26748 – change

tejbeer — Sat, 13 Jun 2020 18:24:37 +0530

tejbeer – 3 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm

Rev 26721 – change

tejbeer — Fri, 05 Jun 2020 13:01:10 +0530

tejbeer – 14 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PendingOrderItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderServiceImpl.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/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partners_allocation.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-order-item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending_fofo_order.vm

Rev 26320 – CHANGE

tejbeer — Wed, 12 Feb 2020 13:15:03 +0530

tejbeer – 4 file(s) modified
CHANGE

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/notify_cancel.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/returnables.vm

Rev 26293 – change

tejbeer — Tue, 28 Jan 2020 16:30:43 +0530

tejbeer – 2 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm

Rev 26246 –

amit.gupta — Wed, 22 Jan 2020 19:57:00 +0530

amit.gupta – 7 file(s) modified

~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/env.property
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/activated-imeis.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/activated-imeis.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-activated-imeis.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm

Rev 26131 – change

tejbeer — Thu, 09 Jan 2020 10:34:14 +0530

tejbeer – 11 file(s) modified
change

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CatalogListingModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PromoterDetailModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Promoter.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PromoterRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PromoterRepositoryImpl.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/PunchInOutController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-info.vm

Rev 25736 – change

tejbeer — Thu, 31 Oct 2019 16:44:39 +0530

tejbeer – 12 file(s) modified
change

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemIdAvailability.java
~ /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/GenericRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/focused_model.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
+ /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/open-indent.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/refferal.vm

Rev 25721 – indent change

tejbeer — Tue, 29 Oct 2019 12:32:31 +0530

tejbeer – 38 file(s) modified
indent change

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CatalogListingModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/FocusedModelShortageModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PlannedModel.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/config/DBConfig.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/FocusedModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/MonthlyPlanned.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PlannedDetail.java
+ /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/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/cs/CsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PartnersPositionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PartnersPositionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderItemRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/MonthlyPlannedRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/MonthlyPlannedRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PlannedDetailRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PlannedDetailRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventorySnapshotRepository.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/focused_model.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/hygiene.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/focused_model.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/notify-order-modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm

Rev 24556 – changes in indent

tejbeer — Thu, 21 Feb 2019 12:59:13 +0530

tejbeer – 1 file(s) modified
changes in indent

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js

Rev 24410 – Fixed pricing

amit.gupta — Sun, 06 Jan 2019 17:31:04 +0530

amit.gupta – 10 file(s) modified
Fixed pricing

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemDescriptionModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDrop.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/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm

Rev 24406 – Fixed changes related to item acitve/pause

amit.gupta — Thu, 03 Jan 2019 14:44:30 +0530

amit.gupta – 11 file(s) modified
Fixed changes related to item acitve/pause

~ /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/PriceDropController.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/TagListingController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm

Rev 24229 – Fixed indent

amit.gupta — Sat, 17 Nov 2018 19:30:11 +0530

amit.gupta – 13 file(s) modified
Fixed indent

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CatalogListingModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/StockAllocationModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/StockAllocation.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.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/StockAllocationRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/StockAllocationRepositoryImp.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/StockAllocationServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm

Rev 23855 – Added feature to pause listing

amit.gupta — Wed, 04 Jul 2018 10:36:23 +0530

amit.gupta – 7 file(s) modified
Added feature to pause listing

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.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/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm

Rev 23796 – Added changes related to indent

amit.gupta — Mon, 25 Jun 2018 05:53:56 +0530

amit.gupta – 18 file(s) modified
Added changes related to indent

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomRetailer.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemIdAvailability.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /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/ScanRecord.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.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/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/order/OrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.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/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm

Rev 23786 – Major commit. 1. Fixed profitmandi-web refactored as per new role ...

amit.gupta — Thu, 14 Jun 2018 15:38:04 +0530

amit.gupta – 45 file(s) modified
Major commit.
1. Fixed profitmandi-web refactored as per new role management logic.
2. Added Allocation Mechanism
3. Minor bug fixes.

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/CounterSize.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/BrandPerformance.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomRetailer.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemIdAvailability.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/StockAllocationModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStoreSequenceGeneration.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/StockAllocation.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/dtr/FofoStoreRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreSequenceGenerationRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreSequenceGenerationRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.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/StockAllocationRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/StockAllocationRepositoryImp.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/StockAllocationService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/StockAllocationServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.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/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/RoleManager.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/bootstrap3-typeahead.min.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-snapshot.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/RoleManagerService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserServiceImpl.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MigrationController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/UserAddRoleRequest.java

Rev 23772 – Fixed purchase Grn issue

amit.gupta — Wed, 06 Jun 2018 04:50:21 +0530

amit.gupta – 6 file(s) modified
Fixed purchase Grn issue

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomItem.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/service/inventory/PurchaseServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm

Rev 23644 – Fixed denied issue

amit.gupta — Tue, 15 May 2018 13:40:27 +0530

amit.gupta – 1 file(s) modified
Fixed denied issue

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js

Rev 23638 – Added Changes to Partner Return and Customers Return

amit.gupta — Fri, 11 May 2018 08:20:44 +0530

amit.gupta – 43 file(s) modified
Added Changes to Partner Return and Customers Return

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/BadReturnRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreditNotePdfModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/FoiBadReturnRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CurrentInventorySnapshot.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CustomerCreditNote.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CustomerReturnItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrderItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InvoiceNumberGenerationSequence.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PurchaseReturnItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/ReturnType.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/fofo/BadInventorySnapshotRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/BadInventorySnapshotRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerCreditNoteRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerCreditNoteRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerReturnItemRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerReturnItemRepositoryImpl.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/fofo/PurchaseReturnItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnItemRepositoryImpl.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/order/OrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.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/java/com/spice/profitmandi/common
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/common/model
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/common/model/FoiBadReturnRequest.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/PurchaseReturnController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/model/BadReturnRequest.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/approved-returns.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-to-return.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-returns.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/returnable-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/returnables.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java