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

Rev 25003 –

amit.gupta — Sat, 01 Jun 2019 11:00:40 +0530

amit.gupta – 1 file(s) modified

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

Rev 25002 –

amit.gupta — Sat, 01 Jun 2019 10:54:57 +0530

amit.gupta – 1 file(s) modified

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

Rev 25001 –

amit.gupta — Sat, 01 Jun 2019 10:28:42 +0530

amit.gupta – 1 file(s) modified

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

Rev 25000 –

amit.gupta — Sat, 01 Jun 2019 10:14:12 +0530

amit.gupta – 1 file(s) modified

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

Rev 24999 –

amit.gupta — Sat, 01 Jun 2019 09:52:22 +0530

amit.gupta – 1 file(s) modified

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

Rev 24996 –

amit.gupta — Fri, 31 May 2019 17:45:31 +0530

amit.gupta – 1 file(s) modified

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

Rev 24880 – DashBoard Front page

govind — Thu, 25 Apr 2019 11:43:30 +0530

govind – 18 file(s) modified
DashBoard Front page

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/InsurancePolicy.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsurancePolicyRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsurancePolicyRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsuranceProviderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsuranceProviderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeTransactionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeTransactionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderItemRepositoryImpl.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-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/insurance-details-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/insurance-details.vm
x /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/my-ticket.vm

Rev 24441 –

amit.gupta — Sat, 26 Jan 2019 00:49:47 +0530

amit.gupta – 1 file(s) modified

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

Rev 24387 – Fixed dashboard

amit.gupta — Fri, 28 Dec 2018 11:39:20 +0530

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

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

Rev 24383 – Added major commit to remove dtr-data

amit.gupta — Thu, 27 Dec 2018 17:32:47 +0530

amit.gupta – 53 file(s) modified
Added major commit to remove dtr-data

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/AuthUser.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Activity.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Ticket.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/TicketCategory.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/TicketSubCategory.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivityType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/AuthRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/AuthRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/ActivityRepository.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/TicketCategoryRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketCategoryRepositoryImpl.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/dao/repository/cs/TicketSubCategoryRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketSubCategoryRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.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/user/UserRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebConfig.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AuthUserController.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/LoginController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PaymentOptionController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/MVCResponseSender.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/login.css
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/authUser.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/login.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auth-users-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/change-auth-user-password.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-auth-user.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/forget-password.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/user-profile.vm
~ /trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/staging.properties
~ /trunk/PyDTR/src/scripts/ActivityReport.py
~ /trunk/PyDTR/src/scripts/ProfitMandiPushNotificationSender.py
~ /trunk/PyDTR/src/scripts/pushbatchcreditnotification.py
~ /trunk/PyDTR/src/scripts/UserSegmentationLinksMaster.py

Rev 24366 – Fixed message

amit.gupta — Fri, 21 Dec 2018 13:44:22 +0530

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

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

Rev 24365 – Fixed investment message in panel

amit.gupta — Fri, 21 Dec 2018 13:39:19 +0530

amit.gupta – 4 file(s) modified
Fixed investment message in panel

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 24356 – Fixed investment

amit.gupta — Thu, 20 Dec 2018 19:48:22 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerDailyInvestment.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/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 24352 –

amit.gupta — Thu, 20 Dec 2018 18:22:29 +0530

amit.gupta – 1 file(s) modified

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

Rev 24339 – Fixed appconfig

amit.gupta — Tue, 18 Dec 2018 13:56:53 +0530

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

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

Rev 24338 – Fixed investment summary

amit.gupta — Tue, 18 Dec 2018 13:49:25 +0530

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

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

Rev 24336 – Fixed insurance

amit.gupta — Tue, 18 Dec 2018 13:47:04 +0530

amit.gupta – 4 file(s) modified
Fixed insurance

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerDailyInvestment.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java

Rev 24327 –

amit.gupta — Fri, 14 Dec 2018 19:29:00 +0530

amit.gupta – 1 file(s) modified

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

Rev 24325 –

amit.gupta — Fri, 14 Dec 2018 19:18:44 +0530

amit.gupta – 1 file(s) modified

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

Rev 24324 –

amit.gupta — Fri, 14 Dec 2018 19:15:05 +0530

amit.gupta – 1 file(s) modified

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

Rev 24323 –

amit.gupta — Fri, 14 Dec 2018 19:05:26 +0530

amit.gupta – 1 file(s) modified

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

Rev 24321 – Fixed Investment Summary chart

amit.gupta — Fri, 14 Dec 2018 18:58:50 +0530

amit.gupta – 2 file(s) modified
Fixed Investment Summary chart

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

Rev 24315 –

amit.gupta — Wed, 12 Dec 2018 18:57:00 +0530

amit.gupta – 1 file(s) modified

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

Rev 24312 –

amit.gupta — Wed, 12 Dec 2018 17:43:02 +0530

amit.gupta – 1 file(s) modified

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

Rev 24288 – Added Canvas for highlighting investment Summary

amit.gupta — Tue, 11 Dec 2018 20:41:44 +0530

amit.gupta – 4 file(s) modified
Added Canvas for highlighting investment Summary

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/dashboard.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 24276 – Fixed partner mark

amit.gupta — Tue, 11 Dec 2018 16:30:22 +0530

amit.gupta – 12 file(s) modified
Fixed partner mark

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerDailyInvestment.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerDailyInvestmentRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerDailyRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TargetSlabRepository.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/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SupportController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/dashboard.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java

Rev 24271 – Added Neeraj

amit.gupta — Tue, 11 Dec 2018 11:24:26 +0530

amit.gupta – 17 file(s) modified
Added Neeraj

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.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/fofo/ScanRecordRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderService.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/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/customer-return.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/dashboard.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 24263 – active inactive annoucements and contact us page

tejbeer — Tue, 04 Dec 2018 18:17:21 +0530

tejbeer – 9 file(s) modified
active inactive annoucements and contact us page

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/NotificationDataModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/NotificationData.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationPanelRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationPanelRepositoryImpl.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/NotificationController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 24248 – Changes in target and Profile

govind — Mon, 26 Nov 2018 18:23:18 +0530

govind – 13 file(s) modified
Changes in target and Profile

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerTargetDetails.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/fofo/PartnerTargetRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/PaymentOptionService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/PaymentOptionServiceImpl.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/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerTargetController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PaymentOptionController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-target-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/user-profile.vm

Rev 24203 – Gifts can now be biilled

amit.gupta — Fri, 02 Nov 2018 19:42:45 +0530

amit.gupta – 9 file(s) modified
Gifts can now be biilled

Rev 24182 –

govind — Thu, 01 Nov 2018 10:52:35 +0530

govind – 1 file(s) modified

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

Rev 24121 – Target Vs Sale and Update Bill Details

govind — Mon, 01 Oct 2018 16:15:45 +0530

govind – 14 file(s) modified
Target Vs Sale and Update Bill Details

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/monitored/NagiosMonitorTasks.java
x /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/monitored/SendMailDailyVsTargetReport.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/NagiosMonitoringScheduledSkeleton.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/slab/TargetSlabService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/slab/TargetSlabServiceImpl.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/PartnerTargetController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-order-customer-details.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-target.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm

Rev 24098 – Annoucements

tejbeer — Wed, 19 Sep 2018 16:42:11 +0530

tejbeer – 11 file(s) modified
Annoucements

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/NotificationDataModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/NotificationData.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationPanelRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationPanelRepositoryImpl.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/NotificationController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/notification-panel.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/send-notification.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/notification-panel.vm

Rev 24078 –

amit.gupta — Tue, 04 Sep 2018 14:53:37 +0530

amit.gupta – 1 file(s) modified

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

Rev 24077 – Fixed https:// cross site

amit.gupta — Tue, 04 Sep 2018 14:49:26 +0530

amit.gupta – 7 file(s) modified
Fixed https:// cross site

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/punch-in-out.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 24072 – Fixed https and attendance issues

amit.gupta — Tue, 04 Sep 2018 11:19:37 +0530

amit.gupta – 25 file(s) modified
Fixed https and attendance issues

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.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-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/punch-in-out.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge-commission.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-vendor.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-warehouse.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listings.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/user-profile.vm

Rev 23951 – Added pricedrop summary model

amit.gupta — Thu, 26 Jul 2018 14:54:17 +0530

amit.gupta – 19 file(s) modified
Added pricedrop summary model

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ClosingStockOnDate.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/GrnPendingDataModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ImeiDropSummaryModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PartnerImeiNotSold.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/ReporticoService.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FileUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDrop.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/authentication/RoleManager.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/build.gradle
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebConfig.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
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm

Rev 23944 – Fixed logic to show error

amit.gupta — Mon, 23 Jul 2018 18:58:30 +0530

amit.gupta – 1 file(s) modified
Fixed logic to show error

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

Rev 23936 – AddtoWalletRequest

tejbeer — Thu, 19 Jul 2018 17:28:47 +0530

tejbeer – 15 file(s) modified
AddtoWalletRequest

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/AddWalletRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/AddWalletRequestStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepositoryImpl.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/WalletController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/add-wallet-request.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateAddMoneyRequest.java

Rev 23923 – Fixed alert mechanism for non partners

amit.gupta — Wed, 18 Jul 2018 12:25:24 +0530

amit.gupta – 1 file(s) modified
Fixed alert mechanism for non partners

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