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

Rev 2642 – Thrift code for 'My Notes' feature

varun.gupta — Tue, 19 Jul 2011 18:07:44 +0530

varun.gupta – 5 file(s) modified
Thrift code for 'My Notes' feature

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 2615 – Added new statuses and new methods

chandranshu — Fri, 15 Jul 2011 18:47:26 +0530

chandranshu – 2 file(s) modified
Added new statuses and new methods

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 2612 – Renamed the SALES_RETURNED, SALES_RET_PENDING and DOA_PENDING statuses

chandranshu — Fri, 15 Jul 2011 18:13:45 +0530

chandranshu – 2 file(s) modified
Renamed the SALES_RETURNED, SALES_RET_PENDING and DOA_PENDING statuses

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 2601 – Renamed DOA_RETURNED to DOA_RECEIVED

chandranshu — Fri, 15 Jul 2011 14:53:10 +0530

chandranshu – 2 file(s) modified
Renamed DOA_RETURNED to DOA_RECEIVED

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 2590 – Added support for the warehouse executive to accept and validate ...

chandranshu — Fri, 15 Jul 2011 13:06:07 +0530

chandranshu – 1 file(s) modified
Added support for the warehouse executive to accept and validate a DOA

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 2575 – Added constants for a few missing payment options

chandranshu — Thu, 14 Jul 2011 12:00:19 +0530

chandranshu – 1 file(s) modified
Added constants for a few missing payment options

~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java

Rev 2560 – Changed the description of DOA_RETURNED

chandranshu — Wed, 13 Jul 2011 15:50:16 +0530

chandranshu – 1 file(s) modified
Changed the description of DOA_RETURNED

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java

Rev 2538 – Added new statuses and methods to support picking up an ...

chandranshu — Tue, 12 Jul 2011 17:13:33 +0530

chandranshu – 3 file(s) modified
Added new statuses and methods to support picking up an order in case of DOA

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 2515 – Added email as a field in the provider object

chandranshu — Mon, 11 Jul 2011 14:57:52 +0530

chandranshu – 1 file(s) modified
Added email as a field in the provider object

~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Provider.java

Rev 2491 – made double and integer attributes of Item struct optional.

ankur.singhal — Thu, 07 Jul 2011 19:33:58 +0530

ankur.singhal – 2 file(s) modified
made double and integer attributes of Item struct optional.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 2462 – Added methods to initialize and capture HDFC and EBS payments

chandranshu — Wed, 06 Jul 2011 17:48:55 +0530

chandranshu – 2 file(s) modified
Added methods to initialize and capture HDFC and EBS payments

~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java

Rev 2443 – Added some attributes to the dashboard user and changed the ...

chandranshu — Wed, 06 Jul 2011 16:07:38 +0530

chandranshu – 2 file(s) modified
Added some attributes to the dashboard user and changed the return type of the authenticateUser

~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/DashboardUser.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java

Rev 2383 – Reverted code for our billing

rajveer — Thu, 30 Jun 2011 13:49:19 +0530

rajveer – 2 file(s) modified
Reverted code for our billing

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 2364 – Generated files for the addition of IMEI number to line ...

chandranshu — Wed, 29 Jun 2011 17:21:22 +0530

chandranshu – 2 file(s) modified
Generated files for the addition of IMEI number to line item

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 2357 – Added role in CatalogDashboardUser. Enhancements in catalog dashboard.

ankur.singhal — Tue, 28 Jun 2011 20:50:45 +0530

ankur.singhal – 3 file(s) modified
Added role in CatalogDashboardUser. Enhancements in catalog dashboard.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/CatalogDashboardUser.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java

Rev 2303 – added constant map for payment method in payment service.

ankur.singhal — Wed, 22 Jun 2011 14:03:48 +0530

ankur.singhal – 3 file(s) modified
added constant map for payment method in payment service.

~ /trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 2285 – added method to mark/unmark item's risky flag.

ankur.singhal — Tue, 21 Jun 2011 17:39:24 +0530

ankur.singhal – 1 file(s) modified
added method to mark/unmark item's risky flag.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java

Rev 2250 – Added risky flag to catalog item.

ankur.singhal — Fri, 17 Jun 2011 20:55:11 +0530

ankur.singhal – 1 file(s) modified
Added risky flag to catalog item.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java

Rev 2244 – Reverted OrderStatus to show the messages also.

rajveer — Fri, 17 Jun 2011 17:16:49 +0530

rajveer – 1 file(s) modified
Reverted OrderStatus to show the messages also.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java

Rev 2219 – Coupon code now being stored in Transaction. discounted_price and discounted_amount ...

varun.gupta — Thu, 16 Jun 2011 13:43:14 +0530

varun.gupta – 11 file(s) modified
Coupon code now being stored in Transaction. discounted_price and discounted_amount fields dropped from lineitem and order tables.

~ /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/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Transaction.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

Rev 2128 – made some Item struct attributes optional.

ankur.singhal — Thu, 09 Jun 2011 20:21:20 +0530

ankur.singhal – 2 file(s) modified
made some Item struct attributes optional.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 2115 – created struct VendorItemMapping in Catalog thrift.

ankur.singhal — Wed, 08 Jun 2011 11:25:04 +0530

ankur.singhal – 1 file(s) modified
created struct VendorItemMapping in Catalog thrift.

+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemMapping.java

Rev 2114 – added methods to get VendorItemMapping for an item. Created a ...

ankur.singhal — Wed, 08 Jun 2011 11:24:11 +0530

ankur.singhal – 2 file(s) modified
added methods to get VendorItemMapping for an item. Created a struct VendorItemMapping. Also added hotspotCategory to Item struct.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java

Rev 2077 – Update category, brand, model name and model number when item ...

rajveer — Fri, 03 Jun 2011 19:02:50 +0530

rajveer – 1 file(s) modified
Update category, brand, model name and model number when item is marked as content complete

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java

Rev 2064 – added method getAllVendors. Added bestSellingRank attribute to item struct

ankur.singhal — Fri, 03 Jun 2011 11:53:21 +0530

ankur.singhal – 2 file(s) modified
added method getAllVendors. Added bestSellingRank attribute to item struct

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java

Rev 2060 – change method getPayments comments. If gatewayId is passed as 0, ...

ankur.singhal — Thu, 02 Jun 2011 19:12:04 +0530

ankur.singhal – 1 file(s) modified
change method getPayments comments. If gatewayId is passed as 0, it is ignored.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java

Rev 2041 – Added an aspect for eclipse to use Maven

chandranshu — Thu, 02 Jun 2011 12:12:04 +0530

chandranshu – 5 file(s) modified
Added an aspect for eclipse to use Maven

~ /trunk/ThriftConfig/.classpath
~ /trunk/ThriftConfig/.project
~ /trunk/ThriftConfig/.settings/org.eclipse.jdt.core.prefs
+ /trunk/ThriftConfig/.settings/org.maven.ide.eclipse.prefs
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java

Rev 2034 – Java code for giinge custom message when item in not ...

rajveer — Wed, 01 Jun 2011 18:18:48 +0530

rajveer – 3 file(s) modified
Java code for giinge custom message when item in not active.

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

Rev 2024 – added a method to authenticate CatalogDashboardUser. Also added a DB ...

ankur.singhal — Wed, 01 Jun 2011 14:02:24 +0530

ankur.singhal – 2 file(s) modified
added a method to authenticate CatalogDashboardUser. Also added a DB entity CatalogDashboardUser.

+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/CatalogDashboardUser.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java

Rev 2020 – Add source column to user table.

vikas — Wed, 01 Jun 2011 13:19:42 +0530

vikas – 6 file(s) modified
Add source column to user table.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 1998 – Don't use tracker table.

vikas — Tue, 31 May 2011 17:30:47 +0530

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

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Tracker.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/TrackLog.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserAffiliateException.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java

Rev 1991 – added methods getAllItemPricing and updateVendorItemPricing to Catalog service. These are ...

ankur.singhal — Tue, 31 May 2011 15:37:53 +0530

ankur.singhal – 5 file(s) modified
added methods getAllItemPricing and updateVendorItemPricing to Catalog service. These are used in CatalogDashboard.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java

Rev 1982 – Java interface for Promotion Service

varun.gupta — Tue, 31 May 2011 14:59:39 +0530

varun.gupta – 10 file(s) modified
Java interface for Promotion Service

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Cart.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Coupon.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Line.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Promotion.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionException.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionTracking.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java

Rev 1969 – Added category object in thrift and its relevant functions.

rajveer — Mon, 30 May 2011 13:28:09 +0530

rajveer – 1 file(s) modified
Added category object in thrift and its relevant functions.

+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java

Rev 1968 – Added category object in thrift and its relevant functions.

rajveer — Mon, 30 May 2011 13:27:35 +0530

rajveer – 1 file(s) modified
Added category object in thrift and its relevant functions.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java

Rev 1925 – Added support to get brand wise best deals, best ...

rajveer — Mon, 23 May 2011 21:55:18 +0530

rajveer – 1 file(s) modified
Added support to get brand wise best deals, best sellers and latest arrivals

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java

Rev 1910 – Trac #355: Color marked in DB will be default selected ...

varun.gupta — Fri, 20 May 2011 19:55:23 +0530

varun.gupta – 7 file(s) modified
Trac #355: Color marked in DB will be default selected on the product page

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/VUI.java
~ /trunk/ContentStore/src/velocity/product_summary.vm
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

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