SmartDukaan – /

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

Rev 33425 – Fixed Order quantity availability

amit.gupta — Sun, 02 Jun 2024 23:09:56 +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 33424 – Added

amit.gupta — Sun, 02 Jun 2024 23:02:34 +0530

amit.gupta – 1 file(s) modified
Added

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

Rev 33423 – Fixed loan

amit.gupta — Sun, 02 Jun 2024 19:25:38 +0530

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

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

Rev 33422 – Fixed SD Credit Sanctions. Will only be utilised when not ...

amit.gupta — Sun, 02 Jun 2024 19:18:15 +0530

amit.gupta – 1 file(s) modified
Fixed SD Credit Sanctions. Will only be utilised when not enough limit available to fulfill complete order thoroughly.

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

Rev 33421 – Added amount

amit.gupta — Sat, 01 Jun 2024 22:11:12 +0530

amit.gupta – 1 file(s) modified
Added amount

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

Rev 33420 – Fixed average credit days.

amit.gupta — Sat, 01 Jun 2024 17:11:06 +0530

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

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

Rev 33419 – Changes related to order

amit.gupta — Sat, 01 Jun 2024 17:09:47 +0530

amit.gupta – 6 file(s) modified
Changes related to order

~ /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-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-credit-detail-row.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-credit-detail.vm

Rev 33418 – Removed einvoices

amit.gupta — Sat, 01 Jun 2024 16:53:35 +0530

amit.gupta – 1 file(s) modified
Removed einvoices

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

Rev 33417 – Added invoice without eivoice

amit.gupta — Sat, 01 Jun 2024 16:52:27 +0530

amit.gupta – 2 file(s) modified
Added invoice without eivoice

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java

Rev 33416 – Added

amit.gupta — Sat, 01 Jun 2024 12:54:29 +0530

amit.gupta – 1 file(s) modified
Added

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

Rev 33415 – Fixed notification service

amit.gupta — Sat, 01 Jun 2024 12:52:38 +0530

amit.gupta – 2 file(s) modified
Fixed notification service

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

Rev 33414 – Fixed current inventory snapshot

amit.gupta — Sat, 01 Jun 2024 12:49:56 +0530

amit.gupta – 1 file(s) modified
Fixed current inventory snapshot

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

Rev 33413 – update guide book and send specific language guide book to ...

tejus.lohani — Fri, 31 May 2024 18:41:14 +0530

tejus.lohani – 3 file(s) modified
update guide book and send specific language guide book to partner

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-verification-index.vm

Rev 33412 – datatable added in this

ranu — Fri, 31 May 2024 18:13:08 +0530

ranu – 2 file(s) modified
datatable added in this

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/focused_model.vm

Rev 33411 – show alert for billing when entered wrong value

ranu — Thu, 30 May 2024 17:08:34 +0530

ranu – 1 file(s) modified
show alert for billing when entered wrong value

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

Rev 33410 – revert code mahaveer nlc

ranu — Thu, 30 May 2024 11:30:40 +0530

ranu – 1 file(s) modified
revert code mahaveer nlc

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

Rev 33409 – revert code mahaveer performance percentage

ranu — Thu, 30 May 2024 11:29:10 +0530

ranu – 1 file(s) modified
revert code mahaveer performance percentage

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

Rev 33408 – MAHAVEER PERFORMANCE HIGH GRAPH CHNAGED

ranu — Wed, 29 May 2024 15:05:48 +0530

ranu – 1 file(s) modified
MAHAVEER PERFORMANCE HIGH GRAPH CHNAGED

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

Rev 33407 – hide nlc for mahaveer

ranu — Wed, 29 May 2024 14:15:45 +0530

ranu – 1 file(s) modified
hide nlc for mahaveer

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

Rev 33406 – Fixed Order quantity availability

amit.gupta — Wed, 29 May 2024 13:16:29 +0530

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

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

Rev 33405 – Fixed Order quantity availability

amit.gupta — Wed, 29 May 2024 12:59:45 +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 33404 – Fixed transaction

amit.gupta — Wed, 29 May 2024 12:48:16 +0530

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

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