SmartDukaan – /

Rev 4869 – Moved logic to decide isCod in service.

rajveer — Sat, 31 Mar 2012 20:15:54 +0530

rajveer – 1 file(s) modified
Moved logic to decide isCod in service.

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

Rev 4868 – Changed the method call.

rajveer — Sat, 31 Mar 2012 20:08:23 +0530

rajveer – 1 file(s) modified
Changed the method call.

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

Rev 4867 – Changed the method call.

rajveer — Sat, 31 Mar 2012 20:05:24 +0530

rajveer – 1 file(s) modified
Changed the method call.

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

Rev 4866 – Allow cod for delhi/ncr for 20000 and assign provider as ...

rajveer — Sat, 31 Mar 2012 19:57:07 +0530

rajveer – 3 file(s) modified
Allow cod for delhi/ncr for 20000 and assign provider as Aramex. For ludhiyana allow cod for 10000 and assign provider as Aramex. Rest india, provider is Bluedart and cod limit is 10000.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 4865 – Changes method isCodAllowed to handle more conditions like based on ...

rajveer — Sat, 31 Mar 2012 19:52:56 +0530

rajveer – 7 file(s) modified
Changes method isCodAllowed to handle more conditions like based on pricing etc.

~ /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/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 4864 – Fixed small bug where cancellation was called.

rajveer — Sat, 31 Mar 2012 18:55:18 +0530

rajveer – 1 file(s) modified
Fixed small bug where cancellation was called.

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

Rev 4863 – Added SGalaxy coupon to the ignore list for feed generation

varun.gupta — Sat, 31 Mar 2012 13:08:45 +0530

varun.gupta – 1 file(s) modified
Added SGalaxy coupon to the ignore list for feed generation

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

Rev 4862 – Using Thrift type Discount in place of SQLAlchemy type

varun.gupta — Sat, 31 Mar 2012 13:02:28 +0530

varun.gupta – 1 file(s) modified
Using Thrift type Discount in place of SQLAlchemy type

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

Rev 4861 – List of discounts rather than Discount object is now being ...

varun.gupta — Sat, 31 Mar 2012 12:29:12 +0530

varun.gupta – 1 file(s) modified
List of discounts rather than Discount object is now being returned

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

Rev 4860 –

varun.gupta — Sat, 31 Mar 2012 11:54:17 +0530

varun.gupta – 1 file(s) modified

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

Rev 4859 – Modified the generic rule to return tuple (cart object and ...

varun.gupta — Sat, 31 Mar 2012 03:06:56 +0530

varun.gupta – 1 file(s) modified
Modified the generic rule to return tuple (cart object and list of discount objects)

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

Rev 4858 – trac#1031 If preferred warehouse is set then only vendors from ...

anupam.singh — Fri, 30 Mar 2012 21:52:11 +0530

anupam.singh – 1 file(s) modified
trac#1031
If preferred warehouse is set then only vendors from that warehouse are used to calculate average transfer price.
Reviewer : Phani

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

Rev 4857 – Removed Nokia Lumia 710 from SH911

varun.gupta — Fri, 30 Mar 2012 20:47:41 +0530

varun.gupta – 1 file(s) modified
Removed Nokia Lumia 710 from SH911

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

Rev 4856 – Corrected the call to get coupon usage per user

varun.gupta — Fri, 30 Mar 2012 16:49:33 +0530

varun.gupta – 1 file(s) modified
Corrected the call to get coupon usage per user

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

Rev 4855 – New script added for validationg content generation and raise alert ...

amit.gupta — Fri, 30 Mar 2012 15:38:32 +0530

amit.gupta – 1 file(s) modified
New script added for validationg content generation and raise alert if any parameter exceeds the threshold percentage

+ /trunk/runutils/catalog-content-validation.sh

Rev 4854 – Handling all exceptions in EmailReader instead of CRMEmailProcessor Reviewer ...

anupam.singh — Fri, 30 Mar 2012 14:45:59 +0530

anupam.singh – 1 file(s) modified
Handling all exceptions in EmailReader instead of CRMEmailProcessor

Reviewer : Mandeep Dhir

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

Rev 4853 – Put the condition which is checking for wrong inputs.

rajveer — Fri, 30 Mar 2012 14:43:24 +0530

rajveer – 3 file(s) modified
Put the condition which is checking for wrong inputs.

~ /trunk/runutils/deploy-everything.sh
~ /trunk/runutils/update-content-and-catalog.sh
~ /trunk/runutils/update-static-content.sh

Rev 4852 – Added category table in the catalog dumps.

rajveer — Fri, 30 Mar 2012 13:49:37 +0530

rajveer – 1 file(s) modified
Added category table in the catalog dumps.

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

Rev 4851 – Added master scripts for updating content, rolling back content, deploying ...

rajveer — Fri, 30 Mar 2012 13:39:16 +0530

rajveer – 2 file(s) modified
Added master scripts for updating content, rolling back content, deploying wars and rolling back wars.

+ /trunk/runutils/ContentUpdationManager.sh
+ /trunk/runutils/DeploymentManager.sh

Rev 4850 – Added provision to update and roll back builds seamlessly

rajveer — Fri, 30 Mar 2012 13:37:32 +0530

rajveer – 2 file(s) modified
Added provision to update and roll back builds seamlessly

~ /trunk/runutils/copy-wars-to-production.sh
~ /trunk/runutils/deploy-everything.sh

Rev 4849 – Added provision to update and roll back content seamlessly

rajveer — Fri, 30 Mar 2012 13:36:12 +0530

rajveer – 2 file(s) modified
Added provision to update and roll back content seamlessly

~ /trunk/runutils/update-content-and-catalog.sh
~ /trunk/runutils/update-static-content.sh

Rev 4848 – Fixed the isCod method for Aramex.

anupam.singh — Fri, 30 Mar 2012 12:45:34 +0530

anupam.singh – 1 file(s) modified
Fixed the isCod method for Aramex.

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

Rev 4847 – Trac#1043 Handling cases where itemnumber to itemId mapping is not ...

mandeep.dhir — Fri, 30 Mar 2012 10:10:03 +0530

mandeep.dhir – 4 file(s) modified
Trac#1043 Handling cases where itemnumber to itemId mapping is not unique

~ /trunk/PyProj/src/shop2020/thriftpy/generic/constants.py
~ /trunk/PyProj/src/shop2020/thriftpy/generic/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py

Rev 4846 – Trac#1043 Handling cases where itemnumber to itemId mapping is not ...

mandeep.dhir — Fri, 30 Mar 2012 10:09:26 +0530

mandeep.dhir – 11 file(s) modified
Trac#1043 Handling cases where itemnumber to itemId mapping is not unique

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/generic/Constants.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/generic/ExceptionType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/GenericService/GenericService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ItemNumberHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ItemNumberMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ItemNumberMapper.xml

Rev 4845 – removed the ab testing variable

varun.gupta — Fri, 30 Mar 2012 09:43:17 +0530

varun.gupta – 1 file(s) modified
removed the ab testing variable

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

Rev 4844 – trac # 1060 Reshipped orders now marked as Prepaid in ...

anupam.singh — Thu, 29 Mar 2012 20:10:41 +0530

anupam.singh – 1 file(s) modified
trac # 1060
Reshipped orders now marked as Prepaid in CRM

~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm

Rev 4843 – query for getting items by product_group changed reviewer: Rajveer

phani.kumar — Thu, 29 Mar 2012 19:12:08 +0530

phani.kumar – 1 file(s) modified
query for getting items by product_group changed
reviewer: Rajveer

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

Rev 4842 – Removed the check which was adding the delay reason for ...

rajveer — Thu, 29 Mar 2012 17:40:25 +0530

rajveer – 1 file(s) modified
Removed the check which was adding the delay reason for only statuses less than SHIPPED_FROM_WH

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

Rev 4841 – corrected the checkout ID

varun.gupta — Thu, 29 Mar 2012 16:54:45 +0530

varun.gupta – 1 file(s) modified
corrected the checkout ID

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

Rev 4840 – Copying bestdealtext as well while cloning

mandeep.dhir — Thu, 29 Mar 2012 16:30:39 +0530

mandeep.dhir – 1 file(s) modified
Copying bestdealtext as well while cloning

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

Rev 4839 – Ticket #1013 - Added mechanism to qualify coupon based on ...

varun.gupta — Thu, 29 Mar 2012 15:09:10 +0530

varun.gupta – 1 file(s) modified
Ticket #1013 - Added mechanism to qualify coupon based on affiliates

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

Rev 4838 – Decreased the width of menu-bar partition

varun.gupta — Thu, 29 Mar 2012 13:29:32 +0530

varun.gupta – 1 file(s) modified
Decreased the width of menu-bar partition

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

Rev 4837 – Ticket #1019 - Created OrderStatus group for all open orders ...

varun.gupta — Thu, 29 Mar 2012 13:23:51 +0530

varun.gupta – 6 file(s) modified
Ticket #1019 - Created OrderStatus group for all open orders and modified MyAccount section to incorporate this new group

~ /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/OrderStatusGroups.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/MyaccountController.java

Rev 4836 – Cart message should be displayed when something has been updated.

rajveer — Thu, 29 Mar 2012 13:13:40 +0530

rajveer – 1 file(s) modified
Cart message should be displayed when something has been updated.

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

Rev 4835 – Added new status for cancellation.

rajveer — Thu, 29 Mar 2012 12:30:02 +0530

rajveer – 1 file(s) modified
Added new status for cancellation.

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

Rev 4834 – Added content model for mouse. #1053

amit.gupta — Thu, 29 Mar 2012 12:10:13 +0530

amit.gupta – 6 file(s) modified
Added content model for mouse.
#1053

~ /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 4833 – Trac#992 Adding email ids of sandeep and suraj as well ...

mandeep.dhir — Thu, 29 Mar 2012 10:57:18 +0530

mandeep.dhir – 1 file(s) modified
Trac#992 Adding email ids of sandeep and suraj as well here

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EODStockReportProcessor.java

Rev 4832 – Trac#992 Adding CompareInventory.sh

mandeep.dhir — Wed, 28 Mar 2012 23:11:26 +0530

mandeep.dhir – 1 file(s) modified
Trac#992 Adding CompareInventory.sh

+ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CompareInventory.sh

Rev 4831 – Optimised setting the id and productId

varun.gupta — Wed, 28 Mar 2012 18:36:53 +0530

varun.gupta – 1 file(s) modified
Optimised setting the id and productId

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

Rev 4830 – After 3 o'clock next day deliverable items should not be ...

rajveer — Wed, 28 Mar 2012 17:37:21 +0530

rajveer – 1 file(s) modified
After 3 o'clock next day deliverable items should not be changed. Also expected delivery time column.

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