Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
7772 4659 d 8 h anupam.singh /StoreWebsite/src/main/webapp/WEB-INF/content/ UI fix  
/StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
7695 4674 d 1 h anupam.singh /StoreWebsite/src/main/ Handled exceptions while getting logistic and price estimates  
/StoreWebsite/src/main/webapp/js/entity_20130704.js
/StoreWebsite/src/main/webapp/js/storewebsite_20130704.js
/StoreWebsite/src/main/webapp/js/entity_20130608.js
/StoreWebsite/src/main/webapp/js/storewebsite_20130611.js
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
/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
7611 4684 d 4 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
7483 4695 d 9 h anupam.singh /StoreWebsite/src/main/webapp/ changed hotspot logo  
/StoreWebsite/src/main/webapp/images/hotspotLogoBlue.jpg
/StoreWebsite/src/main/webapp/images/hotspotLogoWhite.jpg
/StoreWebsite/src/main/webapp/images/Hotspot-Logo.jpg
/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
7449 4697 d 19 h anupam.singh /StoreWebsite/src/main/webapp/ Creation of form in jQuery was not working on IE. Changed to use <a> tag.
Corrected some address validation code on payment details page
 
/StoreWebsite/src/main/webapp/js/storewebsite_20130611.js
/StoreWebsite/src/main/webapp/js/storewebsite_20130608.js
/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
7435 4698 d 9 h anupam.singh /StoreWebsite/src/main/ Added order type when creating order. Removing create order button on form submit to avoid double clicks.  
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
/StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
/StoreWebsite/src/main/webapp/js/storewebsite_20130608.js
7427 4699 d 18 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 4701 d 2 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
7386 4703 d 10 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
7358 4712 d 10 h anupam.singh /StoreWebsite/src/main/ cosmetic changes  
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
/StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.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/report-index.vm
/StoreWebsite/src/main/webapp/js/entity.js
/StoreWebsite/src/main/webapp/js/storewebsite.js
7343 4715 d 9 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
7327 4717 d 2 h anupam.singh /StoreWebsite/src/main/webapp/WEB-INF/content/ Removed today's collection from header  
/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.vm
/StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
/StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm
7325 4717 d 2 h anupam.singh /StoreWebsite/src/main/webapp/WEB-INF/content/ fixed links to storewebsite  
/StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm
/StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
/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/search-index.vm
7324 4717 d 3 h anupam.singh /StoreWebsite/src/main/webapp/ Added missing CSS and changed rch to storewebsite in links  
/StoreWebsite/src/main/webapp/css/jquery.ui.autocomplete.css
/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.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
7323 4717 d 3 h anupam.singh /StoreWebsite/src/main/ Changes for StoreWebsite  
/StoreWebsite/src/main/webapp/css/style.css
/StoreWebsite/src/main/webapp/css/widget.css
/StoreWebsite/src/main/webapp/css/widgets.css
/StoreWebsite/src/main/webapp/images/filter-divider.gif
/StoreWebsite/src/main/webapp/images/grey-ver-bar.gif
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderDetailsController.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/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/entity.css
/StoreWebsite/src/main/webapp/css/product.css
/StoreWebsite/src/main/webapp/js/entity.js
/StoreWebsite/src/main/webapp/js/storewebsite.js
7293 4722 d 8 h anupam.singh / - Changes related to StoreWebsite
- Added source to "change_transaction_status" method
 
/StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
/StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
/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/js/storewebsite.js
/trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.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/model/v1/order/impl/OrderServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/order/script/CreateRTGSBulkOrders.py
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.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/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.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/services/CommonPaymentService.java
7263 4729 d 5 h anupam.singh / Checkin for SnippetCaching, SourceDetail, CSS and JS changes etc.  
/StoreWebsite/src/main/java/in/shop2020/serving/cache
/StoreWebsite/src/main/java/in/shop2020/serving/cache/CategorySnippetCacheWrapper.java
/StoreWebsite/src/main/java/in/shop2020/serving/cache/EhcacheWrapper.java
/StoreWebsite/src/main/java/in/shop2020/serving/cache/SearchSnippetCacheWrapper.java
/StoreWebsite/src/main/java/in/shop2020/serving/cache/SnippetCacheWrapper.java
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
/StoreWebsite/src/main/java/in/shop2020/serving/service/ContentServingService.java
/StoreWebsite/src/main/java/in/shop2020/serving/utils/Category.java
/StoreWebsite/src/main/java/in/shop2020/serving/utils/DesEncrypter.java
/StoreWebsite/src/main/java/in/shop2020/serving/utils/FileUtils.java
/StoreWebsite/src/main/java/in/shop2020/serving/utils/FormattingUtils.java
/StoreWebsite/src/main/java/in/shop2020/serving/utils/SnippetType.java
/StoreWebsite/src/main/java/in/shop2020/serving/utils/UserMessage.java
/StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm
/StoreWebsite/src/main/webapp/css/storewebsite.css
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/SourceDetail.java
/StoreWebsite/src/main/webapp/css/rechargewebapp_18042013.css
/StoreWebsite/pom.xml
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderDetailsController.java
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/SearchController.java
/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/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
7248 4730 d 10 h anupam.singh /StoreWebsite/src/main/ New changes  
/StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderDetailsController.java
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
/StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
/StoreWebsite/src/main/webapp/images/1.jpg
/StoreWebsite/src/main/webapp/js/storewebsite.js