SmartDukaan – /trunk/ThriftConfig/src/main/java/in/shop2020/model/

Rev 36230 – ADVANCE_SECURITY(34) added in wallet refrence ..as per deena sir

ranu — Thu, 09 Apr 2026 13:49:10 +0530

ranu – 1 file(s) modified
ADVANCE_SECURITY(34) added in wallet refrence ..as per deena sir

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 36149 – Add INVOICE_CANCELLED(90) status for post-billing IRN cancellation within 24h

amit — Thu, 02 Apr 2026 11:55:37 +0530

amit – 1 file(s) modified
Add INVOICE_CANCELLED(90) status for post-billing IRN cancellation within 24h

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java

Rev 35996 – Add REJECTED(2) to ReturnAction enum for return rejection flow

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

amit – 1 file(s) modified
Add REJECTED(2) to ReturnAction enum for return rejection flow

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReturnAction.java

Rev 35060 – Fixed wrong notifications going to retailers

amit — Tue, 23 Sep 2025 23:57:33 +0530

amit – 4 file(s) modified
Fixed wrong notifications going to retailers

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SendNotificationModel.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 34709 – Added Loan Related Changes

amit.gupta — Thu, 26 Jun 2025 13:12:20 +0530

amit.gupta – 16 file(s) modified
Added Loan Related Changes

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerTypeChange.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/enumuration/catalog/SchemeType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.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/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/service/catalog/ItemLoaderService.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-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.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 33399 – online process all order and payment by l2 accounts and ...

ranu — Mon, 27 May 2024 14:48:11 +0530

ranu – 11 file(s) modified
online process all order and payment by l2 accounts and spilit order PendingOrderItem

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreatePendingOrderItem.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomFofoOrderItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PendingOrderItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CartItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CartItemResponseModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.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/StoreController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 33359 – Fixed Sanction as well as approval issue

amit.gupta — Fri, 10 May 2024 19:19:24 +0530

amit.gupta – 3 file(s) modified
Fixed Sanction as well as approval issue

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/SidbiService.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 31316 – Removed unwanted files

amit.gupta — Mon, 19 Dec 2022 14:48:03 +0530

amit.gupta – 1 file(s) modified
Removed unwanted files

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 31314 – Added ReferenceType for Shopboy Support

amit.gupta — Mon, 19 Dec 2022 12:48:57 +0530

amit.gupta – 2 file(s) modified
Added ReferenceType for Shopboy Support

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 31223 – Fixed files

amit.gupta — Fri, 02 Dec 2022 18:41:27 +0530

amit.gupta – 4 file(s) modified
Fixed files

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/HoldInventoryDetail.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemStockPurchaseParams.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/HotspotServiceMatrix.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/TransferLot.java

Rev 31222 – Removed unwanted files

amit.gupta — Fri, 02 Dec 2022 18:29:44 +0530

amit.gupta – 4 file(s) modified
Removed unwanted files

x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/holdInventoryDetail.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/itemStockPurchaseParams.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/hotspotServiceMatrix.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/transferLot.java

Rev 31027 – Adedd default httpClient

amit.gupta — Mon, 10 Oct 2022 14:46:08 +0530

amit.gupta – 1 file(s) modified
Adedd default httpClient

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 30874 – Fixed Scheduling issues

amit.gupta — Thu, 25 Aug 2022 13:30:16 +0530

amit.gupta – 1 file(s) modified
Fixed Scheduling issues

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 30862 –

tejbeer — Wed, 24 Aug 2022 18:08:32 +0530

tejbeer – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 30654 – Added scheme in processing for specified scheme ids

amit.gupta — Fri, 24 Jun 2022 17:09:13 +0530

amit.gupta – 1 file(s) modified
Added scheme in processing for specified scheme ids

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 30449 – Added Offer Changes

amit.gupta — Fri, 20 May 2022 16:21:59 +0530

amit.gupta – 19 file(s) modified
Added Offer Changes

~ /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-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LineItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ImeiActivationTimestampModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/StateGstRateRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/StateGstRateRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ActivatedImeiRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ActivatedImeiRepositoryImpl.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/OrderRepository.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/AdminUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 29702 –

amit.gupta — Fri, 17 Dec 2021 12:47:05 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 29603 –

amit.gupta — Tue, 23 Nov 2021 15:43:13 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 29602 –

amit.gupta — Tue, 23 Nov 2021 13:53:16 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 28244 –

amit.gupta — Mon, 19 Apr 2021 13:29:11 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 26793 –

tejbeer — Mon, 29 Jun 2020 18:14:15 +0530

tejbeer – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 26504 –

amit.gupta — Thu, 02 Apr 2020 20:29:38 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 26503 –

amit.gupta — Thu, 02 Apr 2020 20:28:27 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 26484 –

amit.gupta — Sat, 21 Mar 2020 21:13:57 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 26074 –

amit.gupta — Thu, 02 Jan 2020 13:53:49 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 25802 –

amit.gupta — Mon, 11 Nov 2019 12:46:43 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 24877 – change

tejbeer — Tue, 23 Apr 2019 17:36:39 +0530

tejbeer – 1 file(s) modified
change

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 24740 – change

tejbeer — Mon, 18 Mar 2019 18:37:20 +0530

tejbeer – 1 file(s) modified
change

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java

Rev 23446 – Added changes related to fofo.

amit.gupta — Mon, 19 Mar 2018 20:37:05 +0530

amit.gupta – 18 file(s) modified
Added changes related to fofo.

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FetchNewFlipCartOrders.java
~ /trunk/Common/src/main/java/in/shop2020/serving/services/FetchNewFlipkartOrdersNew.java
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticUtils.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 23441 – Rolled back

amit.gupta — Fri, 16 Mar 2018 18:07:27 +0530

amit.gupta – 1 file(s) modified
Rolled back

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java

Rev 23437 – Bug Fixed from 26 - 33 from bug sheet

ashik.ali — Thu, 15 Mar 2018 19:58:54 +0530

ashik.ali – 3 file(s) modified
Bug Fixed from 26 - 33 from bug sheet

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 23313 – Added tax rate

amit.gupta — Sat, 03 Feb 2018 12:39:10 +0530

amit.gupta – 8 file(s) modified
Added tax rate

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkAddController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-add-options.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 23310 – Removed old tax methods and fixed tax rates for mobile ...

amit.gupta — Fri, 02 Feb 2018 11:20:51 +0530

amit.gupta – 4 file(s) modified
Removed old tax methods and fixed tax rates for mobile category to 12

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java

Rev 23307 –

ashik.ali — Thu, 01 Feb 2018 19:40:55 +0530

ashik.ali – 2 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java

Rev 23160 –

ashik.ali — Fri, 05 Jan 2018 16:24:44 +0530

ashik.ali – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java

Rev 23157 –

ashik.ali — Fri, 05 Jan 2018 15:22:10 +0530

ashik.ali – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/StateGstRate.java

Rev 23152 –

ashik.ali — Thu, 04 Jan 2018 18:19:39 +0530

ashik.ali – 5 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 23151 –

ashik.ali — Thu, 04 Jan 2018 17:45:56 +0530

ashik.ali – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java

Rev 23144 –

ashik.ali — Thu, 04 Jan 2018 12:40:11 +0530

ashik.ali – 3 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/StateGstRate.java