SmartDukaan – /

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

Rev 5751 – Changing All to Select Zone

anupam.singh — Wed, 08 Aug 2012 17:43:08 +0530

anupam.singh – 1 file(s) modified
Changing All to Select Zone

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

Rev 5750 – Added similar items table.

rajveer — Wed, 08 Aug 2012 17:36:31 +0530

rajveer – 1 file(s) modified
Added similar items table.

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

Rev 5749 – Change in Deployment script of GoogleAppEngine to update next version ...

amar.kumar — Wed, 08 Aug 2012 16:46:11 +0530

amar.kumar – 1 file(s) modified
Change in Deployment script of GoogleAppEngine to update next version number in appengine-web.xml after every deployment

~ /trunk/runutils/deploy-gae.sh

Rev 5748 – Alert for store address empty was being generated for myLocation ...

anupam.singh — Wed, 08 Aug 2012 12:12:42 +0530

anupam.singh – 1 file(s) modified
Alert for store address empty was being generated for myLocation tab as well. Fixed.

~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 5747 – Added alert if no store is selected in the current ...

anupam.singh — Wed, 08 Aug 2012 12:02:51 +0530

anupam.singh – 2 file(s) modified
Added alert if no store is selected in the current selected zone.

~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/shippingAddress.js

Rev 5746 – Trac #1541 Option to choose zone of the pickup store

anupam.singh — Wed, 08 Aug 2012 04:57:03 +0530

anupam.singh – 4 file(s) modified
Trac #1541
Option to choose zone of the pickup store

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/shipping.css
~ /trunk/Website/src/main/webapp/js/shippingAddress.js

Rev 5745 – Change for showing searchQuery in searchBox in search page

amar.kumar — Tue, 07 Aug 2012 19:54:51 +0530

amar.kumar – 1 file(s) modified
Change for showing searchQuery in searchBox in search page

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

Rev 5744 – Changes to adjust alert thresholds and including business day concept ...

amar.kumar — Tue, 07 Aug 2012 16:10:42 +0530

amar.kumar – 1 file(s) modified
Changes to adjust alert thresholds and including business day concept as well as correcting orderId concatenation with string while ending monitoring

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

Rev 5743 – Added support to deliver to store from warehouse through runner.

rajveer — Tue, 07 Aug 2012 16:10:07 +0530

rajveer – 3 file(s) modified
Added support to deliver to store from warehouse through runner.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/MarkOrdersAsManifestedConfirmationBox.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java

Rev 5742 – Added null pointer check for userIds to be Alerted

amar.kumar — Tue, 07 Aug 2012 15:06:37 +0530

amar.kumar – 1 file(s) modified
Added null pointer check for userIds to be Alerted

~ /trunk/AlertService/src/main/java/in/shop2020/alert/util/AlertTask.java

Rev 5741 – Fixed small issues related to javascript.

rajveer — Tue, 07 Aug 2012 13:32:55 +0530

rajveer – 1 file(s) modified
Fixed small issues related to javascript.

~ /trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-show.vm

Rev 5740 – #1538, #1543 Content Model for DSLR and Compact Cameras.

amit.gupta — Tue, 07 Aug 2012 13:13:54 +0530

amit.gupta – 6 file(s) modified
#1538, #1543
Content Model for DSLR and Compact Cameras.

~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/categoryslidesequence.xml
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml
~ /trunk/ContentStore/src/xml/model/units.xml

Rev 5739 – Added zone in the store table.

rajveer — Mon, 06 Aug 2012 17:29:23 +0530

rajveer – 5 file(s) modified
Added zone in the store table.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/PickupStore.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 5738 – Change to use feedback(reject) even if there is no conflict

amar.kumar — Mon, 06 Aug 2012 15:19:03 +0530

amar.kumar – 1 file(s) modified
Change to use feedback(reject) even if there is no conflict

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

Rev 5737 – Added RTO lost in transit.

rajveer — Mon, 06 Aug 2012 15:05:12 +0530

rajveer – 1 file(s) modified
Added RTO lost in transit.

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

Rev 5736 – Changing paths for logs to avoid logRotate compressing on these ...

amar.kumar — Mon, 06 Aug 2012 14:45:04 +0530

amar.kumar – 1 file(s) modified
Changing paths for logs to avoid logRotate compressing on these logs

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

Rev 5735 – Changing default Assignee for COD Verification to Gaurabh

amar.kumar — Mon, 06 Aug 2012 13:36:45 +0530

amar.kumar – 1 file(s) modified
Changing default Assignee for COD Verification to Gaurabh

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java

Rev 5734 – Failed Payment Escalation default Assignee changed from zaffar to gaurabh

amar.kumar — Mon, 06 Aug 2012 13:35:40 +0530

amar.kumar – 1 file(s) modified
Failed Payment Escalation default Assignee changed from zaffar to gaurabh

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

Rev 5733 – Changing config for sarvottam

mandeep.dhir — Mon, 06 Aug 2012 12:50:10 +0530

mandeep.dhir – 1 file(s) modified
Changing config for sarvottam

~ /trunk/InventoryManager/src/main/resources/supplier-inventory.cfg

Rev 5732 – Adding sheetal.kumar@spiceretail.co.in

mandeep.dhir — Mon, 06 Aug 2012 12:39:31 +0530

mandeep.dhir – 1 file(s) modified
Adding sheetal.kumar@spiceretail.co.in

~ /trunk/HotspotDashboard/src/main/resources/in/shop2020/hotspot/dashbaord/server/InventoryReportProcessor.properties

Rev 5731 – Bugfix - Fixing the delivery estimate for preferred sticky items

mandeep.dhir — Mon, 06 Aug 2012 12:20:14 +0530

mandeep.dhir – 1 file(s) modified
Bugfix - Fixing the delivery estimate for preferred sticky items

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

Rev 5730 – Added column for hotspot store id in the store collection ...

rajveer — Mon, 06 Aug 2012 12:13:54 +0530

rajveer – 1 file(s) modified
Added column for hotspot store id in the store collection report.

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

Rev 5729 – Ticket #323 Camera Resolution Filter - Order to be changed ...

amit.gupta — Mon, 06 Aug 2012 11:13:00 +0530

amit.gupta – 4 file(s) modified
Ticket #323
Camera Resolution Filter - Order to be changed
Reviewer : Rajveer

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java

Rev 5728 – Adding correct recepients

anupam.singh — Sat, 04 Aug 2012 11:25:03 +0530

anupam.singh – 2 file(s) modified
Adding correct recepients

~ /trunk/pentaho/scripts/LastDayAccessoriesSales.py
~ /trunk/pentaho/scripts/PreviousDayOrdersMailer.py

Rev 5727 – Fixed SQL statement

anupam.singh — Sat, 04 Aug 2012 11:17:45 +0530

anupam.singh – 2 file(s) modified
Fixed SQL statement

~ /trunk/pentaho/scripts/LastDayAccessoriesSales.py
~ /trunk/pentaho/scripts/PreviousDayOrdersMailer.py

Rev 5726 – including only uncancelled orders

anupam.singh — Sat, 04 Aug 2012 11:05:24 +0530

anupam.singh – 2 file(s) modified
including only uncancelled orders

~ /trunk/pentaho/scripts/LastDayAccessoriesSales.py
~ /trunk/pentaho/scripts/PreviousDayOrdersMailer.py

Rev 5725 – Hotspot AddressId was being assigned to the addressId field.

anupam.singh — Fri, 03 Aug 2012 19:14:50 +0530

anupam.singh – 1 file(s) modified
Hotspot AddressId was being assigned to the addressId field.

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

Rev 5724 – Bug fixing.

rajveer — Fri, 03 Aug 2012 18:57:52 +0530

rajveer – 3 file(s) modified
Bug fixing.

~ /trunk/PyProj/src/shop2020/logistics/service/script/ServiceDetailsLoader.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-show.vm

Rev 5723 – Corrected css paths.

rajveer — Fri, 03 Aug 2012 18:24:20 +0530

rajveer – 1 file(s) modified
Corrected css paths.

~ /trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-show.vm

Rev 5722 – Corrected javascript code.

rajveer — Fri, 03 Aug 2012 18:22:19 +0530

rajveer – 1 file(s) modified
Corrected javascript code.

~ /trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-show.vm

Rev 5721 – Removed unused column state.

rajveer — Fri, 03 Aug 2012 16:23:54 +0530

rajveer – 1 file(s) modified
Removed unused column state.

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

Rev 5720 – Option to pull report for all stores.

rajveer — Fri, 03 Aug 2012 14:36:15 +0530

rajveer – 3 file(s) modified
Option to pull report for all stores.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/Support/src/main/webapp/WEB-INF/content/store-collection-index.vm

Rev 5719 – Added support of hotspot store id in our system.

rajveer — Fri, 03 Aug 2012 13:57:16 +0530

rajveer – 12 file(s) modified
Added support of hotspot store id in our system.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PickupStoreController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/store-collection-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/PickupStore.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 5718 – Store collection report for hotspot finance department.

rajveer — Fri, 03 Aug 2012 12:33:34 +0530

rajveer – 1 file(s) modified
Store collection report for hotspot finance department.

~ /trunk/Support/src/main/webapp/WEB-INF/content/store-collection-index.vm