Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
5623 4929 d 22 h anupam.singh /trunk/ Trac # 1426, 1263, 1425
Reviewer : Mandeep		  
/trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/ProductNotificationsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/QuicklinksController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
/trunk/Support/src/main/webapp/WEB-INF/content/registered-users-authsuccess.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
4817 5042 d 14 h anupam.singh /trunk/Support/src/main/ Registered user report now supports date range.
Reviewer : Varun Gupta		  
/trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
/trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java
/trunk/Support/src/main/webapp/WEB-INF/content/registered-users-authsuccess.vm
4600 5067 d 20 h varun.gupta /trunk/ Vendor Reconciliation Report Generator - v1.0  
/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
/trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/PaymentSettlement.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/handler/PaymentGatewayHandler.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/persistence/PaymentGatewayMapper.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
/trunk/PaymentService/src/main/resources/in/shop2020/payment/persistence/PaymentGatewayMapper.xml
/trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
/trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
3936 5193 d 19 h chandranshu /trunk/Support/src/main/java/in/shop2020/support/controllers/ Added a redirect to the reports dashboard in case a user is not authorized to view a report  
/trunk/Support/src/main/java/in/shop2020/support/controllers/CodReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/PromotionsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java
3105 5251 d 22 h chandranshu /trunk/Support/src/main/java/in/shop2020/support/ Replaced e.printStackTraces with logger.error  
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/PendingOrdersController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
1941 5349 d 21 h ankur.singhal /trunk/Support/src/main/ struts.xml modified (default interceptors) to fix inventory update issue. Also moved authorisation method to utility class.  
/trunk/Support/src/main/java/in/shop2020/support/utils
/trunk/Support/src/main/java/in/shop2020/support/utils/ReportsUtils.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/ReportsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java
/trunk/Support/src/main/resources/struts.xml
/trunk/Support/src/main/webapp/WEB-INF/content/statistics-authsuccess.vm
1891 5355 d 20 h ankur.singhal /trunk/ enhancements/modifications done to move the reports in reporting dashboard.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/LogoutController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/ReportsController.java
/trunk/Support/src/main/java/in/shop2020/support/interceptors
/trunk/Support/src/main/java/in/shop2020/support/interceptors/LoginInterceptor.java
/trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
/trunk/Support/src/main/webapp/WEB-INF/content/exception.vm
/trunk/Support/src/main/webapp/WEB-INF/content/reports-authfail.vm
/trunk/Support/src/main/webapp/WEB-INF/content/reports-authsuccess.vm
/trunk/Support/src/main/webapp/WEB-INF/content/reports-common.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/Report.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/ReportUser.java
/trunk/PyProj/src/shop2020/helpers/impl/Converters.py
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/DataService.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/helpers/test/Test.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java
/trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java
/trunk/Support/src/main/resources/struts.xml
/trunk/Support/src/main/webapp/WEB-INF/content/payment-details-authsuccess.vm
/trunk/Support/src/main/webapp/WEB-INF/content/registered-users-authsuccess.vm
/trunk/Support/src/main/webapp/WEB-INF/content/statistics-authsuccess.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
1676 5371 d 17 h ankur.singhal /trunk/Support/src/main/ Report of registered users. Contain all the addresses too corresponding to each user.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
/trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java
/trunk/Support/src/main/webapp/WEB-INF/content/registered-users-authfail.vm
/trunk/Support/src/main/webapp/WEB-INF/content/registered-users-authsuccess.vm