SmartDukaan – /

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

Rev 4642 – Updating usages of getLogisticsEstimation()

mandeep.dhir — Tue, 06 Mar 2012 17:44:33 +0530

mandeep.dhir – 3 file(s) modified
Updating usages of getLogisticsEstimation()

~ /trunk/PyProj/src/shop2020/logistics/service/test/Test.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/utils/caching/TestCaching.py

Rev 4641 – Added support to copy resource file from jar to /tmp ...

rajveer — Tue, 06 Mar 2012 17:01:25 +0530

rajveer – 2 file(s) modified
Added support to copy resource file from jar to /tmp dir.

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

Rev 4640 – Logging Exception if Amazon data generation fails Trac#

mandeep.dhir — Tue, 06 Mar 2012 16:49:34 +0530

mandeep.dhir – 1 file(s) modified
Logging Exception if Amazon data generation fails Trac#

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

Rev 4639 – Ticket id : 954 Change in URl for going ...

amar.kumar — Tue, 06 Mar 2012 15:42:10 +0530

amar.kumar – 1 file(s) modified
Ticket id : 954

Change in URl for going back to product search frequency page

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/productSearch.jsp

Rev 4638 – Ticket Id : 954 Page to view Different search ...

amar.kumar — Tue, 06 Mar 2012 15:36:30 +0530

amar.kumar – 4 file(s) modified
Ticket Id : 954

Page to view Different search queries on Saholic.com with frequencies of querys and conversion rate (actual clicks on Search results) and detailed information of individual searches.

+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/model/Category.java
+ /trunk/GoogleAppDatalog/src/main/webapp/jsp/productSearch.jsp
+ /trunk/GoogleAppDatalog/src/main/webapp/jsp/productSearchFrequency.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/web.xml

Rev 4637 – Reading DB location from config server Removing jdbc.properties

mandeep.dhir — Tue, 06 Mar 2012 15:32:56 +0530

mandeep.dhir – 5 file(s) modified
Reading DB location from config server
Removing jdbc.properties

~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/WarehouseServer.java
~ /trunk/WarehouseService/src/main/resources/context.xml
x /trunk/WarehouseService/src/main/resources/jdbc.properties

Rev 4636 – Added Chaitnaya to the mailing list of slipped orders.

rajveer — Tue, 06 Mar 2012 15:14:41 +0530

rajveer – 1 file(s) modified
Added Chaitnaya to the mailing list of slipped orders.

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

Rev 4635 – Added delay reason string.

rajveer — Tue, 06 Mar 2012 15:12:43 +0530

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

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

Rev 4634 – Added promotional offer + removed dependency of itemNumber xls

amit.gupta — Tue, 06 Mar 2012 14:59:41 +0530

amit.gupta – 1 file(s) modified
Added promotional offer + removed dependency of itemNumber xls

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

Rev 4633 – Added promotional offer + removed dependency of itemNumber xls

amit.gupta — Tue, 06 Mar 2012 14:53:46 +0530

amit.gupta – 1 file(s) modified
Added promotional offer + removed dependency of itemNumber xls

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

Rev 4632 – Ticket Id: 954 Added the Referer URL in JsonData ...

amar.kumar — Tue, 06 Mar 2012 14:31:30 +0530

amar.kumar – 2 file(s) modified
Ticket Id: 954

Added the Referer URL in JsonData while logging the Product View event in Google App Engine

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/ProductView.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java

Rev 4631 – Updated enum IDs for external HDD size

varun.gupta — Tue, 06 Mar 2012 14:08:59 +0530

varun.gupta – 1 file(s) modified
Updated enum IDs for external HDD size

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

Rev 4630 – Bugfix: Change estimate considering COD while address is changed

mandeep.dhir — Tue, 06 Mar 2012 13:54:44 +0530

mandeep.dhir – 7 file(s) modified
Bugfix: Change estimate considering COD while address is changed

~ /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/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java

Rev 4629 – Unit added for Dimension feature for External HDD

varun.gupta — Tue, 06 Mar 2012 13:52:39 +0530

varun.gupta – 1 file(s) modified
Unit added for Dimension feature for External HDD

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

Rev 4628 – Hard disk rotational speed is made recommended field. Unit for ...

varun.gupta — Mon, 05 Mar 2012 20:53:20 +0530

varun.gupta – 3 file(s) modified
Hard disk rotational speed is made recommended field. Unit for Data transfer speed is now Mbps.

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

Rev 4627 – Added stubs and implementation of getItemNumbers in warehouse service.

amit.gupta — Mon, 05 Mar 2012 19:14:23 +0530

amit.gupta – 1 file(s) modified
Added stubs and implementation of getItemNumbers in warehouse service.

~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ItemNumberMapper.xml

Rev 4626 – Corrected simplecaptcha path in pom.xml

rajveer — Mon, 05 Mar 2012 17:44:20 +0530

rajveer – 1 file(s) modified
Corrected simplecaptcha path in pom.xml

~ /trunk/Website/pom.xml

Rev 4625 – Implemented isAlive() Trac#947

mandeep.dhir — Mon, 05 Mar 2012 17:41:27 +0530

mandeep.dhir – 1 file(s) modified
Implemented isAlive() Trac#947

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java