| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 36447 |
12 d 13 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
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 |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
|
| 36408 |
16 d 17 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
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/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/resources/js/business/return.js
|
| 36316 |
23 d 18 h |
aman |
/trunk/ |
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
|
| 36027 |
55 d 17 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
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/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
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
|
| 36022 |
56 d 18 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Sale Returns: invoice return flow with auto-approve, rename to Sale Returns, role-based search results, Finance L2+ access |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return-orders.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-readonly.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/resources/js/business/return.js
|
| 35998 |
60 d 18 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Invoice Return: controller endpoints, UI views (receive/refund/reject/details/search), JS handlers, role-based access, dashboard menu |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-note-details.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
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-readonly.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes-table.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
|
| 34580 |
359 d 22 h |
ranu |
/trunk/ |
intrasist data modification |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/return-to-vendor.vm
/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
|
| 34142 |
482 d 1 h |
tejus.lohani |
/trunk/profitmandi-fofo/src/main/ |
DN request only mapped partner ,show only mapped partner |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-returns.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/returnables.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
|
| 29937 |
1563 d 18 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/webapp/ |
OK |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
|
| 27763 |
1919 d 19 h |
tejbeer |
/trunk/ |
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/controller/PartnerOnBoardingPanelController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-index.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/AUTHORS.txt
/trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/LICENSE.txt
/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
/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/package.json
/trunk/profitmandi-fofo/src/main/webapp/resources/js/panel-listing.js
/trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/jquery-ui-1.10.1.custom.css
/trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/jquery-ui-1.10.1.custom.min.css
/trunk/profitmandi-fofo/src/main/webapp/resources/assets/jquery-ui/jquery-ui-1.10.1.custom.min.js
/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-1.9.2.custom.min.js
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/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/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
|
| 27754 |
1920 d 19 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ |
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
|
| 26320 |
2283 d 0 h |
tejbeer |
/trunk/ |
CHANGE |
|
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
/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
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
|
| 23644 |
2921 d 0 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/ |
Fixed denied issue |
|
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
|
| 23638 |
2925 d 5 h |
amit.gupta |
/trunk/ |
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/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/enumuration/fofo/ReturnType.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-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/model/BadReturnRequest.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-to-return.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/returnable-details.vm
/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/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/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/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/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/approved-returns.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/returnables.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
|
| 23540 |
2955 d 23 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/ |
Fixed itemdesc |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
|
| 23539 |
2956 d 0 h |
amit.gupta |
/trunk/ |
Added debit notes for return |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Test.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes.vm
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FormattingUtils.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/DebitNote.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/DebitNoteRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/DebitNoteRepositoryImpl.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/recharge/RechargeServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
|
| 23532 |
2957 d 23 h |
amit.gupta |
/trunk/ |
Added changes related to returns |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DebitNotePdfModel.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FormattingUtils.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/DebitNote.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Purchase.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/PurchaseReturnController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.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/EntityController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java
|
| 23506 |
2961 d 5 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/ |
Added changes related to Schemes |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CronController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/approved-returns.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-returns.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/returnables.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.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/SchemeController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java
/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/staging.properties
|