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

Rev 6433 – Added support for recharge coupons

anupam.singh — Tue, 04 Dec 2012 22:41:24 +0530

anupam.singh – 18 file(s) modified
Added support for recharge coupons

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/BaseOrder.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePayOptionsController.java
~ /trunk/Website/src/main/webapp/js/recharge.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm

Rev 4674 – When two orders use one transaction Id a new cell ...

anupam.singh — Mon, 12 Mar 2012 11:33:01 +0530

anupam.singh – 1 file(s) modified
When two orders use one transaction Id a new cell was not being created for the second order.

Reviewer : Mandeep Dhir

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

Rev 4657 – When multiple orders use a single transactionId only the last ...

anupam.singh — Thu, 08 Mar 2012 23:59:03 +0530

anupam.singh – 1 file(s) modified
When multiple orders use a single transactionId only the last order was being used. Fixed this issue now.

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

Rev 4598 – Trac #881 Added transactionId against each product sale in Affiliate ...

anupam.singh — Fri, 02 Mar 2012 13:53:40 +0530

anupam.singh – 1 file(s) modified
Trac #881
Added transactionId against each product sale in Affiliate report.

Reviewer : Amar

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

Rev 3936 – Added a redirect to the reports dashboard in case a ...

chandranshu — Fri, 28 Oct 2011 16:43:23 +0530

chandranshu – 10 file(s) modified
Added a redirect to the reports dashboard in case a user is not authorized to view a report

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/CodReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PromotionsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java

Rev 3378 – Get rid of string column to store the event type.

vikas — Tue, 20 Sep 2011 13:13:41 +0530

vikas – 13 file(s) modified
Get rid of string column to store the event type.

~ /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/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/TrackLog.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/TrackLogType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
x /trunk/Website/src/main/java/in/shop2020/serving/controllers/TrackingController.java

Rev 3343 – Add Total row.

vikas — Fri, 16 Sep 2011 15:41:38 +0530

vikas – 1 file(s) modified
Add Total row.

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

Rev 3341 – Fix a bug. Check for only orderd that are delivered ...

vikas — Fri, 16 Sep 2011 14:06:46 +0530

vikas – 1 file(s) modified
Fix a bug. Check for only orderd that are delivered successfully.

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

Rev 3315 – Changes to affilate report as per Satya.

vikas — Thu, 15 Sep 2011 15:06:29 +0530

vikas – 2 file(s) modified
Changes to affilate report as per Satya.

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

Rev 3293 – Make affiliate report secured. Added date range filter for reports.

vikas — Wed, 14 Sep 2011 15:38:09 +0530

vikas – 8 file(s) modified
Make affiliate report secured. Added date range filter for reports.

~ /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/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/affiliate-report.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 3213 – Removed printStackTrace

chandranshu — Tue, 06 Sep 2011 12:39:43 +0530

chandranshu – 8 file(s) modified
Removed printStackTrace

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