SmartDukaan – /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java

Rev 7611 – Added provision for storing and working on card type.

anupam.singh — Mon, 24 Jun 2013 17:15:55 +0530

anupam.singh – 10 file(s) modified
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

Rev 7527 – Changed reports to show status description from enum.

anupam.singh — Fri, 14 Jun 2013 18:30:00 +0530

anupam.singh – 2 file(s) modified
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

Rev 7427 – Bug fixes

anupam.singh — Sun, 09 Jun 2013 03:58:11 +0530

anupam.singh – 23 file(s) modified
Bug fixes

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
x /StoreWebsite/src/main/webapp/css/entity.css
+ /StoreWebsite/src/main/webapp/css/entity_20130608.css (copied from /StoreWebsite/src/main/webapp/css/entity.css@7426)
x /StoreWebsite/src/main/webapp/js/entity.js
+ /StoreWebsite/src/main/webapp/js/entity_20130608.js (copied from /StoreWebsite/src/main/webapp/js/entity.js@7426)
x /StoreWebsite/src/main/webapp/js/storewebsite.js
+ /StoreWebsite/src/main/webapp/js/storewebsite_20130608.js (copied from /StoreWebsite/src/main/webapp/js/storewebsite.js@7426)
~ /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/error-result.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

Rev 7423 – Minor UI fixes

anupam.singh — Fri, 07 Jun 2013 19:27:52 +0530

anupam.singh – 16 file(s) modified
Minor UI fixes

Rev 7409 – Added Menu bar in home page. Change store payment status ...

anupam.singh — Fri, 07 Jun 2013 00:49:59 +0530

anupam.singh – 7 file(s) modified
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/css/header-footer.css
~ /StoreWebsite/src/main/webapp/css/storewebsite.css
~ /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
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 7399 – StoreWebsite changes

anupam.singh — Thu, 06 Jun 2013 02:00:36 +0530

anupam.singh – 8 file(s) modified
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/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py

Rev 7393 – Added options in CRM to cancel storeWebsite orders

anupam.singh — Wed, 05 Jun 2013 16:47:44 +0530

anupam.singh – 17 file(s) modified
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/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-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/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

Rev 7386 – Changes for store website

anupam.singh — Wed, 05 Jun 2013 12:05:09 +0530

anupam.singh – 32 file(s) modified
Changes for store website

~ /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/LoginController.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/css/storewebsite.css
~ /StoreWebsite/src/main/webapp/js/entity.js
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
~ /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/index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/logout.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/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/StorePaymentStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7349 – Refund Flow changes

anupam.singh — Fri, 24 May 2013 18:36:48 +0530

anupam.singh – 3 file(s) modified
Refund Flow changes

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm

Rev 7348 – Cancellation and Return FrontEnd

anupam.singh — Fri, 24 May 2013 16:57:30 +0530

anupam.singh – 3 file(s) modified
Cancellation and Return FrontEnd

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm

Rev 7346 – Storewebsite changes

anupam.singh — Fri, 24 May 2013 14:12:35 +0530

anupam.singh – 4 file(s) modified
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

Rev 7343 – Changes for Store Website

anupam.singh — Fri, 24 May 2013 12:12:12 +0530

anupam.singh – 21 file(s) modified
Changes for Store Website

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/BaseController.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/webapp/css/storewebsite.css
+ /StoreWebsite/src/main/webapp/images/rupee-symbol.png
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
~ /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 (copied from /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm@7327)
x /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.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/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