SmartDukaan – /

Rev 3887 – Trac#579 Warranty for laptops

mandeep.dhir — Tue, 25 Oct 2011 12:54:08 +0530

mandeep.dhir – 2 file(s) modified
Trac#579 Warranty for laptops

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ExpandedSlide.java
~ /trunk/ContentStore/src/velocity/ProductDetail.vm

Rev 3886 – Added Id column to the generated sheet

chandranshu — Tue, 25 Oct 2011 12:21:52 +0530

chandranshu – 1 file(s) modified
Added Id column to the generated sheet

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/MasterSheetGenerator.java

Rev 3885 – Center aligned the 'delete item from cart' link and added ...

varun.gupta — Tue, 25 Oct 2011 12:11:45 +0530

varun.gupta – 1 file(s) modified
Center aligned the 'delete item from cart' link and added title.

~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 3884 – Added support to download the master sheet containing vendor prices ...

chandranshu — Tue, 25 Oct 2011 12:08:37 +0530

chandranshu – 2 file(s) modified
Added support to download the master sheet containing vendor prices of a different vendor

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemActions.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/FileDownloadServlet.java

Rev 3883 – Removed partition between two columns of menu

varun.gupta — Tue, 25 Oct 2011 11:54:15 +0530

varun.gupta – 2 file(s) modified
Removed partition between two columns of menu

~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css

Rev 3882 – Trac#579 Renaming years to year and months to month

mandeep.dhir — Tue, 25 Oct 2011 10:33:40 +0530

mandeep.dhir – 1 file(s) modified
Trac#579 Renaming years to year and months to month

~ /trunk/ContentStore/src/xml/model/units.xml

Rev 3881 – Removed the onPageLoad AJAX request for shipping estimate

varun.gupta — Mon, 24 Oct 2011 19:53:03 +0530

varun.gupta – 1 file(s) modified
Removed the onPageLoad AJAX request for shipping estimate

~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 3880 – Trac#579 Adding Failed payments processor

mandeep.dhir — Mon, 24 Oct 2011 19:36:04 +0530

mandeep.dhir – 1 file(s) modified
Trac#579 Adding Failed payments processor

+ /trunk/CRMService/src/main/java/in/shop2020/crm/util/FailedPaymentsProcessor.java

Rev 3879 – Two column menu for Mobile Phones

varun.gupta — Mon, 24 Oct 2011 19:26:39 +0530

varun.gupta – 2 file(s) modified
Two column menu for Mobile Phones

~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css

Rev 3878 – Trac#579 Adding TxnProcessor for CODs

mandeep.dhir — Mon, 24 Oct 2011 19:23:50 +0530

mandeep.dhir – 2 file(s) modified
Trac#579 Adding TxnProcessor for CODs

+ /trunk/CRMService/src/main/java/in/shop2020/crm/util
+ /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTxnProcessor.java

Rev 3877 – Corrected the max usage condition

varun.gupta — Mon, 24 Oct 2011 17:47:14 +0530

varun.gupta – 1 file(s) modified
Corrected the max usage condition

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_diwali_gift_voucher.py

Rev 3876 – Activated search on the enter key

chandranshu — Mon, 24 Oct 2011 17:34:18 +0530

chandranshu – 1 file(s) modified
Activated search on the enter key

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/SearchItemBox.java

Rev 3875 – Added link also to android page.

rajveer — Mon, 24 Oct 2011 17:29:46 +0530

rajveer – 1 file(s) modified
Added link also to android page.

~ /trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm

Rev 3874 – Added android banner.

rajveer — Mon, 24 Oct 2011 17:25:54 +0530

rajveer – 1 file(s) modified
Added android banner.

~ /trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm

Rev 3873 – Trac#579 Added warranty type and coverage features

mandeep.dhir — Mon, 24 Oct 2011 17:07:10 +0530

mandeep.dhir – 1 file(s) modified
Trac#579 Added warranty type and coverage features

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java

Rev 3872 – Added search support in the catalog dashboard

chandranshu — Mon, 24 Oct 2011 16:59:55 +0530

chandranshu – 14 file(s) modified
Added search support in the catalog dashboard

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogDashboard.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogTree.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemList.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/SearchItemBox.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemList.ui.xml
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 3871 – Diwali Gift Vouchers

varun.gupta — Mon, 24 Oct 2011 16:56:01 +0530

varun.gupta – 2 file(s) modified
Diwali Gift Vouchers

+ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_diwali_gift_voucher.py (copied from /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_for_5perc_discount_on_5k_purchase.py@3513)
x /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_for_5perc_discount_on_5k_purchase.py

Rev 3870 – Trac#579 Added warranty type and coverage features

mandeep.dhir — Mon, 24 Oct 2011 16:39:11 +0530

mandeep.dhir – 4 file(s) modified
Trac#579 Added warranty type and coverage features

~ /trunk/ContentStore/src/velocity/ProductDetail.vm
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 3869 – Added warranty type and warranty coverage features to warranty slide ...

rajveer — Mon, 24 Oct 2011 16:38:10 +0530

rajveer – 1 file(s) modified
Added warranty type and warranty coverage features to warranty slide
Trac#579

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java

Rev 3868 – Script to load item numbers

chandranshu — Mon, 24 Oct 2011 16:12:36 +0530

chandranshu – 3 file(s) modified
Script to load item numbers

+ /trunk/PyProj/src/shop2020/warehouse/main/script
+ /trunk/PyProj/src/shop2020/warehouse/main/script/ItemNumberLoader.py
+ /trunk/PyProj/src/shop2020/warehouse/main/script/__init__.py

Rev 3867 – Added support to close a purchase

chandranshu — Mon, 24 Oct 2011 14:26:38 +0530

chandranshu – 2 file(s) modified
Added support to close a purchase

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-show.vm

Rev 3866 – Added support for closing purchases

chandranshu — Mon, 24 Oct 2011 14:25:30 +0530

chandranshu – 1 file(s) modified
Added support for closing purchases

~ /trunk/PyProj/src/shop2020/warehouse/main/handler/WarehouseHandler.py

Rev 3865 – New Purchase orders will be created in the READY state ...

chandranshu — Mon, 24 Oct 2011 14:18:17 +0530

chandranshu – 1 file(s) modified
New Purchase orders will be created in the READY state now

~ /trunk/PyProj/src/shop2020/warehouse/main/model/PurchaseOrder.py

Rev 3864 – Clicking on Discounts link will open a new tab

varun.gupta — Mon, 24 Oct 2011 14:11:30 +0530

varun.gupta – 1 file(s) modified
Clicking on Discounts link will open a new tab

~ /trunk/Website/src/main/resources/templates/header.vm

Rev 3863 – Added link to Android BDay offers

varun.gupta — Mon, 24 Oct 2011 13:57:24 +0530

varun.gupta – 6 file(s) modified
Added link to Android BDay offers

~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/css/common.css
~ /trunk/Website/src/main/webapp/css/header-footer.css
~ /trunk/Website/src/main/webapp/images/droid.gif

Rev 3862 – Fixed my accounts address issues.

rajveer — Mon, 24 Oct 2011 12:18:01 +0530

rajveer – 3 file(s) modified
Fixed my accounts address issues.

~ /trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
~ /trunk/Website/src/main/webapp/css/common.css
~ /trunk/Website/src/main/webapp/css/myaccount.css

Rev 3861 – Fixed the alignment of 'Next >>' link in Image/Video slider.

varun.gupta — Mon, 24 Oct 2011 11:58:25 +0530

varun.gupta – 1 file(s) modified
Fixed the alignment of 'Next >>' link in Image/Video slider.

~ /trunk/Website/src/main/webapp/css/product.css

Rev 3860 – In session source, we would store the recent source from ...

vikas — Mon, 24 Oct 2011 11:50:36 +0530

vikas – 1 file(s) modified
In session source, we would store the recent source from which user came, instead of saving the first source for the session.

~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java

Rev 3859 – Store first source also in transaction.

vikas — Mon, 24 Oct 2011 11:49:23 +0530

vikas – 2 file(s) modified
Store first source also in transaction.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java

Rev 3858 – Store first source also in transaction.

vikas — Mon, 24 Oct 2011 11:47:55 +0530

vikas – 12 file(s) modified
Store first source also in transaction.

~ /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/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Transaction.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 3857 – Included Midnight Black color for Galaxy SL

varun.gupta — Fri, 21 Oct 2011 19:23:36 +0530

varun.gupta – 1 file(s) modified
Included Midnight Black color for Galaxy SL

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_Android_BDay.py

Rev 3856 – Fixed Long name issue on the cart page

varun.gupta — Fri, 21 Oct 2011 18:16:52 +0530

varun.gupta – 2 file(s) modified
Fixed Long name issue on the cart page

~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 3855 – Updated contact us success page

rajveer — Fri, 21 Oct 2011 18:03:29 +0530

rajveer – 1 file(s) modified
Updated contact us success page

~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-success.vm

Rev 3854 – Fixed the alignments in header

varun.gupta — Fri, 21 Oct 2011 16:41:47 +0530

varun.gupta – 1 file(s) modified
Fixed the alignments in header

~ /trunk/Website/src/main/webapp/css/header-footer.css

Rev 3853 – Trac#582 Truncating test when no. of rows on one page ...

mandeep.dhir — Fri, 21 Oct 2011 15:25:59 +0530

mandeep.dhir – 10 file(s) modified
Trac#582 Truncating test when no. of rows on one page in datatables change

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/CRMServer.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 3852 – Corrected the figures in comment

varun.gupta — Fri, 21 Oct 2011 15:21:33 +0530

varun.gupta – 1 file(s) modified
Corrected the figures in comment

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_Android_BDay.py

Rev 3851 – Cart Widget - Footer message margin reduced

varun.gupta — Fri, 21 Oct 2011 15:12:27 +0530

varun.gupta – 1 file(s) modified
Cart Widget - Footer message margin reduced

~ /trunk/Website/src/main/webapp/css/widgets.css

Rev 3850 – Replaced the ListDataProvider by AsyncDataProvider

chandranshu — Fri, 21 Oct 2011 14:44:51 +0530

chandranshu – 5 file(s) modified
Replaced the ListDataProvider by AsyncDataProvider

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemList.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/ItemStatus.java

Rev 3849 – Added new methods to the catalog service to retrieve items ...

chandranshu — Fri, 21 Oct 2011 14:41:30 +0530

chandranshu – 4 file(s) modified
Added new methods to the catalog service to retrieve items in a range

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py

Rev 3848 – Added new methods to the catalog service to retrieve items ...

chandranshu — Fri, 21 Oct 2011 14:39:42 +0530

chandranshu – 2 file(s) modified
Added new methods to the catalog service to retrieve items in a range

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift