Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
6433 4790 d 10 h anupam.singh /trunk/ 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/WEB-INF/content/confirm-index.vm
/trunk/Website/src/main/webapp/js/recharge.js
4674 5057 d 21 h anupam.singh /trunk/Support/src/main/java/in/shop2020/support/controllers/ 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
4657 5061 d 8 h anupam.singh /trunk/Support/src/main/java/in/shop2020/support/controllers/ 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
4598 5067 d 19 h anupam.singh /trunk/Support/src/main/java/in/shop2020/support/controllers/ Trac #881
Added transactionId against each product sale in Affiliate report.

Reviewer : Amar		  
/trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
3936 5193 d 16 h chandranshu /trunk/Support/src/main/java/in/shop2020/support/controllers/ 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/CodReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.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
3378 5231 d 19 h vikas /trunk/ Get rid of string column to store the event type.  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/TrackLogType.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/TrackingController.java
/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/UserContextService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.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/UserContextService.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
3343 5235 d 17 h vikas /trunk/Support/src/main/java/in/shop2020/support/controllers/ Add Total row.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
3341 5235 d 18 h vikas /trunk/Support/src/main/java/in/shop2020/support/controllers/ Fix a bug. Check for only orderd that are delivered successfully.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
3315 5236 d 17 h vikas /trunk/Support/src/main/ 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
3293 5237 d 17 h vikas /trunk/ 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
3213 5245 d 20 h chandranshu /trunk/Support/src/main/java/in/shop2020/support/ Removed printStackTrace  
/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/HotspotReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/ReportsController.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/java/in/shop2020/support/utils/ReportsUtils.java
3125 5251 d 12 h rajveer /trunk/Support/src/main/java/in/shop2020/support/ 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
2980 5264 d 13 h vikas /trunk/Support/src/main/java/in/shop2020/support/controllers/ Only list completed orders in affiliate report.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
2904 5272 d 15 h chandranshu /trunk/Support/src/main/java/in/shop2020/support/controllers/ Added javadocs to classes explaining what they intend to do  
/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
2501 5305 d 16 h vikas /trunk/Support/src/main/ 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
2393 5313 d 14 h vikas /trunk/Support/src/main/java/in/shop2020/support/controllers/ Remove duplicate payments from affiliate report.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
2345 5316 d 16 h vikas /trunk/Support/src/main/java/in/shop2020/support/controllers/ Fix some bugs in affiliate reports.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
2340 5316 d 19 h vikas /trunk/Support/src/main/java/in/shop2020/support/controllers/ add item name and amount in affiliate report.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
2058 5341 d 15 h vikas /trunk/Support/src/main/java/in/shop2020/support/controllers/ Fix file name for affiliate report.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
2042 5341 d 20 h chandranshu /trunk/Support/src/main/java/in/shop2020/support/ Removed unused imports and methods from some classes  
/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/HotspotReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java

←Prev12Next→

Show All