SmartDukaan – /

Rev 4016 – Added support to process orders lying in a different database

chandranshu — Wed, 09 Nov 2011 16:47:27 +0530

chandranshu – 5 file(s) modified
Added support to process orders lying in a different database

~ /trunk/PyProj/src/shop2020/model/v1/order/script/EditOrderDetails.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ExpectedAndActualDeliveryReport.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/MarkOrdersAsFailed.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/MoveOrdersToPendingQueue.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py

Rev 4015 – Trac#595 removing unnecessary autoincrement column

mandeep.dhir — Wed, 09 Nov 2011 16:44:01 +0530

mandeep.dhir – 1 file(s) modified
Trac#595 removing unnecessary autoincrement column

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

Rev 4014 – Added support to load data into a DB server running ...

chandranshu — Wed, 09 Nov 2011 16:09:52 +0530

chandranshu – 4 file(s) modified
Added support to load data into a DB server running on a different host

~ /trunk/PyProj/src/shop2020/logistics/service/script/DestinationProviderAllocationLoader.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/HolidaysLoader.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/ServiceDetailsLoader.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/WarehouseAllocationLoader.py

Rev 4013 – Added support to add AWB numbers to a DB server ...

chandranshu — Wed, 09 Nov 2011 16:03:57 +0530

chandranshu – 1 file(s) modified
Added support to add AWB numbers to a DB server running on a different host

~ /trunk/PyProj/src/shop2020/logistics/service/script/AwbNumberLoader.py

Rev 4012 – Fixed messaging.

rajveer — Wed, 09 Nov 2011 15:40:33 +0530

rajveer – 1 file(s) modified
Fixed messaging.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java

Rev 4011 – Reduced non-assignment range from 2 hours to 45 minutes.

rajveer — Wed, 09 Nov 2011 15:32:47 +0530

rajveer – 1 file(s) modified
Reduced non-assignment range from 2 hours to 45 minutes.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java

Rev 4010 – Corrected the miscalculation in the expected delivery time

chandranshu — Wed, 09 Nov 2011 15:28:02 +0530

chandranshu – 1 file(s) modified
Corrected the miscalculation in the expected delivery time

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

Rev 4009 – Added support to set the expected shipping time of an ...

chandranshu — Wed, 09 Nov 2011 15:05:33 +0530

chandranshu – 5 file(s) modified
Added support to set the expected shipping time of an order

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsInfo.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 4008 – Trac#595 Robust handling of Failed payments, COD transactions and delayed ...

mandeep.dhir — Wed, 09 Nov 2011 14:08:53 +0530

mandeep.dhir – 38 file(s) modified
Trac#595 Robust handling of Failed payments, COD transactions and delayed orders by CRM. TransacitonService and PaymentService now persist relevant transactions, payments to their own database. Then CRM polls these new tables and processes them (creation of tickets essentially)

~ /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/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/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTransactionProcessorTask.java
x /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTxnProcessor.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/util/DelayedOrderProcessorTask.java
x /trunk/CRMService/src/main/java/in/shop2020/crm/util/FailedPaymentsProcessor.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/util/PaymentProcessorTask.java
+ /trunk/PaymentService/src/main/java/in/shop2020/payment/handler/PaymentRequiringExtraProcessingHandler.java
+ /trunk/PaymentService/src/main/java/in/shop2020/payment/persistence/PaymentRequiringExtraProcessingMapper.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
+ /trunk/PaymentService/src/main/resources/in/shop2020/payment/persistence/PaymentRequiringExtraProcessingMapper.xml
~ /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/crm/CRMService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.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/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ExtraTransactionProcessingType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/ExtraPaymentProcessingType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 4007 – Added scripts for inventory stock reports

chandranshu — Wed, 09 Nov 2011 09:10:59 +0530

chandranshu – 2 file(s) modified
Added scripts for inventory stock reports

+ /trunk/PyProj/src/shop2020/utils/CsvToXlsConvertor.py
+ /trunk/runutils/inventory-status-report.sh

Rev 4006 – All videos should also be displayed on the Introduction slide.

rajveer — Tue, 08 Nov 2011 19:26:21 +0530

rajveer – 1 file(s) modified
All videos should also be displayed on the Introduction slide.

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

Rev 4005 – Deleting unused velocity files.

rajveer — Tue, 08 Nov 2011 18:15:33 +0530

rajveer – 1 file(s) modified
Deleting unused velocity files.

x /trunk/ContentStore/src/main/java/in/shop2020/ui/velocity

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