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

Rev 26963 – Changed activeonly

amit.gupta — Tue, 25 Aug 2020 11:31:13 +0530

amit.gupta – 5 file(s) modified
Changed activeonly

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java

Rev 26927 –

amit.gupta — Mon, 17 Aug 2020 12:35:09 +0530

amit.gupta – 1 file(s) modified

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

Rev 26694 – change

tejbeer — Mon, 25 May 2020 15:10:18 +0530

tejbeer – 13 file(s) modified
change

+ /trunk/profitmandi-common/.settings
+ /trunk/profitmandi-common/.settings/org.eclipse.buildship.core.prefs
~ /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/CreateOfferRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/offers.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm

Rev 26675 – cg

tejbeer — Sat, 23 May 2020 11:56:24 +0530

tejbeer – 5 file(s) modified
cg

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offermargin.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AmountMarginModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java

Rev 26674 – change

tejbeer — Sat, 23 May 2020 00:15:28 +0530

tejbeer – 8 file(s) modified
change

~ /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/CreateOfferRequest.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/offers.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_history.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm

Rev 26626 –

amit.gupta — Sun, 10 May 2020 01:20:04 +0530

amit.gupta – 1 file(s) modified

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

Rev 26625 –

amit.gupta — Sun, 10 May 2020 01:19:38 +0530

amit.gupta – 1 file(s) modified

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

Rev 26619 – change

tejbeer — Sat, 09 May 2020 10:17:24 +0530

tejbeer – 1 file(s) modified
change

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

Rev 26588 – offer change

tejbeer — Wed, 29 Apr 2020 19:37:06 +0530

tejbeer – 23 file(s) modified
offer change

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offer.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offermargin.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/OfferPartner.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog/ItemCriteriaType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/Interface/ItemType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AmountMarginModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ItemTypeParams.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SimpleItemType.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/dao/repository/catalog/OfferMarginRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferMarginRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferPartnerRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferPartnerRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/offers.js
~ /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/scheme_offer.vm

Rev 26479 –

amit.gupta — Wed, 18 Mar 2020 20:40:26 +0530

amit.gupta – 2 file(s) modified

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

Rev 26474 – Fixed Dasshboard

amit.gupta — Wed, 18 Mar 2020 19:55:58 +0530

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

~ /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/auth_user_partner_detail.vm

Rev 26468 –

amit.gupta — Wed, 18 Mar 2020 19:22:16 +0530

amit.gupta – 2 file(s) modified

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

Rev 26460 –

amit.gupta — Wed, 18 Mar 2020 16:48:55 +0530

amit.gupta – 10 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerDetailModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerStatsService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerStatsServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm

Rev 26458 –

amit.gupta — Tue, 17 Mar 2020 15:38:45 +0530

amit.gupta – 1 file(s) modified

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

Rev 26455 –

amit.gupta — Tue, 17 Mar 2020 13:26:21 +0530

amit.gupta – 1 file(s) modified

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

Rev 26453 –

amit.gupta — Tue, 17 Mar 2020 12:01:12 +0530

amit.gupta – 1 file(s) modified

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

Rev 26447 –

amit.gupta — Sun, 15 Mar 2020 21:03:43 +0530

amit.gupta – 1 file(s) modified

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

Rev 26445 –

amit.gupta — Fri, 13 Mar 2020 19:50:51 +0530

amit.gupta – 1 file(s) modified

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

Rev 26435 –

tejbeer — Thu, 12 Mar 2020 11:11:27 +0530

tejbeer – 1 file(s) modified

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

Rev 26434 – change

tejbeer — Thu, 12 Mar 2020 11:02:25 +0530

tejbeer – 1 file(s) modified
change

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

Rev 26433 – change

tejbeer — Thu, 12 Mar 2020 10:53:22 +0530

tejbeer – 1 file(s) modified
change

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

Rev 26432 – chnage

tejbeer — Thu, 12 Mar 2020 10:45:47 +0530

tejbeer – 1 file(s) modified
chnage

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

Rev 26431 – change

tejbeer — Thu, 12 Mar 2020 10:35:16 +0530

tejbeer – 1 file(s) modified
change

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

Rev 26422 – change

tejbeer — Wed, 11 Mar 2020 15:12:09 +0530

tejbeer – 3 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java

Rev 26418 – change

tejbeer — Mon, 09 Mar 2020 17:47:18 +0530

tejbeer – 16 file(s) modified
change

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerDetailModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PartnersPositionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PartnersPositionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/refferal.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auth_user_detail.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auth_user_partner_detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/refferal-approve.vm

Rev 26414 –

amit.gupta — Sat, 07 Mar 2020 15:34:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 26413 –

amit.gupta — Sat, 07 Mar 2020 15:33:41 +0530

amit.gupta – 1 file(s) modified

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

Rev 26400 – Fixed Price Drop related issues

amit.gupta — Wed, 04 Mar 2020 17:06:20 +0530

amit.gupta – 10 file(s) modified
Fixed Price Drop related issues

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDrop.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/PriceDropImeiStatus.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java

Rev 26330 –

amit.gupta — Fri, 14 Feb 2020 13:24:25 +0530

amit.gupta – 1 file(s) modified

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

Rev 26329 –

amit.gupta — Fri, 14 Feb 2020 13:16:54 +0530

amit.gupta – 1 file(s) modified

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

Rev 26328 –

amit.gupta — Fri, 14 Feb 2020 13:10:48 +0530

amit.gupta – 1 file(s) modified

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

Rev 26327 –

amit.gupta — Fri, 14 Feb 2020 13:00:47 +0530

amit.gupta – 1 file(s) modified

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

Rev 26309 – Fixed Brand Stock Value

amit.gupta — Wed, 05 Feb 2020 11:39:08 +0530

amit.gupta – 4 file(s) modified
Fixed Brand Stock Value

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java

Rev 26267 –

amit.gupta — Sat, 25 Jan 2020 12:02:33 +0530

amit.gupta – 2 file(s) modified

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

Rev 26244 – change

tejbeer — Wed, 22 Jan 2020 17:19:16 +0530

tejbeer – 7 file(s) modified
change

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ReporticoProject.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Lead.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateRefferalRequest.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java

Rev 26237 –

amit.gupta — Wed, 22 Jan 2020 15:55:24 +0530

amit.gupta – 1 file(s) modified

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

Rev 26236 –

amit.gupta — Wed, 22 Jan 2020 15:27:33 +0530

amit.gupta – 1 file(s) modified

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

Rev 26234 –

amit.gupta — Wed, 22 Jan 2020 15:23:29 +0530

amit.gupta – 3 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/activated-imeis.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm

Rev 26233 – Fixed investment

amit.gupta — Tue, 21 Jan 2020 17:24:05 +0530

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

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

Rev 26222 – change

tejbeer — Mon, 20 Jan 2020 18:09:36 +0530

tejbeer – 1 file(s) modified
change

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