SmartDukaan – /

Rev 2628 – Added support to reship an order and create a return ...

chandranshu — Mon, 18 Jul 2011 18:03:31 +0530

chandranshu – 13 file(s) modified
Added support to reship an order and create a return order as well

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ReshipOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ReshipOrderEventHandler.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/ReshipOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderType.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ReshipOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ReshipOrderResponse.java
~ /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

Rev 2627 – Changed the order of Servlet and Servlet mapping elements to ...

chandranshu — Mon, 18 Jul 2011 14:49:01 +0530

chandranshu – 1 file(s) modified
Changed the order of Servlet and Servlet mapping elements to ensure that they comply with the servlet specification

~ /trunk/CatalogDashboard/src/main/webapp/WEB-INF/web.xml

Rev 2626 – Added the servlet mapping for the Mastersheet generating servlet

chandranshu — Mon, 18 Jul 2011 14:46:51 +0530

chandranshu – 1 file(s) modified
Added the servlet mapping for the Mastersheet generating servlet

~ /trunk/CatalogDashboard/src/main/webapp/WEB-INF/web.xml

Rev 2625 – Updated the Logistics Reconciliation script to read the unused ref ...

chandranshu — Mon, 18 Jul 2011 12:01:15 +0530

chandranshu – 1 file(s) modified
Updated the Logistics Reconciliation script to read the unused ref no. for delivery and undelivered report

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

Rev 2624 – Updated the Logistics Reconciliation script to read the unused ref ...

chandranshu — Mon, 18 Jul 2011 11:53:10 +0530

chandranshu – 1 file(s) modified
Updated the Logistics Reconciliation script to read the unused ref no.

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

Rev 2623 – Exception message modified.

varun.gupta — Sun, 17 Jul 2011 12:59:47 +0530

varun.gupta – 1 file(s) modified
Exception message modified.

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_nokias_promotion.py

Rev 2622 – Rule for NokiaS campaign

varun.gupta — Sun, 17 Jul 2011 10:01:48 +0530

varun.gupta – 1 file(s) modified
Rule for NokiaS campaign

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

Rev 2621 – Returning None if there are no categories

varun.gupta — Fri, 15 Jul 2011 19:51:42 +0530

varun.gupta – 1 file(s) modified
Returning None if there are no categories

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

Rev 2620 – GoogleAppDataLog moved to maven.

vikas — Fri, 15 Jul 2011 19:46:02 +0530

vikas – 42 file(s) modified
GoogleAppDataLog moved to maven.

+ /trunk/GoogleAppDatalog
+ /trunk/GoogleAppDatalog/.classpath
+ /trunk/GoogleAppDatalog/.project
+ /trunk/GoogleAppDatalog/.settings
+ /trunk/GoogleAppDatalog/.settings/com.google.gdt.eclipse.core.prefs
+ /trunk/GoogleAppDatalog/.settings/com.google.gwt.eclipse.core.prefs
+ /trunk/GoogleAppDatalog/.settings/org.eclipse.jdt.core.prefs
+ /trunk/GoogleAppDatalog/pom.xml
+ /trunk/GoogleAppDatalog/src
+ /trunk/GoogleAppDatalog/src/main
+ /trunk/GoogleAppDatalog/src/main/java
+ /trunk/GoogleAppDatalog/src/main/java/in
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/model
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/model/Message.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/server
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/server/MessageRepository.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/AddDataLogServlet.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/IndexServlet.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/mappers
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/mappers/TestMapper.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/ShowCompareProducts.java
+ /trunk/GoogleAppDatalog/src/main/resources
+ /trunk/GoogleAppDatalog/src/main/resources/in
+ /trunk/GoogleAppDatalog/src/main/resources/in/shop2020
+ /trunk/GoogleAppDatalog/src/main/resources/log4j.properties
+ /trunk/GoogleAppDatalog/src/main/resources/logging.properties
+ /trunk/GoogleAppDatalog/src/main/resources/META-INF
+ /trunk/GoogleAppDatalog/src/main/resources/META-INF/jdoconfig.xml
+ /trunk/GoogleAppDatalog/src/main/resources/META-INF/persistence.xml
+ /trunk/GoogleAppDatalog/src/main/webapp
+ /trunk/GoogleAppDatalog/src/main/webapp/index.jsp
+ /trunk/GoogleAppDatalog/src/main/webapp/jsp
+ /trunk/GoogleAppDatalog/src/main/webapp/jsp/session-activity.jsp
+ /trunk/GoogleAppDatalog/src/main/webapp/jsp/successfull-payments.jsp
+ /trunk/GoogleAppDatalog/src/main/webapp/META-INF
+ /trunk/GoogleAppDatalog/src/main/webapp/META-INF/MANIFEST.MF
+ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF
+ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/appengine-web.xml
+ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/mapreduce.xml
+ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/web.xml

Rev 2619 – Deleting to move it to maven project.

vikas — Fri, 15 Jul 2011 19:42:40 +0530

vikas – 1 file(s) modified
Deleting to move it to maven project.

x /trunk/GoogleAppDatalog

Rev 2618 – Googleapp dependency jars.

vikas — Fri, 15 Jul 2011 19:37:49 +0530

vikas – 9 file(s) modified
Googleapp dependency jars.

+ /thirdparty/src/main/resources/readonly/appengine-mapper
+ /thirdparty/src/main/resources/readonly/appengine-mapper/1.0
+ /thirdparty/src/main/resources/readonly/appengine-mapper/1.0/appengine-mapper.jar
+ /thirdparty/src/main/resources/readonly/charts4j
+ /thirdparty/src/main/resources/readonly/charts4j/1.2
+ /thirdparty/src/main/resources/readonly/charts4j/1.2/charts4j-1.2.jar
+ /thirdparty/src/main/resources/readonly/guava
+ /thirdparty/src/main/resources/readonly/guava/r07
+ /thirdparty/src/main/resources/readonly/guava/r07/guava-r07.jar

Rev 2617 – Updated ReceiveReturnHandler to use the new method capable of processing ...

chandranshu — Fri, 15 Jul 2011 18:49:32 +0530

chandranshu – 1 file(s) modified
Updated ReceiveReturnHandler to use the new method capable of processing both sales return and DOA

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ReceiveReturnHandler.java

Rev 2616 – Added new statuses and new methods

chandranshu — Fri, 15 Jul 2011 18:48:21 +0530

chandranshu – 5 file(s) modified
Added new statuses and new methods

~ /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/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py

Rev 2615 – Added new statuses and new methods

chandranshu — Fri, 15 Jul 2011 18:47:26 +0530

chandranshu – 2 file(s) modified
Added new statuses and new methods

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

Rev 2614 – Added new statuses and new methods

chandranshu — Fri, 15 Jul 2011 18:47:12 +0530

chandranshu – 1 file(s) modified
Added new statuses and new methods

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

Rev 2613 – Renamed the SALES_RETURNED, SALES_RET_PENDING and DOA_PENDING statuses

chandranshu — Fri, 15 Jul 2011 18:14:48 +0530

chandranshu – 2 file(s) modified
Renamed the SALES_RETURNED, SALES_RET_PENDING and DOA_PENDING statuses

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py

Rev 2612 – Renamed the SALES_RETURNED, SALES_RET_PENDING and DOA_PENDING statuses

chandranshu — Fri, 15 Jul 2011 18:13:45 +0530

chandranshu – 2 file(s) modified
Renamed the SALES_RETURNED, SALES_RET_PENDING and DOA_PENDING statuses

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

Rev 2611 – Renamed the SALES_RETURNED, SALES_RET_PENDING and DOA_PENDING statuses

chandranshu — Fri, 15 Jul 2011 18:13:17 +0530

chandranshu – 1 file(s) modified
Renamed the SALES_RETURNED, SALES_RET_PENDING and DOA_PENDING statuses

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

Rev 2610 – Minor modifications for colescing multiple disparate workflows into one

chandranshu — Fri, 15 Jul 2011 18:11:39 +0530

chandranshu – 17 file(s) modified
Minor modifications for colescing multiple disparate workflows into one

x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AcceptDoaEvent.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AcceptDoaEventHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ReceiveReturnEvent.java (copied from /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AcceptDoaEvent.java@2588)
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ReceiveReturnEventHandler.java (copied from /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AcceptDoaEventHandler.java@2588)
~ /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
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptDoaHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderDetailsHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ReceiveReturnHandler.java (copied from /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptDoaHandler.java@2588)
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AcceptDoaRequest.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AcceptDoaResponse.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/OrderType.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ReceiveReturnRequest.java (copied from /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AcceptDoaRequest.java@2588)
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ReceiveReturnResponse.java (copied from /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AcceptDoaResponse.java@2588)

Rev 2609 – Removed the sqlite file for the order database

chandranshu — Fri, 15 Jul 2011 17:14:00 +0530

chandranshu – 3 file(s) modified
Removed the sqlite file for the order database

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
x /trunk/PyProj/src/shop2020/model/v1/order/impl/Order.sqlite
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py

Rev 2608 – Added velocity properties for velocity logging

rajveer — Fri, 15 Jul 2011 16:46:00 +0530

rajveer – 1 file(s) modified
Added velocity properties for velocity logging

+ /trunk/ContentCreation/src/main/resources/velocity.properties

Rev 2607 – Remove the empty space from the brand name, model number, ...

rajveer — Fri, 15 Jul 2011 16:39:45 +0530

rajveer – 1 file(s) modified
Remove the empty space from the brand name, model number, model name while storing in bdb

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 2606 – Added tablets in search option. Fixed bug which was breaking ...

rajveer — Fri, 15 Jul 2011 15:55:09 +0530

rajveer – 3 file(s) modified
Added tablets in search option. Fixed bug which was breaking searching

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java
~ /trunk/Website/src/main/resources/templates/searchbar.vm

Rev 2605 – Changed order of model name and model number as per ...

rajveer — Fri, 15 Jul 2011 15:00:17 +0530

rajveer – 5 file(s) modified
Changed order of model name and model number as per trac ticket: 425

~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-edit.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-editNew.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-editSlide.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 2604 – Added blackberry tablet od in comparision rules

rajveer — Fri, 15 Jul 2011 14:58:39 +0530

rajveer – 1 file(s) modified
Added blackberry tablet od in comparision rules

~ /trunk/ContentStore/src/jython/comparisonrules/software_math.py

Rev 2603 – Added new video format. Also change name from WLAN to ...

rajveer — Fri, 15 Jul 2011 14:58:03 +0530

rajveer – 3 file(s) modified
Added new video format. Also change name from WLAN to Wi-Fi

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

Rev 2602 – Renamed DOA_RETURNED to DOA_RECEIVED

chandranshu — Fri, 15 Jul 2011 14:53:28 +0530

chandranshu – 2 file(s) modified
Renamed DOA_RETURNED to DOA_RECEIVED

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

Rev 2601 – Renamed DOA_RETURNED to DOA_RECEIVED

chandranshu — Fri, 15 Jul 2011 14:53:10 +0530

chandranshu – 2 file(s) modified
Renamed DOA_RETURNED to DOA_RECEIVED

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

Rev 2600 – Renamed DOA_RETURNED to DOA_RECEIVED

chandranshu — Fri, 15 Jul 2011 14:52:06 +0530

chandranshu – 1 file(s) modified
Renamed DOA_RETURNED to DOA_RECEIVED

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

Rev 2599 – Renamed DOA_RETURNED to DOA_RECEIVED

chandranshu — Fri, 15 Jul 2011 14:51:41 +0530

chandranshu – 4 file(s) modified
Renamed DOA_RETURNED to DOA_RECEIVED

~ /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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py

Rev 2598 – In case of one day message will be "Within 1 ...

rajveer — Fri, 15 Jul 2011 14:20:38 +0530

rajveer – 1 file(s) modified
In case of one day message will be "Within 1 business day" instead of "Within 1 business days"

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

Rev 2597 – Add order hour.

vikas — Fri, 15 Jul 2011 14:17:20 +0530

vikas – 1 file(s) modified
Add order hour.

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

Rev 2596 – Add payment gateway and payment method dimensions. Update price range.

vikas — Fri, 15 Jul 2011 13:17:26 +0530

vikas – 1 file(s) modified
Add payment gateway and payment method dimensions. Update price range.

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 2595 – Corrected a code comment

chandranshu — Fri, 15 Jul 2011 13:12:17 +0530

chandranshu – 1 file(s) modified
Corrected a code comment

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

Rev 2594 – Added a javadoc comment

chandranshu — Fri, 15 Jul 2011 13:10:20 +0530

chandranshu – 1 file(s) modified
Added a javadoc comment

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

Rev 2593 – Ensured that the attribute list of the thrift Payment object ...

chandranshu — Fri, 15 Jul 2011 13:09:33 +0530

chandranshu – 1 file(s) modified
Ensured that the attribute list of the thrift Payment object is never null

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/domain/Payment.java

Rev 2592 – Added target to svn:ignore list

chandranshu — Fri, 15 Jul 2011 13:08:30 +0530

chandranshu – 1 file(s) modified
Added target to svn:ignore list

~ /trunk/CatalogDashboard

Rev 2591 – Added support for the warehouse executive to accept and validate ...

chandranshu — Fri, 15 Jul 2011 13:07:07 +0530

chandranshu – 4 file(s) modified
Added support for the warehouse executive to accept and validate a DOA

Rev 2590 – Added support for the warehouse executive to accept and validate ...

chandranshu — Fri, 15 Jul 2011 13:06:07 +0530

chandranshu – 1 file(s) modified
Added support for the warehouse executive to accept and validate a DOA

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

Rev 2589 – Added support for the warehouse executive to accept and validate ...

chandranshu — Fri, 15 Jul 2011 13:05:41 +0530

chandranshu – 1 file(s) modified
Added support for the warehouse executive to accept and validate a DOA

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