SmartDukaan – /

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

Rev 6560 – Including timestamp also

anupam.singh — Mon, 31 Dec 2012 14:11:33 +0530

anupam.singh – 2 file(s) modified
Including timestamp also

~ /trunk/pentaho/data-integration/transformations/MarkRepeatOrders.ktr
~ /trunk/pentaho/data-integration/transformations/RepeatSaleAnalysis.ktr

Rev 6559 – Added link for samsung cameras

amit.gupta — Mon, 31 Dec 2012 13:47:26 +0530

amit.gupta – 1 file(s) modified
Added link for samsung cameras

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

Rev 6558 – Comitting missed changes for Marking item as lost in warehouse

amar.kumar — Mon, 31 Dec 2012 12:20:03 +0530

amar.kumar – 2 file(s) modified
Comitting missed changes for Marking item as lost in warehouse

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 6557 – Forcing spoon to use db2 for loading commonorders

anupam.singh — Mon, 31 Dec 2012 11:48:05 +0530

anupam.singh – 1 file(s) modified
Forcing spoon to use db2 for loading commonorders

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

Rev 6556 – reverted

amit.gupta — Mon, 31 Dec 2012 11:35:22 +0530

amit.gupta – 1 file(s) modified
reverted

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

Rev 6555 – fixed minor defects.

amit.gupta — Mon, 31 Dec 2012 11:32:42 +0530

amit.gupta – 2 file(s) modified
fixed minor defects.

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

Rev 6554 – Changes in itemLoader script, added commonorders schema

anupam.singh — Fri, 28 Dec 2012 20:59:41 +0530

anupam.singh – 4 file(s) modified
Changes in itemLoader script, added commonorders schema

~ /trunk/pentaho/data-integration/transformations/itemLoader.ktr
~ /trunk/pentaho/data-integration/transformations/RepeatSaleAnalysis.ktr
+ /trunk/pentaho/schema/CommonOrdersSchema.xml
+ /trunk/pentaho/scripts/temp.py

Rev 6553 – Add invoice in case of recharge successful.

rajveer — Fri, 28 Dec 2012 18:42:35 +0530

rajveer – 1 file(s) modified
Add invoice in case of recharge successful.

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

Rev 6552 – OTG T&C page and pop up

kshitij.sood — Fri, 28 Dec 2012 18:39:13 +0530

kshitij.sood – 2 file(s) modified
OTG T&C page and pop up

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

Rev 6551 – changed label.

amit.gupta — Fri, 28 Dec 2012 17:34:34 +0530

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

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

Rev 6550 – Added khushal bhatia in the reports.

rajveer — Fri, 28 Dec 2012 17:21:47 +0530

rajveer – 6 file(s) modified
Added khushal bhatia in the reports.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CatalogComparer.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/purchase/scripts/vendorFulfilmentReport.py

Rev 6549 – new content model for Music players category id 12001-Music Players ...

amit.gupta — Fri, 28 Dec 2012 17:02:05 +0530

amit.gupta – 6 file(s) modified
new content model for Music players
category id 12001-Music Players root category
category id 12002-Music players child category

~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/categoryslidesequence.xml
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml
~ /trunk/ContentStore/src/xml/model/units.xml

Rev 6548 – Making Changes for: 1) Pulling inventory for Serialized Items from ...

amar.kumar — Fri, 28 Dec 2012 15:06:26 +0530

amar.kumar – 12 file(s) modified
Making Changes for:
1) Pulling inventory for Serialized Items from Inventory Mgmnt Dashboard
2) Backend for Lost Item
3) Correction in Purchase Return Code to decrease availability in CIS

Reviewed By Amit Gupta

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryReaderController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryAvailability.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
~ /trunk/WarehouseService/src/main/resources/mybatis-config.xml

Rev 6547 – ETL now successful for commonorders

anupam.singh — Thu, 27 Dec 2012 18:14:54 +0530

anupam.singh – 2 file(s) modified
ETL now successful for commonorders

~ /trunk/pentaho/data-integration/transformations/MarkRepeatOrders.ktr
~ /trunk/pentaho/data-integration/transformations/RepeatSaleAnalysis.ktr

Rev 6546 – Shoogloo affiliate should pass txn id instead of payment id.

rajveer — Thu, 27 Dec 2012 17:50:32 +0530

rajveer – 2 file(s) modified
Shoogloo affiliate should pass txn id instead of payment id.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 6545 – Corrected the issue of the total inventory count.

rajveer — Thu, 27 Dec 2012 17:03:42 +0530

rajveer – 1 file(s) modified
Corrected the issue of the total inventory count.

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

Rev 6544 – Corrected logic to get inventory while adding to cart.

rajveer — Thu, 27 Dec 2012 16:26:05 +0530

rajveer – 1 file(s) modified
Corrected logic to get inventory while adding to cart.

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

Rev 6543 – One more cancellation reason - "customer denied placing order on ...

anupam.singh — Thu, 27 Dec 2012 15:45:53 +0530

anupam.singh – 1 file(s) modified
One more cancellation reason - "customer denied placing order on our site"

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java

Rev 6542 – Entry should not be set in the database.

rajveer — Thu, 27 Dec 2012 14:36:44 +0530

rajveer – 1 file(s) modified
Entry should not be set in the database.

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