Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
37057 22 d 22 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Add admin Order Report (CSV) with month-bounded date range; scope non-admins to their own store and fix NPE on blank admin fofoId (Integer/int ternary unboxing) in downloadOrderReport  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
37037 24 d 18 h amit /trunk/profitmandi-fofo/src/main/ Add Order Report under Partner Reports: /orderReport page + per-fofo /downloadOrderReport CSV (admin partner filter, blank=all partners; non-admin forced to own store), reports.js handlers, jsVersion 373->374  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-report.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/ReportsController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
36708 66 d 19 h aman /trunk/ Fix:Credit note report fix  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
36513 83 d 18 h amit /trunk/ Add running_balance to userwallethistory: persist wallet balance after each transaction for instant ledger display. Populate at all write paths (WalletService, adjustTransaction). Read directly in wallet statement template and CSV download. Includes backfill migration SQL. Renamed walletSummart to walletSummary.  
/trunk/profitmandi-dao/src/main/resources/sql/migration_running_balance_wallet_history.sql
/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/transaction/UserWalletHistory.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WalletSummaryReportModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoWalletController.java
36198 117 d 17 h amit /trunk/profitmandi-fofo/src/main/ Add Download All CN summary report for FOFO_ADMIN: bulk CSV with partner details, IRN, ack date per month  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/credit-note.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
34728 399 d 22 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ donotcommit  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
34713 401 d 19 h aman.kumar /trunk/ Get invoice number in loan report and correct the date format in loan report  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LoanStatement.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanStatementReportModel.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-loan-statement-summary.vm
34256 517 d 2 h ranu /trunk/ hid live and cn attachement part live  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CurrentAvailableAndPurchaseQtyModel.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/FofoOpeningStock.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/OfferPayout.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDropIMEI.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/HidAllocationModel.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/FofoOpeningStockRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/OfferPayoutRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/OfferPayoutRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInOutRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInOutRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropIMEIRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropIMEIRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/credit-note-list.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/hid-allocation-list.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
34236 522 d 17 h ranu /trunk/ credit note report given to finnace and partner  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/credit-note-list.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/credit-note.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CreditNoteRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CreditNoteRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
34096 572 d 23 h aman.kumar /trunk/ Wallet-report changes and wallet-addn serchbydate option  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-rejected.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-req.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/add-wallet-request.js
34093 578 d 16 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Sale report downloaded by End date  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
34069 589 d 23 h aman.kumar /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Partner Report access error from partner side  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
34066 591 d 17 h aman.kumar /trunk/ Partner Report access to rbm team  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/foco-sale-report.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer-payout-dump-report.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-account-statement.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-loan-statement-summary.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-loan-statement.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/price-drop-report.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-summary-report.vm
34011 611 d 21 h tejus.lohani /trunk/ bug fix in wallet statement report  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm
33816 673 d 18 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ wallet statement adeed running and openeing  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
33815 673 d 18 h ranu /trunk/profitmandi-fofo/src/main/ wallet statement adeed running and openeing  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-loan-statement-summary.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm
33814 674 d 0 h ranu /trunk/ retailer alternate contacts ui  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-contact-list.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-contacts.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RetailerContactRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RetailerContactRepositoryImpl.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/ReportsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
33809 675 d 1 h ranu /trunk/ partner loan ledger statment  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanStatementReportModel.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-loan-statement-summary.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-loan-statement.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/State.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LoanStatement.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanStatementRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanStatementRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.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/ReportsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/account-statement-list.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-account-statement.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
33775 687 d 17 h ranu /trunk/profitmandi-fofo/src/main/ partner account ledger statment  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/account-statement-list.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-account-statement.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/vendor-catalog-pricing-pending-request.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
33656 725 d 19 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixed report  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java

←Prev12Next→

Show All