SmartDukaan – /

Rev 2830 – Add user communications.

vikas — Wed, 03 Aug 2011 16:41:31 +0530

vikas – 9 file(s) modified
Add user communications.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
+ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCommunicationInfoController.java
+ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCommunicationsController.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/user-communication-info-index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/user-communications-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm

Rev 2829 – Updated url for tablets category.

rajveer — Wed, 03 Aug 2011 16:07:28 +0530

rajveer – 1 file(s) modified
Updated url for tablets category.

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

Rev 2828 – Update brand, modelname, modelnumber, category for all items of the ...

rajveer — Wed, 03 Aug 2011 15:26:02 +0530

rajveer – 1 file(s) modified
Update brand, modelname, modelnumber, category for all items of the entity. Update status for only IN_PROCESS items.

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

Rev 2827 – changed id.

rajveer — Wed, 03 Aug 2011 14:59:29 +0530

rajveer – 1 file(s) modified
changed id.

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

Rev 2826 – corrected spelling mistake.

rajveer — Wed, 03 Aug 2011 14:58:55 +0530

rajveer – 1 file(s) modified
corrected spelling mistake.

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

Rev 2825 – Added support to mail the purchase order when the warehouse ...

chandranshu — Wed, 03 Aug 2011 14:36:20 +0530

chandranshu – 11 file(s) modified
Added support to mail the purchase order when the warehouse executive prints the list of pending orders

~ /trunk/HotspotDashboard/.classpath
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/PrintPendingEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/PrintPendingEventHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.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/PrintPendingOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/PoSheetGenerator.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/WareHouseUtils.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/PrintPendingOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/PrintPendingOrderResponse.java

Rev 2824 – Added vendor id field to the Thrift warehouse object

chandranshu — Wed, 03 Aug 2011 14:32:34 +0530

chandranshu – 2 file(s) modified
Added vendor id field to the Thrift warehouse object

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 2823 – Warehouse service code

chandranshu — Wed, 03 Aug 2011 14:31:26 +0530

chandranshu – 24 file(s) modified
Warehouse service code

~ /trunk/PyProj/src/shop2020/helpers/impl/model/DashboardUser.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
+ /trunk/PyProj/src/shop2020/warehouse
+ /trunk/PyProj/src/shop2020/warehouse/main
+ /trunk/PyProj/src/shop2020/warehouse/main/handler
+ /trunk/PyProj/src/shop2020/warehouse/main/handler/WarehouseHandler.py
+ /trunk/PyProj/src/shop2020/warehouse/main/handler/__init__.py
+ /trunk/PyProj/src/shop2020/warehouse/main/model
+ /trunk/PyProj/src/shop2020/warehouse/main/model/LineItem.py
+ /trunk/PyProj/src/shop2020/warehouse/main/model/Purchase.py
+ /trunk/PyProj/src/shop2020/warehouse/main/model/PurchaseOrder.py
+ /trunk/PyProj/src/shop2020/warehouse/main/model/Scan.py
+ /trunk/PyProj/src/shop2020/warehouse/main/model/StockLedger.py
+ /trunk/PyProj/src/shop2020/warehouse/main/model/Supplier.py
+ /trunk/PyProj/src/shop2020/warehouse/main/model/Warehouse.py
+ /trunk/PyProj/src/shop2020/warehouse/main/model/WarehouseDashboardUser.py
+ /trunk/PyProj/src/shop2020/warehouse/main/model/__init__.py
+ /trunk/PyProj/src/shop2020/warehouse/main/WarehouseServer.py
+ /trunk/PyProj/src/shop2020/warehouse/main/__init__.py
+ /trunk/PyProj/src/shop2020/warehouse/test
+ /trunk/PyProj/src/shop2020/warehouse/test/__init__.py
+ /trunk/PyProj/src/shop2020/warehouse/__init__.py

Rev 2822 – Added support to send email with an attachment through Gmail

chandranshu — Wed, 03 Aug 2011 14:29:50 +0530

chandranshu – 6 file(s) modified
Added support to send email with an attachment through Gmail

~ /trunk/Common/pom.xml
~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
+ /trunk/Common/src/main/java/in/shop2020/utils/GmailUtils.java
~ /trunk/Common/src/main/resources/shop2020.cfg
~ /trunk/Common/src/main/resources/shop2020_production.cfg
~ /trunk/Common/src/main/resources/shop2020_staging.cfg

Rev 2821 – The client for the warehouse service and the generated Python ...

chandranshu — Wed, 03 Aug 2011 14:28:43 +0530

chandranshu – 8 file(s) modified
The client for the warehouse service and the generated Python code

+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/WarehouseServiceClient.java
+ /trunk/PyProj/src/shop2020/clients/WarehouseClient.py
+ /trunk/PyProj/src/shop2020/thriftpy/warehouse
+ /trunk/PyProj/src/shop2020/thriftpy/warehouse/constants.py
+ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
+ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
+ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
+ /trunk/PyProj/src/shop2020/thriftpy/warehouse/__init__.py

Rev 2820 – Added support for managing purchase orders and purchases

chandranshu — Wed, 03 Aug 2011 14:27:03 +0530

chandranshu – 17 file(s) modified
Added support for managing purchase orders and purchases

+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/LineItem.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/POStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Purchase.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/PurchaseOrder.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Role.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Scan.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/StockLedger.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/StockLedgerStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Supplier.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Warehouse.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseDashboardUser.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseServiceException.java
+ /trunk/ThriftGen/thriftsrc/WarehouseService
+ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift

Rev 2819 – Added a method to create a purchase order

chandranshu — Wed, 03 Aug 2011 14:24:45 +0530

chandranshu – 10 file(s) modified
Added a method to create a purchase order

~ /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/model/v1/order/test/TestCreatePurchaseOrder.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 2818 – Removed commented out code

chandranshu — Wed, 03 Aug 2011 14:20:52 +0530

chandranshu – 1 file(s) modified
Removed commented out code

~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java

Rev 2817 – Save session source, session start time and first source time.

vikas — Wed, 03 Aug 2011 13:53:50 +0530

vikas – 3 file(s) modified
Save session source, session start time and first source time.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java

Rev 2816 – Save session source, session start time and first source time.

vikas — Wed, 03 Aug 2011 13:53:23 +0530

vikas – 4 file(s) modified
Save session source, session start time and first source time.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Transaction.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java

Rev 2815 – Save session source, session start time and first source time.

vikas — Wed, 03 Aug 2011 13:52:52 +0530

vikas – 12 file(s) modified
Save session source, session start time and first source 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/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py

Rev 2814 – Save session source, session start time and first source time.

vikas — Wed, 03 Aug 2011 13:52:09 +0530

vikas – 2 file(s) modified
Save session source, session start time and first source time.

~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 2813 – Updated test cases corresponding to similartyIndex changes

rajveer — Wed, 03 Aug 2011 13:35:47 +0530

rajveer – 4 file(s) modified
Updated test cases corresponding to similartyIndex changes

~ /trunk/Website/src/test/resources/db/catalog.sql
~ /trunk/Website/src/test/samples/home/test18.javascript
~ /trunk/Website/src/test/samples/product/test20.javascript
~ /trunk/Website/src/test/samples/product/test34.javascript

Rev 2812 – Make y axis logrithmic.

vikas — Wed, 03 Aug 2011 13:30:56 +0530

vikas – 1 file(s) modified
Make y axis logrithmic.

~ /trunk/pentaho/reports/serp/Query-rank-timeline-report.prpt

Rev 2811 – Removed unused variables.

rajveer — Wed, 03 Aug 2011 13:23:50 +0530

rajveer – 2 file(s) modified
Removed unused variables.

~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/entity.js

Rev 2810 – Changes made to display similar items from database.

rajveer — Wed, 03 Aug 2011 12:45:47 +0530

rajveer – 4 file(s) modified
Changes made to display similar items from database.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-success.vm

Rev 2809 – Added support to get similar items.

rajveer — Wed, 03 Aug 2011 12:37:30 +0530

rajveer – 8 file(s) modified
Added support to get similar items.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /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/model/v1/catalog/test/CatalogTest.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py

Rev 2808 – Java stuff Added similarityIndex column to display similar items for ...

rajveer — Wed, 03 Aug 2011 12:34:02 +0530

rajveer – 2 file(s) modified
Java stuff Added similarityIndex column to display similar items for out of stock items

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java

Rev 2807 – Added similarityIndex column to display similar items for out of ...

rajveer — Wed, 03 Aug 2011 12:33:27 +0530

rajveer – 1 file(s) modified
Added similarityIndex column to display similar items for out of stock items

~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 2806 – Updated test cases after changing twitter handle and adding GA ...

varun.gupta — Wed, 03 Aug 2011 12:13:10 +0530

varun.gupta – 5 file(s) modified
Updated test cases after changing twitter handle and adding GA Event tracking on Related Accessories widget.

~ /trunk/Website/src/test/samples/home/test1.html
~ /trunk/Website/src/test/samples/home/test8.css
~ /trunk/Website/src/test/samples/product/test1.html
~ /trunk/Website/src/test/samples/product/test5.css
~ /trunk/Website/src/test/samples/product/test34.javascript

Rev 2805 – Fixed menu for IE

rajveer — Tue, 02 Aug 2011 17:52:43 +0530

rajveer – 2 file(s) modified
Fixed menu for IE

~ /trunk/Website/src/main/resources/templates/mainmenu.vm
~ /trunk/Website/src/main/webapp/css/nav.css

Rev 2804 – Removed an extra target attribute from Social icon anchor link

varun.gupta — Tue, 02 Aug 2011 17:48:32 +0530

varun.gupta – 1 file(s) modified
Removed an extra target attribute from Social icon anchor link

~ /trunk/Website/src/main/resources/templates/header.vm

Rev 2803 – Removed unused space between menu items on the main menu.

rajveer — Tue, 02 Aug 2011 17:15:09 +0530

rajveer – 1 file(s) modified
Removed unused space between menu items on the main menu.

~ /trunk/Website/src/main/resources/templates/mainmenu.vm

Rev 2802 – Added GA on accessories widget click.

rajveer — Tue, 02 Aug 2011 17:09:08 +0530

rajveer – 1 file(s) modified
Added GA on accessories widget click.

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

Rev 2801 – Add dimenstion source.

vikas — Tue, 02 Aug 2011 16:40:00 +0530

vikas – 1 file(s) modified
Add dimenstion source.

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 2800 – Modified the data sent to GA event log

varun.gupta — Tue, 02 Aug 2011 15:40:12 +0530

varun.gupta – 1 file(s) modified
Modified the data sent to GA event log

~ /trunk/Website/src/main/webapp/js/my-notes.js

Rev 2799 – Corrected serial version id.

rajveer — Tue, 02 Aug 2011 15:36:09 +0530

rajveer – 1 file(s) modified
Corrected serial version id.

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

Rev 2798 – This part of the product page has now been moved ...

varun.gupta — Tue, 02 Aug 2011 15:35:25 +0530

varun.gupta – 1 file(s) modified
This part of the product page has now been moved to ProductSummary.vm

x /trunk/Website/src/main/resources/templates/socialutils.vm

Rev 2797 – Corrected serial version id.

rajveer — Tue, 02 Aug 2011 15:33:47 +0530

rajveer – 1 file(s) modified
Corrected serial version id.

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

Rev 2796 – Changed the twitter handle to saholic

varun.gupta — Tue, 02 Aug 2011 15:28:51 +0530

varun.gupta – 2 file(s) modified
Changed the twitter handle to saholic

~ /trunk/ContentStore/src/velocity/ProductDetail.vm
~ /trunk/Website/src/main/resources/templates/header.vm

Rev 2795 – Added serial version id. to comparator map.

rajveer — Tue, 02 Aug 2011 15:26:29 +0530

rajveer – 1 file(s) modified
Added serial version id. to comparator map.

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

Rev 2794 – Migration of comparison stats .

rajveer — Tue, 02 Aug 2011 15:21:07 +0530

rajveer – 1 file(s) modified
Migration of comparison stats .

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

Rev 2793 – Added serial version id to comparison stats fetcher

rajveer — Tue, 02 Aug 2011 15:17:53 +0530

rajveer – 2 file(s) modified
Added serial version id to comparison stats fetcher

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

Rev 2792 – Changed the option group name to be more specific

chandranshu — Tue, 02 Aug 2011 15:08:56 +0530

chandranshu – 1 file(s) modified
Changed the option group name to be more specific

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

Rev 2791 – Ticket #453 - Now HTTP request for the skin image ...

varun.gupta — Mon, 01 Aug 2011 18:07:30 +0530

varun.gupta – 1 file(s) modified
Ticket #453 - Now HTTP request for the skin image will not be sent in case there is no slide requiring it.

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