SmartDukaan – /

Rev 4490 – Added DOA Request and return request raised handling in CRM. ...

anupam.singh — Mon, 13 Feb 2012 13:45:46 +0530

anupam.singh – 15 file(s) modified
Added DOA Request and return request raised handling in CRM. On ticket info page clicking on activity now shows attachments as well.

Trac #894, #862, #863

Reviewer : Mandeep Dhir

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 4489 – Track #822 - Default title below Product page's main image ...

varun.gupta — Mon, 13 Feb 2012 11:52:51 +0530

varun.gupta – 1 file(s) modified
Track #822 - Default title below Product page's main image fixed

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

Rev 4488 – Added support of return requesting and request authorisation.

rajveer — Fri, 10 Feb 2012 17:54:55 +0530

rajveer – 8 file(s) modified
Added support of return requesting and request authorisation.

~ /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/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 4487 – Changed name of some of the group of orders.

rajveer — Fri, 10 Feb 2012 15:52:12 +0530

rajveer – 1 file(s) modified
Changed name of some of the group of orders.

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

Rev 4486 – Implemented the RTO flow. Added some new statuses.

rajveer — Fri, 10 Feb 2012 15:45:26 +0530

rajveer – 3 file(s) modified
Implemented the RTO flow. Added some new statuses.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4485 – Added statuses for RTO Flow.

rajveer — Fri, 10 Feb 2012 15:24:00 +0530

rajveer – 1 file(s) modified
Added statuses for RTO Flow.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java

Rev 4484 – Changed the name of various order statuses.

rajveer — Fri, 10 Feb 2012 13:57:32 +0530

rajveer – 13 file(s) modified
Changed the name of various order statuses.

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.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/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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.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/FailedOrdersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java

Rev 4483 – Changed name of the order statuses.

rajveer — Fri, 10 Feb 2012 13:48:40 +0530

rajveer – 1 file(s) modified
Changed name of the order statuses.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java

Rev 4482 – Added aramex url in shop2020.cfg

rajveer — Thu, 09 Feb 2012 20:10:07 +0530

rajveer – 1 file(s) modified
Added aramex url in shop2020.cfg

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

Rev 4481 – import was missing for two methods

anupam.singh — Thu, 09 Feb 2012 19:44:54 +0530

anupam.singh – 1 file(s) modified
import was missing for two methods

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

Rev 4480 – Added feature values for Laptops

amit.gupta — Thu, 09 Feb 2012 19:14:17 +0530

amit.gupta – 1 file(s) modified
Added feature values for Laptops

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

Rev 4479 – Added support to reship or refund the lost and damaged ...

rajveer — Thu, 09 Feb 2012 18:20:42 +0530

rajveer – 4 file(s) modified
Added support to reship or refund the lost and damaged orders.

Rev 4478 – Added support to receive return in three conditions and than ...

rajveer — Thu, 09 Feb 2012 18:19:17 +0530

rajveer – 14 file(s) modified
Added support to receive return in three conditions and than reship or refund them accordingly.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ReceiveReturnEvent.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/ReceiveReturnBox.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/ReceiveReturnHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderType.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ReceiveReturnRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ReturnShipmentCondition.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4477 – modified the A/B Test experiment ID

varun.gupta — Thu, 09 Feb 2012 17:42:15 +0530

varun.gupta – 1 file(s) modified
modified the A/B Test experiment ID

~ /trunk/Website/src/main/filters/staging/filters.properties

Rev 4476 – trac #882 Reviewer : Rajveer If warehouse preference ...

anupam.singh — Thu, 09 Feb 2012 17:27:59 +0530

anupam.singh – 1 file(s) modified
trac #882

Reviewer : Rajveer

If warehouse preference is set then delivery estimate should be linked to availability in preferred warehouse rather than total availability.

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

Rev 4475 – 200 discount given to nc41@indiatimes.com

varun.gupta — Thu, 09 Feb 2012 16:44:51 +0530

varun.gupta – 1 file(s) modified
200 discount given to nc41@indiatimes.com

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

Rev 4474 – added poi dependency.

amit.gupta — Thu, 09 Feb 2012 16:31:01 +0530

amit.gupta – 1 file(s) modified
added poi dependency.

~ /trunk/ContentStore/pom.xml

Rev 4473 – removed protocol ftp from the FTP Url.

amit.gupta — Thu, 09 Feb 2012 16:26:24 +0530

amit.gupta – 1 file(s) modified
removed protocol ftp from the FTP Url.

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

Rev 4472 – Putting Amazon related code in try-catch

mandeep.dhir — Thu, 09 Feb 2012 13:02:05 +0530

mandeep.dhir – 1 file(s) modified
Putting Amazon related code in try-catch

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

Rev 4471 – Taking only one backup

mandeep.dhir — Thu, 09 Feb 2012 12:23:07 +0530

mandeep.dhir – 1 file(s) modified
Taking only one backup

~ /trunk/runutils/backup-CMS.sh

Rev 4470 – Trac# Fixing FTP URL for amazon

mandeep.dhir — Thu, 09 Feb 2012 10:39:10 +0530

mandeep.dhir – 1 file(s) modified
Trac# Fixing FTP URL for amazon

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

Rev 4469 – added condition for ftp upload only to be run from ...

amit.gupta — Wed, 08 Feb 2012 19:01:59 +0530

amit.gupta – 1 file(s) modified
added condition for ftp upload only to be run from staging environment

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

Rev 4468 – added condition for ftp upload only to be run from ...

amit.gupta — Wed, 08 Feb 2012 19:01:35 +0530

amit.gupta – 1 file(s) modified
added condition for ftp upload only to be run from staging environment

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

Rev 4467 – Added junit dependency for commons net

amit.gupta — Wed, 08 Feb 2012 18:28:51 +0530

amit.gupta – 2 file(s) modified
Added junit dependency for commons net

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

Rev 4466 – added net commons jar to classpath

amit.gupta — Wed, 08 Feb 2012 18:21:18 +0530

amit.gupta – 2 file(s) modified
added net commons jar to classpath

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

Rev 4465 – Added dependency for Apcache Commons Net

amit.gupta — Wed, 08 Feb 2012 17:37:25 +0530

amit.gupta – 1 file(s) modified
Added dependency for Apcache Commons Net

~ /trunk/ContentStore/pom.xml

Rev 4464 – removed thrift related comments

amit.gupta — Wed, 08 Feb 2012 17:36:48 +0530

amit.gupta – 1 file(s) modified
removed thrift related comments

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

Rev 4463 – Added amazon specifice categories

amit.gupta — Wed, 08 Feb 2012 17:35:40 +0530

amit.gupta – 1 file(s) modified
Added amazon specifice categories

+ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonCategories.java

Rev 4462 – modified calling method for Amazon SCD.

amit.gupta — Wed, 08 Feb 2012 17:31:13 +0530

amit.gupta – 1 file(s) modified
modified calling method for Amazon SCD.

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

Rev 4461 – Automated FTP upload for prices and availability and added differential ...

amit.gupta — Wed, 08 Feb 2012 17:27:30 +0530

amit.gupta – 1 file(s) modified
Automated FTP upload for prices and availability and added differential capability for the newly added entities.

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

Rev 4460 – Corrected the GA account ID

varun.gupta — Wed, 08 Feb 2012 16:43:59 +0530

varun.gupta – 1 file(s) modified
Corrected the GA account ID

~ /trunk/Website/src/main/filters/staging/filters.properties

Rev 4459 – Added the new order statuses for handling of doa damaged ...

rajveer — Wed, 08 Feb 2012 15:30:19 +0530

rajveer – 6 file(s) modified
Added the new order statuses for handling of doa damaged and doa lost in transit.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxWidget.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 4458 – Reduced the height of login/register popup

varun.gupta — Wed, 08 Feb 2012 14:54:38 +0530

varun.gupta – 1 file(s) modified
Reduced the height of login/register popup

~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 4457 – modified the intruction text below email address field

varun.gupta — Wed, 08 Feb 2012 14:53:31 +0530

varun.gupta – 2 file(s) modified
modified the intruction text below email address field

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

Rev 4456 – updated experiment IDs for new A/B test

varun.gupta — Wed, 08 Feb 2012 14:52:02 +0530

varun.gupta – 2 file(s) modified
updated experiment IDs for new A/B test

~ /trunk/Website/src/main/filters/prod/filters.properties
~ /trunk/Website/src/main/filters/staging/filters.properties

Rev 4455 – Disable Flag and Request Pick No for delivered orders and ...

rajveer — Wed, 08 Feb 2012 00:00:18 +0530

rajveer – 7 file(s) modified
Disable Flag and Request Pick No for delivered orders and enable them for "DOA request approved" orders.
Display an anchor in left side called "DOA request approved", it will have all orders in this status.
Display an anchor in left side called "DOA Lost In Transit", it will have all orders in this status.
Change name from "Authorize pickup" to "Confirm Pickp"

~ /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/server/handler/OrderDetailsHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/DetailsMask.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderType.java

Rev 4454 – Added support to receive DOA request from customer and mark ...

rajveer — Tue, 07 Feb 2012 20:15:34 +0530

rajveer – 6 file(s) modified
Added support to receive DOA request from customer and mark the order as authorised or denied.

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

Rev 4453 – Trac #852 and #869 - Full name field removed from ...

varun.gupta — Tue, 07 Feb 2012 20:09:00 +0530

varun.gupta – 18 file(s) modified
Trac #852 and #869 - Full name field removed from Registration procedure. A/B test variants added for Login/Register popup vs redirect added.

~ /trunk/Website/src/main/filters/staging/filters.properties
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/loginregister.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-mini-index.vm

Rev 4452 – Changed the name of various statuses.

rajveer — Tue, 07 Feb 2012 19:23:07 +0530

rajveer – 13 file(s) modified
Changed the name of various statuses.

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderDetailsHandler.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/model/v1/order/impl/OrderServiceHandler.py
~ /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/services/PaymentDetailsGenerator.java
~ /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
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FailedOrdersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java

Rev 4451 – Fixed broken common.js

anupam.singh — Tue, 07 Feb 2012 17:43:37 +0530

anupam.singh – 1 file(s) modified
Fixed broken common.js

~ /trunk/Crm/src/main/webapp/js/common.js