SmartDukaan – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/

Rev 32784 – Same docket number repeated

raveendra.bharati — Tue, 02 Jan 2024 16:13:21 +0530

raveendra.bharati – 1 file(s) modified
Same docket number repeated

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

Rev 32778 – Fixed whatsapp notifications

amit.gupta — Sat, 30 Dec 2023 17:11:14 +0530

amit.gupta – 1 file(s) modified
Fixed whatsapp notifications

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

Rev 32777 – Fixed whatsapp notifications

amit.gupta — Sat, 30 Dec 2023 17:06:26 +0530

amit.gupta – 3 file(s) modified
Fixed whatsapp notifications

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

Rev 32776 – Minor refactoring

amit.gupta — Thu, 28 Dec 2023 20:09:08 +0530

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

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

Rev 32763 – Minor refactoring

amit.gupta — Fri, 22 Dec 2023 00:50:59 +0530

amit.gupta – 14 file(s) modified
Minor refactoring

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventoryCISRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInventoryItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseInventoryServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/rest
+ /trunk/profitmandi-fofo/src/main/resources/application.properties
+ /trunk/profitmandi-fofo/src/main/resources/message.properties
+ /trunk/profitmandi-fofo/src/main/resources/message_en.properties
+ /trunk/profitmandi-fofo/src/main/resources/message_hi.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/env.property
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-listing.vm

Rev 32762 – Fixed devki issue

amit.gupta — Fri, 22 Dec 2023 00:24:55 +0530

amit.gupta – 1 file(s) modified
Fixed devki issue

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

Rev 32761 – Fixed devki issue

amit.gupta — Thu, 21 Dec 2023 11:37:02 +0530

amit.gupta – 1 file(s) modified
Fixed devki issue

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

Rev 32758 – Fixed missing orders

amit.gupta — Wed, 20 Dec 2023 15:49:53 +0530

amit.gupta – 1 file(s) modified
Fixed missing orders

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

Rev 32757 – Fixed missing orders

amit.gupta — Wed, 20 Dec 2023 15:45:47 +0530

amit.gupta – 1 file(s) modified
Fixed missing orders

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

Rev 32756 – Fixed missing orders

amit.gupta — Wed, 20 Dec 2023 15:35:56 +0530

amit.gupta – 2 file(s) modified
Fixed missing orders

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

Rev 32751 – Added changes Related for bronze in case of min limit

amit.gupta — Tue, 19 Dec 2023 17:30:15 +0530

amit.gupta – 4 file(s) modified
Added changes Related for bronze in case of min limit

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/BrandLimitServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RetailerBrandsLimitRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RetailerBrandsLimitRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java

Rev 32750 – online pending order aasign to partner

ranu — Tue, 19 Dec 2023 15:30:25 +0530

ranu – 3 file(s) modified
online pending order aasign to partner

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm

Rev 32742 – Fixed

amit.gupta — Fri, 15 Dec 2023 17:51:08 +0530

amit.gupta – 1 file(s) modified
Fixed

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

Rev 32740 – Fixed equals with compare to

amit.gupta — Fri, 15 Dec 2023 17:17:53 +0530

amit.gupta – 1 file(s) modified
Fixed equals with compare to

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

Rev 32736 – on brand limit page default limit correction on time of ...

ranu — Fri, 15 Dec 2023 14:37:30 +0530

ranu – 3 file(s) modified
on brand limit page default limit correction on time of 0

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RetailerBrandsLimit.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brands-limit-row-mapping.vm

Rev 32731 – online order is not showing

ranu — Thu, 14 Dec 2023 11:40:56 +0530

ranu – 3 file(s) modified
online order is not showing

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm

Rev 32727 – remove mandii fron UI only

shampa — Wed, 13 Dec 2023 14:36:56 +0530

shampa – 1 file(s) modified
remove mandii fron UI only

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

Rev 32711 – removed tr

amit.gupta — Mon, 11 Dec 2023 11:23:14 +0530

amit.gupta – 1 file(s) modified
removed tr

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

Rev 32710 – Added Logging

amit.gupta — Mon, 11 Dec 2023 11:15:10 +0530

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

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

Rev 32697 – vendor info not coming in online order (fixed)

ranu — Tue, 05 Dec 2023 14:48:39 +0530

ranu – 4 file(s) modified
vendor info not coming in online order (fixed)

~ /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-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm

Rev 32693 – removed tr

amit.gupta — Sat, 02 Dec 2023 18:39:35 +0530

amit.gupta – 1 file(s) modified
removed tr

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

Rev 32691 – removed tr

amit.gupta — Sat, 02 Dec 2023 16:39:43 +0530

amit.gupta – 1 file(s) modified
removed tr

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

Rev 32685 – LocalDateTime

shampa — Fri, 01 Dec 2023 16:45:56 +0530

shampa – 1 file(s) modified
LocalDateTime

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

Rev 32683 – removed tr

amit.gupta — Fri, 01 Dec 2023 10:38:27 +0530

amit.gupta – 1 file(s) modified
removed tr

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

Rev 32681 – added settled on field

amit.gupta — Thu, 30 Nov 2023 20:21:58 +0530

amit.gupta – 7 file(s) modified
added settled on field

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

Rev 32675 – Profitmandiconstandmap

shampa — Thu, 30 Nov 2023 12:35:29 +0530

shampa – 1 file(s) modified
Profitmandiconstandmap

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

Rev 32672 – Fixed partner count in summary

amit.gupta — Thu, 30 Nov 2023 12:09:42 +0530

amit.gupta – 6 file(s) modified
Fixed partner count in summary

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RBMPerformanceSummaryModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerCollectionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_target.vm

Rev 32667 – Email Update recorrect

raveendra.bharati — Wed, 29 Nov 2023 15:40:43 +0530

raveendra.bharati – 3 file(s) modified
Email Update recorrect

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm

Rev 32663 – fix partner cell count

ranu — Tue, 28 Nov 2023 16:39:37 +0530

ranu – 3 file(s) modified
fix partner cell count

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/oneassist/OneAssistService.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_target.vm

Rev 32662 – fix jira point ticket number 391,376,397 comitted

ranu — Tue, 28 Nov 2023 11:19:53 +0530

ranu – 3 file(s) modified
fix jira point ticket number 391,376,397 comitted

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-ticket-modal.vm

Rev 32654 – removed tr

amit.gupta — Mon, 20 Nov 2023 11:48:20 +0530

amit.gupta – 1 file(s) modified
removed tr

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

Rev 32650 – removed tr

amit.gupta — Sat, 18 Nov 2023 11:47:58 +0530

amit.gupta – 1 file(s) modified
removed tr

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

Rev 32649 – removed tr

amit.gupta — Sat, 18 Nov 2023 11:44:14 +0530

amit.gupta – 1 file(s) modified
removed tr

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

Rev 32647 – removed tr

amit.gupta — Fri, 17 Nov 2023 21:43:25 +0530

amit.gupta – 1 file(s) modified
removed tr

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

Rev 32637 – Fixed address issue

amit.gupta — Thu, 16 Nov 2023 16:16:31 +0530

amit.gupta – 1 file(s) modified
Fixed address issue

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

Rev 32629 – Fixed logic for invoice edit

amit.gupta — Fri, 10 Nov 2023 18:48:54 +0530

amit.gupta – 5 file(s) modified
Fixed logic for invoice edit

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/HygieneDataRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/HygieneDataRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm

Rev 32627 – order and invoice genrate without address select

ranu — Fri, 10 Nov 2023 17:52:07 +0530

ranu – 5 file(s) modified
order and invoice genrate without address select

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-details.vm

Rev 32626 – removed tr

amit.gupta — Fri, 10 Nov 2023 10:44:27 +0530

amit.gupta – 1 file(s) modified
removed tr

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

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 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