Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
4484 5089 d 3 h rajveer /trunk/ Changed the name of various order statuses.  
/trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderDetailsHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/RejectOrderHandler.java
/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.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/FailedOrdersController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java
4452 5091 d 22 h rajveer /trunk/ Changed the name of various statuses.  
/trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderDetailsHandler.java
/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.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.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
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/FailedOrdersController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java
4141 5166 d 0 h chandranshu /trunk/ Added support to download payment reconciliation report for a given period  
/trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentReconciliationController.java
/trunk/Support/src/main/webapp/WEB-INF/content/payment-reconciliation-authfail.vm
/trunk/Support/src/main/webapp/WEB-INF/content/payment-reconciliation-authsuccess.vm
/trunk/PaymentService/src/main/java/in/shop2020/payment/handler/PaymentHandler.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/persistence/PaymentMapper.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
/trunk/PaymentService/src/main/resources/in/shop2020/payment/persistence/PaymentMapper.xml
/trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
/trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
3501 5222 d 2 h mandeep.dhir /trunk/Support/src/main/java/in/shop2020/support/services/ Trac#504 Removing unnecessary txn lookup  
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
3166 5250 d 6 h chandranshu /trunk/Support/src/main/java/in/shop2020/support/services/ Added authorized payments to the payment details report  
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
3125 5251 d 21 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
3107 5252 d 4 h chandranshu /trunk/Support/src/main/java/in/shop2020/support/services/ Added more logging statements and removed the newline in warehouse location  
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/PendingOrdersGenerator.java
3105 5252 d 4 h chandranshu /trunk/Support/src/main/java/in/shop2020/support/ Replaced e.printStackTraces with logger.error  
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/PendingOrdersController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
2785 5282 d 1 h chandranshu /trunk/Support/src/main/java/in/shop2020/support/services/ Ignored the Reshipped orders from the Payment Details report  
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
2492 5306 d 22 h ankur.singhal /trunk/Support/src/main/ Added hotspot reconciliation report to reports dashboard. Back to dashboard link in user orders report.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
/trunk/Support/src/main/webapp/WEB-INF/content/hotspot-reconciliation-report.vm
/trunk/Support/src/main/webapp/WEB-INF/content/user-orders-report.vm
2310 5322 d 2 h ankur.singhal /trunk/Support/src/main/java/in/shop2020/support/services/ Added payment method in the report. Also done some formatting  
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
2090 5337 d 3 h ankur.singhal /trunk/Support/src/main/java/in/shop2020/support/services/ added column GatewayTxnStatus in the report.  
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
2061 5341 d 22 h ankur.singhal /trunk/Support/src/main/java/in/shop2020/support/services/ Ticket:409. Modifications to payment details of all gateways  
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
1881 5357 d 2 h ankur.singhal /trunk/Support/src/main/ 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
1660 5372 d 3 h ankur.singhal /trunk/Support/src/main/java/in/shop2020/support/services/ bug fixed. Bug: for payments not null and pendingPayments is null, returning null  
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
1655 5372 d 5 h ankur.singhal /trunk/Support/src/main/java/in/shop2020/support/services/ Added address column and amount column is formatted.  
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
1631 5373 d 6 h ankur.singhal /trunk/Support/src/main/java/in/shop2020/support/ added pending payments also in the report.  
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentDetailsController.java