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

Rev 33108 – fix download report issue thats occurs in partner dashboard

tejus.lohani — Sat, 16 Mar 2024 12:26:01 +0530

tejus.lohani – 1 file(s) modified
fix download report issue thats occurs in partner dashboard

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

Rev 33103 – patch for

amit.gupta — Fri, 15 Mar 2024 15:03:47 +0530

amit.gupta – 2 file(s) modified
patch for

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AuthUserController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-auth-user.vm

Rev 33102 – FIX reports Download problem (download report was Empty) on admin ...

tejus.lohani — Fri, 15 Mar 2024 12:26:20 +0530

tejus.lohani – 3 file(s) modified
FIX reports Download problem (download report was Empty) on admin dashboard

Rev 33092 – Add partner reports option on side bar of Admin Dashboard

tejus.lohani — Wed, 13 Mar 2024 17:15:53 +0530

tejus.lohani – 9 file(s) modified
Add partner reports option on side bar of Admin Dashboard

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-auth-user.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/foco-sale-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-collection-summary.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-indent-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm

Rev 33091 – scheme and offer report

shampa — Wed, 13 Mar 2024 16:57:40 +0530

shampa – 4 file(s) modified
scheme and offer report

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer-payout-dump-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-payout-report.vm

Rev 33083 – Removed logging

amit.gupta — Mon, 11 Mar 2024 17:28:50 +0530

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

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

Rev 33081 – ticket category internal and external

ranu — Mon, 11 Mar 2024 13:22:03 +0530

ranu – 3 file(s) modified
ticket category internal and external

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-ticket-category.vm

Rev 33076 – Log error

amit.gupta — Sat, 09 Mar 2024 20:39:16 +0530

amit.gupta – 1 file(s) modified
Log error

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

Rev 33075 – patch for

amit.gupta — Sat, 09 Mar 2024 19:12:49 +0530

amit.gupta – 1 file(s) modified
patch for

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

Rev 33073 – Fixed unwanted logs

amit.gupta — Sat, 09 Mar 2024 19:00:14 +0530

amit.gupta – 2 file(s) modified
Fixed unwanted logs

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerCollectionServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java

Rev 33069 – patch for

amit.gupta — Sat, 09 Mar 2024 18:46:26 +0530

amit.gupta – 1 file(s) modified
patch for

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

Rev 33067 – reports fetch and requested by in add wallet

shampa — Thu, 07 Mar 2024 19:46:23 +0530

shampa – 11 file(s) modified
reports fetch and requested by in add wallet

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/AddWalletRequest.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/ReportsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-billing-summary-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-collection-summary.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-indent-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-payout-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm

Rev 33066 – add Pagination in Auth-user-create

raveendra.bharati — Wed, 06 Mar 2024 20:01:41 +0530

raveendra.bharati – 3 file(s) modified
add Pagination in Auth-user-create

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AuthUserController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-auth-user.vm

Rev 33065 – Create search bar in auth User Create

raveendra.bharati — Wed, 06 Mar 2024 16:33:06 +0530

raveendra.bharati – 4 file(s) modified
Create search bar in auth User Create

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AuthUserController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-auth-user.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse_brand_stock.vm

Rev 33063 – Added google api key through properties

ranu — Wed, 06 Mar 2024 12:14:30 +0530

ranu – 3 file(s) modified
Added google api key through properties

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

Rev 33045 – Added sidbi and improvements in credit note

amit.gupta — Mon, 04 Mar 2024 13:06:03 +0530

amit.gupta – 16 file(s) modified
Added sidbi and improvements in credit note

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/FofoSidbiSanction.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/enumuration/fofo/Gateway.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/NotEqualsModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/FofoSidbiSanctionRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/FofoSidbiSanctionRepositoryImpl.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-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-credit-detail.js
~ /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/wallet-edit.vm

Rev 33043 – Fixed exclude issue

amit.gupta — Sun, 03 Mar 2024 08:52:32 +0530

amit.gupta – 4 file(s) modified
Fixed exclude issue

Rev 33030 – Fixed offers

amit.gupta — Thu, 29 Feb 2024 12:51:50 +0530

amit.gupta – 5 file(s) modified
Fixed offers

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java

Rev 33025 – Fixed notifications logic in case of state specific

amit.gupta — Wed, 28 Feb 2024 20:52:51 +0530

amit.gupta – 3 file(s) modified
Fixed notifications logic in case of state specific

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java

Rev 33010 – offer payout dumb report created new ui and api , ...

shampa — Tue, 27 Feb 2024 18:55:21 +0530

shampa – 7 file(s) modified
offer payout dumb report created new ui and api , and my sales add fetch report api

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/OfferPayoutDumpReportModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/foco-sale-report.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer-payout-dump-report.vm

Rev 33006 – Invoice contr

amit.gupta — Tue, 27 Feb 2024 15:17:29 +0530

amit.gupta – 1 file(s) modified
Invoice contr

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

Rev 33005 – Invoice contr

amit.gupta — Tue, 27 Feb 2024 12:51:03 +0530

amit.gupta – 1 file(s) modified
Invoice contr

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

Rev 33004 – Added L2 to have access to grn

amit.gupta — Tue, 27 Feb 2024 12:48:00 +0530

amit.gupta – 1 file(s) modified
Added L2 to have access to grn

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

Rev 32989 – Invoice contr

amit.gupta — Mon, 26 Feb 2024 18:34:46 +0530

amit.gupta – 1 file(s) modified
Invoice contr

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

Rev 32988 – Logging added

amit.gupta — Mon, 26 Feb 2024 18:29:05 +0530

amit.gupta – 2 file(s) modified
Logging added

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

Rev 32970 – Added accessories to take values automatically for internal movement

amit.gupta — Sat, 17 Feb 2024 17:58:27 +0530

amit.gupta – 1 file(s) modified
Added accessories to take values automatically for internal movement

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

Rev 32953 – Handled dtrUser email/mobile cant be duplicated

amit.gupta — Tue, 13 Feb 2024 12:25:39 +0530

amit.gupta – 2 file(s) modified
Handled dtrUser email/mobile cant be duplicated

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java

Rev 32952 – Added Item bulk uplaoder

amit.gupta — Tue, 13 Feb 2024 11:47:47 +0530

amit.gupta – 6 file(s) modified
Added Item bulk uplaoder

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ItemType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ItemLoaderModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ItemLoaderService.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java

Rev 32944 – Fixed order modal and cancellation logic

amit.gupta — Fri, 09 Feb 2024 17:54:05 +0530

amit.gupta – 2 file(s) modified
Fixed order modal and cancellation logic

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/cancel-order-modal.vm

Rev 32942 – Added samsung removed rest

amit.gupta — Fri, 09 Feb 2024 16:22:10 +0530

amit.gupta – 1 file(s) modified
Added samsung removed rest

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

Rev 32938 – Added indent changes

amit.gupta — Thu, 08 Feb 2024 19:27:44 +0530

amit.gupta – 2 file(s) modified
Added indent 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/today_po.vm

Rev 32935 – Fixed changes

amit.gupta — Thu, 08 Feb 2024 17:24:38 +0530

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

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

Rev 32934 – Added url endpoint

amit.gupta — Thu, 08 Feb 2024 17:10:15 +0530

amit.gupta – 1 file(s) modified
Added url endpoint

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

Rev 32933 – Added L2 and above with complete access to warehouse

amit.gupta — Thu, 08 Feb 2024 13:49:51 +0530

amit.gupta – 1 file(s) modified
Added L2 and above with complete access to warehouse

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

Rev 32929 – Added hook handler from SmartPing/Click2call

amit.gupta — Wed, 07 Feb 2024 11:16:32 +0530

amit.gupta – 11 file(s) modified
Added hook handler from SmartPing/Click2call

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/AgentRecording.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/AgentRecordingRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/AgentRecordingRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/smartping
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/smartping/model
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/smartping/model/AHDetailModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/smartping/model/CallDetailModel.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/smartping/model/CallDetailModel.java@32918)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/smartping/model/RecordingModel.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/smartping/model/RecordingModel.java@32918)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/smartping/SmartPingAgentModel.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/smartping/SmartPingAgentModel.java@32905)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/smartping/SmartPingService.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/smartping/SmartPingService.java@32905)
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebHookController.java

Rev 32928 – Fixed changes

amit.gupta — Tue, 06 Feb 2024 17:16:31 +0530

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

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

Rev 32927 – use catalog instead of item

amit.gupta — Tue, 06 Feb 2024 15:05:22 +0530

amit.gupta – 1 file(s) modified
use catalog instead of item

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

Rev 32924 – Fixed issue with only itemcode is being asked

amit.gupta — Tue, 06 Feb 2024 13:39:28 +0530

amit.gupta – 1 file(s) modified
Fixed issue with only itemcode is being asked

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

Rev 32921 – Fixed changes

amit.gupta — Mon, 05 Feb 2024 18:05:10 +0530

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

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

Rev 32920 – Fixed changes

amit.gupta — Mon, 05 Feb 2024 17:51:49 +0530

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

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