SmartDukaan – /

Rev 3473 – Added support to change color and shift warehouse

chandranshu — Thu, 29 Sep 2011 11:31:10 +0530

chandranshu – 16 file(s) modified
Added support to change color and shift warehouse

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ChooseColorEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ChooseColorEventHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ChooseWarehouseEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ChooseWarehouseEventHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/AddWeightBox.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ChooseColorBox.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ChooseWarehouseBox.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/ChooseColorHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ChooseWarehouseHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ChooseColorRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ChooseColorResponse.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ChooseWarehouseRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ChooseWarehouseResponse.java

Rev 3472 – Coupons on SE LT15i & SE SK17i removed.

varun.gupta — Wed, 28 Sep 2011 19:43:20 +0530

varun.gupta – 1 file(s) modified
Coupons on SE LT15i & SE SK17i removed.

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

Rev 3471 – SE SK17i & SE LT15i disqualified from the application of ...

varun.gupta — Wed, 28 Sep 2011 19:19:38 +0530

varun.gupta – 1 file(s) modified
SE SK17i & SE LT15i disqualified from the application of this coupon rule.

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

Rev 3470 – Updated product notifications code to avoid duplicate entries.

rajveer — Wed, 28 Sep 2011 19:09:34 +0530

rajveer – 1 file(s) modified
Updated product notifications code to avoid duplicate entries.

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

Rev 3469 – Added new methods to update the item or the warehouse ...

chandranshu — Wed, 28 Sep 2011 18:50:18 +0530

chandranshu – 6 file(s) modified
Added new methods to update the item or the warehouse of an order

~ /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/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 3468 – Added new configs for HA DB setup

chandranshu — Wed, 28 Sep 2011 18:49:25 +0530

chandranshu – 1 file(s) modified
Added new configs for HA DB setup

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 3467 – Ensured that the expected delay is set to zero initially

chandranshu — Wed, 28 Sep 2011 18:48:27 +0530

chandranshu – 1 file(s) modified
Ensured that the expected delay is set to zero initially

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

Rev 3466 – Updated dependency on the javax mail

rajveer — Wed, 28 Sep 2011 16:28:11 +0530

rajveer – 2 file(s) modified
Updated dependency on the javax mail

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

Rev 3465 – Added email dependency.

rajveer — Wed, 28 Sep 2011 16:14:29 +0530

rajveer – 1 file(s) modified
Added email dependency.

~ /trunk/ContentStore/pom.xml

Rev 3464 – Added support of notifications.

rajveer — Wed, 28 Sep 2011 16:06:51 +0530

rajveer – 1 file(s) modified
Added support of notifications.

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

Rev 3463 – Added support to add weight to an order

chandranshu — Wed, 28 Sep 2011 15:15:24 +0530

chandranshu – 12 file(s) modified
Added support to add weight to an order

~ /trunk/HotspotDashboard/.classpath
~ /trunk/HotspotDashboard/pom.xml
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddWeightEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddWeightEventHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/AddWeightBox.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/OrderDetails.ui.xml
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddWeightHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddWeightRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddWeightResponse.java

Rev 3462 – Saved feedback will only be applied in case of conflict ...

varun.gupta — Wed, 28 Sep 2011 15:12:38 +0530

varun.gupta – 1 file(s) modified
Saved feedback will only be applied in case of conflict state prevailing.

~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.js

Rev 3461 – Removed unused imports

chandranshu — Wed, 28 Sep 2011 15:12:16 +0530

chandranshu – 2 file(s) modified
Removed unused imports

~ /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 3460 – Start email sender script.

rajveer — Wed, 28 Sep 2011 15:10:18 +0530

rajveer – 1 file(s) modified
Start email sender script.

+ /trunk/runutils/start-email-sender.sh

Rev 3459 – Differentiated between 0 and Nonde for expectedDelay

chandranshu — Wed, 28 Sep 2011 14:37:14 +0530

chandranshu – 1 file(s) modified
Differentiated between 0 and Nonde for expectedDelay

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

Rev 3458 – New barcode font for Aramex

chandranshu — Wed, 28 Sep 2011 13:17:00 +0530

chandranshu – 1 file(s) modified
New barcode font for Aramex

~ /trunk/Support/src/main/resources/aramex/barcode.TTF

Rev 3457 – Tokens produced by splitting model number on hyphen will be ...

varun.gupta — Wed, 28 Sep 2011 12:42:25 +0530

varun.gupta – 1 file(s) modified
Tokens produced by splitting model number on hyphen will be joined by AND operator in the query.

~ /trunk/PriceComparisonFramework/src/PyLucene/Retriever.py

Rev 3456 – Changed the log file path to /var/log/services

varun.gupta — Wed, 28 Sep 2011 12:24:34 +0530

varun.gupta – 1 file(s) modified
Changed the log file path to /var/log/services

~ /trunk/runutils/start-price-comparison-server.sh

Rev 3455 – Removed Nokia 1616 from the qualified set of models

varun.gupta — Wed, 28 Sep 2011 11:55:03 +0530

varun.gupta – 1 file(s) modified
Removed Nokia 1616 from the qualified set of models

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

Rev 3454 – Removed Nokia 1280 from the qualified set of models

varun.gupta — Wed, 28 Sep 2011 11:25:37 +0530

varun.gupta – 1 file(s) modified
Removed Nokia 1280 from the qualified set of models

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

Rev 3453 – Method added to import synonyms

varun.gupta — Wed, 28 Sep 2011 11:02:53 +0530

varun.gupta – 1 file(s) modified
Method added to import synonyms

~ /trunk/PriceComparisonFramework/src/Utils.py

Rev 3452 – Artificial changes

chandranshu — Tue, 27 Sep 2011 19:21:52 +0530

chandranshu – 2 file(s) modified
Artificial changes

~ /trunk/PyProj/src/shop2020/warehouse/main/handler/WarehouseHandler.py
~ /trunk/PyProj/src/shop2020/warehouse/main/model/PurchaseOrder.py

Rev 3451 – Added a method to update the weight of an order. ...

chandranshu — Tue, 27 Sep 2011 19:20:28 +0530

chandranshu – 6 file(s) modified
Added a method to update the weight of an order. Added a parameter to getShippedOrders

Rev 3450 – Fixing some NPEs.

vikas — Tue, 27 Sep 2011 19:02:58 +0530

vikas – 5 file(s) modified
Fixing some NPEs.

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/search-events.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/session-activity.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/user-activity.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/appengine-web.xml
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/cron.xml

Rev 3449 – Added a courier-reconciliation report. Removed some unused classes.

chandranshu — Tue, 27 Sep 2011 18:48:52 +0530

chandranshu – 9 file(s) modified
Added a courier-reconciliation report. Removed some unused classes.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierReconciliationController.java
x /trunk/Support/src/main/java/in/shop2020/support/controllers/InvoiceController.java
x /trunk/Support/src/main/java/in/shop2020/support/controllers/PendingOrdersController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseOrderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierReconciliationGenerator.java
x /trunk/Support/src/main/java/in/shop2020/support/services/InvoiceGenerationService.java
x /trunk/Support/src/main/java/in/shop2020/support/services/PendingOrdersGenerator.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/courier-reconciliation-index.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/payment-details-authsuccess.vm

Rev 3448 – Updated python rules to handle optional 2G field.

rajveer — Tue, 27 Sep 2011 18:46:55 +0530

rajveer – 3 file(s) modified
Updated python rules to handle optional 2G field.

~ /trunk/ContentStore/src/jython/comparisonrules/voice_calling_technology_math.py
~ /trunk/ContentStore/src/jython/irdatarules/battery-capacity-talktime.py
~ /trunk/ContentStore/src/main/java/in/shop2020/util/CMPJythonWrapper.java

Rev 3447 – Updated class path for test setup

rajveer — Tue, 27 Sep 2011 17:21:27 +0530

rajveer – 1 file(s) modified
Updated class path for test setup

~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 3446 – Best price visualisation now getting updated after submitting feedback.

varun.gupta — Tue, 27 Sep 2011 17:18:42 +0530

varun.gupta – 1 file(s) modified
Best price visualisation now getting updated after submitting feedback.

~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.js

Rev 3445 – Cleanup logging.

vikas — Tue, 27 Sep 2011 16:45:53 +0530

vikas – 1 file(s) modified
Cleanup logging.

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

Rev 3444 – Changes to store the product activity with source.

vikas — Tue, 27 Sep 2011 15:53:34 +0530

vikas – 7 file(s) modified
Changes to store the product activity with source.

+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/model/ItemActivityWithSource.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/server/ItemActivityWithSourceRepository.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/DailyProductWithSourceAggregatorServlet.java
+ /trunk/GoogleAppDatalog/src/main/webapp/jsp/product-activity-with-source.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/appengine-web.xml
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/cron.xml
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/web.xml

Rev 3443 – Handling the exception.

rajveer — Tue, 27 Sep 2011 15:12:48 +0530

rajveer – 1 file(s) modified
Handling the exception.

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

Rev 3442 – Updated the script.

rajveer — Tue, 27 Sep 2011 15:08:51 +0530

rajveer – 1 file(s) modified
Updated the script.

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

Rev 3441 – Updated thrift dependency

rajveer — Tue, 27 Sep 2011 15:04:03 +0530

rajveer – 2 file(s) modified
Updated thrift dependency

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

Rev 3440 – Synonym resolution and Feedback layer added

varun.gupta — Tue, 27 Sep 2011 15:02:09 +0530

varun.gupta – 4 file(s) modified
Synonym resolution and Feedback layer added

~ /trunk/PriceComparisonFramework/src/PyLucene/Retriever.py
~ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/PriceChart.html
~ /trunk/PriceComparisonFramework/src/WebUI/PriceComparisonServer.py
~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.js

Rev 3439 – Synonym generation added to content generation process

varun.gupta — Tue, 27 Sep 2011 14:46:40 +0530

varun.gupta – 1 file(s) modified
Synonym generation added to content generation process

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

Rev 3438 – SynonymExporter will generate JSON file containing synonyms for product names

varun.gupta — Tue, 27 Sep 2011 14:14:31 +0530

varun.gupta – 1 file(s) modified
SynonymExporter will generate JSON file containing synonyms for product names

+ /trunk/ContentStore/src/main/java/in/shop2020/util/SynonymExporter.java

Rev 3437 – Split source columns into source type and source url for ...

vikas — Tue, 27 Sep 2011 12:16:36 +0530

vikas – 1 file(s) modified
Split source columns into source type and source url for performance in cube schema.

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 3436 – Split source columns into source type and source url for ...

vikas — Tue, 27 Sep 2011 11:12:12 +0530

vikas – 2 file(s) modified
Split source columns into source type and source url for performance.

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

Rev 3435 – Updated thrift dependency

rajveer — Tue, 27 Sep 2011 11:05:56 +0530

rajveer – 6 file(s) modified
Updated thrift dependency

~ /trunk/ContentCreation/pom.xml
~ /trunk/ContentStore/pom.xml
~ /trunk/Crm/pom.xml
~ /trunk/HotspotDashboard/pom.xml
~ /trunk/Social/pom.xml
~ /trunk/Support/pom.xml

Rev 3434 – Reverted the orderstatus file.

rajveer — Mon, 26 Sep 2011 21:58:00 +0530

rajveer – 1 file(s) modified
Reverted the orderstatus file.

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