SmartDukaan – /

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

Rev 24343 –

amit.gupta — Tue, 18 Dec 2018 17:44:16 +0530

amit.gupta – 1 file(s) modified

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

Rev 24342 – Removed logic for Investment

amit.gupta — Tue, 18 Dec 2018 16:32:59 +0530

amit.gupta – 1 file(s) modified
Removed logic for Investment

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

Rev 24341 –

amit.gupta — Tue, 18 Dec 2018 15:35:53 +0530

amit.gupta – 1 file(s) modified

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

Rev 24340 –

amit.gupta — Tue, 18 Dec 2018 14:06:31 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.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 24337 – Fixed investment summary

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

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

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.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 24335 – Fixed appconfig

amit.gupta — Tue, 18 Dec 2018 12:47:49 +0530

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

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

Rev 24334 –

amit.gupta — Tue, 18 Dec 2018 12:46:38 +0530

amit.gupta – 1 file(s) modified

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

Rev 24333 – Fixed nothing

amit.gupta — Tue, 18 Dec 2018 12:22:44 +0530

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

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm

Rev 24332 – Fixed po scenario

amit.gupta — Mon, 17 Dec 2018 15:24:54 +0530

amit.gupta – 1 file(s) modified
Fixed po scenario

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java

Rev 24331 – Added guava library for hashing

amit.gupta — Mon, 17 Dec 2018 12:48:10 +0530

amit.gupta – 1 file(s) modified
Added guava library for hashing

~ /trunk/profitmandi-dao/build.gradle

Rev 24330 – Added auth mechanism

amit.gupta — Mon, 17 Dec 2018 12:06:47 +0530

amit.gupta – 9 file(s) modified
Added auth mechanism

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/AuthUser.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/auth
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/auth/AuthType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth
+ /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/service/AuthService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AuthServiceImpl.java

Rev 24329 – financial Service

govind — Mon, 17 Dec 2018 12:02:54 +0530

govind – 2 file(s) modified
financial Service

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

Rev 24328 – financial comment

govind — Mon, 17 Dec 2018 11:45:02 +0530

govind – 6 file(s) modified
financial comment

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig/ServiceConfigService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig/ServiceConfigServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-partner-service-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm

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

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

amit.gupta – 1 file(s) modified

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

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

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

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/build.gradle

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

govind — Thu, 13 Dec 2018 16:45:13 +0530

govind – 1 file(s) modified

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

Rev 24319 – fixed removed code

govind — Thu, 13 Dec 2018 16:38:01 +0530

govind – 1 file(s) modified
fixed removed code

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

Rev 24318 –

govind — Thu, 13 Dec 2018 16:32:10 +0530

govind – 1 file(s) modified

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

Rev 24317 – financial service

govind — Thu, 13 Dec 2018 16:21:52 +0530

govind – 23 file(s) modified
financial service

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerBrandService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ServiceBrandsConfig.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/ApplicableServiceType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/PartnerStatusType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ServiceConfigRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ServiceConfigRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig/ServiceConfigService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig/ServiceConfigServiceImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/Not-allowed-sign.jpg
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-brands-to-service.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-partner-brand-service-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-partner-service-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/added-brands.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin-partner-services.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brands-service.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-service.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/service-brands.vm

Rev 24316 –

amit.gupta — Thu, 13 Dec 2018 11:25:22 +0530

amit.gupta – 1 file(s) modified

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

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

amit.gupta — Wed, 12 Dec 2018 17:48:26 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 24313 –

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

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/build.gradle

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

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

amit.gupta – 4 file(s) modified

~ /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/PartnerDailyRepositoryImpl.java
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/dashboard.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 24310 –

amit.gupta — Wed, 12 Dec 2018 17:06:51 +0530

amit.gupta – 1 file(s) modified

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