SmartDukaan – /

Rev 1907 – Removed an unused import

chandranshu — Fri, 20 May 2011 18:36:17 +0530

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

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AflUpdatesController.java

Rev 1906 – Corrected the warehouse logistics location value

chandranshu — Fri, 20 May 2011 18:35:56 +0530

chandranshu – 1 file(s) modified
Corrected the warehouse logistics location value

~ /trunk/Website/src/test/resources/db/catalog.sql

Rev 1905 – EBS Payment service integration

chandranshu — Fri, 20 May 2011 18:30:36 +0530

chandranshu – 20 file(s) modified
EBS Payment service integration

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/utils/ebs
+ /trunk/Website/src/main/java/in/shop2020/serving/utils/ebs/Base64.java
+ /trunk/Website/src/main/java/in/shop2020/serving/utils/ebs/RC4.java
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
+ /trunk/Website/src/main/webapp/images/maestro-logo.gif
+ /trunk/Website/src/main/webapp/images/visa-master-logo.jpg
+ /trunk/Website/src/main/webapp/js/paymode-selection.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-response-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-response-show.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm

Rev 1904 – Added redirection from RegisterController

varun.gupta — Fri, 20 May 2011 18:01:10 +0530

varun.gupta – 2 file(s) modified
Added redirection from RegisterController

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm

Rev 1903 – Fix expand collapse problem in widget.

vikas — Fri, 20 May 2011 17:55:13 +0530

vikas – 1 file(s) modified
Fix expand collapse problem in widget.

~ /trunk/Website/src/main/webapp/js/widget_accordion.js

Rev 1902 – Add payment Id in tracking.

vikas — Fri, 20 May 2011 17:54:39 +0530

vikas – 1 file(s) modified
Add payment Id in tracking.

~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.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 1900 – add method to get all master affiliates.

vikas — Fri, 20 May 2011 17:46:00 +0530

vikas – 1 file(s) modified
add method to get all master affiliates.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java

Rev 1899 – add method to get all master affiliates.

vikas — Fri, 20 May 2011 17:45:41 +0530

vikas – 4 file(s) modified
add method to get all master affiliates.

~ /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

Rev 1898 – add method to get all master affiliates.

vikas — Fri, 20 May 2011 17:45:02 +0530

vikas – 1 file(s) modified
add method to get all master affiliates.

~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 1897 – Added the port number to the test config

chandranshu — Fri, 20 May 2011 16:04:02 +0530

chandranshu – 1 file(s) modified
Added the port number to the test config

~ /trunk/Common/src/test/resources/shop2020.cfg

Rev 1896 – Created yet another config to first bring the user to ...

chandranshu — Fri, 20 May 2011 15:48:37 +0530

chandranshu – 2 file(s) modified
Created yet another config to first bring the user to an intermediate wait page

~ /trunk/Common/src/main/resources/shop2020.cfg
~ /trunk/Common/src/test/resources/shop2020.cfg

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 1894 – Added getAddressById.

vikas — Thu, 19 May 2011 19:03:30 +0530

vikas – 5 file(s) modified
Added getAddressById.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py

Rev 1893 – Added getAddressById.

vikas — Thu, 19 May 2011 19:01:11 +0530

vikas – 1 file(s) modified
Added getAddressById.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java

Rev 1892 – Added getAddressById.

vikas — Thu, 19 May 2011 19:00:40 +0530

vikas – 1 file(s) modified
Added getAddressById.

~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

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 1890 – Removed unused imports

chandranshu — Thu, 19 May 2011 12:59:15 +0530

chandranshu – 1 file(s) modified
Removed unused imports

~ /ClientAgent/src/main/java/in/shop2020/agent/utils/Sniffer.java

Rev 1889 – Added a sniffer to add ability to run arbitrary queries

chandranshu — Thu, 19 May 2011 12:58:11 +0530

chandranshu – 2 file(s) modified
Added a sniffer to add ability to run arbitrary queries

+ /ClientAgent/src/main/java/in/shop2020/agent/utils/Sniffer.java
+ /ClientAgent/src/main/resources/sniffer.conf

Rev 1888 – Error fixed. reports-common.vm is to be released with next revision

ankur.singhal — Thu, 19 May 2011 10:41:44 +0530

ankur.singhal – 1 file(s) modified
Error fixed. reports-common.vm is to be released with next revision

~ /trunk/Support/src/main/webapp/WEB-INF/content/statistics-authsuccess.vm

Rev 1887 – add batteries in rank ckecking.

vikas — Wed, 18 May 2011 19:10:40 +0530

vikas – 1 file(s) modified
add batteries in rank ckecking.

~ /trunk/runutils/rankcheck.py

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 1885 – More price updates

chandranshu — Wed, 18 May 2011 17:43:19 +0530

chandranshu – 1 file(s) modified
More price updates

+ /trunk/PyProj/src/samplesheets/ItemList-Handset-18.2-May-2011.xls

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 1883 – Corrected the image paths

chandranshu — Wed, 18 May 2011 16:33:34 +0530

chandranshu – 1 file(s) modified
Corrected the image paths

~ /trunk/Website/src/main/webapp/css/jquery-ui-1.8.6.custom.css

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 1880 – New sheet from Chaitnaya

chandranshu — Wed, 18 May 2011 14:30:38 +0530

chandranshu – 1 file(s) modified
New sheet from Chaitnaya

+ /trunk/PyProj/src/samplesheets/ItemList-Handset-18-May-2011.xls

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 1878 – add window location href.

vikas — Wed, 18 May 2011 13:45:09 +0530

vikas – 1 file(s) modified
add window location href.

~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 1877 – One bug in payement tracking. enclose url in quotes.

vikas — Wed, 18 May 2011 13:02:43 +0530

vikas – 2 file(s) modified
One bug in payement tracking. enclose url in quotes.

~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 1876 – Links added to load Contact Form with a particular query ...

varun.gupta — Wed, 18 May 2011 11:33:21 +0530

varun.gupta – 3 file(s) modified
Links added to load Contact Form with a particular query type.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/terms-conditions.vm

Rev 1875 – New item list for 17th May

chandranshu — Tue, 17 May 2011 19:15:19 +0530

chandranshu – 1 file(s) modified
New item list for 17th May

+ /trunk/PyProj/src/samplesheets/ItemList-Handset-17-May-2011.xls

Rev 1874 – Updated sheets for BlueDart Serviceable locations and Provider selection Courier ...

ankur.singhal — Tue, 17 May 2011 18:00:40 +0530

ankur.singhal – 2 file(s) modified
Updated sheets for BlueDart Serviceable locations and Provider selection Courier Logic.

+ /trunk/PyProj/src/samplesheets/BlueDartServiceableLocations-1May.xls
+ /trunk/PyProj/src/samplesheets/CourierLogic-1May.xls

Rev 1873 – Modified the logic of tracking 'multi' adds to the cart

varun.gupta — Tue, 17 May 2011 17:31:42 +0530

varun.gupta – 1 file(s) modified
Modified the logic of tracking 'multi' adds to the cart

~ /trunk/Website/src/main/webapp/js/all.js

Rev 1872 – Added variable filtering for GA ID in ga-invoker.js. Removed profile ...

varun.gupta — Tue, 17 May 2011 16:13:33 +0530

varun.gupta – 1 file(s) modified
Added variable filtering for GA ID in ga-invoker.js. Removed profile to exclude ga-invoker.js from the minification on staging.

~ /trunk/Website/pom.xml

Rev 1871 – Added ga_invoker.js to track events from local machines too.

varun.gupta — Tue, 17 May 2011 16:08:29 +0530

varun.gupta – 1 file(s) modified
Added ga_invoker.js to track events from local machines too.

~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm

Rev 1870 – GA Event tracking added to dev and staging builds as ...

varun.gupta — Tue, 17 May 2011 16:01:19 +0530

varun.gupta – 4 file(s) modified
GA Event tracking added to dev and staging builds as well to complete the test cycle

~ /trunk/Website/src/main/filters/dev/filters.properties
~ /trunk/Website/src/main/filters/prod/filters.properties
~ /trunk/Website/src/main/filters/staging/filters.properties
~ /trunk/Website/src/main/webapp/js/ga-invoker.js

Rev 1869 – Updates configs to use DEMO account's Id and secret key

chandranshu — Tue, 17 May 2011 13:58:23 +0530

chandranshu – 2 file(s) modified
Updates configs to use DEMO account's Id and secret key

~ /trunk/Common/src/main/resources/shop2020.cfg
~ /trunk/Common/src/test/resources/shop2020.cfg

Rev 1868 – log user registerations from affiliates.

vikas — Tue, 17 May 2011 12:53:56 +0530

vikas – 3 file(s) modified
log user registerations from affiliates.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/TrackingController.java
~ /trunk/Website/src/main/webapp/js/all.js