Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
6673 4842 d 12 h amit.gupta /trunk/Website/src/main/resources/templates/ minor change.  
/trunk/Website/src/main/resources/templates/orderdetails.vm
6672 4842 d 12 h amit.gupta /trunk/Website/src/main/ change Expected date to promised delivery date.  
/trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/main/resources/templates/orderdetails.vm
6604 4852 d 13 h anupam.singh /trunk/Website/src/main/resources/templates/ Adding links to my recharge and my wallet in orderdetails template vm  
/trunk/Website/src/main/resources/templates/orderdetails.vm
6561 4856 d 14 h amit.gupta /trunk/ otg front-end and mail logic implementation.  
/trunk/PyProj/src/shop2020/model/v1/order/script/LogisticUtils.py
/trunk/Website/src/main/webapp/images/quesmark.png
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py
/trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py
/trunk/PyProj/src/shop2020/model/v1/order/script/DelhiveryLogisticsReconciliation.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/user/PromotionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
/trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/main/resources/templates/orderdetails.vm
/trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
/trunk/Website/src/main/webapp/css/entity.css
/trunk/Website/src/main/webapp/js/cart-details.js
/trunk/Website/src/main/webapp/js/entity.js
5842 4990 d 10 h rajveer /trunk/Website/src/main/resources/templates/ reverted order details  
/trunk/Website/src/main/resources/templates/orderdetails.vm
5841 4990 d 10 h rajveer /trunk/Website/src/main/resources/templates/ For order details.  
/trunk/Website/src/main/resources/templates/orderdetails.vm
5837 4991 d 11 h rajveer /trunk/Website/src/main/resources/templates/ Dont display awb for runner  
/trunk/Website/src/main/resources/templates/orderdetails.vm
4815 5135 d 11 h phani.kumar /trunk/ Ticket #985 Add cancel button on order detail page on Website
Ticket #1023 Tracking of DOA and Return Pickups
Ticket #1022 Changes in Email Sent to Customers after DOA/Return Pickups are Confirmed
reviewer: Rajveer		  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatusGroups.java
/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/script/AramexLogisticsReconciliation.py
/trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py
/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/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/controllers/OrderController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/main/resources/templates/orderdetails.vm
/trunk/Website/src/main/webapp/css/myaccount.css
/trunk/Website/src/main/webapp/js/myaccount.js
4350 5202 d 18 h mandeep.dhir /trunk/Website/src/main/resources/templates/ Not allowing address to be changed for payment failed or payment pending orders.  
/trunk/Website/src/main/resources/templates/orderdetails.vm
4349 5202 d 18 h mandeep.dhir /trunk/Website/src/main/resources/templates/ Passing item id instead of lineitem id  
/trunk/Website/src/main/resources/templates/orderdetails.vm
4325 5206 d 15 h mandeep.dhir /trunk/Website/src/main/ Trac#669 Made changes to order detail page to enable user to change address for an order  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/AddressController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/main/resources/templates/orderdetails.vm
/trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
/trunk/Website/src/main/webapp/css/myaccount.css
/trunk/Website/src/main/webapp/js/cart-details.js
/trunk/Website/src/main/webapp/js/myaccount.js
4217 5236 d 16 h varun.gupta /trunk/Website/src/main/ Trac #734 - Deal text included in Cart flow  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
/trunk/Website/src/main/resources/templates/orderdetails.vm
/trunk/Website/src/main/resources/templates/shippingdetails.vm
/trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
/trunk/Website/src/main/webapp/css/cartflow.css
3830 5294 d 11 h chandranshu /trunk/Website/ Merged the Website1 code back into the website  
/trunk/Website/src/main/resources/templates/cartwidget.vm
/trunk/Website/src/main/webapp/WEB-INF/content/careers.vm
/trunk/Website/src/main/webapp/css/cartflow.css
/trunk/Website/src/main/webapp/css/entity.css
/trunk/Website/src/main/webapp/css/header-footer.css
/trunk/Website/src/main/webapp/css/home.css
/trunk/Website/src/main/webapp/css/widgets.css
/trunk/Website/src/main/webapp/images/Arrow_OrangeButton_AllScreens.png
/trunk/Website/src/main/webapp/images/BG_NavBar.png
/trunk/Website/src/main/webapp/images/ButtonAddtoCart_ALLSTATES.png
/trunk/Website/src/main/webapp/images/ButtonWhite_ALLSTATES.png
/trunk/Website/src/main/webapp/images/Button_AddNewAddress_ALLSTATES.png
/trunk/Website/src/main/webapp/images/Button_Apply_ALLSTATES.png
/trunk/Website/src/main/webapp/images/Button_EnterShippingInfo_ALLSTATES.png
/trunk/Website/src/main/webapp/images/Button_MakePayment_ALLSTATES-copy.png
/trunk/Website/src/main/webapp/images/Button_ProceedToPayment_ALLSTATES.png
/trunk/Website/src/main/webapp/images/Button_UpdateDeliveryTime_ALLSTATES.png
/trunk/Website/src/main/webapp/images/Button_ViewAllOrders_ALLSTATES.png
/trunk/Website/src/main/webapp/images/Cross_DeleteRow_DEF.png
/trunk/Website/src/main/webapp/images/Cross_DeleteRow_DWN.png
/trunk/Website/src/main/webapp/images/Cross_DeleteRow_OVR.png
/trunk/Website/src/main/webapp/images/FooterBG.png
/trunk/Website/src/main/webapp/images/FooterFootBG.png
/trunk/Website/src/main/webapp/images/IconAddtoCompare_ProdArea.png
/trunk/Website/src/main/webapp/images/IconBestDeals_NavBar.png
/trunk/Website/src/main/webapp/images/IconCompareWith_ProdArea.png
/trunk/Website/src/main/webapp/images/IconCross_Lists_DEF.png
/trunk/Website/src/main/webapp/images/IconCross_Lists_OVR.png
/trunk/Website/src/main/webapp/images/IconDownArrow_SelectedTab.png
/trunk/Website/src/main/webapp/images/IconDownArrow_UnselectedTab.png
/trunk/Website/src/main/webapp/images/IconDownArrow_WhiteButton.png
/trunk/Website/src/main/webapp/images/IconEmptyCart_CartSummary.png
/trunk/Website/src/main/webapp/images/IconFreeDelivery_TopBar.png
/trunk/Website/src/main/webapp/images/IconOfferPack_ProdList.png
/trunk/Website/src/main/webapp/images/IconOfferPack_ProdPage.png
/trunk/Website/src/main/webapp/images/IconSearchButton_ALLSTATES.png
/trunk/Website/src/main/webapp/images/IconSupport_TopBar.png
/trunk/Website/src/main/webapp/images/Icon_AddNewAddress_ALLSTATES.png
/trunk/Website/src/main/webapp/images/Icon_DeliveryTime.png
/trunk/Website/src/main/webapp/images/Icon_ShareOnFacebook.png
/trunk/Website/src/main/webapp/images/Icons_CreditCardsPayment.png
/trunk/Website/src/main/webapp/images/Icons_Security.png
/trunk/Website/src/main/webapp/images/LeftTab_Selected.png
/trunk/Website/src/main/webapp/images/LeftTab_Unselected.png
/trunk/Website/src/main/webapp/images/ListIcon_Cart_Default.png
/trunk/Website/src/main/webapp/images/ListIcon_Cart_Mouseover.png
/trunk/Website/src/main/webapp/images/MidTab_Selected.png
/trunk/Website/src/main/webapp/images/MidTab_Unselected.png
/trunk/Website/src/main/webapp/images/RadioButton_Selected.png
/trunk/Website/src/main/webapp/images/RadioButton_Unselected.png
/trunk/Website/src/main/webapp/images/RightTab_Selected.png
/trunk/Website/src/main/webapp/images/RightTab_Unselected.png
/trunk/Website/src/main/webapp/images/VerticalSeparator_NavBar.png
/trunk/Website/src/main/webapp/images/button-glass-bg.png
/trunk/Website/src/main/webapp/images/number_Unselected.png
/trunk/Website/src/main/webapp/images/number_selected.png
/trunk/Website/src/main/webapp/images/saholic-logo.jpg
/trunk/Website/src/main/webapp/images/sprite.png
/trunk/Website/src/main/webapp/js/common.js
/trunk/Website/src/main/resources/templates/searchbar.vm
/trunk/Website/pom.xml
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
/trunk/Website/src/main/java/in/shop2020/serving/utils/FormattingUtils.java
/trunk/Website/src/main/resources/templates/accessories.vm
/trunk/Website/src/main/resources/templates/browsehistory.vm
/trunk/Website/src/main/resources/templates/commoncssfiles.vm
/trunk/Website/src/main/resources/templates/commonjsfiles.vm
/trunk/Website/src/main/resources/templates/footer.vm
/trunk/Website/src/main/resources/templates/header.vm
/trunk/Website/src/main/resources/templates/mainbanner.vm
/trunk/Website/src/main/resources/templates/mostcompared.vm
/trunk/Website/src/main/resources/templates/myresearch.vm
/trunk/Website/src/main/resources/templates/orderdetails.vm
/trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
/trunk/Website/src/main/resources/templates/shippingdetails.vm
/trunk/Website/src/main/webapp/WEB-INF/content/aboutus.vm
/trunk/Website/src/main/webapp/WEB-INF/content/address-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/best-sellers-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/browse-history-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/estimate-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/exception.vm
/trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-success.vm
/trunk/Website/src/main/webapp/WEB-INF/content/glossary-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/latest-arrivals-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/most-compared-products-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/myresearch-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/order-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/pay-error-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/privacy-policy.vm
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/related-accessories-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/terms-conditions.vm
/trunk/Website/src/main/webapp/WEB-INF/content/updates-psuccess.vm
/trunk/Website/src/main/webapp/css/cart.css
/trunk/Website/src/main/webapp/css/common.css
/trunk/Website/src/main/webapp/css/comparision.css
/trunk/Website/src/main/webapp/css/contactus.css
/trunk/Website/src/main/webapp/css/myaccount.css
/trunk/Website/src/main/webapp/css/proceed-to-pay.css
/trunk/Website/src/main/webapp/css/product.css
/trunk/Website/src/main/webapp/css/style.css
/trunk/Website/src/main/webapp/css/widget.css
/trunk/Website/src/main/webapp/js/all.js
/trunk/Website/src/main/webapp/js/cart-details.js
/trunk/Website/src/main/webapp/js/custom-jquery.js
/trunk/Website/src/main/webapp/js/entity.js
/trunk/Website/src/main/webapp/js/loginregister.js
/trunk/Website/src/main/webapp/js/my-notes.js
/trunk/Website/src/main/webapp/js/productCategory.js
3119 5344 d 13 h rajveer /trunk/Website/src/main/ Changed text of after sales and removed highlight of open orders in order details page  
/trunk/Website/src/main/resources/templates/orderdetails.vm
/trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm
3037 5350 d 19 h rajveer /trunk/Website/src/main/ Changed name of section from my purchases to purchase. Allowed to get related accessories widget.  
/trunk/Website/src/main/resources/templates/orderdetails.vm
/trunk/Website/src/main/resources/templates/personaldetails.vm
/trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
/trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
/trunk/Website/src/main/webapp/js/all.js
/trunk/Website/src/main/webapp/js/entity.js
3019 5351 d 11 h rajveer /trunk/Website/src/main/ Added support of my purchase and after sales.  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/AfterSalesController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
/trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
/trunk/Website/src/main/resources/templates/orderdetails.vm
/trunk/Website/src/main/resources/templates/personaldetails.vm
/trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
/trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
1316 5490 d 15 h varun.gupta /trunk/Website/src/main/ Fixed 'Shipping Updates' issue (#Ticket 269). Fixed 'Completed Orders' page.  
/trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/main/resources/templates/completedorders.vm
/trunk/Website/src/main/resources/templates/myaccount.vm
/trunk/Website/src/main/resources/templates/orderdetails.vm
/trunk/Website/src/main/webapp/WEB-INF/content/bluedart-updates-show.vm
1038 5511 d 13 h chandranshu /trunk/Website/ Moved conf files to src/main/resources  
/trunk/Website/src/main/resources
/trunk/Website/src/main/resources/log4j.properties
/trunk/Website/src/main/resources/struts.properties
/trunk/Website/src/main/resources/struts.xml
/trunk/Website/src/main/resources/templates
/trunk/Website/src/main/resources/velocity.properties
/trunk/Website/conf/log4j.properties
/trunk/Website/conf/struts.properties
/trunk/Website/conf/struts.xml
/trunk/Website/conf/templates
/trunk/Website/conf/velocity.properties
981 5513 d 18 h chandranshu /trunk/Website/conf/templates/ Trac#213: Added order city and state to the display  
/trunk/Website/conf/templates/orderdetails.vm
909 5525 d 11 h rajveer /trunk/Website/conf/templates/ added color in order page  
/trunk/Website/conf/templates/orderdetails.vm

←Prev12Next→

Show All