SmartDukaan – /

Rev 33465 – bulk vendor pricing for category team

ranu — Fri, 21 Jun 2024 13:04:28 +0530

ranu – 7 file(s) modified
bulk vendor pricing for category team

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/VendorCatalogPricingModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/VendorCatalogPricingService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/VendorCatalogPricingServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
+ /trunk/profitmandi-fofo/src/main/resources/vendor-catalog-pricing-file.xlsx
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/vendor-catalog.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bulk-vendor-pricing.vm

Rev 33464 – poco billing mail shoot daily category team

ranu — Fri, 21 Jun 2024 13:03:16 +0530

ranu – 6 file(s) modified
poco billing mail shoot daily category team

~ /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/transaction/Order.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

Rev 33463 – Fixed machine

amit.gupta — Fri, 21 Jun 2024 11:28:38 +0530

amit.gupta – 2 file(s) modified
Fixed machine

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties

Rev 33462 – commit

amit.gupta — Thu, 20 Jun 2024 22:01:36 +0530

amit.gupta – 1 file(s) modified
commit

~ /trunk/profitmandi-web/src/main/resources/META-INF/prod.properties

Rev 33461 – Fixed prod properties for Solr Url

amit.gupta — Thu, 20 Jun 2024 21:56:49 +0530

amit.gupta – 1 file(s) modified
Fixed prod properties for Solr Url

~ /trunk/profitmandi-cron/src/main/resources/META-INF/prod.properties

Rev 33460 – Fixed solr url

amit.gupta — Thu, 20 Jun 2024 20:00:42 +0530

amit.gupta – 3 file(s) modified
Fixed solr url

~ /trunk/profitmandi-cron/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/solr/FofoSolr.java
~ /trunk/profitmandi-dao/src/main/resources/META-INF/prod.properties

Rev 33459 – Fixed changes regarding credit issue

amit.gupta — Thu, 20 Jun 2024 19:45:34 +0530

amit.gupta – 10 file(s) modified
Fixed changes regarding credit issue

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/OfferPayout.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.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/repository/transaction/PriceDropIMEIRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropIMEIRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/InventoryPayoutModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/InventoryMarginModel.java

Rev 33458 – Fixed changes

amit.gupta — Thu, 20 Jun 2024 19:34:01 +0530

amit.gupta – 3 file(s) modified
Fixed changes

Rev 33457 – Fixed changes regarding credit

amit.gupta — Thu, 20 Jun 2024 19:30:22 +0530

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

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

Rev 33456 – null pointer exception solved when its coming warehouse qty model ...

ranu — Wed, 19 Jun 2024 12:20:55 +0530

ranu – 1 file(s) modified
null pointer exception solved when its coming warehouse qty model null

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

Rev 33455 – validation added on grn if supplier is internal then entered ...

ranu — Tue, 18 Jun 2024 18:35:19 +0530

ranu – 4 file(s) modified
validation added on grn if supplier is internal then entered imei should be exist

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInventoryItemRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-receive-new-invoice.vm

Rev 33454 – Minor change

amit.gupta — Sun, 16 Jun 2024 17:58:17 +0530

amit.gupta – 1 file(s) modified
Minor change

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

Rev 33453 – Do not run Vivo Activations on 1st of every month

amit.gupta — Sat, 15 Jun 2024 15:09:29 +0530

amit.gupta – 1 file(s) modified
Do not run Vivo Activations on 1st of every month

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

Rev 33452 – Fixed changes regarding SD/SIDBI credit

amit.gupta — Fri, 14 Jun 2024 19:50:23 +0530

amit.gupta – 4 file(s) modified
Fixed changes regarding SD/SIDBI credit

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java

Rev 33451 – change billing warehouse option give all warehouse access to vinay

ranu — Fri, 14 Jun 2024 16:35:40 +0530

ranu – 3 file(s) modified
change billing warehouse option give all warehouse access to vinay

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction-detail.vm

Rev 33450 – some css modification

ranu — Fri, 14 Jun 2024 14:53:37 +0530

ranu – 1 file(s) modified
some css modification

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm

Rev 33449 – add total due and utilization number on wallet

ranu — Fri, 14 Jun 2024 13:36:47 +0530

ranu – 3 file(s) modified
add total due and utilization number on wallet

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SDCreditResponseOut.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm

Rev 33448 – b2b sd credit add total due and utilization

ranu — Fri, 14 Jun 2024 13:27:25 +0530

ranu – 3 file(s) modified
b2b sd credit add total due and utilization

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SDCreditResponseOut.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 33447 – Added Training to L1, L2, L3

amit.gupta — Fri, 14 Jun 2024 13:19:10 +0530

amit.gupta – 1 file(s) modified
Added Training to L1, L2, L3

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

Rev 33446 – application java commit on enable scheduling

ranu — Thu, 13 Jun 2024 16:54:36 +0530

ranu – 1 file(s) modified
application java commit on enable scheduling

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

Rev 33445 – application java commit on enable scheduling

ranu — Thu, 13 Jun 2024 16:34:48 +0530

ranu – 1 file(s) modified
application java commit on enable scheduling

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

Rev 33444 – create method for livedemo brand bill

ranu — Thu, 13 Jun 2024 15:58:24 +0530

ranu – 3 file(s) modified
create method for livedemo brand bill

Rev 33443 – print resource and order cancel by partner and cron dao ...

ranu — Thu, 13 Jun 2024 15:52:49 +0530

ranu – 21 file(s) modified
print resource and order cancel by partner and cron dao mail shoot for Live Demo

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrintResource.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrintResourceRegion.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/model/LiveDemoOrderLineItemModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PrintResourceModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrintResourceRegionRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrintResourceRegionRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrintResourceRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrintResourceRepositoryImpl.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-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java
~ /trunk/profitmandi-fofo/src/main/resources/messages_en.properties
~ /trunk/profitmandi-fofo/src/main/resources/message_en.properties
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/print-resource.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/all-print-resource.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner_print_resource.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/print-resource.vm

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 33441 – Offer Processing fixed

amit.gupta — Sun, 09 Jun 2024 11:49:43 +0530

amit.gupta – 2 file(s) modified
Offer Processing fixed

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ItemCriteriaPayout.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 33440 – Added

amit.gupta — Fri, 07 Jun 2024 16:24:31 +0530

amit.gupta – 1 file(s) modified
Added

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/AST.java

Rev 33439 – show pay method column description

ranu — Thu, 06 Jun 2024 15:02:19 +0530

ranu – 1 file(s) modified
show pay method column description

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm

Rev 33438 – Added offer container

amit.gupta — Thu, 06 Jun 2024 12:09:54 +0530

amit.gupta – 1 file(s) modified
Added offer container

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-imei-history.vm

Rev 33437 – b2c online order process modified

ranu — Thu, 06 Jun 2024 11:51:47 +0530

ranu – 6 file(s) modified
b2c online order process modified

~ /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/order.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/order-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending_fofo_order.vm

Rev 33436 – b2c modified flow for online order

ranu — Thu, 06 Jun 2024 11:48:47 +0530

ranu – 20 file(s) modified
b2c modified flow for online order

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreatePendingOrderItem.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PendingOrderItemPolicyPlan.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/entity/fofo/PendingOrderPlan.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/model/CustomerOrderAndInsuranceDetails.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/pendingOrder
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/pendingOrder/PendingOrderDetail.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderPlanRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderPlanRepositoryImpl.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/integrations/CCAvenuePaymentService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/oneassist/OneAssistService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceServiceImpl.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 33435 – Fixed schedule

amit.gupta — Wed, 05 Jun 2024 14:21:59 +0530

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

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

Rev 33434 – Added

amit.gupta — Wed, 05 Jun 2024 13:15:25 +0530

amit.gupta – 1 file(s) modified
Added

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

Rev 33433 – Added

amit.gupta — Wed, 05 Jun 2024 12:58:32 +0530

amit.gupta – 1 file(s) modified
Added

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

Rev 33432 – Fixed bug due to price drop

amit.gupta — Tue, 04 Jun 2024 19:57:36 +0530

amit.gupta – 3 file(s) modified
Fixed bug due to price drop

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.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

Rev 33431 – Fixed Order quantity availability

amit.gupta — Tue, 04 Jun 2024 12:13:29 +0530

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

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

Rev 33430 – Fixed Order quantity availability

amit.gupta — Mon, 03 Jun 2024 18:33:30 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java

Rev 33429 – Fixed Order quantity availability

amit.gupta — Mon, 03 Jun 2024 18:22:21 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java

Rev 33428 – Fixed Order quantity availability

amit.gupta — Mon, 03 Jun 2024 15:09:12 +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 33427 – Fixed dispatch no need to send mail when RTO

amit.gupta — Mon, 03 Jun 2024 14:50:45 +0530

amit.gupta – 1 file(s) modified
Fixed dispatch no need to send mail when RTO

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

Rev 33426 – Added

amit.gupta — Mon, 03 Jun 2024 12:38:48 +0530

amit.gupta – 1 file(s) modified
Added

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