SmartDukaan – /

Rev 4092 – Removed whitespace at the end of line

chandranshu — Thu, 17 Nov 2011 19:05:28 +0530

chandranshu – 1 file(s) modified
Removed whitespace at the end of line

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

Rev 4091 – Added some more comments

chandranshu — Thu, 17 Nov 2011 19:04:35 +0530

chandranshu – 1 file(s) modified
Added some more comments

~ /trunk/PyProj/src/shop2020/logistics/service/script/AwbNumberAlerter.py

Rev 4090 – Added comments

chandranshu — Thu, 17 Nov 2011 19:02:46 +0530

chandranshu – 22 file(s) modified
Added comments

~ /trunk/PyProj/src/shop2020/logistics/service/script/AwbNumberLoader.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/DestinationProviderAllocationLoader.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/HolidaysLoader.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/ServiceDetailsLoader.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/WarehouseAllocationLoader.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/BestDealDataLoader.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/BestSellerDataLoader.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CompareInventory.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/DuplicateChecker.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/GenerateJungleeData.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/InitialInventoryLoader.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/InventoryStockReportGenerator.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/ItemLoader.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/ProductGroupDetailLoader.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/VendorItemKeyGenerator.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/MarkOrdersAsFailed.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/MoveOrdersToPendingQueue.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/UndeliveredOrdersReport.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/UpdateRtoData.py
~ /trunk/PyProj/src/shop2020/warehouse/main/script/ItemNumberLoader.py

Rev 4089 – Not displaying erroneous promised shipping field Copying ticket attrs from ...

mandeep.dhir — Thu, 17 Nov 2011 17:59:57 +0530

mandeep.dhir – 2 file(s) modified
Not displaying erroneous promised shipping field
Copying ticket attrs from current ticket state while marking activities as read

~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 4088 – Corrected the calculation of expected delivery time. Right now, the ...

chandranshu — Thu, 17 Nov 2011 17:46:46 +0530

chandranshu – 1 file(s) modified
Corrected the calculation of expected delivery time. Right now, the first day was not being checked and the calculated last day was always off by one day

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

Rev 4087 – A/B Testing: URL param, utmxkey, moved out to a filter ...

varun.gupta — Thu, 17 Nov 2011 16:52:33 +0530

varun.gupta – 1 file(s) modified
A/B Testing: URL param, utmxkey, moved out to a filter variable

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

Rev 4086 – Primary address is not mandatory so need to fix code ...

mandeep.dhir — Thu, 17 Nov 2011 12:27:44 +0530

mandeep.dhir – 1 file(s) modified
Primary address is not mandatory so need to fix code accordingly.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java

Rev 4085 – Added filter properties to minify profile

varun.gupta — Wed, 16 Nov 2011 19:48:32 +0530

varun.gupta – 1 file(s) modified
Added filter properties to minify profile

~ /trunk/Website/pom.xml

Rev 4084 – Froze the header in the inventory stock report

chandranshu — Wed, 16 Nov 2011 19:22:03 +0530

chandranshu – 2 file(s) modified
Froze the header in the inventory stock report

~ /trunk/PyProj/src/shop2020/utils/CsvToXlsConvertor.py
~ /trunk/runutils/inventory-status-report.sh

Rev 4083 – Fixing a bug. cookie was not actually decrypted even when ...

vikas — Wed, 16 Nov 2011 18:44:02 +0530

vikas – 1 file(s) modified
Fixing a bug. cookie was not actually decrypted even when isEncrypted boolean was set.

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

Rev 4082 – Added score for AMD Athlon II Neo K325 Dual-Core processor

varun.gupta — Wed, 16 Nov 2011 18:35:00 +0530

varun.gupta – 1 file(s) modified
Added score for AMD Athlon II Neo K325 Dual-Core processor

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/processor.py

Rev 4081 – Added Windows Premium to the score list

varun.gupta — Wed, 16 Nov 2011 18:25:18 +0530

varun.gupta – 1 file(s) modified
Added Windows Premium to the score list

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/operatingsystem.py

Rev 4080 – Corrected update content script

rajveer — Wed, 16 Nov 2011 17:46:34 +0530

rajveer – 2 file(s) modified
Corrected update content script

~ /trunk/runutils/update-content-and-catalog.sh
~ /trunk/runutils/update-content.sh

Rev 4079 – Given top margin of 5 pixels.

rajveer — Wed, 16 Nov 2011 17:31:22 +0530

rajveer – 1 file(s) modified
Given top margin of 5 pixels.

~ /trunk/Website/src/main/webapp/css/product.css

Rev 4078 – Refunds may be created for COD orders if the customer ...

chandranshu — Wed, 16 Nov 2011 14:13:27 +0530

chandranshu – 1 file(s) modified
Refunds may be created for COD orders if the customer paid for them and we received the money but not when the order is returned to us undelivered

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

Rev 4077 – New logic to determine RTO orders

chandranshu — Wed, 16 Nov 2011 14:05:40 +0530

chandranshu – 1 file(s) modified
New logic to determine RTO orders

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

Rev 4076 – Script to inform users that their order would be delayed

chandranshu — Wed, 16 Nov 2011 13:47:57 +0530

chandranshu – 1 file(s) modified
Script to inform users that their order would be delayed

+ /trunk/PyProj/src/shop2020/model/v1/order/script/InformUsers.py

Rev 4075 – No refund should be created for COD orders

chandranshu — Wed, 16 Nov 2011 13:42:55 +0530

chandranshu – 1 file(s) modified
No refund should be created for COD orders

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

Rev 4074 – Update sql query to filter out refunded items.

vikas — Wed, 16 Nov 2011 13:16:52 +0530

vikas – 1 file(s) modified
Update sql query to filter out refunded items.

~ /trunk/pentaho/scripts/ReportMailerFromDb.py

Rev 4073 – executable script to scrape and index pricing data

varun.gupta — Wed, 16 Nov 2011 12:52:18 +0530

varun.gupta – 1 file(s) modified
executable script to scrape and index pricing data

+ /trunk/runutils/update-price-comparison-data.sh

Rev 4072 –

varun.gupta — Wed, 16 Nov 2011 12:49:09 +0530

varun.gupta – 2 file(s) modified

x /trunk/runutils/update-price-comparison-data.sh
x /trunk/runutils/update-price-comparison-index.sh

Rev 4071 –

varun.gupta — Wed, 16 Nov 2011 12:43:35 +0530

varun.gupta – 1 file(s) modified

+ /trunk/runutils/update-price-comparison-index.sh (copied from /trunk/runutils/update-price-comparison-data.sh@4054)

Rev 4070 – Update sql query to filter only valid orders.

vikas — Wed, 16 Nov 2011 12:42:19 +0530

vikas – 1 file(s) modified
Update sql query to filter only valid orders.

~ /trunk/pentaho/scripts/ReportMailerFromDb.py

Rev 4069 – Script to update RTO data which wasn't correctly uploaded earlier

chandranshu — Wed, 16 Nov 2011 12:37:17 +0530

chandranshu – 1 file(s) modified
Script to update RTO data which wasn't correctly uploaded earlier

+ /trunk/PyProj/src/shop2020/model/v1/order/script/UpdateRtoData.py

Rev 4068 – Update sql query to get data from current and previous ...

vikas — Wed, 16 Nov 2011 12:25:06 +0530

vikas – 1 file(s) modified
Update sql query to get data from current and previous months.

~ /trunk/pentaho/scripts/ReportMailerFromDb.py

Rev 4067 – Update subject and attachment filename to contain date

vikas — Wed, 16 Nov 2011 12:18:24 +0530

vikas – 1 file(s) modified
Update subject and attachment filename to contain date

~ /trunk/pentaho/scripts/ReportMailerFromDb.py

Rev 4066 – Daily product sale Report mailer.

vikas — Wed, 16 Nov 2011 12:01:42 +0530

vikas – 1 file(s) modified
Daily product sale Report mailer.

+ /trunk/pentaho/scripts/ReportMailerFromDb.py

Rev 4065 – Trac#651 Autorefresh page, Alert confirmation in case agent tries to ...

mandeep.dhir — Wed, 16 Nov 2011 09:56:01 +0530

mandeep.dhir – 7 file(s) modified
Trac#651 Autorefresh page, Alert confirmation in case agent tries to cancel an order.

~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /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 4064 – Added a check to prevent SAWarnings raised due to an ...

chandranshu — Wed, 16 Nov 2011 08:41:36 +0530

chandranshu – 1 file(s) modified
Added a check to prevent SAWarnings raised due to an empty in clause

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

Rev 4063 – Added support to generate the inventory stock report for a ...

chandranshu — Wed, 16 Nov 2011 08:38:30 +0530

chandranshu – 6 file(s) modified
Added support to generate the inventory stock report for a particular vendor

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/InventoryStockReportGenerator.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 4062 – Added support to restrict the query for current availability and ...

chandranshu — Wed, 16 Nov 2011 08:22:14 +0530

chandranshu – 1 file(s) modified
Added support to restrict the query for current availability and reservations to a particular vendor

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

Rev 4061 – Add shoogloo tracking code if conversion happens because of shoogloo ...

vikas — Tue, 15 Nov 2011 19:25:43 +0530

vikas – 2 file(s) modified
Add shoogloo tracking code if conversion happens because of shoogloo aff.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 4060 – Conditional restart of solr search engine.

rajveer — Tue, 15 Nov 2011 18:45:11 +0530

rajveer – 2 file(s) modified
Conditional restart of solr search engine.

~ /trunk/runutils/update-content-and-catalog.sh
~ /trunk/runutils/update-content.sh

Rev 4059 – Restart the solr search service and update schema when content ...

rajveer — Tue, 15 Nov 2011 18:19:16 +0530

rajveer – 3 file(s) modified
Restart the solr search service and update schema when content is updated.

+ /trunk/runutils/stop-solr-service.sh
~ /trunk/runutils/update-content-and-catalog.sh
~ /trunk/runutils/update-content.sh

Rev 4058 – Copy the generated files to the export directory.

rajveer — Tue, 15 Nov 2011 18:15:41 +0530

rajveer – 2 file(s) modified
Copy the generated files to the export directory.

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

Rev 4057 – Changed method name and added new method call.

rajveer — Tue, 15 Nov 2011 18:04:50 +0530

rajveer – 2 file(s) modified
Changed method name and added new method call.

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

Rev 4056 – Trac #650 and Trac #643 Reviewer: Mandeep Removed possible values ...

rajveer — Tue, 15 Nov 2011 18:02:26 +0530

rajveer – 17 file(s) modified
Trac #650 and Trac #643
Reviewer: Mandeep
Removed possible values from NewIR to avoid the exception mentioned in ticket #650.
Added catchall xml support to add in solr schema.

~ /trunk/ContentStore/src/jython/irmetadatarules/basic-data-connectivity.py
~ /trunk/ContentStore/src/jython/irmetadatarules/battery-capacity-talktime.py
~ /trunk/ContentStore/src/jython/irmetadatarules/brand.py
~ /trunk/ContentStore/src/jython/irmetadatarules/built-in-memory.py
~ /trunk/ContentStore/src/jython/irmetadatarules/camera-resolution.py
~ /trunk/ContentStore/src/jython/irmetadatarules/carry-in-pocket.py
~ /trunk/ContentStore/src/jython/irmetadatarules/cellular-technologies.py
~ /trunk/ContentStore/src/jython/irmetadatarules/data-connectivity.py
~ /trunk/ContentStore/src/jython/irmetadatarules/form-factor.py
~ /trunk/ContentStore/src/jython/irmetadatarules/irmeta-featuredefinition.py
~ /trunk/ContentStore/src/jython/irmetadatarules/irmeta-slidedefinition.py
~ /trunk/ContentStore/src/jython/irmetadatarules/main-category.py
~ /trunk/ContentStore/src/jython/irmetadatarules/price.py
~ /trunk/ContentStore/src/jython/irmetadatarules/sub-category.py
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewIR.java
~ /trunk/ContentStore/src/xsl/irmetadata_catchall.xsl
~ /trunk/ContentStore/src/xsl/irmetadata_solrschema.xsl

Rev 4055 – Added Anand to the list of recipients of the AWB ...

chandranshu — Tue, 15 Nov 2011 15:25:15 +0530

chandranshu – 1 file(s) modified
Added Anand to the list of recipients of the AWB number alert

~ /trunk/PyProj/src/shop2020/logistics/service/script/AwbNumberAlerter.py

Rev 4054 – script to run scraping and indexing of pricing data

varun.gupta — Tue, 15 Nov 2011 13:36:09 +0530

varun.gupta – 1 file(s) modified
script to run scraping and indexing of pricing data

+ /trunk/runutils/update-price-comparison-data.sh

Rev 4053 – Moved GA account ID and experiment ID for AB test ...

varun.gupta — Tue, 15 Nov 2011 13:30:30 +0530

varun.gupta – 6 file(s) modified
Moved GA account ID and experiment ID for AB test to filters and added ID values for production

~ /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/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm