SmartDukaan – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/

Rev 36446 – DN lifecycle: decouple rejection from restore, add DebitNoteStatus, retailer acknowledgment ...

amit — Fri, 01 May 2026 23:48:55 +0530

amit – 8 file(s) modified
DN lifecycle: decouple rejection from restore, add DebitNoteStatus, retailer acknowledgment flow

- Add DebitNoteStatus enum (CREATED/RECEIVED/APPROVED/REJECTED/CANCELLED) on debit_note table
- Add retailer_acknowledge_timestamp on purchase_return_order
- rejectReturn() no longer calls restoreReturnedItems() — inventory stays reduced until retailer confirms goods received back
- New acknowledgeRejectedReturn(): retailer confirms receipt, restores inventory+schemes+offers, DN→CANCELLED
- Set DN status in receiveDebitNoteItems (RECEIVED), refundOrder (APPROVED), rejectReturn (REJECTED)
- notifyReturnRejected: updated message, added Finance L1+L2 to CC
- notifyItemsReceived: added Finance L1
- New notifyRejectedGoodsAcknowledged notification
- SQL migration with backfill for existing data

~ /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/PurchaseReturnOrder.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/DebitNoteStatus.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnNotificationService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnNotificationServiceImpl.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/resources/sql/migration_dn_status_retailer_ack.sql

Rev 35997 – Invoice Return: PurchaseReturnOrder entity, ReturnAction DAO enum, receive/refund/reject service, ReturnOrderInfo ...

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

amit – 10 file(s) modified
Invoice Return: PurchaseReturnOrder entity, ReturnAction DAO enum, receive/refund/reject service, ReturnOrderInfo selectByOrderId

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PurchaseReturnOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/ReturnOrderInfo.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/ReturnAction.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/transaction/ReturnOrderInfoRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/ReturnOrderInfoRepositoryImpl.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/transaction/ReturnServiceImpl.java

Rev 35652 – PineLabs Offer and Create Order

vikas — Tue, 03 Feb 2026 19:52:20 +0530

vikas – 14 file(s) modified
PineLabs Offer and Create Order

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PinelabsCustomer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PinelabsOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/Gateway.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AddAmountToWalletModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/CCAvenuePaymentService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/pinelabs/dto/CreateOrderResponse.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/pinelabs/PinelabsApiConfig.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/pinelabs/PinelabsOrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/FofoCatalogResponse.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.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/WalletController.java

Rev 33045 – Added sidbi and improvements in credit note

amit.gupta — Mon, 04 Mar 2024 13:06:03 +0530

amit.gupta – 16 file(s) modified
Added sidbi and improvements in credit note

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.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/transaction/FofoSidbiSanction.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/enumuration/fofo/Gateway.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/NotEqualsModel.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/transaction/FofoSidbiSanctionRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/FofoSidbiSanctionRepositoryImpl.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/hdfc/HdfcPaymentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-credit-detail.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-credit-detail-row.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-edit.vm

Rev 32462 – Fixe

amit.gupta — Tue, 19 Sep 2023 17:15:28 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/Milestone.java

Rev 32460 – Fixed formatting of milestone

amit.gupta — Tue, 19 Sep 2023 16:10:53 +0530

amit.gupta – 3 file(s) modified
Fixed formatting of milestone

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/Milestone.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-targets.vm

Rev 32446 – Fixed front end related issues with add/remove row

amit.gupta — Sat, 16 Sep 2023 17:34:50 +0530

amit.gupta – 1 file(s) modified
Fixed front end related issues with add/remove row

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/Milestone.java

Rev 32438 – Added PO Count logic

amit.gupta — Fri, 15 Sep 2023 13:10:23 +0530

amit.gupta – 7 file(s) modified
Added PO Count logic

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/Milestone.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerMonthlySaleModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PartnerRegionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PartnerRegionRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-targets.vm

Rev 31269 –

tejbeer — Wed, 14 Dec 2022 17:13:34 +0530

tejbeer – 4 file(s) modified

Rev 31267 – change

tejbeer — Wed, 14 Dec 2022 16:56:54 +0530

tejbeer – 3 file(s) modified
change

Rev 31262 –

tejbeer — Tue, 13 Dec 2022 16:40:27 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/Milestone.java

Rev 31259 – change

tejbeer — Tue, 13 Dec 2022 16:08:35 +0530

tejbeer – 6 file(s) modified
change

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/Milestone.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerDetailModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/milestone.vm

Rev 30859 – sddirect loan

tejbeer — Wed, 24 Aug 2022 17:44:09 +0530

tejbeer – 43 file(s) modified
sddirect loan

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/mandii/AccountStatusResponseOut.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.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/dtr/CreditAccount.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Loan.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/entity/transaction/SanctionRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/SDCreditRequirement.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/Gateway.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/CreditRisk.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/LoanReferenceType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/SanctionStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/DailyStatementModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SanctionRequestModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SdCreditRequirementModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SDCreditResponseOut.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepositoryImpl.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/dao/repository/transaction/SanctionRequestRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SanctionRequestRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SDCreditRequirementRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SDCreditRequirementRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/SDCreditModel.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/SDCreditController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sd-credit.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sanction-request-row.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sanction-request.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sd-credit-requirement-row.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sd-credit.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GatewayController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java

Rev 30219 – change

tejbeer — Mon, 28 Mar 2022 16:54:39 +0530

tejbeer – 28 file(s) modified
change

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomRetailer.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/FundfinaService.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/PartnerBankAccount.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/PartnerUserData.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/PreApprovalRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/PreApprovalResponse.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/PreApprovals.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/PreApprovalsResponse.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/PushNotificationRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/PushNotificationResponse.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/TransactionalData.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/TransactionRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/TransactionResponse.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/TransactionSummary.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/Vertical.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FormattingUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/CreditAccount.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/FundFinaPreApproval.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/Gateway.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/dtr/FundFinaPreApprovalRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FundFinaPreApprovalRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerService.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/WebSecurityConfig.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/FundFinaController.java

Rev 29497 –

amit.gupta — Thu, 28 Oct 2021 13:43:02 +0530

amit.gupta – 13 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoPayment.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/LoanPaymentRequest.java@29456)
~ /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/LoanPaymentRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/Gateway.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/LoanPaymentStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/PaymentStatus.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/LoanPaymentStatus.java@29456)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoPaymentRepository.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/LoanPaymentRequestRepository.java@29456)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoPaymentRepositoryImpl.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/LoanPaymentRequestRespositoryImpl.java@29456)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/LoanPaymentRequestRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/LoanPaymentRequestRespositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PaymentRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PaymentRepositoryImpl.java

Rev 29051 – changes

manish — Wed, 25 Aug 2021 17:57:39 +0530

manish – 9 file(s) modified
changes

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomRetailer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ServiceBrandsConfig.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/ApplicableServiceType.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/finance-services.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-service-deActivate-modal.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-service-modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm

Rev 28241 – Added changes to handle Partner payments online

amit.gupta — Mon, 19 Apr 2021 11:33:06 +0530

amit.gupta – 14 file(s) modified
Added changes to handle Partner payments online

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/LoanPaymentRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/LoanTransaction.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/Gateway.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/LoanPaymentStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PaymentOptionModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/LoanPaymentRequestRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/LoanPaymentRequestRespositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/CCAvenuePaymentService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuHandler.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPaymentService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayResponseController.java

Rev 24317 – financial service

govind — Thu, 13 Dec 2018 16:21:52 +0530

govind – 23 file(s) modified
financial service

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerBrandService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ServiceBrandsConfig.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/ApplicableServiceType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/PartnerStatusType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ServiceConfigRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ServiceConfigRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig/ServiceConfigService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig/ServiceConfigServiceImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/Not-allowed-sign.jpg
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-brands-to-service.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-partner-brand-service-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-partner-service-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/added-brands.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin-partner-services.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brands-service.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-service.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/service-brands.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 22608 –

ashik.ali — Wed, 11 Oct 2017 15:03:21 +0530

ashik.ali – 19 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/SchemeTag.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Tag.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog/TagType.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/TagType.java@22581)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/TagType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerSchemeTagRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerSchemeTagRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepository.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/catalog/SchemeTagRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeTagRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagRepositoryImpl.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserAccountImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserAccountRepositoryImpl.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserAccountImpl.java@22602)
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagServiceImpl.java

Rev 21984 –

kshitij.sood — Tue, 18 Jul 2017 12:29:27 +0530

kshitij.sood – 11 file(s) modified

~ /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/Customer.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/InventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Purchase.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/PaymentOptionType.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/PurchaseRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseRepositoryImpl.java

Rev 21718 –

ashik.ali — Thu, 15 Jun 2017 16:04:12 +0530

ashik.ali – 7 file(s) modified

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/PaymentOptionType.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/PaymentOptionType.java@21596)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/ScanType.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/ScanType.java@21545)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/TagType.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/TagType.java@21677)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/PaymentOptionType.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/ScanType.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/TagType.java