SmartDukaan – /

Rev 4004 – Added support to highlight delayed orders in the OM dashboard

chandranshu — Tue, 08 Nov 2011 15:26:51 +0530

chandranshu – 11 file(s) modified
Added support to highlight delayed orders in the OM dashboard

~ /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/client/inbox/OrderList.ui.xml
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Alert.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/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4003 – Adjusted the column names read from the feature values sheet

chandranshu — Tue, 08 Nov 2011 15:18:58 +0530

chandranshu – 1 file(s) modified
Adjusted the column names read from the feature values sheet

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

Rev 4002 – Added one more note for COD and cleaned up some ...

varun.gupta — Tue, 08 Nov 2011 11:30:23 +0530

varun.gupta – 2 file(s) modified
Added one more note for COD and cleaned up some inline CSS.

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

Rev 4001 – Processing missed Failed payments transactions

mandeep.dhir — Fri, 04 Nov 2011 12:23:58 +0530

mandeep.dhir – 1 file(s) modified
Processing missed Failed payments transactions

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

Rev 4000 – Processing missed COD transactions

mandeep.dhir — Fri, 04 Nov 2011 12:18:46 +0530

mandeep.dhir – 1 file(s) modified
Processing missed COD transactions

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

Rev 3999 – Changes to shop2020.cfg to use new location of CRM

mandeep.dhir — Fri, 04 Nov 2011 11:25:41 +0530

mandeep.dhir – 1 file(s) modified
Changes to shop2020.cfg to use new location of CRM

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

Rev 3998 – Sending response to communication email instead of login email

mandeep.dhir — Fri, 04 Nov 2011 11:04:30 +0530

mandeep.dhir – 1 file(s) modified
Sending response to communication email instead of login email

~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm

Rev 3997 – Added banner at best deals page.

rajveer — Fri, 04 Nov 2011 11:00:52 +0530

rajveer – 1 file(s) modified
Added banner at best deals page.

~ /trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm

Rev 3996 – Trac#629 Minor enhancements to CRM - Adding promised delivery date

mandeep.dhir — Fri, 04 Nov 2011 10:51:11 +0530

mandeep.dhir – 7 file(s) modified
Trac#629 Minor enhancements to CRM - Adding promised delivery date

~ /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/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /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/resources/log4j.properties

Rev 3995 – Enumvalues changed for ethernet

mandeep.dhir — Thu, 03 Nov 2011 17:53:22 +0530

mandeep.dhir – 1 file(s) modified
Enumvalues changed for ethernet

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

Rev 3994 – Added support for the warehouse admin to specify the delay ...

chandranshu — Thu, 03 Nov 2011 16:44:28 +0530

chandranshu – 4 file(s) modified
Added support for the warehouse admin to specify the delay as no. of business days rather than actual no. of days

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 3993 – Trac ticket #631 Setting the min width of the top ...

rajveer — Thu, 03 Nov 2011 15:51:07 +0530

rajveer – 1 file(s) modified
Trac ticket #631 Setting the min width of the top toolbar, so that it will not spill out if we shrink the browser width.

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

Rev 3992 – Added vendor key support to amazon data generator

chandranshu — Thu, 03 Nov 2011 14:36:46 +0530

chandranshu – 1 file(s) modified
Added vendor key support to amazon data generator

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

Rev 3991 – Bugfix. Copying images in case they are not present in ...

mandeep.dhir — Thu, 03 Nov 2011 13:34:32 +0530

mandeep.dhir – 1 file(s) modified
Bugfix. Copying images in case they are not present in export dir

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

Rev 3990 – Modified the font-weight and bgcolor for the header topbar

varun.gupta — Wed, 02 Nov 2011 18:51:45 +0530

varun.gupta – 1 file(s) modified
Modified the font-weight and bgcolor for the header topbar

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

Rev 3989 – Fixed URLs for phone icon images

varun.gupta — Wed, 02 Nov 2011 17:09:53 +0530

varun.gupta – 1 file(s) modified
Fixed URLs for phone icon images

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

Rev 3988 – Set wmode parameter to be "transparent"

varun.gupta — Wed, 02 Nov 2011 16:13:17 +0530

varun.gupta – 1 file(s) modified
Set wmode parameter to be "transparent"

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

Rev 3987 – Trac#632 Send mails through Sendgrid instead of Gmail

mandeep.dhir — Wed, 02 Nov 2011 15:27:59 +0530

mandeep.dhir – 1 file(s) modified
Trac#632 Send mails through Sendgrid instead of Gmail

~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py

Rev 3986 – Added support to increase the expected delivery time.

chandranshu — Wed, 02 Nov 2011 13:07:57 +0530

chandranshu – 16 file(s) modified
Added support to increase the expected delivery time.

~ /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/client/inbox/JacketInfoBox.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 3985 – Restoring HTTP Authentication

varun.gupta — Wed, 02 Nov 2011 12:16:20 +0530

varun.gupta – 1 file(s) modified
Restoring HTTP Authentication

~ /trunk/Website/src/main/webapp/WEB-INF/web.xml

Rev 3984 – Removed height of main banner.

rajveer — Wed, 02 Nov 2011 12:14:44 +0530

rajveer – 1 file(s) modified
Removed height of main banner.

~ /trunk/Website/src/main/webapp/css/home.css

Rev 3983 – HelperServvice to be run locally

mandeep.dhir — Wed, 02 Nov 2011 12:04:44 +0530

mandeep.dhir – 1 file(s) modified
HelperServvice to be run locally

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

Rev 3982 – Setting default Assignee as Zaffar for outbound calls

mandeep.dhir — Wed, 02 Nov 2011 11:47:51 +0530

mandeep.dhir – 1 file(s) modified
Setting default Assignee as Zaffar for outbound calls

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 3981 – Android BDay banner update

varun.gupta — Wed, 02 Nov 2011 11:43:54 +0530

varun.gupta – 1 file(s) modified
Android BDay banner update

~ /trunk/Social/src/main/webapp/images/android-bday-banner.jpg

Rev 3980 – Changed message.

rajveer — Wed, 02 Nov 2011 11:07:06 +0530

rajveer – 1 file(s) modified
Changed message.

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

Rev 3979 – Updated community promotion for Android bday.

rajveer — Wed, 02 Nov 2011 11:04:35 +0530

rajveer – 1 file(s) modified
Updated community promotion for Android bday.

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

Rev 3978 – Updated android rule for only four items

rajveer — Wed, 02 Nov 2011 10:53:56 +0530

rajveer – 1 file(s) modified
Updated android rule for only four items

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

Rev 3977 – Now catching all kind of exceptions resulting from network and ...

varun.gupta — Tue, 01 Nov 2011 19:16:26 +0530

varun.gupta – 1 file(s) modified
Now catching all kind of exceptions resulting from network and retrying in next iteration after sleep

~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py

Rev 3976 – BugFix - symbol for minutes in lowercase characters

mandeep.dhir — Tue, 01 Nov 2011 18:39:56 +0530

mandeep.dhir – 1 file(s) modified
BugFix - symbol for minutes in lowercase characters

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/util/BackgroundTaskExecutor.java

Rev 3975 – Taking backup every 12 hours

mandeep.dhir — Tue, 01 Nov 2011 18:28:21 +0530

mandeep.dhir – 1 file(s) modified
Taking backup every 12 hours

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/util/BackgroundTaskExecutor.java

Rev 3974 – Modified image URLs to include /media in the path

varun.gupta — Tue, 01 Nov 2011 18:06:42 +0530

varun.gupta – 2 file(s) modified
Modified image URLs to include /media in the path

~ /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 3973 – Trac#612 Adding another protocol WAP 2.1

mandeep.dhir — Tue, 01 Nov 2011 17:43:19 +0530

mandeep.dhir – 1 file(s) modified
Trac#612 Adding another protocol WAP 2.1

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

Rev 3972 – Querying reopen tickets as well when open tickets are asked ...

mandeep.dhir — Tue, 01 Nov 2011 17:37:54 +0530

mandeep.dhir – 1 file(s) modified
Querying reopen tickets as well when open tickets are asked for

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

Rev 3971 – Trac#581 Hot backup for bdb data. Also removing files after ...

mandeep.dhir — Tue, 01 Nov 2011 17:12:34 +0530

mandeep.dhir – 4 file(s) modified
Trac#581 Hot backup for bdb data. Also removing files after every 4 days

+ /trunk/ContentCreation/src/main/java/in/shop2020/creation/util/BackgroundTaskExecutor.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/web.xml
~ /trunk/ContentStore/src/main/java/in/shop2020/storage/bdb/StorageManager.java
+ /trunk/ContentStore/src/main/java/in/shop2020/util/BDBHotBackupTask.java

Rev 3970 – AB testing scripts and variations added for Cart and Shipping ...

varun.gupta — Tue, 01 Nov 2011 17:11:34 +0530

varun.gupta – 3 file(s) modified
AB testing scripts and variations added for Cart and Shipping pages

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm

Rev 3969 – Removing the HTTP Auth for shop2020.in

varun.gupta — Tue, 01 Nov 2011 15:34:54 +0530

varun.gupta – 1 file(s) modified
Removing the HTTP Auth for shop2020.in

~ /trunk/Website/src/main/webapp/WEB-INF/web.xml

Rev 3968 – COD option will be conditionally shown.

varun.gupta — Tue, 01 Nov 2011 13:17:28 +0530

varun.gupta – 1 file(s) modified
COD option will be conditionally shown.

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

Rev 3967 – Removed Cashback offer message.

rajveer — Tue, 01 Nov 2011 13:02:53 +0530

rajveer – 1 file(s) modified
Removed Cashback offer message.

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

Rev 3966 – Seach UI reconstructed. Now category select dropdown is stimulated by ...

varun.gupta — Tue, 01 Nov 2011 12:54:48 +0530

varun.gupta – 3 file(s) modified
Seach UI reconstructed. Now category select dropdown is stimulated by non-form elements

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

Rev 3965 – A message will be shown in case COD isn't available ...

varun.gupta — Tue, 01 Nov 2011 12:53:19 +0530

varun.gupta – 1 file(s) modified
A message will be shown in case COD isn't available on the product/location

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