SmartDukaan – /

Rev 4682 – Removed option to cancel from OM dashboard. Changed CANCELED ...

rajveer — Mon, 12 Mar 2012 18:50:11 +0530

rajveer – 8 file(s) modified
Removed option to cancel from OM dashboard. Changed CANCELED status to COD_VERIFICATION_FAILED. Changed REFUNDED status to CANCELLED_DUE_TO_LOW_INVENTORY.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4681 – Trac ID : #901, #961 Reviewed By : Anupam Singh

amar.kumar — Mon, 12 Mar 2012 18:42:41 +0530

amar.kumar – 9 file(s) modified
Trac ID : #901, #961
Reviewed By : Anupam Singh

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 4680 – Temporary fix to amend entity ids

mandeep.dhir — Mon, 12 Mar 2012 18:08:21 +0530

mandeep.dhir – 1 file(s) modified
Temporary fix to amend entity ids

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java

Rev 4679 – Temporary fix to amend entity ids

mandeep.dhir — Mon, 12 Mar 2012 17:46:17 +0530

mandeep.dhir – 1 file(s) modified
Temporary fix to amend entity ids

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java

Rev 4678 – Corrected the category ids of laptop accessories.

rajveer — Mon, 12 Mar 2012 17:21:09 +0530

rajveer – 2 file(s) modified
Corrected the category ids of laptop accessories.

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

Rev 4677 – Removed accessories finder temporarily..

rajveer — Mon, 12 Mar 2012 16:41:05 +0530

rajveer – 1 file(s) modified
Removed accessories finder temporarily..

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java

Rev 4676 – null check add for enum types. #982

amit.gupta — Mon, 12 Mar 2012 16:40:29 +0530

amit.gupta – 1 file(s) modified
null check add for enum types.
#982

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CN.java

Rev 4675 – Made changes in the way the calls to promotion service ...

amit.gupta — Mon, 12 Mar 2012 11:38:25 +0530

amit.gupta – 1 file(s) modified
Made changes in the way the calls to promotion service were made.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java

Rev 4674 – When two orders use one transaction Id a new cell ...

anupam.singh — Mon, 12 Mar 2012 11:33:01 +0530

anupam.singh – 1 file(s) modified
When two orders use one transaction Id a new cell was not being created for the second order.

Reviewer : Mandeep Dhir

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

Rev 4673 – Added aramex as option.

rajveer — Fri, 09 Mar 2012 17:47:22 +0530

rajveer – 1 file(s) modified
Added aramex as option.

~ /trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm

Rev 4672 – Create refund order only if order has been accepted

rajveer — Fri, 09 Mar 2012 17:33:43 +0530

rajveer – 1 file(s) modified
Create refund order only if order has been accepted

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

Rev 4671 – Corrected the promised shipping date.

rajveer — Fri, 09 Mar 2012 17:17:47 +0530

rajveer – 1 file(s) modified
Corrected the promised shipping date.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java

Rev 4670 – Corrected spacing.

rajveer — Fri, 09 Mar 2012 17:09:02 +0530

rajveer – 1 file(s) modified
Corrected spacing.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java

Rev 4669 – Checkboxes in MyResearch snippets will be default selected

varun.gupta — Fri, 09 Mar 2012 17:08:36 +0530

varun.gupta – 1 file(s) modified
Checkboxes in MyResearch snippets will be default selected

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

Rev 4668 – Ticket 928 - COD validation moved in service

varun.gupta — Fri, 09 Mar 2012 15:10:07 +0530

varun.gupta – 7 file(s) modified
Ticket 928 - COD validation moved in service

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java

Rev 4667 – Removing catch part of the exception.

rajveer — Fri, 09 Mar 2012 14:41:54 +0530

rajveer – 1 file(s) modified
Removing catch part of the exception.

~ /trunk/PyProj/src/shop2020/model/v1/user/PromotionServer.py

Rev 4666 – 1) Added lost in transit flow for the order. 2) ...

rajveer — Fri, 09 Mar 2012 14:33:29 +0530

rajveer – 16 file(s) modified
1) Added lost in transit flow for the order.
2) Removed Batch No and Serial No from the order table.
3) Added Promised shipping date.

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LostInTransitEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LostInTransitEventHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenter.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxWidget.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/LostInTransitHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderDetailsHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/RejectOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/LostInTransitRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/LostInTransitResponse.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderType.java

Rev 4665 – Support for alphanumeric IMEI numbers

mandeep.dhir — Fri, 09 Mar 2012 11:48:22 +0530

mandeep.dhir – 1 file(s) modified
Support for alphanumeric IMEI numbers

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

Rev 4664 – Changed enum name from INIT to COD_VERIFICATION_PENDING

rajveer — Fri, 09 Mar 2012 11:36:28 +0530

rajveer – 3 file(s) modified
Changed enum name from INIT to COD_VERIFICATION_PENDING

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderDetailsHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/RejectOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java

Rev 4663 – Changed enum name from INIT to COD_VERIFICATION_PENDING

rajveer — Fri, 09 Mar 2012 11:35:55 +0530

rajveer – 3 file(s) modified
Changed enum name from INIT to COD_VERIFICATION_PENDING

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTransactionProcessorTask.java

Rev 4662 – Changed enum name of the INIT status. Added new flow ...

rajveer — Fri, 09 Mar 2012 11:34:36 +0530

rajveer – 6 file(s) modified
Changed enum name of the INIT status. Added new flow of the LOST in Transit.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java

Rev 4661 – Added new order statuses and changed description of INIT status.

rajveer — Fri, 09 Mar 2012 11:33:06 +0530

rajveer – 3 file(s) modified
Added new order statuses and changed description of INIT status.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4660 – Calling appropriate method for autoverification cases

mandeep.dhir — Fri, 09 Mar 2012 11:29:13 +0530

mandeep.dhir – 1 file(s) modified
Calling appropriate method for autoverification cases

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTransactionProcessorTask.java

Rev 4659 – Support for alphanumeric IMEI numbers

mandeep.dhir — Fri, 09 Mar 2012 11:24:02 +0530

mandeep.dhir – 3 file(s) modified
Support for alphanumeric IMEI numbers

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BillOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java

Rev 4658 – Support for alphanumeric IMEI numbers

mandeep.dhir — Fri, 09 Mar 2012 11:23:08 +0530

mandeep.dhir – 15 file(s) modified
Support for alphanumeric IMEI numbers

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketInfoBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddJacketNumberRequest.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
~ /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/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/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4657 – When multiple orders use a single transactionId only the last ...

anupam.singh — Thu, 08 Mar 2012 23:59:03 +0530

anupam.singh – 1 file(s) modified
When multiple orders use a single transactionId only the last order was being used. Fixed this issue now.

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

Rev 4656 – Ticket #917 input text box enhanced reviewer: Rajveer

phani.kumar — Wed, 07 Mar 2012 18:50:51 +0530

phani.kumar – 3 file(s) modified
Ticket #917 input text box enhanced
reviewer: Rajveer

~ /trunk/Website/src/main/webapp/css/proceed-to-pay.css
~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 4655 – spelling mistake corrected

phani.kumar — Wed, 07 Mar 2012 17:01:36 +0530

phani.kumar – 1 file(s) modified
spelling mistake corrected

~ /trunk/PyProj/src/shop2020/config/ConfigServer.py

Rev 4654 – Added more categories for mobile accessories

amit.gupta — Wed, 07 Mar 2012 16:49:51 +0530

amit.gupta – 2 file(s) modified
Added more categories for mobile accessories

~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonCategories.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java

Rev 4653 – Added getHashcode method

amit.gupta — Wed, 07 Mar 2012 13:21:52 +0530

amit.gupta – 1 file(s) modified
Added getHashcode method

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/Entity.java

Rev 4652 – Added Gbps as unit for Data Transfer Speed of External ...

varun.gupta — Wed, 07 Mar 2012 13:21:28 +0530

varun.gupta – 1 file(s) modified
Added Gbps as unit for Data Transfer Speed of External HDD

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

Rev 4651 – Added support to failfast. If service is unable to get ...

rajveer — Wed, 07 Mar 2012 13:10:58 +0530

rajveer – 10 file(s) modified
Added support to failfast. If service is unable to get parameters from config server, it must fail. It must not continue with default parameters.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/PaymentServer.java
~ /trunk/PyProj/src/shop2020/config/ConfigServer.py
~ /trunk/PyProj/src/shop2020/content/main/ContentServer.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServer.py
~ /trunk/PyProj/src/shop2020/logistics/service/LogisticsServer.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/CatalogServer.py
~ /trunk/PyProj/src/shop2020/model/v1/order/TransactionServer.py
~ /trunk/PyProj/src/shop2020/model/v1/user/UserContextServer.py
~ /trunk/PyProj/src/shop2020/purchase/main/PurchaseServer.py

Rev 4650 – Enum IDs reassigned. Unit added representing TB.

varun.gupta — Wed, 07 Mar 2012 12:41:01 +0530

varun.gupta – 3 file(s) modified
Enum IDs reassigned. Unit added representing TB.

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

Rev 4649 – Ticket #937 authorization pop ups for selling price and transfer ...

phani.kumar — Wed, 07 Mar 2012 12:34:50 +0530

phani.kumar – 14 file(s) modified
Ticket #937 authorization pop ups for selling price and transfer price
reviewer: Rajveer

~ /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/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /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/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 4648 – Added delay reason text.

rajveer — Wed, 07 Mar 2012 12:22:50 +0530

rajveer – 1 file(s) modified
Added delay reason text.

~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py

Rev 4647 – Added delay reason text in the order

rajveer — Wed, 07 Mar 2012 12:01:46 +0530

rajveer – 15 file(s) modified
Added delay reason text in the order

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddDelayReasonEvent.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/AddDelayReasonBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddDelayReasonHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddDelayReasonRequest.java
~ /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/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/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4646 – Setting the url in the context.

rajveer — Tue, 06 Mar 2012 18:48:53 +0530

rajveer – 1 file(s) modified
Setting the url in the context.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/PaymentServer.java

Rev 4645 – MAde context public for debugging.

rajveer — Tue, 06 Mar 2012 18:40:22 +0530

rajveer – 1 file(s) modified
MAde context public for debugging.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java

Rev 4644 – Added some debug messages.

rajveer — Tue, 06 Mar 2012 18:39:26 +0530

rajveer – 1 file(s) modified
Added some debug messages.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/PaymentServer.java

Rev 4643 – Added / at the end of the directory.

rajveer — Tue, 06 Mar 2012 17:51:31 +0530

rajveer – 2 file(s) modified
Added / at the end of the directory.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcEmiPaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java