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

Rev 27229 – Add readonly

amit.gupta — Mon, 19 Oct 2020 12:26:51 +0530

amit.gupta – 4 file(s) modified
Add readonly

~ /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/model/LoginDetails.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java

Rev 26743 – Added Cookies handler tomcat8 compatible

amit.gupta — Wed, 10 Jun 2020 21:10:15 +0530

amit.gupta – 2 file(s) modified
Added Cookies handler tomcat8 compatible

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java

Rev 26450 –

amit.gupta — Mon, 16 Mar 2020 17:00:07 +0530

amit.gupta – 1 file(s) modified

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

Rev 26449 – Fixed login

amit.gupta — Mon, 16 Mar 2020 13:44:20 +0530

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

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

Rev 26395 –

amit.gupta — Fri, 28 Feb 2020 16:32:36 +0530

amit.gupta – 1 file(s) modified

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

Rev 26394 –

amit.gupta — Fri, 28 Feb 2020 16:23:55 +0530

amit.gupta – 2 file(s) modified

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

Rev 26147 –

amit.gupta — Thu, 09 Jan 2020 19:02:52 +0530

amit.gupta – 1 file(s) modified

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

Rev 26026 –

amit.gupta — Mon, 23 Dec 2019 12:27:11 +0530

amit.gupta – 1 file(s) modified

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

Rev 26025 –

amit.gupta — Mon, 23 Dec 2019 12:19:36 +0530

amit.gupta – 1 file(s) modified

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

Rev 26022 – Fixed pending returns

amit.gupta — Sun, 22 Dec 2019 16:04:16 +0530

amit.gupta – 4 file(s) modified
Fixed pending returns

~ /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/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-returns.vm

Rev 26021 –

amit.gupta — Sun, 22 Dec 2019 15:29:00 +0530

amit.gupta – 1 file(s) modified

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

Rev 25946 – 1. Fixed Reminder cron entry 2. Bucket Entries fixed.

amit.gupta — Tue, 03 Dec 2019 17:17:32 +0530

amit.gupta – 6 file(s) modified
1. Fixed Reminder cron entry
2. Bucket Entries fixed.

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
~ /trunk/profitmandi-cron/src/main/resources/META-INF/env.properties
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/ItemBucketServiceImpl.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/NotificationController.java

Rev 25897 –

amit.gupta — Tue, 26 Nov 2019 11:55:55 +0530

amit.gupta – 1 file(s) modified

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

Rev 25544 – Fixed wallet issues and blocked inactive users from logging in ...

amit.gupta — Wed, 11 Sep 2019 14:55:39 +0530

amit.gupta – 4 file(s) modified
Fixed wallet issues and blocked inactive users from logging in to dashboard

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/UserWallet.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/java/com/spice/profitmandi/web/controller/LoginController.java

Rev 25454 –

amit.gupta — Tue, 20 Aug 2019 11:20:58 +0530

amit.gupta – 1 file(s) modified

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

Rev 25452 –

amit.gupta — Wed, 14 Aug 2019 15:37:25 +0530

amit.gupta – 1 file(s) modified

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

Rev 25436 –

amit.gupta — Mon, 12 Aug 2019 16:33:26 +0530

amit.gupta – 1 file(s) modified

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

Rev 25380 –

amit.gupta — Mon, 05 Aug 2019 20:16:38 +0530

amit.gupta – 11 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/solr/SolrService.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ContentPojo.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/MediaPojo.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/fofo/FofoOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/ContentPojoPopulator.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/content.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm

Rev 25303 –

amit.gupta — Tue, 16 Jul 2019 13:21:31 +0530

amit.gupta – 1 file(s) modified

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

Rev 25275 –

amit.gupta — Wed, 10 Jul 2019 18:06:40 +0530

amit.gupta – 1 file(s) modified

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

Rev 25243 –

amit.gupta — Sat, 06 Jul 2019 12:42:41 +0530

amit.gupta – 1 file(s) modified

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

Rev 25011 – Adedd web link for team in admin and accessories ...

amit.gupta — Tue, 04 Jun 2019 11:53:57 +0530

amit.gupta – 8 file(s) modified
Adedd web link for team in admin and accessories subcategories are displayed now insted of accessories brands

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Category.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/mobileapp.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 25009 –

amit.gupta — Mon, 03 Jun 2019 15:22:50 +0530

amit.gupta – 1 file(s) modified

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

Rev 25008 –

amit.gupta — Mon, 03 Jun 2019 14:41:51 +0530

amit.gupta – 1 file(s) modified

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

Rev 24984 –

amit.gupta — Tue, 21 May 2019 11:45:37 +0530

amit.gupta – 1 file(s) modified

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

Rev 24983 –

amit.gupta — Mon, 20 May 2019 18:29:10 +0530

amit.gupta – 1 file(s) modified

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

Rev 24981 –

amit.gupta — Mon, 20 May 2019 18:10:02 +0530

amit.gupta – 1 file(s) modified

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

Rev 24976 – Added changes related to new tab

amit.gupta — Mon, 20 May 2019 16:55:43 +0530

amit.gupta – 7 file(s) modified
Added changes related to new tab

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.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/PartnerTargetController.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/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/store.vm

Rev 24527 – Added logic to block partners.

amit.gupta — Tue, 19 Feb 2019 08:21:18 +0530

amit.gupta – 3 file(s) modified
Added logic to block partners.

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java

Rev 24478 – Added gmail Ids for Internal team

amit.gupta — Wed, 06 Feb 2019 15:38:56 +0530

amit.gupta – 5 file(s) modified
Added gmail Ids for Internal team

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AuthUserController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/authUser.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/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 24016 – Fixed attendance

amit.gupta — Mon, 20 Aug 2018 16:27:07 +0530

amit.gupta – 19 file(s) modified
Fixed attendance

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
~ /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/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
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 23784 – Role mgmt and non billable items to be scan

ashik.ali — Fri, 08 Jun 2018 20:38:47 +0530

ashik.ali – 21 file(s) modified
Role mgmt and non billable items to be scan

~ /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/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.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/LoginController.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/PrebookingController.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/java/com/spice/profitmandi/web/controller/RetailerController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RoleController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WarehouseController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/RoleInterceptor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/model/LoginDetails.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/RoleManager.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/Utils.java

Rev 23628 – Add money to recharge local wallet, check local and remote ...

ashik.ali — Thu, 03 May 2018 15:32:11 +0530

ashik.ali – 6 file(s) modified
Add money to recharge local wallet, check local and remote wallet balance, daily recharges tracking

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/SpringWebAppInitializer.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/RechargeController.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

Rev 23568 – Fixed changes related to logging. Updated to log4j2

govind — Tue, 17 Apr 2018 17:23:28 +0530

govind – 94 file(s) modified
Fixed changes related to logging. Updated to log4j2

~ /trunk/profitmandi-common/build.gradle
~ /trunk/profitmandi-common/pom.xml
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/ResponseCodeHolder.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/HelperServiceUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/SnapdealProductPageParser.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/JWTUtil.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/StringUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/interceptor/SimpleCORSInterceptor.java
x /trunk/profitmandi-common/src/main/resources/log4j.xml
~ /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/transaction/TransactionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/CustomTransactionConvertorUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/LogisticsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/PaymentOptionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/RechargeServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.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/SpringWebAppInitializer.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CronController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CustomerController.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/FofoController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.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/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ItemLedgerController.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/MongoMigrationController.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/PaymentOptionController.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/RechargeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RegisterController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ScanRecordController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/RoleInterceptor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/MVCResponseSender.java
+ /trunk/profitmandi-fofo/src/main/resources/log4j2.xml
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/SpringWebAppInitializer.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/CodPaymentService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/CommonPaymentService.java
~ /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/checkout/PayuHandler.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPaymentService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayResponseController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ClicksController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ContactUsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/EntityController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/FileUploaderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/InsuranceController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LivePricingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LogisticsTrackingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MasterDataController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MigrationController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/OTPController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SolrSearchController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/payment/PaymentUtils.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/payment/WalletPaymentService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/OtpProcessor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/services/SolrService.java
x /trunk/profitmandi-web/src/main/resources/log4j.xml
+ /trunk/profitmandi-web/src/main/resources/log4j2.xml

Rev 23419 – New feature: Prebooking Listing, Prebooking Orders, link with orders, order ...

ashik.ali — Tue, 13 Mar 2018 16:03:52 +0530

ashik.ali – 31 file(s) modified
New feature: Prebooking Listing, Prebooking Orders, link with orders, order details

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.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/PaymentOptionController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PrebookingController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-prebooking-listing.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-prebooking-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/prebooking.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items-description.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-details.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-listing-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listings-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listings.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-order-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-orders-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-orders.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/tag-listing-items-description.vm

Rev 23405 – Added changes related to indent and imei selection

amit.gupta — Wed, 07 Mar 2018 12:31:11 +0530

amit.gupta – 44 file(s) modified
Added changes related to indent and imei selection

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/IndentStatus.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomCurrentInventorySnapshot.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Category.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Indent.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/IndentItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepositoryImpl.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/TagListingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/IndentItemRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/IndentItemRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/IndentRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/IndentRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.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/InventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.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/service/indent
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/indent/IndentService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/indent/IndentServiceImpl.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/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/MVCResponseSender.java
~ /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/business
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-indent.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/response.vm

Rev 23271 –

ashik.ali — Wed, 24 Jan 2018 16:57:24 +0530

ashik.ali – 2 file(s) modified

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

Rev 23203 –

ashik.ali — Mon, 15 Jan 2018 17:38:41 +0530

ashik.ali – 6 file(s) modified

Rev 23173 – retailer not found redirect change to login, remove wallet history ...

ashik.ali — Tue, 09 Jan 2018 13:09:29 +0530

ashik.ali – 6 file(s) modified
retailer not found redirect change to login, remove wallet history date and invoice search box, remove new grn line, handle missing shipping details with better way