SmartDukaan – /

Rev 2867 – Removed dependency from pageloader. Added most compared products controller.

rajveer — Tue, 09 Aug 2011 12:41:10 +0530

rajveer – 7 file(s) modified
Removed dependency from pageloader. Added most compared products controller.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MostComparedProductsController.java (copied from /trunk/Website/src/main/java/in/shop2020/serving/controllers/RelatedProductsController.java@2830)
x /trunk/Website/src/main/java/in/shop2020/serving/controllers/RelatedProductsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java

Rev 2866 – Check whether user is created or not before calling UserContext ...

varun.gupta — Tue, 09 Aug 2011 11:40:19 +0530

varun.gupta – 1 file(s) modified
Check whether user is created or not before calling UserContext service

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyNotesController.java

Rev 2865 – Request to get UserNotes from db won't be sent in ...

varun.gupta — Tue, 09 Aug 2011 11:10:28 +0530

varun.gupta – 1 file(s) modified
Request to get UserNotes from db won't be sent in case user id is -1

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyNotesController.java

Rev 2864 – Added the column billingType to warehouse.

chandranshu — Tue, 09 Aug 2011 11:09:19 +0530

chandranshu – 1 file(s) modified
Added the column billingType to warehouse.

~ /trunk/Website/src/test/resources/db/catalog.sql

Rev 2863 – Made some drastic changes

chandranshu — Mon, 08 Aug 2011 18:09:40 +0530

chandranshu – 4 file(s) modified
Made some drastic changes

~ /trunk/runutils/deploy-everything.sh
~ /trunk/runutils/kill.sh
~ /trunk/runutils/run-payment-service.sh
~ /trunk/runutils/start-py-services.sh

Rev 2862 – Updating code to the latest revision. Copying CSS and JS ...

chandranshu — Mon, 08 Aug 2011 17:52:39 +0530

chandranshu – 1 file(s) modified
Updating code to the latest revision. Copying CSS and JS files to the static server.

~ /trunk/runutils/deploy-everything.sh

Rev 2861 – Removed payment service from the list of python services

chandranshu — Mon, 08 Aug 2011 17:44:54 +0530

chandranshu – 1 file(s) modified
Removed payment service from the list of python services

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

Rev 2860 – Updated inventory report script which handles null colors

chandranshu — Mon, 08 Aug 2011 17:43:51 +0530

chandranshu – 1 file(s) modified
Updated inventory report script which handles null colors

~ /trunk/runutils/daily-inventory-report.sh

Rev 2859 – Added warehouse service to be started by the scripts starting ...

chandranshu — Mon, 08 Aug 2011 17:41:07 +0530

chandranshu – 2 file(s) modified
Added warehouse service to be started by the scripts starting all python services

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

Rev 2858 – Added support to specify the deployment server as an argument

chandranshu — Mon, 08 Aug 2011 17:17:49 +0530

chandranshu – 1 file(s) modified
Added support to specify the deployment server as an argument

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

Rev 2857 – For unknown session and first source dates uses 20110101 in ...

vikas — Mon, 08 Aug 2011 15:29:23 +0530

vikas – 2 file(s) modified
For unknown session and first source dates uses 20110101 in pentaho reports.

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

Rev 2856 – Add session and source times.

vikas — Mon, 08 Aug 2011 15:09:48 +0530

vikas – 4 file(s) modified
Add session and source times.

~ /trunk/pentaho/data-integration/transformations/cartLoader.ktr
~ /trunk/pentaho/data-integration/transformations/ordersLoader.ktr
~ /trunk/pentaho/data-integration/transformations/userLoader.ktr
~ /trunk/pentaho/schema/SalesSchema.xml

Rev 2855 – Ignored target from SVN

chandranshu — Mon, 08 Aug 2011 15:01:57 +0530

chandranshu – 1 file(s) modified
Ignored target from SVN

~ /trunk/GoogleAppDatalog

Rev 2854 – Ignored target from SVN

chandranshu — Mon, 08 Aug 2011 15:01:23 +0530

chandranshu – 1 file(s) modified
Ignored target from SVN

~ /trunk/Crm

Rev 2853 – Add session and source times.

vikas — Mon, 08 Aug 2011 15:00:30 +0530

vikas – 4 file(s) modified
Add session and source times.

Rev 2852 – Stopped creating purchase orders when we use our own billing

chandranshu — Mon, 08 Aug 2011 14:59:24 +0530

chandranshu – 1 file(s) modified
Stopped creating purchase orders when we use our own billing

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

Rev 2851 – Made some queries related to statistics more efficient

chandranshu — Mon, 08 Aug 2011 13:42:54 +0530

chandranshu – 2 file(s) modified
Made some queries related to statistics more efficient

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

Rev 2850 – Corrected the method used to get the number of valid ...

chandranshu — Mon, 08 Aug 2011 13:09:04 +0530

chandranshu – 3 file(s) modified
Corrected the method used to get the number of valid orders

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/test/TestCreatePurchaseOrder.py
+ /trunk/PyProj/src/shop2020/model/v1/order/test/TestGetValidOrdersCount.py

Rev 2849 – Updated test cases

rajveer — Mon, 08 Aug 2011 11:19:36 +0530

rajveer – 1 file(s) modified
Updated test cases

~ /trunk/Website/src/test/samples/product/test34.javascript

Rev 2848 – Stopped reducing the reservation count when the billing is external. ...

chandranshu — Mon, 08 Aug 2011 11:01:02 +0530

chandranshu – 2 file(s) modified
Stopped reducing the reservation count when the billing is external. Added more parameters to the invoice URL

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

Rev 2847 – Trac#485 New velocity template for special pages

mandeep.dhir — Thu, 04 Aug 2011 17:02:24 +0530

mandeep.dhir – 1 file(s) modified
Trac#485 New velocity template for special pages

+ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm

Rev 2846 – Trac#485 Reading json files from export/javascripts/ directory

mandeep.dhir — Thu, 04 Aug 2011 16:57:02 +0530

mandeep.dhir – 1 file(s) modified
Trac#485 Reading json files from export/javascripts/ directory

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java

Rev 2845 – Final price for Galaxy Pro modified

varun.gupta — Thu, 04 Aug 2011 16:41:36 +0530

varun.gupta – 1 file(s) modified
Final price for Galaxy Pro modified

~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-success.vm

Rev 2844 – Updated script files to add gson jar to classpath

rajveer — Thu, 04 Aug 2011 14:53:04 +0530

rajveer – 2 file(s) modified
Updated script files to add gson jar to classpath

~ /trunk/runutils/generate-content-from-catalog.sh
~ /trunk/runutils/generate-content-from-cms.sh

Rev 2843 – Added support to handle cases of external as well as ...

chandranshu — Thu, 04 Aug 2011 14:35:49 +0530

chandranshu – 11 file(s) modified
Added support to handle cases of external as well as our billing simultaneously

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.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/JacketInfoBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.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/AuthResponse.java

Rev 2842 – Added support to accept a billing type while adding jacket ...

chandranshu — Thu, 04 Aug 2011 14:34:42 +0530

chandranshu – 7 file(s) modified
Added support to accept a billing type while adding jacket info

~ /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/catalog/BillingType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 2841 – Added billing type to warehouse

chandranshu — Thu, 04 Aug 2011 14:33:38 +0530

chandranshu – 5 file(s) modified
Added billing type to warehouse

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 2840 – Increased upload file size upto 15MB.

rajveer — Thu, 04 Aug 2011 13:43:14 +0530

rajveer – 1 file(s) modified
Increased upload file size upto 15MB.

~ /trunk/ContentCreation/src/main/resources/struts.xml

Rev 2839 – Trac#485 Made changes to avoid a possible NPE during content ...

mandeep.dhir — Thu, 04 Aug 2011 13:21:33 +0530

mandeep.dhir – 1 file(s) modified
Trac#485 Made changes to avoid a possible NPE during content generation process when no special pages are present in database.

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

Rev 2838 – Trac#485 UI for creating special pages' entries. Takes necessary attributes ...

mandeep.dhir — Thu, 04 Aug 2011 13:08:53 +0530

mandeep.dhir – 21 file(s) modified
Trac#485 UI for creating special pages' entries. Takes necessary attributes for them.

x /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/BrandController.java
+ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SpecialPageController.java (copied from /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/BrandController.java@2805)
x /trunk/ContentCreation/src/main/webapp/WEB-INF/content/brand-edit.vm
x /trunk/ContentCreation/src/main/webapp/WEB-INF/content/brand-editNew.vm
x /trunk/ContentCreation/src/main/webapp/WEB-INF/content/brand-index.vm
x /trunk/ContentCreation/src/main/webapp/WEB-INF/content/brand-show.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-edit.vm (copied from /trunk/ContentCreation/src/main/webapp/WEB-INF/content/brand-edit.vm@2805)
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-editNew.vm (copied from /trunk/ContentCreation/src/main/webapp/WEB-INF/content/brand-editNew.vm@2805)
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-index.vm (copied from /trunk/ContentCreation/src/main/webapp/WEB-INF/content/brand-index.vm@2805)
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-show.vm (copied from /trunk/ContentCreation/src/main/webapp/WEB-INF/content/brand-show.vm@2805)
~ /trunk/ContentStore/pom.xml
x /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/Brand.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/ServiceCentre.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/SpecialPage.java (copied from /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/Brand.java@2805)
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java
~ /trunk/ContentStore/src/main/java/in/shop2020/storage/bdb/ContentDatabase.java
~ /trunk/ContentStore/src/main/java/in/shop2020/storage/bdb/ContentViews.java
~ /trunk/ContentStore/src/main/java/in/shop2020/storage/bdb/StorageManager.java
+ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/SpecialPageJSONConvertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java

Rev 2837 – Restored OrderStatus again

chandranshu — Thu, 04 Aug 2011 12:16:27 +0530

chandranshu – 1 file(s) modified
Restored OrderStatus again

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java

Rev 2836 – Date range restricted.

rajveer — Thu, 04 Aug 2011 12:10:23 +0530

rajveer – 1 file(s) modified
Date range restricted.

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

Rev 2835 – Enhanced support for user roles.

chandranshu — Thu, 04 Aug 2011 12:08:44 +0530

chandranshu – 19 file(s) modified
Enhanced support for user roles.

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadPurchaseOrdersListEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadPurchaseOrdersListEventHandler.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/OrderDetails.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/PurchaseOrderList.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/PurchaseOrderList.ui.xml
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/PurchaseOrderListHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AuthResponse.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/BillingType.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/POLineItem.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/PoType.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/PurchaseOrder.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/PurchaseOrderListRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/PurchaseOrderListResponse.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/UserType.java

Rev 2834 – Add coupon code.

vikas — Wed, 03 Aug 2011 19:03:36 +0530

vikas – 2 file(s) modified
Add coupon code.

~ /trunk/pentaho/data-integration/transformations/ordersLoader.ktr
~ /trunk/pentaho/schema/SalesSchema.xml

Rev 2833 – Add user activity.

vikas — Wed, 03 Aug 2011 18:27:08 +0530

vikas – 2 file(s) modified
Add user activity.

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/successfull-payments.jsp
+ /trunk/GoogleAppDatalog/src/main/webapp/jsp/user-activity.jsp

Rev 2832 – Started mailing the PO to the supplier emails

chandranshu — Wed, 03 Aug 2011 17:42:22 +0530

chandranshu – 8 file(s) modified
Started mailing the PO to the supplier emails

~ /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/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/PyProj/src/shop2020/warehouse/main/handler/WarehouseHandler.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift

Rev 2831 – SE SK17i added to the promotion

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

varun.gupta – 1 file(s) modified
SE SK17i added to the promotion

~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-success.vm

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