SmartDukaan – /

Rev 5791 – Trac # 1526 CRM ticket will now be created for ...

anupam.singh — Wed, 15 Aug 2012 02:22:48 +0530

anupam.singh – 10 file(s) modified
Trac # 1526
CRM ticket will now be created for orders which are at pickup stores and their return date is nearing.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/PickupStoreReturns.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 5790 – Changing zoneId to 15

anupam.singh — Tue, 14 Aug 2012 20:06:02 +0530

anupam.singh – 1 file(s) modified
Changing zoneId to 15

~ /trunk/Website/src/main/webapp/WEB-INF/content/buy-online-and-pickup-in-store.vm

Rev 5789 – Removing date from log message of Active and Passive Alerts

amar.kumar — Tue, 14 Aug 2012 18:52:09 +0530

amar.kumar – 1 file(s) modified
Removing date from log message of Active and Passive Alerts

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

Rev 5788 – Changing conversion pattern of log for Passive Alerts to remove ...

amar.kumar — Tue, 14 Aug 2012 18:41:59 +0530

amar.kumar – 1 file(s) modified
Changing conversion pattern of log for Passive Alerts to remove Class name from log

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

Rev 5787 – Not doing any operation in endMonitoring method if monitoredEntity is ...

amar.kumar — Tue, 14 Aug 2012 15:22:35 +0530

amar.kumar – 1 file(s) modified
Not doing any operation in endMonitoring method if monitoredEntity is not found

~ /trunk/AlertService/src/main/java/in/shop2020/alert/handler/EntityHandler.java

Rev 5786 – Checking in changes for fixing threshold setting in MarkDestinationCityReached and ...

amar.kumar — Tue, 14 Aug 2012 15:20:20 +0530

amar.kumar – 1 file(s) modified
Checking in changes for fixing threshold setting in MarkDestinationCityReached and MarkLocalConnected

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

Rev 5785 – passing pickup type as well while fethcing logisticsinfo

mandeep.dhir — Tue, 14 Aug 2012 12:15:46 +0530

mandeep.dhir – 1 file(s) modified
passing pickup type as well while fethcing logisticsinfo

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

Rev 5784 – Get pincode from store in case of runner.

rajveer — Tue, 14 Aug 2012 12:12:24 +0530

rajveer – 1 file(s) modified
Get pincode from store in case of runner.

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

Rev 5783 – In case of pickup from store, assign the order ...

rajveer — Tue, 14 Aug 2012 11:22:27 +0530

rajveer – 1 file(s) modified
In case of pickup from store, assign the order to runner for delivery to store.

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

Rev 5782 – Pickup store should get pincode from its own address.

rajveer — Tue, 14 Aug 2012 11:18:44 +0530

rajveer – 1 file(s) modified
Pickup store should get pincode from its own address.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 5781 – Resetting entityProcessedState on updation of entity

amar.kumar — Tue, 14 Aug 2012 11:09:50 +0530

amar.kumar – 1 file(s) modified
Resetting entityProcessedState on updation of entity

~ /trunk/AlertService/src/main/resources/in/shop2020/alert/persistence/EntityMapper.xml

Rev 5780 – changing zoneId to 14

amar.kumar — Tue, 14 Aug 2012 10:23:13 +0530

amar.kumar – 1 file(s) modified
changing zoneId to 14

~ /trunk/Website/src/main/webapp/WEB-INF/content/buy-online-and-pickup-in-store.vm

Rev 5779 – Adding Rajneesh and Pankaj Kankar as well

mandeep.dhir — Tue, 14 Aug 2012 10:03:19 +0530

mandeep.dhir – 1 file(s) modified
Adding Rajneesh and Pankaj Kankar as well

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

Rev 5778 – Adding log comments to ALert Service exception catch block

amar.kumar — Tue, 14 Aug 2012 03:45:40 +0530

amar.kumar – 1 file(s) modified
Adding log comments to ALert Service exception catch block

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

Rev 5777 – Added T&C and FAQ page for in store pickup

anupam.singh — Tue, 14 Aug 2012 02:23:06 +0530

anupam.singh – 4 file(s) modified
Added T&C and FAQ page for in store pickup

+ /trunk/Website/src/main/webapp/images/payment-page.png
+ /trunk/Website/src/main/webapp/images/shipping-page.png
+ /trunk/Website/src/main/webapp/WEB-INF/content/buy-online-and-pickup-in-store.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm

Rev 5776 – Send mail to customer in case of in store pickup.

rajveer — Mon, 13 Aug 2012 19:40:44 +0530

rajveer – 1 file(s) modified
Send mail to customer in case of in store pickup.

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

Rev 5775 – Changes for pick up stores.

rajveer — Mon, 13 Aug 2012 17:08:16 +0530

rajveer – 3 file(s) modified
Changes for pick up stores.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PickupStoreController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-index.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-show.vm

Rev 5774 – Changes suggested by vrinda in cameras. Added connected pin feature ...

amit.gupta — Mon, 13 Aug 2012 17:08:06 +0530

amit.gupta – 3 file(s) modified
Changes suggested by vrinda in cameras.
Added connected pin feature (recommended) for battery now.

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

Rev 5773 – Contentgeneration is giving OutOfMemoryError due to two huge StringBuffers(a, b) ...

amit.gupta — Mon, 13 Aug 2012 12:26:47 +0530

amit.gupta – 1 file(s) modified
Contentgeneration is giving OutOfMemoryError due to two huge StringBuffers(a, b) where a is appending b( a.append(b) ).
Which renders JVM out of memory.

now buffer b is broken into smaller chunks and appended to a iteratively.

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

Rev 5772 – Adding missing quotes in writing document.charset for zone 9 in ...

amar.kumar — Fri, 10 Aug 2012 16:26:45 +0530

amar.kumar – 1 file(s) modified
Adding missing quotes in writing document.charset for zone 9 in javascript
Reviewed by Amit Gupta

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

Rev 5771 – Photo id instructions were being shown enven when pick from ...

anupam.singh — Fri, 10 Aug 2012 16:00:49 +0530

anupam.singh – 1 file(s) modified
Photo id instructions were being shown enven when pick from store option was not used. Fixed now.

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

Rev 5770 – Truncating extra "Rs. " from Price got after scraping from ...

amar.kumar — Fri, 10 Aug 2012 15:31:42 +0530

amar.kumar – 1 file(s) modified
Truncating extra "Rs. " from Price got after scraping from product page

~ /trunk/PriceComparisonFramework/src/Scrapers/TradusScraper.py

Rev 5769 – Changes for in store pickup and runner.

rajveer — Fri, 10 Aug 2012 15:26:52 +0530

rajveer – 10 file(s) modified
Changes for in store pickup and runner.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenter.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/MarkOrdersAsManifestedConfirmationBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/LogisticsUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AuthResponse.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/MarkOrdersAsManifestedResponse.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java

Rev 5768 – Trac#1551 New columns added

mandeep.dhir — Fri, 10 Aug 2012 15:09:28 +0530

mandeep.dhir – 7 file(s) modified
Trac#1551 New columns added

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryAgeController.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryAge.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 5767 – Added support to assign airway bill number to runner and ...

rajveer — Fri, 10 Aug 2012 14:51:56 +0530

rajveer – 4 file(s) modified
Added support to assign airway bill number to runner and selfpickup.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py

Rev 5766 – Provision to get airway bill number for runner. Other improvements ...

rajveer — Fri, 10 Aug 2012 14:48:54 +0530

rajveer – 7 file(s) modified
Provision to get airway bill number for runner. Other improvements in pickup store.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PickupStoreController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
+ /trunk/Support/src/main/webapp/css/colorbox.css
+ /trunk/Support/src/main/webapp/css/lightbox_inline.css
~ /trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-show.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 5765 – Added a "NEW" icon on pickup from store tab at ...

anupam.singh — Fri, 10 Aug 2012 14:00:01 +0530

anupam.singh – 4 file(s) modified
Added a "NEW" icon on pickup from store tab at shipping page and pay at store tab at payment page.

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/shipping.css
+ /trunk/Website/src/main/webapp/images/new_red.png
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 5764 – Change to track logistics based on expected delivery time instead ...

amar.kumar — Fri, 10 Aug 2012 11:59:37 +0530

amar.kumar – 1 file(s) modified
Change to track logistics based on expected delivery time instead of promised delivery time

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

Rev 5763 – Undone changes for metakeywords as they are still required for ...

amit.gupta — Fri, 10 Aug 2012 11:12:24 +0530

amit.gupta – 1 file(s) modified
Undone changes for metakeywords as they are still required for old website

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

Rev 5762 – Started monitoring product after delivery at store in Alert Service ...

amar.kumar — Fri, 10 Aug 2012 02:02:36 +0530

amar.kumar – 1 file(s) modified
Started monitoring product after delivery at store in Alert Service and threshold is kept at 4 hrs

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

Rev 5761 – Changes to set default location to store data in /usr ...

amar.kumar — Fri, 10 Aug 2012 00:59:50 +0530

amar.kumar – 13 file(s) modified
Changes to set default location to store data in /usr instead of /tmp
Also made changes in TradusScraper to include tablets

~ /trunk/PriceComparisonFramework/src/DataStore/WatchListManager.py
~ /trunk/PriceComparisonFramework/src/FileUtils.py
~ /trunk/PriceComparisonFramework/src/ProcessManager.py
~ /trunk/PriceComparisonFramework/src/PyLucene/IndexBuilder.py
~ /trunk/PriceComparisonFramework/src/PyLucene/IndexManager.py
~ /trunk/PriceComparisonFramework/src/PyLucene/Retriever.py
~ /trunk/PriceComparisonFramework/src/ScrapedDataManager.py
~ /trunk/PriceComparisonFramework/src/Scrapers/MySmartPrice.py
~ /trunk/PriceComparisonFramework/src/Scrapers/TradusScraper.py
~ /trunk/PriceComparisonFramework/src/URLQueue.py
~ /trunk/PriceComparisonFramework/src/Utils.py
~ /trunk/PriceComparisonFramework/src/WebUI/MSPDashboard.py
~ /trunk/PriceComparisonFramework/src/WebUI/PriceComparisonServer.py

Rev 5760 – #1537 Page title and meta description has to be automatically ...

amit.gupta — Thu, 09 Aug 2012 19:44:36 +0530

amit.gupta – 7 file(s) modified
#1537
Page title and meta description has to be automatically created and updated
Reviewer: amar

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-editSlide.vm
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 5759 – Changes to add null check for critical and warning expiry ...

amar.kumar — Thu, 09 Aug 2012 19:43:43 +0530

amar.kumar – 3 file(s) modified
Changes to add null check for critical and warning expiry times

~ /trunk/AlertService/src/main/java/in/shop2020/alert/util/AlertTask.java
~ /trunk/AlertService/src/main/java/in/shop2020/alert/util/Converter.java
~ /trunk/AlertService/src/main/resources/in/shop2020/alert/persistence/EntityMapper.xml

Rev 5758 – Showing pickup store instructions at pay-success page.

anupam.singh — Thu, 09 Aug 2012 19:06:11 +0530

anupam.singh – 1 file(s) modified
Showing pickup store instructions at pay-success page.

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

Rev 5757 – Display customer name along with store in case of pickup ...

rajveer — Thu, 09 Aug 2012 15:24:43 +0530

rajveer – 1 file(s) modified
Display customer name along with store in case of pickup from store.

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

Rev 5756 – Changed from urllib2 to urllib, as urllib2 was throwing errors.

rajveer — Thu, 09 Aug 2012 12:52:32 +0530

rajveer – 1 file(s) modified
Changed from urllib2 to urllib, as urllib2 was throwing errors.

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

Rev 5755 – Undone removing old display types

amit.gupta — Thu, 09 Aug 2012 09:23:06 +0530

amit.gupta – 1 file(s) modified
Undone removing old display types

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

Rev 5754 – Changing cron timings

amar.kumar — Wed, 08 Aug 2012 18:56:17 +0530

amar.kumar – 1 file(s) modified
Changing cron timings

~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/cron.xml

Rev 5753 – Change to use version 2 for daily-Search-Aggregator cron Reviewed by ...

amar.kumar — Wed, 08 Aug 2012 18:37:19 +0530

amar.kumar – 1 file(s) modified
Change to use version 2 for daily-Search-Aggregator cron
Reviewed by Amit Gupta

~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/cron.xml

Rev 5752 – Not logging compare event when referer is null Reviewed by ...

amar.kumar — Wed, 08 Aug 2012 18:25:57 +0530

amar.kumar – 1 file(s) modified
Not logging compare event when referer is null
Reviewed by Amit Gupta

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