SmartDukaan – /

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

Rev 6541 – Job and corresponding transformations which load common orders.

anupam.singh — Wed, 26 Dec 2012 18:58:57 +0530

anupam.singh – 3 file(s) modified
Job and corresponding transformations which load common orders.

+ /trunk/pentaho/data-integration/transformations/CommonOrdersJob.kjb
+ /trunk/pentaho/data-integration/transformations/MarkRepeatOrders.ktr
+ /trunk/pentaho/data-integration/transformations/RepeatSaleAnalysis.ktr

Rev 6540 – Ignore availability for the warehouses.

rajveer — Wed, 26 Dec 2012 18:49:57 +0530

rajveer – 1 file(s) modified
Ignore availability for the warehouses.

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

Rev 6539 – Missed the type changes.

amit.gupta — Wed, 26 Dec 2012 15:51:24 +0530

amit.gupta – 1 file(s) modified
Missed the type changes.

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

Rev 6538 – Incorporated categories specific coupons.

amit.gupta — Mon, 24 Dec 2012 19:12:21 +0530

amit.gupta – 1 file(s) modified
Incorporated categories specific coupons.

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

Rev 6537 – Added option to add delivery delay for selected pincodes.

rajveer — Mon, 24 Dec 2012 16:31:22 +0530

rajveer – 4 file(s) modified
Added option to add delivery delay for selected pincodes.

Rev 6536 – Limiting DTH recharges to 2000

anupam.singh — Mon, 24 Dec 2012 16:29:00 +0530

anupam.singh – 3 file(s) modified
Limiting DTH recharges to 2000

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/DTHRechargeOrder.py
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/webapp/js/recharge.js

Rev 6535 – Set upper limit to 2000 for dth recharges.

rajveer — Mon, 24 Dec 2012 16:23:22 +0530

rajveer – 1 file(s) modified
Set upper limit to 2000 for dth recharges.

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

Rev 6534 – Refund on successful recharge should not be allowed

anupam.singh — Mon, 24 Dec 2012 16:16:24 +0530

anupam.singh – 1 file(s) modified
Refund on successful recharge should not be allowed

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java

Rev 6533 – Fog note on the pay success page.

rajveer — Mon, 24 Dec 2012 11:56:21 +0530

rajveer – 1 file(s) modified
Fog note on the pay success page.

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

Rev 6532 – Ignore inventory updates handle implemented to catalog dashboard.

amit.gupta — Mon, 24 Dec 2012 11:34:39 +0530

amit.gupta – 9 file(s) modified
Ignore inventory updates handle implemented to catalog dashboard.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/ItemWarehouse.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py

Rev 6531 – Added new functionality of selective warehouse item inventory updates.

vikram.raghav — Fri, 21 Dec 2012 20:08:55 +0530

vikram.raghav – 15 file(s) modified
Added new functionality of selective warehouse item inventory updates.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/IgnoredInventoryUpdateItems.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 6530 – Selective Inventory Monitoring for Warehouses.

vikram.raghav — Fri, 21 Dec 2012 19:32:46 +0530

vikram.raghav – 12 file(s) modified
Selective Inventory Monitoring for Warehouses.

~ /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/DeactivateWarehouseDialog.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.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/ItemWarehouse.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
+ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/DeactivateWarehouseDialog.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml

Rev 6529 – added entitytag table to it

amit.gupta — Fri, 21 Dec 2012 17:26:23 +0530

amit.gupta – 1 file(s) modified
added entitytag table to it

~ /trunk/runutils/generate-content-from-catalog.sh

Rev 6528 – Total cart price should be less than 25K.

rajveer — Fri, 21 Dec 2012 15:28:25 +0530

rajveer – 1 file(s) modified
Total cart price should be less than 25K.

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

Rev 6527 – Updated COD limit to 25K for all delhiberry pincodes.

rajveer — Fri, 21 Dec 2012 15:27:00 +0530

rajveer – 1 file(s) modified
Updated COD limit to 25K for all delhiberry pincodes.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 6526 – Added banner id 27

amit.gupta — Fri, 21 Dec 2012 12:47:28 +0530

amit.gupta – 1 file(s) modified
Added banner id 27

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

Rev 6525 – Added the on time guarantee field to order.

rajveer — Fri, 21 Dec 2012 12:42:21 +0530

rajveer – 7 file(s) modified
Added the on time guarantee field to order.

~ /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/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6524 – Added code for on time guarantee.

rajveer — Thu, 20 Dec 2012 19:19:16 +0530

rajveer – 14 file(s) modified
Added code for on time guarantee.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PincodeController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java

Rev 6523 – Added new display type Super LCD 3.

amit.gupta — Thu, 20 Dec 2012 17:34:03 +0530

amit.gupta – 2 file(s) modified
Added new display type Super LCD 3.

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

Rev 6522 – Tag functionality implemented.

amit.gupta — Thu, 20 Dec 2012 17:12:07 +0530

amit.gupta – 2 file(s) modified
Tag functionality implemented.

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/SpecialPage.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/SpecialPageJSONConvertor.java

Rev 6521 – removed it.

amit.gupta — Thu, 20 Dec 2012 17:00:25 +0530

amit.gupta – 1 file(s) modified
removed it.

x /trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-addentity.vm

Rev 6520 – Tag functionality implemented.

amit.gupta — Thu, 20 Dec 2012 16:58:51 +0530

amit.gupta – 8 file(s) modified
Tag functionality implemented.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SpecialPageController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/TagPageController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-edit.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-editNew.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-edit.vm
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SpecialPageConfigurer.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/tag-page-index.vm

Rev 6519 – Controller and VM's for tag implementation in CMS.

kshitij.sood — Thu, 20 Dec 2012 13:09:07 +0530

kshitij.sood – 7 file(s) modified
Controller and VM's for tag implementation in CMS.

+ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/TagPageController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-addentity.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-edit.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-editNew.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-index.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-show.vm