SmartDukaan – /trunk/Support/src/main/java/in/

Rev 2345 – Fix some bugs in affiliate reports.

vikas — Mon, 27 Jun 2011 16:29:18 +0530

vikas – 1 file(s) modified
Fix some bugs in affiliate reports.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java

Rev 2340 – add item name and amount in affiliate report.

vikas — Mon, 27 Jun 2011 13:40:34 +0530

vikas – 1 file(s) modified
add item name and amount in affiliate report.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java

Rev 2310 – Added payment method in the report. Also done some formatting

ankur.singhal — Wed, 22 Jun 2011 15:25:37 +0530

ankur.singhal – 1 file(s) modified
Added payment method in the report. Also done some formatting

~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java

Rev 2190 – Removed an unused field

chandranshu — Tue, 14 Jun 2011 17:38:40 +0530

chandranshu – 1 file(s) modified
Removed an unused field

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentDetailsController.java

Rev 2090 – added column GatewayTxnStatus in the report.

ankur.singhal — Tue, 07 Jun 2011 14:15:16 +0530

ankur.singhal – 1 file(s) modified
added column GatewayTxnStatus in the report.

~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java

Rev 2061 – Ticket:409. Modifications to payment details of all gateways

ankur.singhal — Thu, 02 Jun 2011 19:13:11 +0530

ankur.singhal – 1 file(s) modified
Ticket:409. Modifications to payment details of all gateways

~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java

Rev 2058 – Fix file name for affiliate report.

vikas — Thu, 02 Jun 2011 17:42:05 +0530

vikas – 1 file(s) modified
Fix file name for affiliate report.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java

Rev 2042 – Removed unused imports and methods from some classes

chandranshu — Thu, 02 Jun 2011 12:18:54 +0530

chandranshu – 4 file(s) modified
Removed unused imports and methods from some classes

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CartReportController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java

Rev 2014 – Fixed bug which was hiding last row from display

rajveer — Wed, 01 Jun 2011 11:18:53 +0530

rajveer – 1 file(s) modified
Fixed bug which was hiding last row from display

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java

Rev 2011 – Added selling price to the reconciliation report

rajveer — Tue, 31 May 2011 21:40:19 +0530

rajveer – 1 file(s) modified
Added selling price to the reconciliation report

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java

Rev 2008 – Added the column for Customer Name, removed the restriction of ...

chandranshu — Tue, 31 May 2011 19:11:41 +0530

chandranshu – 1 file(s) modified
Added the column for Customer Name, removed the restriction of status, changed the file name to reflect the date range of report, created an enum for columns to ease future refactoring.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java

Rev 2000 – Don't use tracker table.

vikas — Tue, 31 May 2011 17:31:57 +0530

vikas – 1 file(s) modified
Don't use tracker table.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java

Rev 1941 – struts.xml modified (default interceptors) to fix inventory update issue. Also ...

ankur.singhal — Wed, 25 May 2011 14:44:38 +0530

ankur.singhal – 9 file(s) modified
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/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/java/in/shop2020/support/utils
+ /trunk/Support/src/main/java/in/shop2020/support/utils/ReportsUtils.java
~ /trunk/Support/src/main/resources/struts.xml
~ /trunk/Support/src/main/webapp/WEB-INF/content/statistics-authsuccess.vm

Rev 1901 – Affiliates report.

vikas — Fri, 20 May 2011 17:47:58 +0530

vikas – 2 file(s) modified
Affiliates report.

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/affiliate-report.vm

Rev 1895 – Cart conversion report.

vikas — Thu, 19 May 2011 19:04:15 +0530

vikas – 1 file(s) modified
Cart conversion report.

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/CartReportController.java

Rev 1891 – enhancements/modifications done to move the reports in reporting dashboard.

ankur.singhal — Thu, 19 May 2011 15:34:35 +0530

ankur.singhal – 36 file(s) modified
enhancements/modifications done to move the reports in reporting dashboard.

~ /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/LogoutController.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/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/java/in/shop2020/support/services/RegisteredUsersGenerator.java
~ /trunk/Support/src/main/resources/struts.xml
+ /trunk/Support/src/main/webapp/WEB-INF/content/exception.vm
~ /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/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/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/ThriftConfig/src/main/java/in/shop2020/utils/Report.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/ReportUser.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 1886 – Ticket #380. Added Last 10 Orders to Statistics page.

ankur.singhal — Wed, 18 May 2011 19:05:27 +0530

ankur.singhal – 8 file(s) modified
Ticket #380. Added Last 10 Orders to Statistics page.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/statistics-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 1884 – Removed unused imports and unused variables

chandranshu — Wed, 18 May 2011 16:52:45 +0530

chandranshu – 6 file(s) modified
Removed unused imports and unused variables

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/InvoiceController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PendingOrdersController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java

Rev 1882 – getAllUsers() method signature fixed.

ankur.singhal — Wed, 18 May 2011 16:26:15 +0530

ankur.singhal – 1 file(s) modified
getAllUsers() method signature fixed.

~ /trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java

Rev 1881 – Enhanced report to show successful payments also. User will select ...

ankur.singhal — Wed, 18 May 2011 15:20:33 +0530

ankur.singhal – 3 file(s) modified
Enhanced report to show successful payments also. User will select the status of the payment.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/payment-details-authsuccess.vm

Rev 1879 – Ticket#378. Add user activity columns in the report.

ankur.singhal — Wed, 18 May 2011 14:07:51 +0530

ankur.singhal – 1 file(s) modified
Ticket#378. Add user activity columns in the report.

~ /trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java

Rev 1790 – FIx a bug where user personal info was not printed ...

vikas — Tue, 10 May 2011 11:44:45 +0530

vikas – 1 file(s) modified
FIx a bug where user personal info was not printed in user-communications report.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserCommunicationsController.java

Rev 1744 – Fix some date formatting problems.

vikas — Fri, 06 May 2011 13:09:55 +0530

vikas – 2 file(s) modified
Fix some date formatting problems.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserCommunicationsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java

Rev 1738 – Separate out user communications report from user orders report. Put ...

vikas — Thu, 05 May 2011 19:24:36 +0530

vikas – 2 file(s) modified
Separate out user communications report from user orders report. Put dates properly in excel formats.

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserCommunicationsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java

Rev 1731 – optimisation of methods for getting max, min amounts of orders ...

ankur.singhal — Thu, 05 May 2011 16:24:31 +0530

ankur.singhal – 12 file(s) modified
optimisation of methods for getting max, min amounts of orders and payments. These methods are used for statistics (Support).

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/payments/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/payments/impl/PaymentsHandler.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/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.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

Rev 1684 – added LastLogin time and RegisteredOn time

ankur.singhal — Tue, 03 May 2011 19:44:07 +0530

ankur.singhal – 1 file(s) modified
added LastLogin time and RegisteredOn time

~ /trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java

Rev 1677 – added password protection to payment details report generator.

ankur.singhal — Tue, 03 May 2011 18:42:36 +0530

ankur.singhal – 5 file(s) modified
added password protection to payment details report generator.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/payment-details-authfail.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/payment-details-authsuccess.vm (copied from /trunk/Support/src/main/webapp/WEB-INF/content/payment-details-report.vm@1652)
x /trunk/Support/src/main/webapp/WEB-INF/content/payment-details-report.vm

Rev 1676 – Report of registered users. Contain all the addresses too corresponding ...

ankur.singhal — Tue, 03 May 2011 18:41:50 +0530

ankur.singhal – 4 file(s) modified
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

Rev 1660 – bug fixed. Bug: for payments not null and pendingPayments is ...

ankur.singhal — Tue, 03 May 2011 14:08:46 +0530

ankur.singhal – 1 file(s) modified
bug fixed. Bug: for payments not null and pendingPayments is null, returning null

~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java

Rev 1655 – Added address column and amount column is formatted.

ankur.singhal — Tue, 03 May 2011 12:16:49 +0530

ankur.singhal – 1 file(s) modified
Added address column and amount column is formatted.

~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java

Rev 1632 – changed error message to empty string if input is correct.

ankur.singhal — Mon, 02 May 2011 11:48:18 +0530

ankur.singhal – 1 file(s) modified
changed error message to empty string if input is correct.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentDetailsController.java

Rev 1631 – added pending payments also in the report.

ankur.singhal — Mon, 02 May 2011 11:38:41 +0530

ankur.singhal – 2 file(s) modified
added pending payments also in the report.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentDetailsController.java
+ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java

Rev 1630 – added more statistics data (max & min order amount, max ...

ankur.singhal — Mon, 02 May 2011 11:26:09 +0530

ankur.singhal – 2 file(s) modified
added more statistics data (max & min order amount, max & min payment amount, distinct customers who have bought)

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/statistics-authsuccess.vm

Rev 1611 – Added password protection for Statistics user.

ankur.singhal — Fri, 29 Apr 2011 15:25:44 +0530

ankur.singhal – 7 file(s) modified
Added password protection for Statistics user.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/statistics-authfail.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/statistics-authsuccess.vm (copied from /trunk/Support/src/main/webapp/WEB-INF/content/statistics-index.vm@1597)
x /trunk/Support/src/main/webapp/WEB-INF/content/statistics-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/StatisticsUser.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 1608 – Merge payment and transactions sheet and include user communications data

vikas — Fri, 29 Apr 2011 14:19:26 +0530

vikas – 1 file(s) modified
Merge payment and transactions sheet and include user communications data

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java

Rev 1597 – Added controller class and vm file for Support/statistics

ankur.singhal — Fri, 29 Apr 2011 12:07:53 +0530

ankur.singhal – 2 file(s) modified
Added controller class and vm file for Support/statistics

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/statistics-index.vm

Rev 1586 – Ref:Ticket#317 -- Payment details

ankur.singhal — Thu, 28 Apr 2011 15:08:03 +0530

ankur.singhal – 2 file(s) modified
Ref:Ticket#317 -- Payment details

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentDetailsController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/payment-details-report.vm

Rev 1517 – Using provider specific barcode font size.

ankur.singhal — Tue, 26 Apr 2011 12:39:07 +0530

ankur.singhal – 1 file(s) modified
Using provider specific barcode font size.

~ /trunk/Support/src/main/java/in/shop2020/support/services/InvoiceGenerationService.java

Rev 1514 – Handle the case where user has not configured any address.

vikas — Mon, 25 Apr 2011 15:18:16 +0530

vikas – 1 file(s) modified
Handle the case where user has not configured any address.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java

Rev 1498 – Cleanup and some formatting changes.

vikas — Thu, 21 Apr 2011 17:22:12 +0530

vikas – 1 file(s) modified
Cleanup and some formatting changes.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java