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

Rev 32887 – inactive promoter

shampa — Thu, 25 Jan 2024 11:44:44 +0530

shampa – 4 file(s) modified
inactive promoter

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/promoter-info.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-inactive.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-info.vm

Rev 32886 – sequence wise menubar

shampa — Thu, 25 Jan 2024 11:32:36 +0530

shampa – 5 file(s) modified
sequence wise menubar

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/MenuRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/MenuRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AccessManagementController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm

Rev 32883 – Fixed changes

amit.gupta — Wed, 24 Jan 2024 13:57:08 +0530

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

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

Rev 32882 – Fixed changes

amit.gupta — Tue, 23 Jan 2024 17:54:50 +0530

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

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-targets-new.vm

Rev 32868 – Added Low inventory as in Process Orders

amit.gupta — Fri, 19 Jan 2024 15:36:56 +0530

amit.gupta – 6 file(s) modified
Added Low inventory as in Process Orders

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offer.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/service/offers/OfferServiceImpl.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/OfferController.java

Rev 32865 – ok

amit.gupta — Wed, 17 Jan 2024 19:49:13 +0530

amit.gupta – 1 file(s) modified
ok

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

Rev 32861 – new partner onboarding

shampa — Wed, 17 Jan 2024 19:03:32 +0530

shampa – 1 file(s) modified
new partner onboarding

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

Rev 32855 – Added changes related to smartdukaan.

amit.gupta — Tue, 16 Jan 2024 17:28:40 +0530

amit.gupta – 2 file(s) modified
Added changes related to smartdukaan.

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

Rev 32849 – Took Raveendra Changes

amit.gupta — Tue, 16 Jan 2024 13:03:09 +0530

amit.gupta – 1 file(s) modified
Took Raveendra Changes

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

Rev 32844 – watermark add and mongo db dependency remove

shampa — Mon, 15 Jan 2024 19:00:07 +0530

shampa – 2 file(s) modified
watermark add and mongo db dependency remove

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-table.vm

Rev 32843 – RBM editable field

shampa — Mon, 15 Jan 2024 18:54:58 +0530

shampa – 3 file(s) modified
RBM editable field

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/panel-listing.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-row-index.vm

Rev 32840 – Removed wahtsapp notification to RBMs for sanction approval

amit.gupta — Mon, 15 Jan 2024 13:07:22 +0530

amit.gupta – 1 file(s) modified
Removed wahtsapp notification to RBMs for sanction approval

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

Rev 32839 – Fixed

amit.gupta — Sat, 13 Jan 2024 21:24:12 +0530

amit.gupta – 1 file(s) modified
Fixed

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

Rev 32836 – Minor changes in controller

amit.gupta — Sat, 13 Jan 2024 20:26:05 +0530

amit.gupta – 1 file(s) modified
Minor changes in controller

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

Rev 32825 – Fixed logic in case po approval. No new po should ...

amit.gupta — Thu, 11 Jan 2024 17:00:37 +0530

amit.gupta – 3 file(s) modified
Fixed logic in case po approval. No new po should be created

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateWarehousePurchaseOrderModel.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/GrnController.java

Rev 32821 – remove 0 value

shampa — Wed, 10 Jan 2024 19:10:55 +0530

shampa – 1 file(s) modified
remove 0 value

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

Rev 32816 – non serialize fix for serial number in invoice item

ranu — Wed, 10 Jan 2024 16:36:41 +0530

ranu – 8 file(s) modified
non serialize fix for serial number in invoice item

~ /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/FofoNonSerializeSerial.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoNonSerializeRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoNonSerializeSerialRepository.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/WebListingController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 32812 – add/remove position

shampa — Tue, 09 Jan 2024 12:44:49 +0530

shampa – 1 file(s) modified
add/remove position

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

Rev 32811 – partner position

shampa — Tue, 09 Jan 2024 12:43:59 +0530

shampa – 1 file(s) modified
partner position

+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerPositonUpdateModel.java

Rev 32800 – Took Raveendra Changes

amit.gupta — Fri, 05 Jan 2024 18:56:20 +0530

amit.gupta – 1 file(s) modified
Took Raveendra Changes

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

Rev 32799 – Took Raveendra Changes

amit.gupta — Fri, 05 Jan 2024 18:22:02 +0530

amit.gupta – 1 file(s) modified
Took Raveendra Changes

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

Rev 32797 – Fixed Invoice 404 issue

amit.gupta — Fri, 05 Jan 2024 17:13:49 +0530

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

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

Rev 32792 – dashboard

shampa — Wed, 03 Jan 2024 13:23:02 +0530

shampa – 1 file(s) modified
dashboard

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

Rev 32791 – Took Raveendra Changes

amit.gupta — Wed, 03 Jan 2024 12:44:40 +0530

amit.gupta – 1 file(s) modified
Took Raveendra Changes

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

Rev 32790 – Fixed Logistics Changes

amit.gupta — Wed, 03 Jan 2024 12:24:15 +0530

amit.gupta – 1 file(s) modified
Fixed Logistics Changes

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

Rev 32789 – Took Raveendra Changes

amit.gupta — Tue, 02 Jan 2024 19:28:59 +0530

amit.gupta – 1 file(s) modified
Took Raveendra Changes

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

Rev 32786 – Fixed approval logic

amit.gupta — Tue, 02 Jan 2024 16:43:15 +0530

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

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

Rev 32785 – Fixed approval logic

amit.gupta — Tue, 02 Jan 2024 16:42:14 +0530

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

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

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