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

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

Rev 1494 – User orders report.

vikas — Thu, 21 Apr 2011 16:50:17 +0530

vikas – 2 file(s) modified
User orders report.

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/user-orders-report.vm

Rev 1476 – changed the main method ---- invoice printing in user home ...

ankur.singhal — Wed, 20 Apr 2011 17:54:33 +0530

ankur.singhal – 1 file(s) modified
changed the main method ---- invoice printing in user home directory.

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

Rev 1389 – Ref: Ticket #273. Required columns added and also done formatting ...

ankur.singhal — Wed, 13 Apr 2011 12:42:52 +0530

ankur.singhal – 1 file(s) modified
Ref: Ticket #273. Required columns added and also done formatting to fit the page in A4 landscape.

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

Rev 1367 – New key format support introduced

chandranshu — Tue, 12 Apr 2011 11:49:50 +0530

chandranshu – 3 file(s) modified
New key format support introduced

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

Rev 1322 – Changed Invoice format as per the new requirements

chandranshu — Fri, 08 Apr 2011 11:23:30 +0530

chandranshu – 1 file(s) modified
Changed Invoice format as per the new requirements

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

Rev 1222 – Pending Orders report complete

chandranshu — Thu, 31 Mar 2011 14:09:56 +0530

chandranshu – 1 file(s) modified
Pending Orders report complete

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

Rev 1218 – Added the summary sheet and the extra rows required at ...

chandranshu — Thu, 31 Mar 2011 12:35:06 +0530

chandranshu – 1 file(s) modified
Added the summary sheet and the extra rows required at the top of the detailed sheet

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

Rev 1194 – Added support to download pending orders report

chandranshu — Wed, 30 Mar 2011 12:35:35 +0530

chandranshu – 2 file(s) modified
Added support to download pending orders report

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/PendingOrdersController.java
+ /trunk/Support/src/main/java/in/shop2020/support/services/PendingOrdersGenerator.java

Rev 1075 – Trac#215: Added support to download courier details report for last ...

chandranshu — Mon, 21 Mar 2011 10:56:59 +0530

chandranshu – 3 file(s) modified
Trac#215: Added support to download courier details report for last two days as well

~ /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/webapp/WEB-INF/content/courier-details-authsuccess.vm

Rev 1066 – Removed some dead code.

varun.gupta — Fri, 18 Mar 2011 17:33:29 +0530

varun.gupta – 1 file(s) modified
Removed some dead code.

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

Rev 1023 – Removed unused jar files from build declaration

chandranshu — Thu, 17 Mar 2011 12:02:54 +0530

chandranshu – 9 file(s) modified
Removed unused jar files from build declaration

~ /trunk/Support/.classpath
~ /trunk/Support/build.properties
~ /trunk/Support/build.xml
+ /trunk/Support/pom.xml
x /trunk/Support/src/in
+ /trunk/Support/src/main
+ /trunk/Support/src/main/java
+ /trunk/Support/src/main/java/in (copied from /trunk/Support/src/in@1021)
+ /trunk/Support/src/main/resources

Rev 992 – Reconciliation Report generator code for the transactions with HotSpot.

varun.gupta — Tue, 15 Mar 2011 16:38:56 +0530

varun.gupta – 2 file(s) modified
Reconciliation Report generator code for the transactions with HotSpot.

+ /trunk/Support/src/in/shop2020/support/controllers/HotspotReconciliationController.java
+ /trunk/Support/WebContent/WEB-INF/content/hotspot-reconciliation-report.vm

Rev 961 – Changes to accept product group

chandranshu — Thu, 10 Mar 2011 18:15:32 +0530

chandranshu – 2 file(s) modified
Changes to accept product group

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

Rev 919 – Weight display fixed. Null removed from name. Paymode made prepaid.

rajveer — Fri, 04 Mar 2011 15:38:17 +0530

rajveer – 3 file(s) modified
Weight display fixed. Null removed from name. Paymode made prepaid.

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

Rev 756 – Started generating the courier-details report at the same time when ...

chandranshu — Fri, 04 Feb 2011 14:55:08 +0530

chandranshu – 4 file(s) modified
Started generating the courier-details report at the same time when the manifest file is generated

~ /trunk/Support/src/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/in/shop2020/support/controllers/ManifestController.java
~ /trunk/Support/WebContent/WEB-INF/content/courier-details-authfail.vm
~ /trunk/Support/WebContent/WEB-INF/content/courier-details-authsuccess.vm

Rev 754 – Added an attribute displayName to the warehouse

chandranshu — Thu, 03 Feb 2011 16:54:48 +0530

chandranshu – 3 file(s) modified
Added an attribute displayName to the warehouse

~ /trunk/Support/.classpath
~ /trunk/Support/src/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/WebContent/WEB-INF/content/courier-details-authsuccess.vm