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

Rev 3125 – Side effect of name changing of clients.

rajveer — Wed, 31 Aug 2011 20:09:54 +0530

rajveer – 17 file(s) modified
Side effect of name changing of clients.

~ /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/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.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/UpdatesController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserCommunicationsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/InvoiceGenerationService.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PendingOrdersGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/utils/ReportsUtils.java

Rev 3107 – Added more logging statements and removed the newline in warehouse ...

chandranshu — Wed, 31 Aug 2011 13:35:05 +0530

chandranshu – 3 file(s) modified
Added more logging statements and removed the newline in warehouse location

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

Rev 3105 – Replaced e.printStackTraces with logger.error

chandranshu — Wed, 31 Aug 2011 13:17:39 +0530

chandranshu – 5 file(s) modified
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

Rev 3104 – Added logging using logger

chandranshu — Wed, 31 Aug 2011 12:37:28 +0530

chandranshu – 1 file(s) modified
Added logging using logger

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

Rev 3078 – Showing status description instead of status name

chandranshu — Mon, 29 Aug 2011 13:00:02 +0530

chandranshu – 1 file(s) modified
Showing status description instead of status name

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

Rev 3071 – Added support to display the type of order and added ...

chandranshu — Mon, 29 Aug 2011 11:56:50 +0530

chandranshu – 2 file(s) modified
Added support to display the type of order and added logging messages

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

Rev 3062 – Changes for COD

chandranshu — Fri, 26 Aug 2011 19:35:14 +0530

chandranshu – 5 file(s) modified
Changes for COD

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/courier-details-authsuccess.vm

Rev 3044 – Changes to accomodate multiple details for the same provider ensuring ...

chandranshu — Thu, 25 Aug 2011 13:37:14 +0530

chandranshu – 18 file(s) modified
Changes to accomodate multiple details for the same provider ensuring all existing things will continue to work

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/AwbNumberLoader.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/ServiceDetailsLoader.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/InvoiceGenerationService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/DeliveryType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Provider.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/ProviderDetails.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 2980 – Only list completed orders in affiliate report.

vikas — Thu, 18 Aug 2011 19:02:43 +0530

vikas – 1 file(s) modified
Only list completed orders in affiliate report.

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

Rev 2904 – Added javadocs to classes explaining what they intend to do

chandranshu — Wed, 10 Aug 2011 17:47:30 +0530

chandranshu – 3 file(s) modified
Added javadocs to classes explaining what they intend to do

Rev 2785 – Ignored the Reshipped orders from the Payment Details report

chandranshu — Mon, 01 Aug 2011 15:54:00 +0530

chandranshu – 1 file(s) modified
Ignored the Reshipped orders from the Payment Details report

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

Rev 2784 – Added support for our own billing.

chandranshu — Mon, 01 Aug 2011 14:54:31 +0530

chandranshu – 4 file(s) modified
Added support for our own billing.

~ /trunk/Support/pom.xml
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/InvoiceController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/InvoiceGenerationService.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/courier-details-authfail.vm

Rev 2501 – Support to generate single report for all affiliates.

vikas — Fri, 08 Jul 2011 16:48:59 +0530

vikas – 2 file(s) modified
Support to generate single report for all affiliates.

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

Rev 2492 – Added hotspot reconciliation report to reports dashboard. Back to dashboard ...

ankur.singhal — Thu, 07 Jul 2011 19:50:54 +0530

ankur.singhal – 4 file(s) modified
Added hotspot reconciliation report to reports dashboard. Back to dashboard link in user orders report.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/hotspot-reconciliation-report.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/user-orders-report.vm

Rev 2393 – Remove duplicate payments from affiliate report.

vikas — Thu, 30 Jun 2011 18:34:50 +0530

vikas – 1 file(s) modified
Remove duplicate payments from affiliate report.

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

Rev 2360 – [Trac#410]: Added order Id

ankur.singhal — Wed, 29 Jun 2011 14:16:06 +0530

ankur.singhal – 1 file(s) modified
[Trac#410]: Added order Id

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

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

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