SmartDukaan – /

Rev 4733 – HDD/ More connectivity options to be added in CMS tool ...

amit.gupta — Fri, 16 Mar 2012 08:27:16 +0530

amit.gupta – 1 file(s) modified
HDD/ More connectivity options to be added in CMS tool
#987

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

Rev 4732 – Corrected the solr start and stop scripts

rajveer — Thu, 15 Mar 2012 20:24:54 +0530

rajveer – 2 file(s) modified
Corrected the solr start and stop scripts

~ /trunk/runutils/update-content-and-catalog.sh
~ /trunk/runutils/update-content.sh

Rev 4731 – Corrected path of jar files in payment service daemon

rajveer — Thu, 15 Mar 2012 19:42:08 +0530

rajveer – 1 file(s) modified
Corrected path of jar files in payment service daemon

~ /trunk/runutils/init.d/payment-server

Rev 4730 – Corrected the error in parsing 2G/3G talktime/standby

amit.gupta — Thu, 15 Mar 2012 19:28:34 +0530

amit.gupta – 1 file(s) modified
Corrected the error in parsing 2G/3G talktime/standby

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

Rev 4729 – Removed default settings of the service. Removed some sysout messages.

rajveer — Thu, 15 Mar 2012 17:56:43 +0530

rajveer – 2 file(s) modified
Removed default settings of the service. Removed some sysout messages.

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

Rev 4728 – logging the events using Log4j instead of sysout statements

anupam.singh — Thu, 15 Mar 2012 17:46:53 +0530

anupam.singh – 1 file(s) modified
logging the events using Log4j instead of sysout statements

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

Rev 4727 – Removing unused scripts which we have converted as init.d scripts. ...

rajveer — Thu, 15 Mar 2012 17:29:09 +0530

rajveer – 6 file(s) modified
Removing unused scripts which we have converted as init.d scripts. Modified deployment script.

~ /trunk/runutils/deploy-everything.sh
x /trunk/runutils/run-crm-service.sh
x /trunk/runutils/run-payment-service.sh
x /trunk/runutils/run-warehouse-service.sh
x /trunk/runutils/start-solr-service.sh
x /trunk/runutils/stop-solr-service.sh

Rev 4726 – Corrected the path to solr search service

rajveer — Thu, 15 Mar 2012 16:57:20 +0530

rajveer – 1 file(s) modified
Corrected the path to solr search service

~ /trunk/runutils/init.d/solr-server

Rev 4725 – Ticket #962 itemloader script changed to reduce duplicate items and ...

phani.kumar — Thu, 15 Mar 2012 16:36:23 +0530

phani.kumar – 14 file(s) modified
Ticket #962 itemloader script changed to reduce duplicate items and catalogdash board also changed
reviewer: mandeep dhir

~ /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/ItemForm.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/MasterSheetGenerator.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/ItemLoader.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 4724 – Added more field values to the mobile section.

amit.gupta — Thu, 15 Mar 2012 16:06:56 +0530

amit.gupta – 1 file(s) modified
Added more field values to the mobile section.

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

Rev 4723 – Removed the file name extensions for the init scripts

rajveer — Thu, 15 Mar 2012 15:56:13 +0530

rajveer – 3 file(s) modified
Removed the file name extensions for the init scripts

+ /trunk/runutils/init.d/crm-server
+ /trunk/runutils/init.d/payment-server
+ /trunk/runutils/init.d/warehouse-server

Rev 4722 – Added more field values to the mobile section.

amit.gupta — Thu, 15 Mar 2012 15:55:53 +0530

amit.gupta – 1 file(s) modified
Added more field values to the mobile section.

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

Rev 4721 – Removing the file name extensions

rajveer — Thu, 15 Mar 2012 15:54:21 +0530

rajveer – 3 file(s) modified
Removing the file name extensions

x /trunk/runutils/init.d/crm-server.sh
x /trunk/runutils/init.d/payment-server.sh
x /trunk/runutils/init.d/warehouse-server.sh

Rev 4720 – Added some statuses which can be marked as delivered.

rajveer — Thu, 15 Mar 2012 15:48:44 +0530

rajveer – 1 file(s) modified
Added some statuses which can be marked as delivered.

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

Rev 4719 – Forgot to implement Daemon Class in Warehouse service

anupam.singh — Thu, 15 Mar 2012 15:20:41 +0530

anupam.singh – 1 file(s) modified
Forgot to implement Daemon Class in Warehouse service

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

Rev 4718 – Daemonized CRM, Payment and Warehouse Servers. Reviewer : Rajveer

anupam.singh — Thu, 15 Mar 2012 15:18:10 +0530

anupam.singh – 9 file(s) modified
Daemonized CRM, Payment and Warehouse Servers.

Reviewer : Rajveer

~ /trunk/CRMService/pom.xml
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/CRMServer.java
~ /trunk/PaymentService/pom.xml
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/PaymentServer.java
+ /trunk/runutils/init.d/crm-server.sh
+ /trunk/runutils/init.d/payment-server.sh
+ /trunk/runutils/init.d/warehouse-server.sh
~ /trunk/WarehouseService/pom.xml
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/WarehouseServer.java

Rev 4717 – itemloader script changed to reduce duplicate items reviewer: mandeep dhir

phani.kumar — Thu, 15 Mar 2012 11:58:13 +0530

phani.kumar – 1 file(s) modified
itemloader script changed to reduce duplicate items
reviewer: mandeep dhir

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

Rev 4716 – Adding startup script for solr search engine

rajveer — Thu, 15 Mar 2012 11:18:56 +0530

rajveer – 1 file(s) modified
Adding startup script for solr search engine

+ /trunk/runutils/init.d/solr-server

Rev 4715 – Added support for reshipped orders, refunds which do not fall ...

varun.gupta — Wed, 14 Mar 2012 21:43:43 +0530

varun.gupta – 9 file(s) modified
Added support for reshipped orders, refunds which do not fall in given date range and COD settlements from Aramex.

~ /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/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
+ /trunk/Support/src/main/webapp/js/vendor-reconciliation.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4714 – Added log to check if ftp upload is true or ...

amit.gupta — Wed, 14 Mar 2012 18:16:24 +0530

amit.gupta – 1 file(s) modified
Added log to check if ftp upload is true or false

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

Rev 4713 – Correct config file path

rajveer — Wed, 14 Mar 2012 15:42:25 +0530

rajveer – 1 file(s) modified
Correct config file path

~ /trunk/runutils/init.d/config-server

Rev 4712 – Added support to mark the order as delivered from dashboard.

rajveer — Wed, 14 Mar 2012 13:42:34 +0530

rajveer – 15 file(s) modified
Added support to mark the order as delivered from dashboard.

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/MarkDeliveredEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/MarkDeliveredEventHandler.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/MarkDeliveredBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/MarkDeliveredHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/MarkDeliveredRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/MarkDeliveredResponse.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-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 4711 – Increased courier assignment limit for Aramex from 5000 to 10000

rajveer — Wed, 14 Mar 2012 11:53:12 +0530

rajveer – 1 file(s) modified
Increased courier assignment limit for Aramex from 5000 to 10000

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

Rev 4710 – Enabling Aramex shipment updates in CRM. Reviewer : Phani Kumar

anupam.singh — Tue, 13 Mar 2012 20:03:31 +0530

anupam.singh – 3 file(s) modified
Enabling Aramex shipment updates in CRM.
Reviewer : Phani Kumar

+ /trunk/Common/src/main/java/in/shop2020/serving/services/AramexTrackingService.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
x /trunk/Website/src/main/java/in/shop2020/serving/services/AramexTrackingService.java

Rev 4709 – Added the cancelled orders report.

rajveer — Tue, 13 Mar 2012 17:54:11 +0530

rajveer – 10 file(s) modified
Added the cancelled orders report.

~ /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/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.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 4708 – We were not considering warehouse preference while doing add to ...

anupam.singh — Tue, 13 Mar 2012 17:34:58 +0530

anupam.singh – 1 file(s) modified
We were not considering warehouse preference while doing add to cart. This change fixes it.

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

Rev 4707 – file required to create egg files changed to include all ...

phani.kumar — Tue, 13 Mar 2012 17:10:27 +0530

phani.kumar – 1 file(s) modified
file required to create egg files changed to include all data files
reviewer: Rajveer

~ /trunk/PyProj/src/setup.py

Rev 4706 – Enumerated os feature in Software slide #792

amit.gupta — Tue, 13 Mar 2012 16:58:17 +0530

amit.gupta – 4 file(s) modified
Enumerated os feature in Software slide
#792

~ /trunk/ContentStore/src/jython/comparisonrules/software_math.py
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml

Rev 4705 – Handling the case where cancelReasonBox is not defined.

anupam.singh — Tue, 13 Mar 2012 16:31:05 +0530

anupam.singh – 1 file(s) modified
Handling the case where cancelReasonBox is not defined.

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

Rev 4704 – Value of cancellationInitiator should be checked intead of the object ...

anupam.singh — Tue, 13 Mar 2012 15:40:27 +0530

anupam.singh – 1 file(s) modified
Value of cancellationInitiator should be checked intead of the object itself

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

Rev 4703 – file required to create egg files reviewer: Rajveer

phani.kumar — Tue, 13 Mar 2012 15:34:18 +0530

phani.kumar – 1 file(s) modified
file required to create egg files
reviewer: Rajveer

+ /trunk/PyProj/src/setup.py

Rev 4702 – Ticket ID : #901 Reviewed by : Anupam Singh

amar.kumar — Tue, 13 Mar 2012 15:29:41 +0530

amar.kumar – 1 file(s) modified
Ticket ID : #901
Reviewed by : Anupam Singh

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

Rev 4701 – Corrected the GB bug.

rajveer — Tue, 13 Mar 2012 15:15:17 +0530

rajveer – 1 file(s) modified
Corrected the GB bug.

~ /trunk/ContentStore/src/jython/irdatarules/laptops/ram.py

Rev 4700 – init.d files updated to use python egg

phani.kumar — Tue, 13 Mar 2012 15:04:55 +0530

phani.kumar – 10 file(s) modified
init.d files updated to use python egg

~ /trunk/runutils/init.d/catalog-server
~ /trunk/runutils/init.d/config-server
~ /trunk/runutils/init.d/content-server
~ /trunk/runutils/init.d/helper-server
~ /trunk/runutils/init.d/inventory-history-server
~ /trunk/runutils/init.d/logistics-server
~ /trunk/runutils/init.d/order-server
~ /trunk/runutils/init.d/promotion-server
~ /trunk/runutils/init.d/purchase-server
~ /trunk/runutils/init.d/user-server

Rev 4699 – Changed file to copy the python eggs also.

rajveer — Tue, 13 Mar 2012 14:10:34 +0530

rajveer – 1 file(s) modified
Changed file to copy the python eggs also.

~ /trunk/runutils/copy-wars-to-production.sh

Rev 4698 – dist folder created to copy egg files reviewer: Rajveer

phani.kumar — Tue, 13 Mar 2012 13:22:55 +0530

phani.kumar – 1 file(s) modified
dist folder created to copy egg files
reviewer: Rajveer

+ /trunk/PyProj/src/dist

Rev 4697 – Deploy python egg before starting any python services.

rajveer — Tue, 13 Mar 2012 13:16:01 +0530

rajveer – 1 file(s) modified
Deploy python egg before starting any python services.

~ /trunk/runutils/start-py-services.sh

Rev 4696 – COD verification pending orders should only be cancelled from ticket-info ...

anupam.singh — Tue, 13 Mar 2012 13:13:34 +0530

anupam.singh – 1 file(s) modified
COD verification pending orders should only be cancelled from ticket-info page and not form order info page

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

Rev 4695 – Removing PO creation URL

mandeep.dhir — Tue, 13 Mar 2012 12:55:37 +0530

mandeep.dhir – 1 file(s) modified
Removing PO creation URL

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

Rev 4694 – Changing version

mandeep.dhir — Tue, 13 Mar 2012 12:27:11 +0530

mandeep.dhir – 1 file(s) modified
Changing version

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java