SmartDukaan – /

Rev 6600 – Added a new resolution type

amit.gupta — Thu, 03 Jan 2013 17:39:16 +0530

amit.gupta – 2 file(s) modified
Added a new resolution type

~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 6599 – added right image path

amit.gupta — Thu, 03 Jan 2013 17:18:22 +0530

amit.gupta – 1 file(s) modified
added right image path

~ /trunk/ContentStore/src/velocity/ProductDetail.vm

Rev 6598 – changed url

amit.gupta — Thu, 03 Jan 2013 17:17:21 +0530

amit.gupta – 1 file(s) modified
changed url

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

Rev 6597 – set refund timestamp to null initially.

rajveer — Thu, 03 Jan 2013 15:34:50 +0530

rajveer – 1 file(s) modified
set refund timestamp to null initially.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/BaseOrder.py

Rev 6596 – Script to get blocked IP's list.

kshitij.sood — Thu, 03 Jan 2013 14:17:20 +0530

kshitij.sood – 1 file(s) modified
Script to get blocked IP's list.

~ /trunk/PyProj/src/shop2020/model/v1/order/script/GetDeniedIpRange.sh

Rev 6595 – Script to get blocked IP's list.

kshitij.sood — Thu, 03 Jan 2013 12:23:55 +0530

kshitij.sood – 1 file(s) modified
Script to get blocked IP's list.

+ /trunk/PyProj/src/shop2020/model/v1/order/script/GetDeniedIpRange.sh

Rev 6594 – Changed field types to bigInt for "blockediprange" table

anupam.singh — Thu, 03 Jan 2013 12:19:56 +0530

anupam.singh – 1 file(s) modified
Changed field types to bigInt for "blockediprange" table

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py

Rev 6593 – MP3 category is now live.

amit.gupta — Thu, 03 Jan 2013 01:23:59 +0530

amit.gupta – 2 file(s) modified
MP3 category is now live.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java

Rev 6592 – Music Players is a better category.

amit.gupta — Thu, 03 Jan 2013 01:05:56 +0530

amit.gupta – 1 file(s) modified
Music Players is a better category.

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

Rev 6591 – Added ip address recognition and blocking of malicious ip addresses ...

anupam.singh — Wed, 02 Jan 2013 21:04:11 +0530

anupam.singh – 11 file(s) modified
Added ip address recognition and blocking of malicious ip addresses for rechargeOrders. Also started to log addresses which are blocked.

~ /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/model/BaseOrder.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/RechargeOrder.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/ConfirmController.java

Rev 6590 – MP3 root changed to Music

amit.gupta — Wed, 02 Jan 2013 18:03:39 +0530

amit.gupta – 1 file(s) modified
MP3 root changed to Music

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

Rev 6589 – set zone id to 29

amit.gupta — Wed, 02 Jan 2013 16:46:08 +0530

amit.gupta – 1 file(s) modified
set zone id to 29

~ /trunk/Website/src/main/webapp/WEB-INF/content/on-time-guarantee.vm

Rev 6588 – OTG should be hidden when page is loaded.

amit.gupta — Wed, 02 Jan 2013 16:20:20 +0530

amit.gupta – 1 file(s) modified
OTG should be hidden when page is loaded.

~ /trunk/ContentStore/src/velocity/ProductDetail.vm

Rev 6587 – moved one copy of question mark icon to unversioned as ...

amit.gupta — Wed, 02 Jan 2013 15:42:49 +0530

amit.gupta – 1 file(s) modified
moved one copy of question mark icon to unversioned as well.

~ /trunk/ContentStore/src/velocity/ProductDetail.vm

Rev 6586 – Unversioned image for questionmark icon.

amit.gupta — Wed, 02 Jan 2013 15:38:10 +0530

amit.gupta – 1 file(s) modified
Unversioned image for questionmark icon.

+ /trunk/Website/src/main/webapp/unversioned/images/quesmark.png

Rev 6585 – made minor changes related to otg

amit.gupta — Wed, 02 Jan 2013 14:52:28 +0530

amit.gupta – 2 file(s) modified
made minor changes related to otg

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

Rev 6584 – Retina Display

amit.gupta — Wed, 02 Jan 2013 14:26:17 +0530

amit.gupta – 1 file(s) modified
Retina Display

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

Rev 6583 – Retina Display

amit.gupta — Wed, 02 Jan 2013 14:25:51 +0530

amit.gupta – 1 file(s) modified
Retina Display

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

Rev 6582 – For Apple Laptops

amit.gupta — Wed, 02 Jan 2013 14:20:13 +0530

amit.gupta – 2 file(s) modified
For Apple Laptops

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/displayngraphics.py
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 6581 – Adding emailAddresses of Chandan and Khushal for inventory related mails

amar.kumar — Wed, 02 Jan 2013 14:18:38 +0530

amar.kumar – 2 file(s) modified
Adding emailAddresses of Chandan and Khushal for inventory related mails

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportSender.java
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py

Rev 6580 – Added a table for ip address range which would not ...

anupam.singh — Wed, 02 Jan 2013 14:12:33 +0530

anupam.singh – 1 file(s) modified
Added a table for ip address range which would not be allowed to recharge on our site.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py

Rev 6579 – Adding names of rajneesh, Sandeep and Rajveer in mismatch reports ...

amar.kumar — Wed, 02 Jan 2013 12:59:26 +0530

amar.kumar – 1 file(s) modified
Adding names of rajneesh, Sandeep and Rajveer in mismatch reports b/w scan Records and CIS

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/InventoryMismatchGenerator.java

Rev 6578 – Reverted

amit.gupta — Wed, 02 Jan 2013 12:33:52 +0530

amit.gupta – 1 file(s) modified
Reverted

~ /trunk/ContentStore/src/velocity/ProductDetail.vm

Rev 6577 – replacing warehouseId with currentWarehouseId for query in InventoryItem table to ...

amar.kumar — Wed, 02 Jan 2013 12:08:51 +0530

amar.kumar – 1 file(s) modified
replacing warehouseId with currentWarehouseId for query in InventoryItem table to get currentQuantity for Non Serialized Item

~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml

Rev 6576 –

amit.gupta — Wed, 02 Jan 2013 12:05:33 +0530

amit.gupta – 1 file(s) modified

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

Rev 6575 – replacing warehouseId with currentWarehouseId for query in InventoryItem table to ...

amar.kumar — Wed, 02 Jan 2013 11:58:58 +0530

amar.kumar – 1 file(s) modified
replacing warehouseId with currentWarehouseId for query in InventoryItem table to get currentQuantity for Non Serialized Item

~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml

Rev 6574 – Context path is now supplied as public method.

amit.gupta — Wed, 02 Jan 2013 11:15:04 +0530

amit.gupta – 1 file(s) modified
Context path is now supplied as public method.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CouponGvsController.java

Rev 6573 – Mountain Lion

amit.gupta — Wed, 02 Jan 2013 11:02:51 +0530

amit.gupta – 1 file(s) modified
Mountain Lion

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

Rev 6572 – Pointing item loader to hadb2

anupam.singh — Tue, 01 Jan 2013 15:47:25 +0530

anupam.singh – 1 file(s) modified
Pointing item loader to hadb2

~ /trunk/pentaho/data-integration/transformations/itemLoader.ktr

Rev 6571 – reverted back.

amit.gupta — Tue, 01 Jan 2013 02:46:10 +0530

amit.gupta – 1 file(s) modified
reverted back.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py

Rev 6570 – Filter by promotion id.

amit.gupta — Tue, 01 Jan 2013 02:44:46 +0530

amit.gupta – 1 file(s) modified
Filter by promotion id.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py

Rev 6569 – added null as prefix to method createCoupon as per new ...

amit.gupta — Tue, 01 Jan 2013 01:40:33 +0530

amit.gupta – 1 file(s) modified
added null as prefix to method createCoupon as per new api changes.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CouponGvsController.java

Rev 6568 – Converted to json string while returning to thrift

amit.gupta — Tue, 01 Jan 2013 01:33:39 +0530

amit.gupta – 1 file(s) modified
Converted to json string while returning to thrift

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py

Rev 6567 – commented

amit.gupta — Mon, 31 Dec 2012 17:26:36 +0530

amit.gupta – 1 file(s) modified
commented

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 6566 – added new OrderStatus to OrderStatusGroup.

amit.gupta — Mon, 31 Dec 2012 17:24:35 +0530

amit.gupta – 3 file(s) modified
added new OrderStatus to OrderStatusGroup.

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatusGroups.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6565 – added otg for changes.

amit.gupta — Mon, 31 Dec 2012 16:56:17 +0530

amit.gupta – 1 file(s) modified
added otg for changes.

~ /trunk/ContentStore/src/velocity/ProductDetail.vm

Rev 6564 – minor chnage of enum

amit.gupta — Mon, 31 Dec 2012 16:55:47 +0530

amit.gupta – 1 file(s) modified
minor chnage of enum

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

Rev 6563 – mountain Lion added to os

amit.gupta — Mon, 31 Dec 2012 16:50:23 +0530

amit.gupta – 2 file(s) modified
mountain Lion added to os

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/operatingsystem.py
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 6562 – Add transfer delay of 3 days in case of hotspot ...

rajveer — Mon, 31 Dec 2012 16:50:15 +0530

rajveer – 1 file(s) modified
Add transfer delay of 3 days in case of hotspot and s mobility.

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py

Rev 6561 – otg front-end and mail logic implementation.

amit.gupta — Mon, 31 Dec 2012 16:40:20 +0530

amit.gupta – 20 file(s) modified
otg front-end and mail logic implementation.

~ /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/order/script/LogisticUtils.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/css/entity.css
+ /trunk/Website/src/main/webapp/images/quesmark.png
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /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