SmartDukaan – /

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 33398 – Fixed reservations

amit.gupta — Fri, 24 May 2024 17:14:18 +0530

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

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

Rev 33397 – Fixed Gst Exception while getting total Sale

amit.gupta — Wed, 22 May 2024 18:54:38 +0530

amit.gupta – 1 file(s) modified
Fixed Gst Exception while getting total Sale

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerTypeChangeServiceImpl.java

Rev 33396 – Fixed warehouse related bugs

amit.gupta — Wed, 22 May 2024 17:33:37 +0530

amit.gupta – 6 file(s) modified
Fixed warehouse related bugs

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/BrandRegionMapping.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/model/WarehouseItemQtyModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/SaholicInventoryServiceImpl.java

Rev 33395 – Added

amit.gupta — Wed, 22 May 2024 11:59:04 +0530

amit.gupta – 1 file(s) modified
Added

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java

Rev 33394 – Fixed Order quantity availability

amit.gupta — Wed, 22 May 2024 11:29:24 +0530

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

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java

Rev 33393 – Move orders to appropriate warehouse when grned

amit.gupta — Wed, 22 May 2024 07:22:40 +0530

amit.gupta – 5 file(s) modified
Move orders to appropriate warehouse when grned

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/AgeingServiceImpl.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-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/WarehouseController.java

Rev 33392 – Orders are now moved based on fulfilment

amit.gupta — Tue, 21 May 2024 19:23:05 +0530

amit.gupta – 1 file(s) modified
Orders are now moved based on fulfilment

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java

Rev 33391 – Fixed

amit.gupta — Tue, 21 May 2024 12:48:46 +0530

amit.gupta – 1 file(s) modified
Fixed

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 33390 – Added Delhi PB

amit.gupta — Mon, 20 May 2024 15:23:24 +0530

amit.gupta – 1 file(s) modified
Added Delhi PB

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BaseController.java

Rev 33389 – Added Delhi PB

amit.gupta — Mon, 20 May 2024 15:18:25 +0530

amit.gupta – 4 file(s) modified
Added Delhi PB

~ /trunk/InventoryManager/src/main/webapp/js/common.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-edit.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm

Rev 33388 – kanchan negi name removed from contact list

ranu — Mon, 20 May 2024 12:13:45 +0530

ranu – 1 file(s) modified
kanchan negi name removed from contact list

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm

Rev 33387 – Fixed Order quantity availability

amit.gupta — Sat, 18 May 2024 19:21:30 +0530

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

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js

Rev 33386 – Added Third Party as well

amit.gupta — Sat, 18 May 2024 17:34:24 +0530

amit.gupta – 1 file(s) modified
Added Third Party as well

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/SaholicInventoryServiceImpl.java

Rev 33385 – Added

amit.gupta — Sat, 18 May 2024 16:01:48 +0530

amit.gupta – 1 file(s) modified
Added

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 33384 – Fixed Bad scan types

amit.gupta — Sat, 18 May 2024 15:50:18 +0530

amit.gupta – 3 file(s) modified
Fixed Bad scan types

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseServiceImpl.java

Rev 33383 – Added rollback for

amit.gupta — Fri, 17 May 2024 16:51:14 +0530

amit.gupta – 1 file(s) modified
Added rollback for

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java

Rev 33382 – Fixed Order quantity availability

amit.gupta — Fri, 17 May 2024 16:24:09 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseServiceImpl.java

Rev 33381 – Fixed exclusions of fofoIds

amit.gupta — Fri, 17 May 2024 13:02:11 +0530

amit.gupta – 1 file(s) modified
Fixed exclusions of fofoIds

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java

Rev 33380 – Fixed Logic

amit.gupta — Thu, 16 May 2024 18:42:14 +0530

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

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

Rev 33379 – Fixed Order quantity availability

amit.gupta — Thu, 16 May 2024 17:54:19 +0530

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

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

Rev 33378 – adjust party sales header in cs service

ranu — Thu, 16 May 2024 14:20:48 +0530

ranu – 1 file(s) modified
adjust party sales header in cs service

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java

Rev 33377 – Fixed

amit.gupta — Thu, 16 May 2024 12:51:10 +0530

amit.gupta – 1 file(s) modified
Fixed

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java

Rev 33376 – Fixed issues related to margin

amit.gupta — Wed, 15 May 2024 18:10:36 +0530

amit.gupta – 1 file(s) modified
Fixed issues related to margin

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java

Rev 33375 – Fixed Order quantity availability

amit.gupta — Wed, 15 May 2024 18:03:37 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java

Rev 33374 – add search box on change partner

ranu — Wed, 15 May 2024 17:43:41 +0530

ranu – 2 file(s) modified
add search box on change partner

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/change-partner-po.vm

Rev 33373 – Fixed Order quantity avai

amit.gupta — Mon, 13 May 2024 18:30:05 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/BrandRegionMapping.java

Rev 33372 – Fixed Order quantity avai

amit.gupta — Mon, 13 May 2024 17:23:25 +0530

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

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

Rev 33371 – Fixed Order quantity avai

amit.gupta — Mon, 13 May 2024 17:18:41 +0530

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

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

Rev 33370 – Fixed Order quantity avai

amit.gupta — Mon, 13 May 2024 17:08:31 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/SaholicInventorySnapshot.java

Rev 33369 – Fixed Order quantity avai

amit.gupta — Mon, 13 May 2024 16:33:12 +0530

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

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java

Rev 33368 – Fixed logic to handle virtual account issue

amit.gupta — Mon, 13 May 2024 16:26:24 +0530

amit.gupta – 1 file(s) modified
Fixed logic to handle virtual account issue

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java

Rev 33367 – fix webOffer layout and fix online order change by pincode

ranu — Mon, 13 May 2024 13:40:53 +0530

ranu – 9 file(s) modified
fix webOffer layout and fix online order change by pincode

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/BrandRegionMapping.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/AddressRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/AddressRepositoryImpl.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/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/web-offer-product.vm

Rev 33366 – Fixed warehouse movement

amit.gupta — Sun, 12 May 2024 15:06:16 +0530

amit.gupta – 1 file(s) modified
Fixed warehouse movement

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

Rev 33365 – Fixed

amit.gupta — Sat, 11 May 2024 19:10:50 +0530

amit.gupta – 1 file(s) modified
Fixed

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

Rev 33364 – Migration for loan

amit.gupta — Sat, 11 May 2024 17:58:07 +0530

amit.gupta – 2 file(s) modified
Migration for loan

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/SidbiService.java

Rev 33363 – Fixed Order quantity avai

amit.gupta — Sat, 11 May 2024 16:45:15 +0530

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

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java

Rev 33362 – Fixed Order quantity avai

amit.gupta — Sat, 11 May 2024 16:32:41 +0530

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

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java

Rev 33361 – Fixed Order quantity avai

amit.gupta — Sat, 11 May 2024 16:23:05 +0530

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

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java

Rev 33360 – Fixed Order quantity avai

amit.gupta — Sat, 11 May 2024 16:15:48 +0530

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

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java