SmartDukaan – /

Rev 4881 – added preferred vendor and default warehouse additem function

phani.kumar — Mon, 02 Apr 2012 15:00:11 +0530

phani.kumar – 2 file(s) modified
added preferred vendor and default warehouse additem function

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 4880 – As per ticket all services on support, CRM and STAGING ...

rajveer — Mon, 02 Apr 2012 14:36:54 +0530

rajveer – 1 file(s) modified
As per ticket all services on support, CRM and STAGING machine should connect to hadb2.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 4879 – Corrected some parts of the content population

rajveer — Mon, 02 Apr 2012 14:28:05 +0530

rajveer – 1 file(s) modified
Corrected some parts of the content population

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

Rev 4878 – Added sheets for all categories.

rajveer — Mon, 02 Apr 2012 13:49:01 +0530

rajveer – 1 file(s) modified
Added sheets for all categories.

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

Rev 4877 – added mail sending using sendEmail

amit.gupta — Mon, 02 Apr 2012 13:28:23 +0530

amit.gupta – 1 file(s) modified
added mail sending using sendEmail

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

Rev 4876 – Sending mail not through Sendgrid

mandeep.dhir — Mon, 02 Apr 2012 13:28:04 +0530

mandeep.dhir – 1 file(s) modified
Sending mail not through Sendgrid

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

Rev 4875 – Ticket #1038 - Separated method to upload COD settlements

varun.gupta — Mon, 02 Apr 2012 13:23:51 +0530

varun.gupta – 11 file(s) modified
Ticket #1038 - Separated method to upload COD settlements

~ /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/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/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/CODPaymentSettlement.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4874 – changed Label for GA event OOS Lighbox shown from product ...

amit.gupta — Mon, 02 Apr 2012 12:57:27 +0530

amit.gupta – 1 file(s) modified
changed Label for GA event OOS Lighbox shown from product id to product name

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

Rev 4873 – Trac#1012 scanning as sale return for orders taht are cancelled ...

mandeep.dhir — Mon, 02 Apr 2012 00:25:57 +0530

mandeep.dhir – 3 file(s) modified
Trac#1012 scanning as sale return for orders taht are cancelled after billing
Trac#1066 Persisting missed updates so that they can reapplied to inventory as well

~ /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/order/impl/DataAccessors.py

Rev 4872 – added mail sending using mutt

amit.gupta — Sun, 01 Apr 2012 23:32:40 +0530

amit.gupta – 1 file(s) modified
added mail sending using mutt

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

Rev 4871 – Fixed variable name.

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

rajveer – 1 file(s) modified
Fixed variable name.

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

Rev 4870 – Fixed variable name.

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

rajveer – 1 file(s) modified
Fixed variable name.

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

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