SmartDukaan – /

Rev 2534 – Removed special characters from EBS payment description

chandranshu — Tue, 12 Jul 2011 14:32:57 +0530

chandranshu – 1 file(s) modified
Removed special characters from EBS payment description

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

Rev 2533 – Update dataconnection to prod.

vikas — Tue, 12 Jul 2011 14:05:15 +0530

vikas – 1 file(s) modified
Update dataconnection to prod.

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

Rev 2532 – Add categories to Item table.

vikas — Tue, 12 Jul 2011 13:50:21 +0530

vikas – 2 file(s) modified
Add categories to Item table.

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

Rev 2531 – Moved googleappurl property to Common.

vikas — Tue, 12 Jul 2011 12:28:12 +0530

vikas – 3 file(s) modified
Moved googleappurl property to Common.

~ /trunk/Website/src/main/filters/dev/filters.properties
~ /trunk/Website/src/main/filters/prod/filters.properties
~ /trunk/Website/src/main/filters/staging/filters.properties

Rev 2530 – Enable filters in Common.

vikas — Tue, 12 Jul 2011 12:14:45 +0530

vikas – 8 file(s) modified
Enable filters in Common.

~ /trunk/Common/pom.xml
+ /trunk/Common/src/main/filters
+ /trunk/Common/src/main/filters/dev
+ /trunk/Common/src/main/filters/dev/filters.properties
+ /trunk/Common/src/main/filters/prod
+ /trunk/Common/src/main/filters/prod/filters.properties
+ /trunk/Common/src/main/filters/staging
+ /trunk/Common/src/main/filters/staging/filters.properties

Rev 2529 – Move DataLogger.properties to Common.

vikas — Tue, 12 Jul 2011 11:55:59 +0530

vikas – 1 file(s) modified
Move DataLogger.properties to Common.

x /trunk/Website/src/main/resources/in

Rev 2528 – Move DataLogger.properties

vikas — Tue, 12 Jul 2011 11:55:01 +0530

vikas – 5 file(s) modified
Move DataLogger.properties

/trunk/Common/src/main/java/in/shop2020/utils/DataLogger.java
+ /trunk/Common/src/main/resources/in
+ /trunk/Common/src/main/resources/in/shop2020
+ /trunk/Common/src/main/resources/in/shop2020/utils
+ /trunk/Common/src/main/resources/in/shop2020/utils/DataLogger.properties

Rev 2527 – Rule added to allow different discounts to different products under ...

varun.gupta — Tue, 12 Jul 2011 02:57:32 +0530

varun.gupta – 1 file(s) modified
Rule added to allow different discounts to different products under same coupon

+ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_single_coupon_different_discounts_for_different_models.py

Rev 2526 – Added support to authorize a DOA return pickup. Sending the ...

chandranshu — Mon, 11 Jul 2011 19:27:03 +0530

chandranshu – 9 file(s) modified
Added support to authorize a DOA return pickup. Sending the attachment to the customer and proper indentation of the email remain.

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AuthorizePickupEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AuthorizePickupEventHandler.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/OrderDetails.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/PickupAuthorizationInfoBox.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/AuthorizePickupHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AuthorizePickupRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AuthorizePickupResponse.java

Rev 2525 – Removed unnecessary serial version id

chandranshu — Mon, 11 Jul 2011 19:03:10 +0530

chandranshu – 1 file(s) modified
Removed unnecessary serial version id

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AcceptOrderResponse.java

Rev 2524 – penyaho -> pentaho

vikas — Mon, 11 Jul 2011 17:14:58 +0530

vikas – 1 file(s) modified
penyaho -> pentaho

~ /trunk/pentaho/scripts/panScript.sh

Rev 2523 – Fixed the bug.

rajveer — Mon, 11 Jul 2011 17:13:56 +0530

rajveer – 1 file(s) modified
Fixed the bug.

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

Rev 2522 – penyaho -> pentaho

vikas — Mon, 11 Jul 2011 17:11:22 +0530

vikas – 1 file(s) modified
penyaho -> pentaho

~ /trunk/pentaho/scripts/panScript.sh

Rev 2521 – data-integration scripts.

vikas — Mon, 11 Jul 2011 17:09:13 +0530

vikas – 2 file(s) modified
data-integration scripts.

+ /trunk/pentaho/scripts
+ /trunk/pentaho/scripts/panScript.sh

Rev 2520 – Campaign tracking terms updated

varun.gupta — Mon, 11 Jul 2011 16:42:38 +0530

varun.gupta – 1 file(s) modified
Campaign tracking terms updated

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

Rev 2519 – Updated Transaformations

vikas — Mon, 11 Jul 2011 16:12:24 +0530

vikas – 2 file(s) modified
Updated Transaformations

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

Rev 2518 – Coupon value for SAHOLIC9100 increased to 1500.

varun.gupta — Mon, 11 Jul 2011 16:00:52 +0530

varun.gupta – 1 file(s) modified
Coupon value for SAHOLIC9100 increased to 1500.

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

Rev 2517 – Add average selling price.

vikas — Mon, 11 Jul 2011 15:58:27 +0530

vikas – 1 file(s) modified
Add average selling price.

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 2516 – Added email as a field in the provider object

chandranshu — Mon, 11 Jul 2011 14:59:28 +0530

chandranshu – 2 file(s) modified
Added email as a field in the provider object

~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py

Rev 2515 – Added email as a field in the provider object

chandranshu — Mon, 11 Jul 2011 14:57:52 +0530

chandranshu – 1 file(s) modified
Added email as a field in the provider object

~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Provider.java

Rev 2514 – Added email as a field in the provider object

chandranshu — Mon, 11 Jul 2011 14:57:15 +0530

chandranshu – 1 file(s) modified
Added email as a field in the provider object

~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 2513 – Added support to request pickup of an order

chandranshu — Mon, 11 Jul 2011 14:50:09 +0530

chandranshu – 8 file(s) modified
Added support to request pickup of an order

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/RequestPickupEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/RequestPickupEventHandler.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/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/RequestPickupHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/RequestPickupRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/RequestPickupResponse.java

Rev 2512 – Removed the unnecessary serial version id and refactored order id ...

chandranshu — Mon, 11 Jul 2011 14:48:14 +0530

chandranshu – 3 file(s) modified
Removed the unnecessary serial version id and refactored order id extraction

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptOrderhandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/FlagOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AcceptOrderRequest.java

Rev 2511 – Move datalogger to Common.

vikas — Mon, 11 Jul 2011 14:18:23 +0530

vikas – 15 file(s) modified
Move datalogger to Common.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AddressController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LogoutController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayErrorController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
x /trunk/Website/src/main/java/in/shop2020/serving/utils/DataLogger.java

Rev 2510 – Move Datalogger.java to Common.

vikas — Mon, 11 Jul 2011 14:15:03 +0530

vikas – 2 file(s) modified
Move Datalogger.java to Common.

~ /trunk/Common/pom.xml
+ /trunk/Common/src/main/java/in/shop2020/utils/DataLogger.java (copied from /trunk/Website/src/main/java/in/shop2020/serving/utils/DataLogger.java@2508)

Rev 2509 – Enabled flagging of an order.

chandranshu — Mon, 11 Jul 2011 13:02:52 +0530

chandranshu – 16 file(s) modified
Enabled flagging of an order.

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/FlagOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/FlagOrderEventHandler.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/InboxWidget.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/FlagOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderDetailsHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/DetailsMask.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/FlagOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/FlagOrderResponse.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderType.java

Rev 2508 – Updated test cases after adding tablet category

rajveer — Mon, 11 Jul 2011 11:59:01 +0530

rajveer – 2 file(s) modified
Updated test cases after adding tablet category

~ /trunk/Website/src/test/samples/home/test1.html
~ /trunk/Website/src/test/samples/product/test1.html

Rev 2507 – Added social network icons and Android festival link on right-top ...

varun.gupta — Sat, 09 Jul 2011 13:12:30 +0530

varun.gupta – 5 file(s) modified
Added social network icons and Android festival link on right-top of header.

~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/common.css
+ /trunk/Website/src/main/webapp/images/droid.gif
+ /trunk/Website/src/main/webapp/images/facebook.png
+ /trunk/Website/src/main/webapp/images/twitter.png

Rev 2506 – Updated url for tablets

rajveer — Fri, 08 Jul 2011 19:30:46 +0530

rajveer – 2 file(s) modified
Updated url for tablets

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/resources/templates/mainmenu.vm

Rev 2505 – Moved glossary at bottom and Tablets at top

rajveer — Fri, 08 Jul 2011 19:26:41 +0530

rajveer – 3 file(s) modified
Moved glossary at bottom and Tablets at top

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/resources/templates/mainmenu.vm

Rev 2504 – corrected the pattern

rajveer — Fri, 08 Jul 2011 19:14:45 +0530

rajveer – 1 file(s) modified
corrected the pattern

~ /trunk/Website/src/main/filters/staging/filters.properties

Rev 2503 – Added authentication for accessing shop2020.in

rajveer — Fri, 08 Jul 2011 18:21:25 +0530

rajveer – 5 file(s) modified
Added authentication for accessing shop2020.in

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/filters/dev/filters.properties
~ /trunk/Website/src/main/filters/prod/filters.properties
~ /trunk/Website/src/main/filters/staging/filters.properties
~ /trunk/Website/src/main/webapp/WEB-INF/web.xml

Rev 2502 – Google app data logging.

vikas — Fri, 08 Jul 2011 17:36:28 +0530

vikas – 46 file(s) modified
Google app data logging.

+ /trunk/GoogleAppDatalog
+ /trunk/GoogleAppDatalog/.classpath
+ /trunk/GoogleAppDatalog/.project
+ /trunk/GoogleAppDatalog/.settings
+ /trunk/GoogleAppDatalog/.settings/com.google.appengine.eclipse.core.prefs
+ /trunk/GoogleAppDatalog/.settings/com.google.gdt.eclipse.core.prefs
+ /trunk/GoogleAppDatalog/.settings/com.google.gwt.eclipse.core.prefs
+ /trunk/GoogleAppDatalog/src
+ /trunk/GoogleAppDatalog/src/in
+ /trunk/GoogleAppDatalog/src/in/shopping
+ /trunk/GoogleAppDatalog/src/in/shopping/googleapp
+ /trunk/GoogleAppDatalog/src/in/shopping/googleapp/mappers
+ /trunk/GoogleAppDatalog/src/in/shopping/googleapp/mappers/TestMapper.java
+ /trunk/GoogleAppDatalog/src/in/shopping/googleapp/servlets
+ /trunk/GoogleAppDatalog/src/in/shopping/googleapp/servlets/AddDataLogServlet.java
+ /trunk/GoogleAppDatalog/src/in/shopping/googleapp/servlets/ShowCompareProducts.java
+ /trunk/GoogleAppDatalog/src/log4j.properties
+ /trunk/GoogleAppDatalog/src/META-INF
+ /trunk/GoogleAppDatalog/src/META-INF/jdoconfig.xml
+ /trunk/GoogleAppDatalog/war
+ /trunk/GoogleAppDatalog/war/index.html
+ /trunk/GoogleAppDatalog/war/jsp
+ /trunk/GoogleAppDatalog/war/jsp/session-activity.jsp
+ /trunk/GoogleAppDatalog/war/jsp/successfull-payments.jsp
+ /trunk/GoogleAppDatalog/war/WEB-INF
+ /trunk/GoogleAppDatalog/war/WEB-INF/appengine-web.xml
+ /trunk/GoogleAppDatalog/war/WEB-INF/lib
+ /trunk/GoogleAppDatalog/war/WEB-INF/lib/appengine-api-1.0-sdk-1.5.1.jar
+ /trunk/GoogleAppDatalog/war/WEB-INF/lib/appengine-api-labs-1.5.1.jar
+ /trunk/GoogleAppDatalog/war/WEB-INF/lib/appengine-jsr107cache-1.5.1.jar
+ /trunk/GoogleAppDatalog/war/WEB-INF/lib/appengine-mapper.jar
+ /trunk/GoogleAppDatalog/war/WEB-INF/lib/charts4j-1.2.jar
+ /trunk/GoogleAppDatalog/war/WEB-INF/lib/commons-logging-1.1.1.jar
+ /trunk/GoogleAppDatalog/war/WEB-INF/lib/datanucleus-appengine-1.0.9.final.jar
+ /trunk/GoogleAppDatalog/war/WEB-INF/lib/datanucleus-core-1.1.5.jar
+ /trunk/GoogleAppDatalog/war/WEB-INF/lib/datanucleus-jpa-1.1.5.jar
+ /trunk/GoogleAppDatalog/war/WEB-INF/lib/geronimo-jpa_3.0_spec-1.1.1.jar
+ /trunk/GoogleAppDatalog/war/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.1.jar
+ /trunk/GoogleAppDatalog/war/WEB-INF/lib/guava-r07.jar
+ /trunk/GoogleAppDatalog/war/WEB-INF/lib/hadoop-0.20.2-core.jar
+ /trunk/GoogleAppDatalog/war/WEB-INF/lib/jdo2-api-2.3-eb.jar
+ /trunk/GoogleAppDatalog/war/WEB-INF/lib/json.jar
+ /trunk/GoogleAppDatalog/war/WEB-INF/lib/jsr107cache-1.1.jar
+ /trunk/GoogleAppDatalog/war/WEB-INF/logging.properties
+ /trunk/GoogleAppDatalog/war/WEB-INF/mapreduce.xml
+ /trunk/GoogleAppDatalog/war/WEB-INF/web.xml

Rev 2501 – Support to generate single report for all affiliates.

vikas — Fri, 08 Jul 2011 16:48:59 +0530

vikas – 2 file(s) modified
Support to generate single report for all affiliates.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/affiliate-report.vm

Rev 2500 – Added check to handle top level category

rajveer — Fri, 08 Jul 2011 15:34:06 +0530

rajveer – 1 file(s) modified
Added check to handle top level category

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

Rev 2499 – added poi and log4j in the classpath.

ankur.singhal — Fri, 08 Jul 2011 14:50:33 +0530

ankur.singhal – 1 file(s) modified
added poi and log4j in the classpath.

~ /trunk/CatalogDashboard/.classpath

Rev 2498 – removed test code for push to production feature. Update content ...

ankur.singhal — Fri, 08 Jul 2011 14:50:08 +0530

ankur.singhal – 2 file(s) modified
removed test code for push to production feature. Update content part is pending.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/resources/log4j.properties

Rev 2497 – added hotspotcategory in convertors. removed null check condition from update_item ...

ankur.singhal — Fri, 08 Jul 2011 14:47:59 +0530

ankur.singhal – 3 file(s) modified
added hotspotcategory in convertors. removed null check condition from update_item method.

~ /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/test/CatalogTest.py

Rev 2496 – added config keys for log file and max count for ...

ankur.singhal — Fri, 08 Jul 2011 14:46:26 +0530

ankur.singhal – 2 file(s) modified
added config keys for log file and max count for push to production.

~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
~ /trunk/Common/src/main/resources/shop2020_staging.cfg

Rev 2495 – Line chart fixes.

vikas — Fri, 08 Jul 2011 14:39:30 +0530

vikas – 1 file(s) modified
Line chart fixes.

~ /trunk/pentaho/reports/CumSalesReport.prpt