SmartDukaan – /

Rev 5639 – Adding Support for scrapers for Sulekha and Tradus Reviewed by: ...

amar.kumar — Fri, 20 Jul 2012 15:21:20 +0530

amar.kumar – 11 file(s) modified
Adding Support for scrapers for Sulekha and Tradus
Reviewed by: Anupam Singh

~ /trunk/PriceComparisonFramework/src/ScraperLoader.py
+ /trunk/PriceComparisonFramework/src/Scrapers/SulekhaScraper.py
+ /trunk/PriceComparisonFramework/src/Scrapers/TradusScraper.py
~ /trunk/PriceComparisonFramework/src/URLQueue.py
~ /trunk/PriceComparisonFramework/src/Utils.py
~ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/MSPChart.html
~ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/PriceChart.html
~ /trunk/PriceComparisonFramework/src/WebUI/MSPDashboard.py
~ /trunk/PriceComparisonFramework/src/WebUI/PriceComparisonServer.py
~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.css
~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.js

Rev 5638 – #1478 [SEO] Improve After Sales Pages Reviewer: Amar

amit.gupta — Fri, 20 Jul 2012 13:52:29 +0530

amit.gupta – 7 file(s) modified
#1478
[SEO] Improve After Sales Pages
Reviewer: Amar

+ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductDocumentsGenerator.java
~ /trunk/ContentStore/src/velocity/AfterSales.vm
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AfterSalesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GeneratedController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/LoginInterceptor.java
~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm

Rev 5637 – Bug fix. First amending reservations and then amending the fulfilment ...

mandeep.dhir — Thu, 19 Jul 2012 18:33:37 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. First amending reservations and then amending the fulfilment warehouse

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

Rev 5636 – Adding code for tracking Logistics through AlertService

amar.kumar — Thu, 19 Jul 2012 16:20:29 +0530

amar.kumar – 1 file(s) modified
Adding code for tracking Logistics through AlertService

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

Rev 5635 – Trac # 1493 Reviewer : Mandeep Dhir

anupam.singh — Thu, 19 Jul 2012 15:07:44 +0530

anupam.singh – 1 file(s) modified
Trac # 1493
Reviewer : Mandeep Dhir

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

Rev 5634 –

vikram.raghav — Thu, 19 Jul 2012 12:59:03 +0530

vikram.raghav – 1 file(s) modified

+ /trunk/Website/src/main/resources/templates/localhost-address.vm

Rev 5633 – Adding images for domain specific changes

vikram.raghav — Thu, 19 Jul 2012 12:29:00 +0530

vikram.raghav – 8 file(s) modified
Adding images for domain specific changes

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/resources/templates/header.vm
+ /trunk/Website/src/main/webapp/images/dev
+ /trunk/Website/src/main/webapp/images/dev/saholic-logo.jpg
+ /trunk/Website/src/main/webapp/images/hotspot
+ /trunk/Website/src/main/webapp/images/hotspot/saholic-logo.jpg
+ /trunk/Website/src/main/webapp/images/staging
+ /trunk/Website/src/main/webapp/images/staging/saholic-logo.jpg

Rev 5632 – #1485 Add new display type "Ultra AMOLED" for phones

amit.gupta — Thu, 19 Jul 2012 12:09:48 +0530

amit.gupta – 2 file(s) modified
#1485
Add new display type "Ultra AMOLED" for phones

~ /trunk/ContentStore/src/jython/comparisonrules/display_math.py
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 5631 – Adding new method for sending html mails and using this ...

amar.kumar — Thu, 19 Jul 2012 11:57:09 +0530

amar.kumar – 2 file(s) modified
Adding new method for sending html mails and using this method while sending delayed-selivery/cancelled order mails

~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py
~ /trunk/PyProj/src/shop2020/utils/EmailAttachmentSender.py

Rev 5630 – Reducing reservation count of accurate warehouse

mandeep.dhir — Thu, 19 Jul 2012 11:23:44 +0530

mandeep.dhir – 1 file(s) modified
Reducing reservation count of accurate warehouse

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

Rev 5629 –

vikram.raghav — Wed, 18 Jul 2012 20:31:58 +0530

vikram.raghav – 1 file(s) modified

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

Rev 5628 – images changes for domain

vikram.raghav — Wed, 18 Jul 2012 20:30:35 +0530

vikram.raghav – 8 file(s) modified
images changes for domain

+ /trunk/Website/src/main/webapp/images/Hotspot
+ /trunk/Website/src/main/webapp/images/Hotspot/saholic-logo.jpg
+ /trunk/Website/src/main/webapp/images/localhost
+ /trunk/Website/src/main/webapp/images/localhost/saholic-logo.jpg
+ /trunk/Website/src/main/webapp/images/Saholic
+ /trunk/Website/src/main/webapp/images/Saholic/saholic-logo.jpg
+ /trunk/Website/src/main/webapp/images/Shop2020
+ /trunk/Website/src/main/webapp/images/Shop2020/saholic-logo.jpg

Rev 5627 – shop2020 address file

vikram.raghav — Wed, 18 Jul 2012 19:10:41 +0530

vikram.raghav – 1 file(s) modified
shop2020 address file

+ /trunk/Website/src/main/resources/templates/Shop2020-address.vm

Rev 5626 – Removing ga-invoker.js from minification process

amar.kumar — Wed, 18 Jul 2012 18:38:23 +0530

amar.kumar – 1 file(s) modified
Removing ga-invoker.js from minification process

~ /trunk/Website/pom.xml

Rev 5625 –

vikram.raghav — Wed, 18 Jul 2012 18:32:03 +0530

vikram.raghav – 62 file(s) modified

~ /trunk/Website/pom.xml
/trunk/Website/src/main/filters/dev/filters.properties
+ /trunk/Website/src/main/filters/hotspot
+ /trunk/Website/src/main/filters/hotspot/filters.properties
~ /trunk/Website/src/main/filters/prod/filters.properties
~ /trunk/Website/src/main/filters/staging/filters.properties
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceInterceptor.java
~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/resources/templates/header.vm
+ /trunk/Website/src/main/resources/templates/Hotspot-address.vm
+ /trunk/Website/src/main/resources/templates/Saholic-address.vm
+ /trunk/Website/src/main/webapp/images/Hotspot-logo.jpg
+ /trunk/Website/src/main/webapp/images/localhost-logo.jpg
+ /trunk/Website/src/main/webapp/images/Saholic-logo.jpg
+ /trunk/Website/src/main/webapp/images/Shop2020-logo.jpg (copied from /trunk/Website/src/main/webapp/images/saholic-logo.jpg@5588)
~ /trunk/Website/src/main/webapp/WEB-INF/content/aboutus.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/address-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/banner.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-sellers-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/cache-admin-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/careers.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/clearance-sale-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/coming-soon-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-success.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/easy-linux.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-response-maybe.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/exception.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/fblike-test-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/generated-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/get-paid-for-your-reviews.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/glossary-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/latest-arrivals-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/order-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/order-success.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-error-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/privacy-policy.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/product-index-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/quicklinks-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/register-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/terms-conditions.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/test-index.vm

Rev 5624 – Chennai pincodes prepaid limit added for 5000.

rajveer — Wed, 18 Jul 2012 14:57:48 +0530

rajveer – 1 file(s) modified
Chennai pincodes prepaid limit added for 5000.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 5623 – Trac # 1426, 1263, 1425 Reviewer : Mandeep

anupam.singh — Wed, 18 Jul 2012 13:40:45 +0530

anupam.singh – 11 file(s) modified
Trac # 1426, 1263, 1425
Reviewer : Mandeep

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ProductNotificationsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/QuicklinksController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/registered-users-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 5622 – Changed phone number in recharge offer t&c page.

rajveer — Wed, 18 Jul 2012 13:04:32 +0530

rajveer – 1 file(s) modified
Changed phone number in recharge offer t&c page.

~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm

Rev 5621 – Added support for partial stock report as well Trac#1414

mandeep.dhir — Wed, 18 Jul 2012 12:38:47 +0530

mandeep.dhir – 1 file(s) modified
Added support for partial stock report as well Trac#1414

~ /ClientAgent/src/main/java/in/shop2020/agent/utils/SarvottamAgent.java

Rev 5620 – Trac#1295 Some bug fixes. - Warehouse change now ...

mandeep.dhir — Wed, 18 Jul 2012 12:37:26 +0530

mandeep.dhir – 8 file(s) modified
Trac#1295 Some bug fixes.
- Warehouse change now considers all sub-warehouses of a billing warehouse
- One with max availability os assigned
- SALE record is persisted now whenever DOA_INVALID_RESHIP happens
- Billing info is not copied with RET_USABLE_RESHIP stuff
- Not shifting reservation for each scan IN
- By default making ItemLOader a partial update

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/ItemLoader.py
~ /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/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 5619 – Trac#1495

anupam.singh — Tue, 17 Jul 2012 18:35:49 +0530

anupam.singh – 1 file(s) modified
Trac#1495

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTransactionProcessorTask.java

Rev 5618 – Commit after each recharge voucher issued.

rajveer — Tue, 17 Jul 2012 18:18:10 +0530

rajveer – 1 file(s) modified
Commit after each recharge voucher issued.

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

Rev 5617 – Putting aggregation code inside try-catch block and logging exception count ...

amar.kumar — Tue, 17 Jul 2012 17:52:40 +0530

amar.kumar – 1 file(s) modified
Putting aggregation code inside try-catch block and logging exception count and last exception trace

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/comparison-stats.jsp

Rev 5616 – Bugfix - removed line that was overwriting catalogClient

mandeep.dhir — Tue, 17 Jul 2012 17:05:45 +0530

mandeep.dhir – 1 file(s) modified
Bugfix - removed line that was overwriting catalogClient

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierController.java

Rev 5615 – Corrected helper service port key.

rajveer — Tue, 17 Jul 2012 16:16:46 +0530

rajveer – 1 file(s) modified
Corrected helper service port key.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/QuicklinksController.java

Rev 5614 – Reverting the UI changes for pickup from store.

rajveer — Tue, 17 Jul 2012 13:39:53 +0530

rajveer – 11 file(s) modified
Reverting the UI changes for pickup from store.

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
x /trunk/Website/src/main/webapp/css/shipping.css
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/shippingAddress.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 5613 – Set store id in cart if delivery to store is ...

rajveer — Tue, 17 Jul 2012 12:50:17 +0530

rajveer – 1 file(s) modified
Set store id in cart if delivery to store is selected. Also always show COD true if pickup is from store.

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

Rev 5612 – updated min price of partners api by reducing voucher amount ...

amit.gupta — Tue, 17 Jul 2012 12:33:24 +0530

amit.gupta – 1 file(s) modified
updated min price of partners api by reducing voucher amount associated with the entity.

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

Rev 5611 – Changes in shop2020.cfg for AlertService

amar.kumar — Tue, 17 Jul 2012 03:10:04 +0530

amar.kumar – 1 file(s) modified
Changes in shop2020.cfg for AlertService

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

Rev 5610 – Adding AlertClient and adding new keys for alertService in ConfigClientKeys

amar.kumar — Tue, 17 Jul 2012 00:39:57 +0530

amar.kumar – 2 file(s) modified
Adding AlertClient and adding new keys for alertService in ConfigClientKeys

+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/AlertClient.java
~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java

Rev 5609 – Added new zone for OpenX images for promotions.

amit.gupta — Mon, 16 Jul 2012 15:05:08 +0530

amit.gupta – 1 file(s) modified
Added new zone for OpenX images for promotions.

~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 5608 – Added two new phones in recharge voucher promotion. Updated offer ...

rajveer — Mon, 16 Jul 2012 14:33:25 +0530

rajveer – 1 file(s) modified
Added two new phones in recharge voucher promotion. Updated offer price of two of them.

~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm

Rev 5607 – Trac # 1491 Removed the delete-address button from shipping page ...

anupam.singh — Mon, 16 Jul 2012 14:19:30 +0530

anupam.singh – 2 file(s) modified
Trac # 1491
Removed the delete-address button from shipping page
Reviewer : Mandeep Dhir

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 5606 – Most frequently searched terms for production goes live today.

amit.gupta — Mon, 16 Jul 2012 13:20:07 +0530

amit.gupta – 1 file(s) modified
Most frequently searched terms for production goes live today.

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

Rev 5605 – Added logic for assignment to Delhivery for Hyderabad pincodes.

rajveer — Mon, 16 Jul 2012 11:53:06 +0530

rajveer – 1 file(s) modified
Added logic for assignment to Delhivery for Hyderabad pincodes.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 5604 – Most frequently searched terms for production goes live today.

amit.gupta — Mon, 16 Jul 2012 11:31:02 +0530

amit.gupta – 2 file(s) modified
Most frequently searched terms for production goes live today.

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

Rev 5603 – Made the changes in recharge offer terms and conditions for ...

rajveer — Mon, 16 Jul 2012 11:23:44 +0530

rajveer – 3 file(s) modified
Made the changes in recharge offer terms and conditions for spicedeck

+ /trunk/Website/src/main/webapp/images/spicedeck_login.jpg
~ /trunk/Website/src/main/webapp/images/spice_email.png
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm

Rev 5602 – Changed the customer care contact number.

rajveer — Mon, 16 Jul 2012 11:15:51 +0530

rajveer – 1 file(s) modified
Changed the customer care contact number.

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

Rev 5601 – reverting most frequwntly searched terms.

amit.gupta — Sat, 14 Jul 2012 14:24:22 +0530

amit.gupta – 1 file(s) modified
reverting most frequwntly searched terms.

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

Rev 5600 – #1456 Level two hierarchy for most frequently searched terms.

amit.gupta — Fri, 13 Jul 2012 20:59:23 +0530

amit.gupta – 5 file(s) modified
#1456
Level two hierarchy for most frequently searched terms.

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/CompatibleAccessoriesIndexGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/LevelHierarchy.java
+ /trunk/ContentStore/src/main/java/in/shop2020/util/MostFrequentlySearchedKeywords.java