SmartDukaan – /

Rev 4133 – Added support for pagination to OM Dashboard's order lists

chandranshu — Thu, 24 Nov 2011 21:15:53 +0530

chandranshu – 22 file(s) modified
Added support for pagination to OM Dashboard's order lists

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/AdminPresenter.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/AdminPresenterImpl.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadAllOrdersListEvent.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadAllOrdersListEventHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadOrderListEvent.java
~ /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/OrderList.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AllOrderListHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AllOrderListRequest.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AllOrderListResponse.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderRequest.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderResponse.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/data/Constants.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 4132 – Changes for best deal text on home page.

rajveer — Thu, 24 Nov 2011 18:57:46 +0530

rajveer – 1 file(s) modified
Changes for best deal text on home page.

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

Rev 4131 – Changes for best deal text on home page.

rajveer — Thu, 24 Nov 2011 18:57:15 +0530

rajveer – 1 file(s) modified
Changes for best deal text on home page.

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

Rev 4130 – Script to update invoice numbers in order table. Reviewer : ...

anupam.singh — Thu, 24 Nov 2011 17:03:13 +0530

anupam.singh – 1 file(s) modified
Script to update invoice numbers in order table.
Reviewer : Chandranshu, Rajveer
trac# 608

+ /trunk/PyProj/src/shop2020/model/v1/order/script/UpdateInvoiceNumbers

Rev 4129 – Showing item details like color, start date, status etc. for ...

mandeep.dhir — Thu, 24 Nov 2011 16:02:31 +0530

mandeep.dhir – 12 file(s) modified
Showing item details like color, start date, status etc. for each entity
Adding NFC feature in Data connectivity slide (Modified comparison rules)
Fixed a bug to pass appropriate item_id in ProductDetail snippet

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
+ /trunk/ContentCreation/src/main/webapp/css/colorbox.css
+ /trunk/ContentCreation/src/main/webapp/jquery/thirdparty
+ /trunk/ContentCreation/src/main/webapp/jquery/thirdparty/jquery.colorbox-min.js
+ /trunk/ContentCreation/src/main/webapp/js/common.js
+ /trunk/ContentCreation/src/main/webapp/js/events.js
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-catalog-details.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
~ /trunk/ContentStore/src/jython/comparisonrules/data_connectivity_math.py
~ /trunk/ContentStore/src/velocity/ProductDetail.vm
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 4128 – Trac Ticket #673 Product slide guide content rearrangement.

rajveer — Thu, 24 Nov 2011 15:40:51 +0530

rajveer – 1 file(s) modified
Trac Ticket #673 Product slide guide content rearrangement.

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

Rev 4127 – Trac Ticket #673 Style changes for product slide guide ...

rajveer — Thu, 24 Nov 2011 15:39:47 +0530

rajveer – 2 file(s) modified
Trac Ticket #673 Style changes for product slide guide content rearrangement.

~ /trunk/Website/src/main/webapp/css/product.css
~ /trunk/Website/src/main/webapp/js/scrolltab.js

Rev 4126 – Trac #675: - Widgets on sidebar are now collapsible - ...

varun.gupta — Thu, 24 Nov 2011 15:35:10 +0530

varun.gupta – 10 file(s) modified
Trac #675:
- Widgets on sidebar are now collapsible
- Phone images on home page aligned in the middle.
- In the widget areas the distance between arrows and title decreased.
- In top black bar and cart summary area, the text aligned vertically
- "Compare Selected" should show the count as "0" (for ex. Compare Selected (0).

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/resources/templates/cartwidget.vm
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css
~ /trunk/Website/src/main/webapp/css/style.css
~ /trunk/Website/src/main/webapp/css/widgets.css
+ /trunk/Website/src/main/webapp/images/IconRightArrow_UnselectedTab.png
~ /trunk/Website/src/main/webapp/js/custom-jquery.js
+ /trunk/Website/src/main/webapp/js/widgets.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/myresearch-show.vm

Rev 4125 – Adjusted column widths and added some comments

chandranshu — Thu, 24 Nov 2011 14:16:23 +0530

chandranshu – 2 file(s) modified
Adjusted column widths and added some comments

~ /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

Rev 4124 – Started using DataGrid for displaying orders. This and the last ...

chandranshu — Thu, 24 Nov 2011 13:56:23 +0530

chandranshu – 2 file(s) modified
Started using DataGrid for displaying orders. This and the last commit lay down the groundwork for pagination

~ /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

Rev 4123 – Removed many redundant events and handlers

chandranshu — Thu, 24 Nov 2011 13:51:58 +0530

chandranshu – 15 file(s) modified
Removed many redundant events and handlers

x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadAcceptedOrderListEvent.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadAcceptedOrderListEventHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadBilledOrderListEvent.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadBilledOrderListEventHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadDeliveredOrderListEvent.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadDeliveredOrderListEventHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadNostockOrderListEvent.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadNostockOrderListEventHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadNotAvailableOrderListEvent.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadNotAvailableOrderListEventHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadRejectedOrderListEvent.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadRejectedOrderListEventHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadShippedOrderListEvent.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadShippedOrderListEventHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java

Rev 4122 – Added Anand and Parmod to the list of recipients for ...

chandranshu — Thu, 24 Nov 2011 12:36:55 +0530

chandranshu – 1 file(s) modified
Added Anand and Parmod to the list of recipients for the RTO report

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

Rev 4121 – EmailAttachmentSender.mail accepts a list of parts, not a list of ...

chandranshu — Thu, 24 Nov 2011 12:32:10 +0530

chandranshu – 1 file(s) modified
EmailAttachmentSender.mail accepts a list of parts, not a list of lists. removed the second enclosing.

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

Rev 4120 – merged the arguments of writerow into a list

chandranshu — Thu, 24 Nov 2011 12:29:19 +0530

chandranshu – 1 file(s) modified
merged the arguments of writerow into a list

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

Rev 4119 – Initial import.

chandranshu — Thu, 24 Nov 2011 11:37:29 +0530

chandranshu – 1 file(s) modified
Initial import.

+ /configuration

Rev 4118 – Corrected the creation time condition set for getting Return Orders

chandranshu — Thu, 24 Nov 2011 02:34:21 +0530

chandranshu – 1 file(s) modified
Corrected the creation time condition set for getting Return Orders

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

Rev 4117 – Added the unused_ prefix to variable names so that no ...

chandranshu — Thu, 24 Nov 2011 02:33:05 +0530

chandranshu – 1 file(s) modified
Added the unused_ prefix to variable names so that no warnings will be shown

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

Rev 4116 – Removing unused scripts

rajveer — Wed, 23 Nov 2011 17:08:10 +0530

rajveer – 1 file(s) modified
Removing unused scripts

x /trunk/PyProj/src/shop2020/scripts

Rev 4115 – Removing old UI project.

rajveer — Wed, 23 Nov 2011 16:47:51 +0530

rajveer – 1 file(s) modified
Removing old UI project.

x /prototype/Website 2.0 S

Rev 4114 – Removed the details pane after a successful search

chandranshu — Wed, 23 Nov 2011 13:17:21 +0530

chandranshu – 1 file(s) modified
Removed the details pane after a successful search

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java

Rev 4113 – Added support to search for an order using the order ...

chandranshu — Wed, 23 Nov 2011 13:00:57 +0530

chandranshu – 10 file(s) modified
Added support to search for an order using the order id

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchOrderEventHandler.java
~ /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/SearchBox.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/SearchOrderHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SearchOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SearchOrderResponse.java

Rev 4112 – Migrated Hotspot Dashboard to work with GWT-2.4

chandranshu — Tue, 22 Nov 2011 19:08:20 +0530

chandranshu – 8 file(s) modified
Migrated Hotspot Dashboard to work with GWT-2.4

~ /trunk/HotspotDashboard/.classpath
~ /trunk/HotspotDashboard/pom.xml
x /trunk/HotspotDashboard/src/main/webapp/WEB-INF/lib/gin-1.0-20090611.jar
+ /trunk/HotspotDashboard/src/main/webapp/WEB-INF/lib/gin-1.5.0.jar
x /trunk/HotspotDashboard/src/main/webapp/WEB-INF/lib/guice-2.0.jar
+ /trunk/HotspotDashboard/src/main/webapp/WEB-INF/lib/guice-3.0.jar
x /trunk/HotspotDashboard/src/main/webapp/WEB-INF/lib/guice-servlet-2.0.jar
+ /trunk/HotspotDashboard/src/main/webapp/WEB-INF/lib/guice-servlet-3.0.jar

Rev 4111 – Fixed the alignment of sidebar widget title

varun.gupta — Tue, 22 Nov 2011 18:56:07 +0530

varun.gupta – 1 file(s) modified
Fixed the alignment of sidebar widget title

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

Rev 4110 – Removed dependency on FileUtils module

varun.gupta — Tue, 22 Nov 2011 17:36:59 +0530

varun.gupta – 1 file(s) modified
Removed dependency on FileUtils module

~ /trunk/PriceComparisonFramework/src/Scrapers/MySmartPrice.py

Rev 4109 – Modified to collect data from MSP

varun.gupta — Tue, 22 Nov 2011 16:32:56 +0530

varun.gupta – 1 file(s) modified
Modified to collect data from MSP

~ /trunk/runutils/update-price-comparison-data.sh

Rev 4108 – script modified for MSP dashboard

varun.gupta — Tue, 22 Nov 2011 15:36:02 +0530

varun.gupta – 1 file(s) modified
script modified for MSP dashboard

~ /trunk/runutils/start-price-comparison-server.sh

Rev 4107 – bgcolor modified for .dark-orange

varun.gupta — Tue, 22 Nov 2011 15:34:08 +0530

varun.gupta – 1 file(s) modified
bgcolor modified for .dark-orange

~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.css

Rev 4106 – Price Comparison Dashboard with MSP data

varun.gupta — Tue, 22 Nov 2011 13:14:41 +0530

varun.gupta – 5 file(s) modified
Price Comparison Dashboard with MSP data

+ /trunk/PriceComparisonFramework/src/Scrapers/MySmartPrice.py
+ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/MSPChart.html
+ /trunk/PriceComparisonFramework/src/WebUI/MSPDashboard.py
~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.css
+ /trunk/PriceComparisonFramework/src/WebUI/static/mspchart.js

Rev 4105 – Adding few fields like Billed by, promised shipping date. Displaying ...

mandeep.dhir — Tue, 22 Nov 2011 11:04:40 +0530

mandeep.dhir – 3 file(s) modified
Adding few fields like Billed by, promised shipping date. Displaying orders above tickets in COD-verification tickets

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm

Rev 4104 – Trac#696 Never overwriting website/default.jpg with Global default image file. This ...

mandeep.dhir — Mon, 21 Nov 2011 18:55:45 +0530

mandeep.dhir – 1 file(s) modified
Trac#696 Never overwriting website/default.jpg with Global default image file.
This was happening for entity id 1001665.

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

Rev 4103 – Ensured that a inventory line is entered for an item ...

chandranshu — Mon, 21 Nov 2011 18:08:25 +0530

chandranshu – 1 file(s) modified
Ensured that a inventory line is entered for an item when an order is placed for it

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

Rev 4102 – Started storing promised_shipping_time

chandranshu — Mon, 21 Nov 2011 15:38:41 +0530

chandranshu – 6 file(s) modified
Started storing promised_shipping_time

~ /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/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 4101 – Started sending returned orders report

chandranshu — Mon, 21 Nov 2011 15:16:24 +0530

chandranshu – 1 file(s) modified
Started sending returned orders report

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

Rev 4100 – Added the extra header

chandranshu — Mon, 21 Nov 2011 13:18:37 +0530

chandranshu – 1 file(s) modified
Added the extra header

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

Rev 4099 – Removed Commented code and debug variable.

anupam.singh — Fri, 18 Nov 2011 18:33:05 +0530

anupam.singh – 1 file(s) modified
Removed Commented code and debug variable.

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

Rev 4098 – Added capability to provide manual timeStamp for incremental content generation. ...

anupam.singh — Fri, 18 Nov 2011 18:28:01 +0530

anupam.singh – 1 file(s) modified
Added capability to provide manual timeStamp for incremental content generation.

Reviewer : Mandeep, Rajveer.
BugId : #639

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

Rev 4097 – trim coupon_code.

vikas — Fri, 18 Nov 2011 16:33:58 +0530

vikas – 1 file(s) modified
trim coupon_code.

~ /trunk/pentaho/data-integration/transformations/ordersLoader.ktr

Rev 4096 – Readding the scripts with the execute bit set

rajveer — Fri, 18 Nov 2011 16:28:45 +0530

rajveer – 5 file(s) modified
Readding the scripts with the execute bit set

+ /trunk/runutils/automysqlbackup-2.5.1-01.sh
+ /trunk/runutils/copy-wars-to-production.sh
+ /trunk/runutils/start-solr-service.sh
+ /trunk/runutils/update-content-and-catalog.sh
+ /trunk/runutils/update-content.sh

Rev 4095 – Removing files which do not have executable permission.

rajveer — Fri, 18 Nov 2011 16:24:50 +0530

rajveer – 5 file(s) modified
Removing files which do not have executable permission.

x /trunk/runutils/automysqlbackup-2.5.1-01.sh
x /trunk/runutils/copy-wars-to-production.sh
x /trunk/runutils/start-solr-service.sh
x /trunk/runutils/update-content-and-catalog.sh
x /trunk/runutils/update-content.sh

Rev 4094 – Removed unused and old scripts

rajveer — Fri, 18 Nov 2011 16:21:40 +0530

rajveer – 14 file(s) modified
Removed unused and old scripts

x /trunk/runutils/generate-static-html-for-one-entity.sh
x /trunk/runutils/get-content-from-prod-server.sh
x /trunk/runutils/NextDayDeliverableItemsReporter.sh
x /trunk/runutils/start-catalog-service.sh
x /trunk/runutils/start-config-service.sh
x /trunk/runutils/start-helper-service.sh
x /trunk/runutils/start-inventory-history-service.sh
x /trunk/runutils/start-logistics-service.sh
x /trunk/runutils/start-order-service.sh
x /trunk/runutils/start-promotion-service.sh
x /trunk/runutils/start-user-service.sh
x /trunk/runutils/start-warehouse-service.sh
x /trunk/runutils/stop-python-services.sh
x /trunk/runutils/update-content-for-one-entity.sh