SmartDukaan – /

Rev 2569 – Added support to build using maven as well as run ...

chandranshu — Wed, 13 Jul 2011 17:40:38 +0530

chandranshu – 3 file(s) modified
Added support to build using maven as well as run using GWT in eclipse

~ /trunk/CatalogDashboard/.classpath
~ /trunk/CatalogDashboard/.settings/com.google.gdt.eclipse.core.prefs
+ /trunk/CatalogDashboard/pom.xml

Rev 2568 – Removed the gwt-servlet jar in the WEB-INF

chandranshu — Wed, 13 Jul 2011 17:36:50 +0530

chandranshu – 1 file(s) modified
Removed the gwt-servlet jar in the WEB-INF

x /trunk/CatalogDashboard/src/main/webapp/WEB-INF/lib/gwt-servlet.jar

Rev 2567 – Removed the non-maven folder

chandranshu — Wed, 13 Jul 2011 17:36:00 +0530

chandranshu – 1 file(s) modified
Removed the non-maven folder

x /trunk/CatalogDashboard/test-classes

Rev 2566 – Removed warnings from some Java files

chandranshu — Wed, 13 Jul 2011 17:35:26 +0530

chandranshu – 5 file(s) modified
Removed warnings from some Java files

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/FileUploadParams.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/MasterSheetGenerator.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java

Rev 2565 – Added buckets in case of tablets.

rajveer — Wed, 13 Jul 2011 17:19:52 +0530

rajveer – 1 file(s) modified
Added buckets in case of tablets.

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

Rev 2564 – Removing the sticky war folder

chandranshu — Wed, 13 Jul 2011 17:18:31 +0530

chandranshu – 1 file(s) modified
Removing the sticky war folder

x /trunk/CatalogDashboard/war

Rev 2563 – Removed the war folder completely

chandranshu — Wed, 13 Jul 2011 17:17:59 +0530

chandranshu – 1 file(s) modified
Removed the war folder completely

x /trunk/CatalogDashboard/war/catalogdashboard

Rev 2562 – Moved stuff from war folder to src/main/webapp

chandranshu — Wed, 13 Jul 2011 17:16:42 +0530

chandranshu – 9 file(s) modified
Moved stuff from war folder to src/main/webapp

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/resources/log4j.properties
+ /trunk/CatalogDashboard/src/main/webapp
+ /trunk/CatalogDashboard/src/main/webapp/CatalogDashboard.css (copied from /trunk/CatalogDashboard/war/CatalogDashboard.css@2559)
+ /trunk/CatalogDashboard/src/main/webapp/CatalogDashboard.html (copied from /trunk/CatalogDashboard/war/CatalogDashboard.html@2559)
+ /trunk/CatalogDashboard/src/main/webapp/WEB-INF (copied from /trunk/CatalogDashboard/war/WEB-INF@2559)
x /trunk/CatalogDashboard/war/CatalogDashboard.css
x /trunk/CatalogDashboard/war/CatalogDashboard.html
x /trunk/CatalogDashboard/war/WEB-INF

Rev 2561 – Replaced two spaces by one space.

rajveer — Wed, 13 Jul 2011 16:57:31 +0530

rajveer – 1 file(s) modified
Replaced two spaces by one space.

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

Rev 2560 – Changed the description of DOA_RETURNED

chandranshu — Wed, 13 Jul 2011 15:50:16 +0530

chandranshu – 1 file(s) modified
Changed the description of DOA_RETURNED

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

Rev 2559 – Corrected the hardcoded city Pune

chandranshu — Wed, 13 Jul 2011 14:08:40 +0530

chandranshu – 4 file(s) modified
Corrected the hardcoded city Pune

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py

Rev 2558 – Added the display of WE buttons for the OM as ...

chandranshu — Wed, 13 Jul 2011 14:07:25 +0530

chandranshu – 1 file(s) modified
Added the display of WE buttons for the OM as well. Disabled all controls by default.

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

Rev 2557 – Updated code to mark content complete items as active

rajveer — Wed, 13 Jul 2011 14:02:43 +0530

rajveer – 1 file(s) modified
Updated code to mark content complete items as active

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

Rev 2556 – Modified rules to included multiple features case

rajveer — Wed, 13 Jul 2011 14:00:00 +0530

rajveer – 2 file(s) modified
Modified rules to included multiple features case

~ /trunk/ContentStore/src/jython/comparisonrules/battery_math.py
~ /trunk/ContentStore/src/jython/comparisonrules/input_mechanisms_math.py

Rev 2555 – Changed name from "Mobile Accessories" to "Accessories". Moved tablets before ...

rajveer — Wed, 13 Jul 2011 13:44:55 +0530

rajveer – 1 file(s) modified
Changed name from "Mobile Accessories" to "Accessories". Moved tablets before Accessories.

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

Rev 2554 – Add price range, Categories dimensions.

vikas — Wed, 13 Jul 2011 13:25:39 +0530

vikas – 1 file(s) modified
Add price range, Categories dimensions.

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 2553 – Add price range, Categories dimensions.

vikas — Wed, 13 Jul 2011 13:20:30 +0530

vikas – 1 file(s) modified
Add price range, Categories dimensions.

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 2552 – Configure log4j logger for social

vikas — Wed, 13 Jul 2011 12:56:45 +0530

vikas – 1 file(s) modified
Configure log4j logger for social

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

Rev 2551 – Fixed bug in category manager.

rajveer — Wed, 13 Jul 2011 12:54:43 +0530

rajveer – 1 file(s) modified
Fixed bug in category manager.

~ /trunk/Common/src/main/java/in/shop2020/utils/CategoryManager.java

Rev 2550 – Configure logger for velocity.

vikas — Wed, 13 Jul 2011 12:53:01 +0530

vikas – 1 file(s) modified
Configure logger for velocity.

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

Rev 2549 – Fix datalogger.

vikas — Wed, 13 Jul 2011 12:51:58 +0530

vikas – 1 file(s) modified
Fix datalogger.

~ /trunk/Website/src/main/resources/log4j.properties

Rev 2548 – Log4j.properties for common.

vikas — Wed, 13 Jul 2011 12:50:47 +0530

vikas – 1 file(s) modified
Log4j.properties for common.

+ /trunk/Common/src/main/resources/log4j.properties

Rev 2547 – Added tablet to behave like mobiles phones. ie we should ...

rajveer — Wed, 13 Jul 2011 12:26:14 +0530

rajveer – 7 file(s) modified
Added tablet to behave like mobiles phones. ie we should be able to compare them

~ /trunk/ContentStore/src/jython/comparisonrules/input_mechanisms_math.py
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewCMP.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewIR.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java

Rev 2546 – Added Symbian Anna in OS.

rajveer — Wed, 13 Jul 2011 12:04:57 +0530

rajveer – 1 file(s) modified
Added Symbian Anna in OS.

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

Rev 2545 – Added configuration file for invoice generation

chandranshu — Wed, 13 Jul 2011 12:01:38 +0530

chandranshu – 5 file(s) modified
Added configuration file for invoice generation

+ /trunk/Support/src/main/resources/in
+ /trunk/Support/src/main/resources/in/shop2020
+ /trunk/Support/src/main/resources/in/shop2020/support
+ /trunk/Support/src/main/resources/in/shop2020/support/services
+ /trunk/Support/src/main/resources/in/shop2020/support/services/InvoiceGenerationService.properties

Rev 2544 – Added a log4j properties file to enable log4j logging

chandranshu — Wed, 13 Jul 2011 11:59:19 +0530

chandranshu – 1 file(s) modified
Added a log4j properties file to enable log4j logging

+ /trunk/Support/src/main/resources/log4j.properties

Rev 2543 – Modified bestDealValue

varun.gupta — Wed, 13 Jul 2011 11:14:06 +0530

varun.gupta – 1 file(s) modified
Modified bestDealValue

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

Rev 2542 – Trimmed the trailing spaces from brand, model name, model number.

rajveer — Wed, 13 Jul 2011 08:21:35 +0530

rajveer – 1 file(s) modified
Trimmed the trailing spaces from brand, model name, model number.

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

Rev 2541 – Discount value modified for Galaxy Ace

varun.gupta — Wed, 13 Jul 2011 00:22:54 +0530

varun.gupta – 1 file(s) modified
Discount value modified for Galaxy Ace

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

Rev 2540 – Discount value modified for Galaxy Ace

varun.gupta — Wed, 13 Jul 2011 00:20:45 +0530

varun.gupta – 1 file(s) modified
Discount value modified for Galaxy Ace

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

Rev 2539 – test changes after introduction of social icons in the header

varun.gupta — Tue, 12 Jul 2011 20:54:39 +0530

varun.gupta – 4 file(s) modified
test changes after introduction of social icons in the header

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

Rev 2538 – Added new statuses and methods to support picking up an ...

chandranshu — Tue, 12 Jul 2011 17:13:33 +0530

chandranshu – 3 file(s) modified
Added new statuses and methods to support picking up an order in case of DOA

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /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 2537 – Added new statuses and methods to support picking up an ...

chandranshu — Tue, 12 Jul 2011 17:08:18 +0530

chandranshu – 1 file(s) modified
Added new statuses and methods to support picking up an order in case of DOA

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

Rev 2536 – Added support to have an order picked up from a ...

chandranshu — Tue, 12 Jul 2011 17:07:09 +0530

chandranshu – 7 file(s) modified
Added support to have an order picked up from a customer in case of DOA

~ /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/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 2535 – Ensured that after the order is authorized, the new view ...

chandranshu — Tue, 12 Jul 2011 16:02:40 +0530

chandranshu – 1 file(s) modified
Ensured that after the order is authorized, the new view is those of remaining delivered orders

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

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