SmartDukaan – /

Rev 4256 – REVIEWER: THE ANUPAM Converting html body of email to plain ...

mandeep.dhir — Wed, 28 Dec 2011 15:56:32 +0530

mandeep.dhir – 1 file(s) modified
**REVIEWER: THE ANUPAM**
Converting html body of email to plain text to avoid inappropriate truncation that could lead to UI rendering issues.

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

Rev 4255 – Removed Anand from mailing list and added Suraj & Sandeep ...

rajveer — Wed, 28 Dec 2011 15:12:57 +0530

rajveer – 2 file(s) modified
Removed Anand from mailing list and added Suraj & Sandeep in list

~ /trunk/PyProj/src/shop2020/logistics/service/script/AwbNumberAlerter.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticsReconciliation.py

Rev 4254 – Send pickup data as to bluedart daily at 10 PM.

rajveer — Wed, 28 Dec 2011 13:23:16 +0530

rajveer – 1 file(s) modified
Send pickup data as to bluedart daily at 10 PM.

+ /trunk/PyProj/src/shop2020/logistics/service/script/LogisticsReportSender.py

Rev 4253 – Temporary fix to make sure we do not capture payments ...

mandeep.dhir — Wed, 28 Dec 2011 13:13:20 +0530

mandeep.dhir – 1 file(s) modified
Temporary fix to make sure we do not capture payments in parallel for same payment objects

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

Rev 4252 – Ticket #743 Reconcile if there is difference of only few ...

rajveer — Tue, 27 Dec 2011 17:03:00 +0530

rajveer – 1 file(s) modified
Ticket #743 Reconcile if there is difference of only few paisas.

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

Rev 4251 – Updated code of dashboard to handle cancellation.

rajveer — Tue, 27 Dec 2011 14:48:23 +0530

rajveer – 3 file(s) modified
Updated code of dashboard to handle cancellation.

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

Rev 4250 – Added "CUSTOMER_NOT_RESPONDING" as another possible reason for COD Cancellation. ...

anupam.singh — Tue, 27 Dec 2011 12:57:45 +0530

anupam.singh – 1 file(s) modified
Added "CUSTOMER_NOT_RESPONDING" as another possible reason for COD Cancellation.

Reviewer : Mandeep Dhir

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

Rev 4249 – In (Line : 266) thOld was being checked for null ...

anupam.singh — Tue, 27 Dec 2011 12:43:34 +0530

anupam.singh – 1 file(s) modified
In (Line : 266) thOld was being checked for null although it is an array. This caused problems in updating tickets table.

Reviewer : Mandeep Dhir

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

Rev 4248 – Ticket #770 Cancellation of the orders which has cancellation confirmed ...

rajveer — Tue, 27 Dec 2011 12:29:20 +0530

rajveer – 8 file(s) modified
Ticket #770 Cancellation of the orders which has cancellation confirmed status.

~ /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/server/TransactionUtils.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 4247 – Ticket #770. Support of new order management flow.

rajveer — Tue, 27 Dec 2011 12:26:34 +0530

rajveer – 9 file(s) modified
Ticket #770. Support of new order management flow.

~ /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
x /trunk/PyProj/src/shop2020/utils/OrderStatus.py
~ /trunk/PyProj/src/shop2020/utils/Utils.py

Rev 4246 – Ticket #770. Support of new order management flow.

rajveer — Tue, 27 Dec 2011 12:25:41 +0530

rajveer – 11 file(s) modified
Ticket #770. Support of new order management flow.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ExtraTransactionProcessingType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatusAuditTrail.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionStatus.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcEmiPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

Rev 4245 – Ticket #770. Support of new order management flow.

rajveer — Tue, 27 Dec 2011 12:22:46 +0530

rajveer – 1 file(s) modified
Ticket #770. Support of new order management flow.

~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4244 – Updated comparison rule windows mobile os 7.5 mango

mandeep.dhir — Tue, 27 Dec 2011 09:25:31 +0530

mandeep.dhir – 1 file(s) modified
Updated comparison rule windows mobile os 7.5 mango

~ /trunk/ContentStore/src/jython/comparisonrules/software_math.py

Rev 4243 – Updated comparison rule windows mobile os 7.5 mango

mandeep.dhir — Mon, 26 Dec 2011 15:57:01 +0530

mandeep.dhir – 1 file(s) modified
Updated comparison rule windows mobile os 7.5 mango

~ /trunk/ContentStore/src/jython/comparisonrules/software_math.py

Rev 4242 – Restricted the CSS to div contained within #header

varun.gupta — Mon, 26 Dec 2011 15:44:28 +0530

varun.gupta – 1 file(s) modified
Restricted the CSS to div contained within #header

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

Rev 4241 – TracId : #684, #740 Reviewer : Mandeep Dhir 1. ...

anupam.singh — Mon, 26 Dec 2011 15:36:39 +0530

anupam.singh – 25 file(s) modified
TracId : #684, #740
Reviewer : Mandeep Dhir

1. Provided a selection list to choose a category for the reason of COD order cancellation.
2. In ticket edit view, showed links to view activity description.
3. Generating activity for bounced mail from send-grid now possible.
4. Column width of tables now different for different columns
5. Files attached in emails from users to CRM agents now visible in the UI.
6. UI enhancements.

~ /trunk/Crm/.project
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityInfoController.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/java/in/shop2020/serving/controllers/UserOrdersController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
+ /trunk/Crm/src/main/java/in/shop2020/util/EmailUtils.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/activity-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-cart-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 4240 – Trac #744 - Added caption for cart widget when cart ...

varun.gupta — Mon, 26 Dec 2011 14:53:08 +0530

varun.gupta – 1 file(s) modified
Trac #744 - Added caption for cart widget when cart is empty

~ /trunk/Website/src/main/resources/templates/cartwidget.vm

Rev 4239 – Removed left margin from User Welcome menu

varun.gupta — Mon, 26 Dec 2011 13:21:23 +0530

varun.gupta – 1 file(s) modified
Removed left margin from User Welcome menu

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

Rev 4238 – Added href to anchor to have default hover effect

varun.gupta — Mon, 26 Dec 2011 12:26:15 +0530

varun.gupta – 1 file(s) modified
Added href to anchor to have default hover effect

~ /trunk/Website/src/main/resources/templates/cartwidget.vm

Rev 4237 – Trac #744 - Lightbox added to communicate how safe shopping ...

varun.gupta — Sun, 25 Dec 2011 21:48:39 +0530

varun.gupta – 3 file(s) modified
Trac #744 - Lightbox added to communicate how safe shopping with Saholic is

~ /trunk/Website/src/main/resources/templates/cartwidget.vm
~ /trunk/Website/src/main/webapp/css/widgets.css
~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 4236 – Prices updated

varun.gupta — Fri, 23 Dec 2011 18:21:22 +0530

varun.gupta – 2 file(s) modified
Prices updated

~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-bb-promo.vm
~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-success.vm

Rev 4235 – Trac #782 - Made the 'My Account' visible only if ...

varun.gupta — Fri, 23 Dec 2011 16:40:08 +0530

varun.gupta – 1 file(s) modified
Trac #782 - Made the 'My Account' visible only if the user is logged in

~ /trunk/Website/src/main/resources/templates/header.vm

Rev 4234 – Concatenate in case of color is not specified

rajveer — Fri, 23 Dec 2011 13:44:25 +0530

rajveer – 1 file(s) modified
Concatenate in case of color is not specified

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

Rev 4233 – Removed Droid icon and added My Account link to header

varun.gupta — Fri, 23 Dec 2011 12:59:47 +0530

varun.gupta – 2 file(s) modified
Removed Droid icon and added My Account link to header

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

Rev 4232 – Trac #778 - Message added on Pay Success page and ...

varun.gupta — Thu, 22 Dec 2011 19:05:30 +0530

varun.gupta – 3 file(s) modified
Trac #778 - Message added on Pay Success page and Order confirmation email for delay due to fog

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 4231 – Trac #772 - Cart footer fixed for A/B test variation. ...

varun.gupta — Thu, 22 Dec 2011 14:52:47 +0530

varun.gupta – 2 file(s) modified
Trac #772 - Cart footer fixed for A/B test variation. 'Checkout' button now appearing correctly when coupon is applied.

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

Rev 4230 – Temporarily setting the action button ID to 'checkout' to avoid ...

varun.gupta — Thu, 22 Dec 2011 13:01:48 +0530

varun.gupta – 1 file(s) modified
Temporarily setting the action button ID to 'checkout' to avoid login/register popup issue

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

Rev 4229 – Updated to get image url matching to color

rajveer — Wed, 21 Dec 2011 18:47:14 +0530

rajveer – 2 file(s) modified
Updated to get image url matching to color

~ /trunk/ContentStore/src/main/java/in/shop2020/util/FeatureValueExtractor.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/GenerateJungleeData.py

Rev 4228 – Trac #773 - Excluded Nokia C2-06 from XML feed

varun.gupta — Wed, 21 Dec 2011 16:41:43 +0530

varun.gupta – 1 file(s) modified
Trac #773 - Excluded Nokia C2-06 from XML feed

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

Rev 4227 – As per ticket #767. 1) Added new email address ...

rajveer — Tue, 20 Dec 2011 19:37:46 +0530

rajveer – 1 file(s) modified
As per ticket #767.
1) Added new email address to which email is sent.
2) Changed sender's name.
3) Changes subject, added city name in subject itself.

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

Rev 4226 – Modified CSS for Best Deal text

varun.gupta — Tue, 20 Dec 2011 18:59:58 +0530

varun.gupta – 1 file(s) modified
Modified CSS for Best Deal text

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

Rev 4225 – Not storing best deal text for an item in a ...

varun.gupta — Tue, 20 Dec 2011 18:06:42 +0530

varun.gupta – 1 file(s) modified
Not storing best deal text for an item in a variable

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm

Rev 4224 – Not storing best deal text for an item in a ...

varun.gupta — Tue, 20 Dec 2011 17:17:12 +0530

varun.gupta – 1 file(s) modified
Not storing best deal text for an item in a variable

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

Rev 4223 – Trac #683 - Retry Payment link added to Payment Failure ...

varun.gupta — Tue, 20 Dec 2011 15:42:18 +0530

varun.gupta – 1 file(s) modified
Trac #683 - Retry Payment link added to Payment Failure page

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

Rev 4222 – Trac #745 - Login/Registeration form will be poped up during ...

varun.gupta — Tue, 20 Dec 2011 15:41:03 +0530

varun.gupta – 5 file(s) modified
Trac #745 - Login/Registeration form will be poped up during cart flow

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/login-mini-index.vm

Rev 4221 – Changed the touchscreen to touch_screen.

rajveer — Tue, 20 Dec 2011 13:23:01 +0530

rajveer – 1 file(s) modified
Changed the touchscreen to touch_screen.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/GenerateJungleeData.py

Rev 4220 – New order for COD sales return order should be cod ...

rajveer — Mon, 19 Dec 2011 16:31:13 +0530

rajveer – 1 file(s) modified
New order for COD sales return order should be cod not prepaid.

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

Rev 4219 – Updated the amazon report generator.

rajveer — Mon, 19 Dec 2011 13:47:27 +0530

rajveer – 1 file(s) modified
Updated the amazon report generator.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/GenerateJungleeData.py

Rev 4218 – Added code to get image url in featurevalueextractor.

rajveer — Mon, 19 Dec 2011 13:39:22 +0530

rajveer – 2 file(s) modified
Added code to get image url in featurevalueextractor.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/FeatureValueExtractor.java

Rev 4217 – Trac #734 - Deal text included in Cart flow

varun.gupta — Sat, 17 Dec 2011 14:58:06 +0530

varun.gupta – 7 file(s) modified
Trac #734 - Deal text included in Cart flow

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/resources/templates/orderdetails.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

SmartDukaan – /

Rev 4256 – **REVIEWER: THE ANUPAM** Converting html body of email to plain ...

Rev 4255 – Removed Anand from mailing list and added Suraj & Sandeep ...

Rev 4254 – Send pickup data as to bluedart daily at 10 PM.

Rev 4253 – Temporary fix to make sure we do not capture payments ...

Rev 4252 – Ticket #743 Reconcile if there is difference of only few ...

Rev 4251 – Updated code of dashboard to handle cancellation.

Rev 4250 – Added "CUSTOMER_NOT_RESPONDING" as another possible reason for COD Cancellation. ...

Rev 4249 – In (Line : 266) thOld was being checked for null ...

Rev 4248 – Ticket #770 Cancellation of the orders which has cancellation confirmed ...

Rev 4247 – Ticket #770. Support of new order management flow.

Rev 4246 – Ticket #770. Support of new order management flow.

Rev 4245 – Ticket #770. Support of new order management flow.

Rev 4244 – Updated comparison rule windows mobile os 7.5 mango

Rev 4243 – Updated comparison rule windows mobile os 7.5 mango

Rev 4242 – Restricted the CSS to div contained within #header

Rev 4241 – TracId : #684, #740 Reviewer : Mandeep Dhir 1. ...

Rev 4240 – Trac #744 - Added caption for cart widget when cart ...

Rev 4239 – Removed left margin from User Welcome menu

Rev 4238 – Added href to anchor to have default hover effect

Rev 4237 – Trac #744 - Lightbox added to communicate how safe shopping ...

Rev 4236 – Prices updated

Rev 4235 – Trac #782 - Made the 'My Account' visible only if ...

Rev 4234 – Concatenate in case of color is not specified

Rev 4233 – Removed Droid icon and added My Account link to header

Rev 4232 – Trac #778 - Message added on Pay Success page and ...

Rev 4231 – Trac #772 - Cart footer fixed for A/B test variation. ...

Rev 4230 – Temporarily setting the action button ID to 'checkout' to avoid ...

Rev 4229 – Updated to get image url matching to color

Rev 4228 – Trac #773 - Excluded Nokia C2-06 from XML feed

Rev 4227 – As per ticket #767. 1) Added new email address ...

Rev 4226 – Modified CSS for Best Deal text

Rev 4225 – Not storing best deal text for an item in a ...

Rev 4224 – Not storing best deal text for an item in a ...

Rev 4223 – Trac #683 - Retry Payment link added to Payment Failure ...

Rev 4222 – Trac #745 - Login/Registeration form will be poped up during ...

Rev 4221 – Changed the touchscreen to touch_screen.

Rev 4220 – New order for COD sales return order should be cod ...

Rev 4219 – Updated the amazon report generator.

Rev 4218 – Added code to get image url in featurevalueextractor.

Rev 4217 – Trac #734 - Deal text included in Cart flow

Rev 4256 – REVIEWER: THE ANUPAM Converting html body of email to plain ...