SmartDukaan – /

Rev 32609 – Fixed orders Shipping Date(dd-MM-yyyy HH:mm:ss), set shipping time in Orders

raveendra.bharati — Tue, 07 Nov 2023 18:19:15 +0530

raveendra.bharati – 4 file(s) modified
Fixed orders Shipping Date(dd-MM-yyyy HH:mm:ss), set shipping time in Orders

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BilledOrderListModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java

Rev 32608 – Scheduled Task

ranu — Tue, 07 Nov 2023 17:44:42 +0530

ranu – 1 file(s) modified
Scheduled Task

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

Rev 32607 – crete cron missing scratch offer by Invoice number

ranu — Tue, 07 Nov 2023 17:12:21 +0530

ranu – 4 file(s) modified
crete cron missing scratch offer by Invoice number

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.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

Rev 32606 – Fixed issue reverted the not condition

amit.gupta — Tue, 07 Nov 2023 14:57:04 +0530

amit.gupta – 1 file(s) modified
Fixed issue reverted the not condition

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingRepositoryImpl.java

Rev 32605 – scracth offer duplicate entry restriction condition added

ranu — Tue, 07 Nov 2023 14:48:15 +0530

ranu – 1 file(s) modified
scracth offer duplicate entry restriction condition added

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

Rev 32604 – Fixed color related inconsistency.

raveendra.bharati — Tue, 07 Nov 2023 12:19:24 +0530

raveendra.bharati – 2 file(s) modified
Fixed color related inconsistency.

~ /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/inventory/VendorCatalogPricingRepositoryImpl.java

Rev 32603 – Fixed order Shipping Date(dd-MM-yyyy HH:mm:ss). Can now be updated

raveendra.bharati — Tue, 07 Nov 2023 12:16:13 +0530

raveendra.bharati – 17 file(s) modified
Fixed order Shipping Date(dd-MM-yyyy HH:mm:ss). Can now be updated

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FormattingUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/ProviderTat.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/ManualPaymentType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/NotifyCancel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/NotifyColorChange.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/NotifyItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/NotifyMessage.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/NotifyOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Payment.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDrop.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/warehouse/TransferLot.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BilledOrderListModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-receive-new-invoice.vm

Rev 32602 – Fixed cart

amit.gupta — Tue, 07 Nov 2023 10:13:07 +0530

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

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

Rev 32601 – Fixed bug re

amit.gupta — Mon, 06 Nov 2023 20:37:12 +0530

amit.gupta – 1 file(s) modified
Fixed bug re

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

Rev 32600 – Fixed bug re

amit.gupta — Mon, 06 Nov 2023 20:22:53 +0530

amit.gupta – 2 file(s) modified
Fixed bug re

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

Rev 32599 – Added condition to restrict only one ScratchOffer per Customer per ...

ranu — Mon, 06 Nov 2023 14:47:37 +0530

ranu – 3 file(s) modified
Added condition to restrict only one ScratchOffer per Customer per Campaign

Rev 32598 – Fixed cart

amit.gupta — Sat, 04 Nov 2023 21:28:04 +0530

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

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

Rev 32597 – Fixed cart

amit.gupta — Sat, 04 Nov 2023 21:23:48 +0530

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

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

Rev 32596 – Fixed cart

amit.gupta — Sat, 04 Nov 2023 15:53:47 +0530

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

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

Rev 32595 – Added changes related to banner listing

ranu — Fri, 03 Nov 2023 19:27:45 +0530

ranu – 4 file(s) modified
Added changes related to banner listing

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/BannerListingDetail.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/banner-listing.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/banner-product-listing.vm

Rev 32594 – Added Logic to ensure that purchase returned stock cant be ...

amit.gupta — Fri, 03 Nov 2023 18:15:17 +0530

amit.gupta – 4 file(s) modified
Added Logic to ensure that purchase returned stock cant be sold out

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml

Rev 32593 – Added Logic to ensure that purchase returned stock cant be ...

amit.gupta — Fri, 03 Nov 2023 17:16:44 +0530

amit.gupta – 1 file(s) modified
Added Logic to ensure that purchase returned stock cant be sold out

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 32592 – Added updatePartnerLimit to test method

amit.gupta — Wed, 01 Nov 2023 18:26:49 +0530

amit.gupta – 1 file(s) modified
Added updatePartnerLimit to test method

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

Rev 32591 – Resolved the issue with any color

amit.gupta — Wed, 01 Nov 2023 13:07:36 +0530

amit.gupta – 1 file(s) modified
Resolved the issue with any color

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

Rev 32590 – Resolved the issue with any color

amit.gupta — Wed, 01 Nov 2023 13:00:57 +0530

amit.gupta – 1 file(s) modified
Resolved the issue with any color

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

Rev 32589 – Fixed logic of duplicate in case of multiple accessories are ...

amit.gupta — Tue, 31 Oct 2023 20:24:25 +0530

amit.gupta – 1 file(s) modified
Fixed logic of duplicate in case of multiple accessories are returned in single debit note

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

Rev 32588 – Fixed cart

amit.gupta — Tue, 31 Oct 2023 18:43:08 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartServiceImpl.java

Rev 32587 – fixed spelling typo

ranu — Tue, 31 Oct 2023 16:30:19 +0530

ranu – 1 file(s) modified
fixed spelling typo

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

Rev 32586 – Fixed Scratch Offers for upcoming Festival

ranu — Tue, 31 Oct 2023 16:29:00 +0530

ranu – 5 file(s) modified
Fixed Scratch Offers for upcoming Festival

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ScratchOfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ScratchOfferRepositoryImpl.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/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java

Rev 32585 – Changed quantity to 400

amit.gupta — Tue, 31 Oct 2023 14:30:52 +0530

amit.gupta – 1 file(s) modified
Changed quantity to 400

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartServiceImpl.java

Rev 32584 – Fixed purchase.js

raveendra.bharati — Tue, 31 Oct 2023 12:32:22 +0530

raveendra.bharati – 3 file(s) modified
Fixed purchase.js

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ControllerSetup.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js

Rev 32583 – Added Diwali Scratch Offer Related changes

amit.gupta — Mon, 30 Oct 2023 15:01:46 +0530

amit.gupta – 3 file(s) modified
Added Diwali Scratch Offer Related changes

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/inventory/ScratchedGift.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebListingController.java

Rev 32582 – Fixed logic for activation

amit.gupta — Mon, 30 Oct 2023 12:14:51 +0530

amit.gupta – 1 file(s) modified
Fixed logic for activation

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

Rev 32581 – Fixed cart

amit.gupta — Sat, 28 Oct 2023 12:16:35 +0530

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

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

Rev 32580 – Fixed bug re

amit.gupta — Fri, 27 Oct 2023 15:41:01 +0530

amit.gupta – 1 file(s) modified
Fixed bug re

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

Rev 32579 – Added changes related to Scratch Offers

amit.gupta — Fri, 27 Oct 2023 15:38:09 +0530

amit.gupta – 3 file(s) modified
Added changes related to Scratch Offers

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/inventory/ScratchedGift.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 32578 – Added changes in monitor/targets

amit.gupta — Fri, 27 Oct 2023 14:36:38 +0530

amit.gupta – 2 file(s) modified
Added changes in monitor/targets

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-targets.vm

Rev 32577 – Committed for further update from Amit

tejbeer — Fri, 27 Oct 2023 13:44:51 +0530

tejbeer – 1 file(s) modified
Committed for further update from Amit

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-targets.vm

Rev 32576 – Order Status should only be shipped from warehouse to be ...

amit.gupta — Thu, 26 Oct 2023 16:17:27 +0530

amit.gupta – 1 file(s) modified
Order Status should only be shipped from warehouse to be marked delivered

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

Rev 32575 – Fixed cart

amit.gupta — Wed, 25 Oct 2023 21:38:42 +0530

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

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

Rev 32574 – Fixed cart

amit.gupta — Wed, 25 Oct 2023 18:28:04 +0530

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

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

Rev 32573 – Resolved the issue with any color

amit.gupta — Sat, 21 Oct 2023 16:16:57 +0530

amit.gupta – 1 file(s) modified
Resolved the issue with any color

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

Rev 32572 – Resolved the issue with any color

amit.gupta — Sat, 21 Oct 2023 15:51:01 +0530

amit.gupta – 1 file(s) modified
Resolved the issue with any color

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

Rev 32571 – Fixed cart

amit.gupta — Sat, 21 Oct 2023 11:41:11 +0530

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

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

Rev 32570 – Fixed cart

amit.gupta — Sat, 21 Oct 2023 11:40:54 +0530

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

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