SmartDukaan – /

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

amit.gupta — Mon, 24 Dec 2018 21:12:51 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/AuthRepositoryImpl.java

Rev 24381 –

amit.gupta — Sat, 22 Dec 2018 17:05:51 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java

Rev 24380 – Fixed js

amit.gupta — Sat, 22 Dec 2018 14:44:08 +0530

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

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js

Rev 24379 –

amit.gupta — Sat, 22 Dec 2018 12:16:40 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java

Rev 24378 –

amit.gupta — Sat, 22 Dec 2018 12:16:14 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js

Rev 24377 –

amit.gupta — Sat, 22 Dec 2018 01:59:47 +0530

amit.gupta – 1 file(s) modified

x /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services1.vm

Rev 24376 – Fixed item typeahead

amit.gupta — Sat, 22 Dec 2018 01:29:02 +0530

amit.gupta – 4 file(s) modified
Fixed item typeahead

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

Rev 24375 – Fixed address

amit.gupta — Fri, 21 Dec 2018 18:16:27 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java

Rev 24374 –

amit.gupta — Fri, 21 Dec 2018 16:43:58 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java

Rev 24373 –

amit.gupta — Fri, 21 Dec 2018 15:41:47 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepositoryImpl.java

Rev 24372 –

amit.gupta — Fri, 21 Dec 2018 15:38:59 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/AddressRepositoryImpl.java

Rev 24371 –

amit.gupta — Fri, 21 Dec 2018 14:47:39 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js

Rev 24370 –

amit.gupta — Fri, 21 Dec 2018 14:40:48 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js

Rev 24369 –

amit.gupta — Fri, 21 Dec 2018 13:59:45 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js

Rev 24368 –

amit.gupta — Fri, 21 Dec 2018 13:57:00 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java

Rev 24367 –

amit.gupta — Fri, 21 Dec 2018 13:56:47 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js

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

amit.gupta — Fri, 21 Dec 2018 13:23:50 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 24363 –

amit.gupta — Fri, 21 Dec 2018 10:42:57 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 24362 – Fixed grn pending

amit.gupta — Fri, 21 Dec 2018 10:41:56 +0530

amit.gupta – 1 file(s) modified
Fixed grn pending

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 24361 –

amit.gupta — Fri, 21 Dec 2018 10:39:56 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 24360 – Fixed

amit.gupta — Fri, 21 Dec 2018 10:37:21 +0530

amit.gupta – 1 file(s) modified
Fixed

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 24359 –

amit.gupta — Fri, 21 Dec 2018 10:32:00 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 24358 –

amit.gupta — Thu, 20 Dec 2018 19:53:00 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java

Rev 24357 –

amit.gupta — Thu, 20 Dec 2018 19:52:47 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js

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 24355 – Fixed totalInvestment

amit.gupta — Thu, 20 Dec 2018 18:45:00 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerDailyInvestment.java

Rev 24354 – Fixed total Investment Value

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

amit.gupta – 1 file(s) modified
Fixed total Investment Value

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerDailyInvestment.java

Rev 24353 –

amit.gupta — Thu, 20 Dec 2018 18:32:33 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerDailyInvestment.java

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

amit.gupta — Thu, 20 Dec 2018 18:01:06 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm

Rev 24350 – Added new js version

amit.gupta — Thu, 20 Dec 2018 17:41:19 +0530

amit.gupta – 1 file(s) modified
Added new js version

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java

Rev 24349 – Added Investment Summary

amit.gupta — Thu, 20 Dec 2018 17:37:28 +0530

amit.gupta – 25 file(s) modified
Added Investment Summary

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomRetailer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/State.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/StateRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/StateRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/AddressRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/AddressRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.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/config/AppConfig.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ControllerSetup.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/ItemController.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/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-info.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/store.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java

Rev 24348 – Fixed return statements

amit.gupta — Wed, 19 Dec 2018 17:25:34 +0530

amit.gupta – 1 file(s) modified
Fixed return statements

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.java

Rev 24347 –

govind — Tue, 18 Dec 2018 18:09:51 +0530

govind – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm

Rev 24346 –

govind — Tue, 18 Dec 2018 18:05:28 +0530

govind – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm

Rev 24345 –

govind — Tue, 18 Dec 2018 18:02:56 +0530

govind – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm

Rev 24344 –

govind — Tue, 18 Dec 2018 17:59:28 +0530

govind – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm