Subversion Repositories SmartDukaan

(root)/StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java – Rev 7611

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

Filtering Options

From rev	To rev	Max revs

Search history for

Show All

Rev	Age	Author	Path	Log message	Diff	Changes
7611	4588 d 23 h	anupam.singh	/	Added provision for storing and working on card type.		/StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm /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/thriftpy/model/v1/order/ttypes.py /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/StoreOrderDetail.java /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
7527	4598 d 22 h	anupam.singh	/StoreWebsite/src/main/	Changed reports to show status description from enum.		/StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm
7427	4604 d 13 h	anupam.singh	/	Bug fixes		/StoreWebsite/src/main/webapp/WEB-INF/content/error-result.vm /StoreWebsite/src/main/webapp/css/entity_20130608.css /StoreWebsite/src/main/webapp/js/entity_20130608.js /StoreWebsite/src/main/webapp/js/storewebsite_20130608.js /StoreWebsite/src/main/webapp/css/entity.css /StoreWebsite/src/main/webapp/js/entity.js /StoreWebsite/src/main/webapp/js/storewebsite.js /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/order-success-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm /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/OrderServiceHandler.py /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
7423	4605 d 21 h	anupam.singh	/	Minor UI fixes		/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/StoreOrderCollection.java /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm /StoreWebsite/src/main/webapp/WEB-INF/content/order-success-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm /StoreWebsite/src/main/webapp/css/header-footer.css /StoreWebsite/src/main/webapp/js/storewebsite.js /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py /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/thriftpy/model/v1/order/ttypes.py /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/StoreOrderDetail.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/StorePaymentStatus.java /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
7409	4606 d 16 h	anupam.singh	/	Added Menu bar in home page. Change store payment status upon order delivery UI fixes		/StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm /StoreWebsite/src/main/webapp/css/header-footer.css /StoreWebsite/src/main/webapp/css/storewebsite.css /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
7399	4607 d 15 h	anupam.singh	/	StoreWebsite changes		/StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm /trunk/Crm/src/main/webapp/js/common.js /trunk/Crm/src/main/webapp/js/events.js /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
7393	4608 d 0 h	anupam.singh	/	Added options in CRM to cancel storeWebsite orders		/StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm /trunk/Crm/src/main/webapp/css/common.css /trunk/Crm/src/main/webapp/js/common.js /trunk/Crm/src/main/webapp/js/events.js /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/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/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/StoreOrderDetail.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
7386	4608 d 4 h	anupam.singh	/	Changes for store website		/StoreWebsite/src/main/java/in/shop2020/serving/controllers/LoginController.java /StoreWebsite/src/main/webapp/WEB-INF/content/index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/logout.vm /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/StoreOrderDetail.java /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/StorePaymentStatus.java /StoreWebsite/src/main/java/in/shop2020/serving/controllers/BaseController.java /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EntityController.java /StoreWebsite/src/main/java/in/shop2020/serving/controllers/HomeController.java /StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderDetailsController.java /StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderSuccessController.java /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java /StoreWebsite/src/main/java/in/shop2020/serving/controllers/SearchController.java /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/order-success-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm /StoreWebsite/src/main/webapp/css/storewebsite.css /StoreWebsite/src/main/webapp/js/entity.js /StoreWebsite/src/main/webapp/js/storewebsite.js /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/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/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
7349	4619 d 22 h	anupam.singh	/StoreWebsite/src/main/	Refund Flow changes		/StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm /StoreWebsite/src/main/webapp/js/storewebsite.js
7348	4620 d 0 h	anupam.singh	/StoreWebsite/src/main/	Cancellation and Return FrontEnd		/StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm /StoreWebsite/src/main/webapp/js/storewebsite.js
7346	4620 d 2 h	anupam.singh	/	Storewebsite changes		/StoreWebsite/.project /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
7343	4620 d 4 h	anupam.singh	/	Changes for Store Website		/StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderSuccessController.java /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java /StoreWebsite/src/main/webapp/WEB-INF/content/order-success-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm /StoreWebsite/src/main/webapp/images/rupee-symbol.png /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm /StoreWebsite/src/main/java/in/shop2020/serving/controllers/BaseController.java /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm /StoreWebsite/src/main/webapp/css/storewebsite.css /StoreWebsite/src/main/webapp/js/storewebsite.js /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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift