SmartDukaan – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

Rev 34576 – Try catch added for bid process

vikas.jangra — Mon, 19 May 2025 01:11:30 +0530

vikas.jangra – 3 file(s) modified
Try catch added for bid process

Rev 34575 – Liquidation/Bidding auto approval

vikas.jangra — Sat, 17 May 2025 16:43:59 +0530

vikas.jangra – 7 file(s) modified
Liquidation/Bidding auto approval

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.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/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/liquidation.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update-schemes-page.vm

Rev 34573 – PO Generated by Retailer or auth user

vikas.jangra — Fri, 16 May 2025 00:55:42 +0530

vikas.jangra – 1 file(s) modified
PO Generated by Retailer or auth user

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

Rev 34572 – Empty Bid Mail

vikas.jangra — Thu, 15 May 2025 22:04:22 +0530

vikas.jangra – 1 file(s) modified
Empty Bid Mail

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

Rev 34568 – Liquidation/Bidding push notification and Publish Email

vikas.jangra — Thu, 15 May 2025 18:55:56 +0530

vikas.jangra – 11 file(s) modified
Liquidation/Bidding push notification and Publish Email

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LiquidationService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.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/catalog/LiquidationController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/liquidation.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/liquidation.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update-schemes-page.vm

Rev 34566 – loan transaction mapping issue at time of approval

ranu — Thu, 15 May 2025 16:26:58 +0530

ranu – 2 file(s) modified
loan transaction mapping issue at time of approval

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java

Rev 34545 – Bidding/Liquidation push notifications

vikas.jangra — Tue, 13 May 2025 16:07:20 +0530

vikas.jangra – 11 file(s) modified
Bidding/Liquidation push notifications

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/LiquidationRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/LiquidationRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LiquidationService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/LiquidationModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java

Rev 34501 – Bulk Order FIX

vikas.jangra — Tue, 29 Apr 2025 15:59:56 +0530

vikas.jangra – 1 file(s) modified
Bulk Order FIX

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

Rev 34492 – Bidding Semi Final code

vikas.jangra — Mon, 28 Apr 2025 23:40:19 +0530

vikas.jangra – 10 file(s) modified
Bidding Semi Final code

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/StringUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Liquidation.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/LiquidationDetail.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/LiquidationRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LiquidationService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/LiquidationModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

Rev 34468 – Liquidation/Bidding Report and whatsapp

vikas.jangra — Thu, 24 Apr 2025 16:08:36 +0530

vikas.jangra – 5 file(s) modified
Liquidation/Bidding Report and whatsapp

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LiquidationService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

Rev 34443 – Bidding/Liquidation Initial Code

vikas.jangra — Tue, 22 Apr 2025 02:59:21 +0530

vikas.jangra – 16 file(s) modified
Bidding/Liquidation Initial Code

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Bid.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Liquidation.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/BidRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/BidRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/LiquidationRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/LiquidationRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LiquidationService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/BiddingModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/LiquidationModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java

Rev 34312 – code committed for loan maping

ranu — Tue, 18 Mar 2025 15:16:54 +0530

ranu – 8 file(s) modified
code committed for loan maping

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/BlockLoanIdSanctionId.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/transaction/TransactionService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 33696 – Added changes related to Narration and fixing loan creation while ...

amit.gupta — Fri, 23 Aug 2024 10:33:02 +0530

amit.gupta – 9 file(s) modified
Added changes related to Narration and fixing loan creation while billing

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Loan.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/order/BulkOrderService.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/transaction/TransactionServiceImpl.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/WalletController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 33597 – bulk order placed with 0 and actual price not need ...

tejus.lohani — Thu, 18 Jul 2024 19:58:15 +0530

tejus.lohani – 1 file(s) modified
bulk order placed with 0 and actual price not need for approval

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

Rev 33556 – Fixed Messaging

amit.gupta — Thu, 11 Jul 2024 12:14:33 +0530

amit.gupta – 1 file(s) modified
Fixed Messaging

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

Rev 33547 – changes in Max negative wallet value

tejus.lohani — Fri, 05 Jul 2024 20:46:46 +0530

tejus.lohani – 4 file(s) modified
changes in Max negative wallet value

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/BulkOrderModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java

Rev 33442 – Add Logger in line-143 for netAmountInHand and correct line-145 Message

tejus.lohani — Thu, 13 Jun 2024 14:45:58 +0530

tejus.lohani – 1 file(s) modified
Add Logger in line-143 for netAmountInHand and correct line-145 Message

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

Rev 33351 – Fixed credit amount

amit.gupta — Thu, 09 May 2024 16:42:19 +0530

amit.gupta – 1 file(s) modified
Fixed credit amount

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

Rev 33343 – Fixed Order quantity avai

amit.gupta — Wed, 08 May 2024 18:51:47 +0530

amit.gupta – 1 file(s) modified
Fixed Order quantity avai

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

Rev 33341 – Moved method getAllPendingTransactionApproval

tejus.lohani — Wed, 08 May 2024 17:57:51 +0530

tejus.lohani – 1 file(s) modified
Moved method getAllPendingTransactionApproval

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

Rev 33338 – Bulk orders can now also be placed using SD credit.

amit.gupta — Wed, 08 May 2024 16:34:49 +0530

amit.gupta – 3 file(s) modified
Bulk orders can now also be placed using SD credit.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/CreditAccountRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/CreditAccountRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

Rev 33219 – work on bulk order

tejus.lohani — Fri, 12 Apr 2024 17:30:38 +0530

tejus.lohani – 2 file(s) modified
work on bulk order

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 33216 – fixed issue for custom price bulk order

tejus.lohani — Fri, 12 Apr 2024 15:40:06 +0530

tejus.lohani – 1 file(s) modified
fixed issue for custom price bulk order

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

Rev 33213 – new feature -Bulk order and Approval add our System

tejus.lohani — Fri, 12 Apr 2024 12:16:57 +0530

tejus.lohani – 18 file(s) modified
new feature -Bulk order and Approval add our System

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/BulkOrderModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/LineItemModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/TransctionApprovalModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/TransactionApproval.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/TransactionApprovalStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/TransactionApprovalRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/TransactionApprovalRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/TransactionApprovalService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionApprovalServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/transaction-approval.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bulk-order.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction/transaction-approvals.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update_PartnerCriteria.vm

Rev 33173 – Fixed ExcelUtils dependencies

amit.gupta — Sat, 30 Mar 2024 16:27:28 +0530

amit.gupta – 2 file(s) modified
Fixed ExcelUtils dependencies

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ItemLoaderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

Rev 33172 – add bulk order service in admin dashboard

tejus.lohani — Sat, 30 Mar 2024 16:09:22 +0530

tejus.lohani – 11 file(s) modified
add bulk order service in admin dashboard

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/BulkOrderModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ItemLoaderService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.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/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bulk_order.vm