SmartDukaan – /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-returns.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

~ /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/pending-returns.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/returnables.vm

Rev 34141 – add field , how request DN now we maintain also

tejus.lohani — Thu, 16 Jan 2025 21:50:05 +0530

tejus.lohani – 8 file(s) modified
add field , how request DN now we maintain also

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PurchaseReturnItem.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-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/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/pending-returns.vm

Rev 34140 – add store code field in pending-return panel

tejus.lohani — Wed, 15 Jan 2025 18:04:19 +0530

tejus.lohani – 1 file(s) modified
add store code field in pending-return panel

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-returns.vm

Rev 32771 – translation english to hindi

raveendra.bharati — Wed, 27 Dec 2023 13:01:10 +0530

raveendra.bharati – 40 file(s) modified
translation english to hindi

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/approved-returns.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-partner-po.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-readonly.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes-table.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dth-recharges.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/empty.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/foco-sale-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/insurance-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-summary.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-aging.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/mobile-recharges.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-billing-summary-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-collection-summary.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-total-income.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-grn.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-indent-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-returns.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/performance.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-orders.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/product-compare.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-inactive.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-info.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/punch-in-outs.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/reports.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-imei-history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-payout-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm

Rev 26022 – Fixed pending returns

amit.gupta — Sun, 22 Dec 2019 16:04:16 +0530

amit.gupta – 4 file(s) modified
Fixed pending returns

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /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

Rev 23946 – Fixed changes related to PriceDrop

amit.gupta — Mon, 23 Jul 2018 19:15:58 +0530

amit.gupta – 7 file(s) modified
Fixed changes related to PriceDrop

~ /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/resources/js/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/approved-returns.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/empty.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-returns.vm

Rev 23654 – Fixed js

amit.gupta — Mon, 21 May 2018 05:58:48 +0530

amit.gupta – 19 file(s) modified
Fixed js

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ReporticoProject.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/FoiBadReturnRequest.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/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/SettlementType.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/service/inventory/PurchaseReturnService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderService.java
x /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/controller/ReportsController.java
x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/model/BadReturnRequest.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-returns.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm

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

Rev 23506 – Added changes related to Schemes

amit.gupta — Thu, 05 Apr 2018 07:44:19 +0530

amit.gupta – 12 file(s) modified
Added changes related to Schemes

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
+ /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/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
+ /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/pending-returns.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/returnables.vm