SmartDukaan – /

Rev 4969 – Commented out confirmation mail.

amit.gupta — Thu, 12 Apr 2012 17:50:16 +0530

amit.gupta – 1 file(s) modified
Commented out confirmation mail.

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

Rev 4968 – Fixed bugs reported by content team. 1. Auto check was ...

amit.gupta — Thu, 12 Apr 2012 17:10:24 +0530

amit.gupta – 1 file(s) modified
Fixed bugs reported by content team.
1. Auto check was getting removed in case of child slides.
2. Links for freeform content/youtube url was not working for child slides.

~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-editSlide.vm

Rev 4967 – Added new enum value for Connector Type for Data Cables. ...

amit.gupta — Thu, 12 Apr 2012 16:04:21 +0530

amit.gupta – 1 file(s) modified
Added new enum value for Connector Type for Data Cables.
#1128

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

Rev 4966 – phone number of warehouse in charges removed from mails and ...

phani.kumar — Thu, 12 Apr 2012 14:55:52 +0530

phani.kumar – 1 file(s) modified
phone number of warehouse in charges removed from mails and name of in charge changed for one warehouse

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

Rev 4965 – Raise the warning if the files are not found for ...

rajveer — Thu, 12 Apr 2012 13:13:43 +0530

rajveer – 1 file(s) modified
Raise the warning if the files are not found for Product properties.

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

Rev 4964 – #1104 Changed titles as recomended

amit.gupta — Thu, 12 Apr 2012 13:04:35 +0530

amit.gupta – 1 file(s) modified
#1104
Changed titles as recomended

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

Rev 4963 – Logging different types of exceptions separately

varun.gupta — Thu, 12 Apr 2012 12:57:10 +0530

varun.gupta – 1 file(s) modified
Logging different types of exceptions separately

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

Rev 4962 – #1104

amit.gupta — Thu, 12 Apr 2012 12:34:45 +0530

amit.gupta – 1 file(s) modified
#1104

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

Rev 4961 – Corrected the permissions

rajveer — Thu, 12 Apr 2012 12:31:03 +0530

rajveer – 1 file(s) modified
Corrected the permissions

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

Rev 4960 – Removing because permissions are not correct

rajveer — Thu, 12 Apr 2012 12:30:06 +0530

rajveer – 1 file(s) modified
Removing because permissions are not correct

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

Rev 4959 – Added support for child slide being optional #1108

amit.gupta — Thu, 12 Apr 2012 12:29:32 +0530

amit.gupta – 12 file(s) modified
Added support for child slide being optional
#1108

~ /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/metamodel/definitions/ChildSlideDefinition.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/definitions/DefinitionsContainer.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/definitions/SlideDefinition.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/jaxb/core/ChildSlideType.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/jaxb/core/SlideDefinitionType.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ExpandedChildSlideDefinition.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ExpandedSlideDefinition.java
x /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/MM.java
~ /trunk/ContentStore/src/xml/metamodel/core.xsd
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 4958 – Added script for building on shop2020

rajveer — Thu, 12 Apr 2012 12:12:25 +0530

rajveer – 1 file(s) modified
Added script for building on shop2020

+ /trunk/runutils/build-for-shop2020.sh

Rev 4957 – Ticket #1026 Enhancement need in selection criteria for master sheet ...

phani.kumar — Thu, 12 Apr 2012 11:50:46 +0530

phani.kumar – 13 file(s) modified
Ticket #1026 Enhancement need in selection criteria for master sheet generator
reviewer: Rajveer

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemActions.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/FileDownloadServlet.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/MasterSheetGenerator.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.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 4956 – Activated authentication interceptor

varun.gupta — Thu, 12 Apr 2012 11:46:48 +0530

varun.gupta – 1 file(s) modified
Activated authentication interceptor

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

Rev 4955 – Start reloading the config server properties after each restart of ...

rajveer — Thu, 12 Apr 2012 11:33:32 +0530

rajveer – 9 file(s) modified
Start reloading the config server properties after each restart of service.

~ /trunk/runutils/init.d/catalog-server
~ /trunk/runutils/init.d/content-server
~ /trunk/runutils/init.d/helper-server
~ /trunk/runutils/init.d/inventory-history-server
~ /trunk/runutils/init.d/logistics-server
~ /trunk/runutils/init.d/order-server
~ /trunk/runutils/init.d/promotion-server
~ /trunk/runutils/init.d/purchase-server
~ /trunk/runutils/init.d/user-server

Rev 4954 – Added back with execute premissions.

rajveer — Thu, 12 Apr 2012 11:26:04 +0530

rajveer – 1 file(s) modified
Added back with execute premissions.

+ /trunk/PyProj/src/shop2020/config/script/ConfigPropertiesReloader.py

Rev 4953 – Deleted because premission were not correctly mentioned.

rajveer — Thu, 12 Apr 2012 11:25:18 +0530

rajveer – 1 file(s) modified
Deleted because premission were not correctly mentioned.

x /trunk/PyProj/src/shop2020/config/script/ConfigPropertiesReloader.py

Rev 4952 – Taking backup only for one day and also storing it ...

mandeep.dhir — Thu, 12 Apr 2012 10:43:53 +0530

mandeep.dhir – 1 file(s) modified
Taking backup only for one day and also storing it in /data/CMS-daily-backup

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

Rev 4951 – Applying tax on unit price of lineitem and not total ...

mandeep.dhir — Thu, 12 Apr 2012 10:26:26 +0530

mandeep.dhir – 1 file(s) modified
Applying tax on unit price of lineitem and not total order amount

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

Rev 4950 – Handled promotion service call failure... Using previously created map ...

amit.gupta — Wed, 11 Apr 2012 16:39:09 +0530

amit.gupta – 1 file(s) modified
Handled promotion service call failure... Using previously created map for offer text to update offer field in Amazon upload feed

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

Rev 4949 – Reviewed by : Varun Gupta Ticket ID : #1114

amar.kumar — Wed, 11 Apr 2012 16:09:09 +0530

amar.kumar – 1 file(s) modified
Reviewed by : Varun Gupta
Ticket ID : #1114

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/productSearchFrequency.jsp

Rev 4948 – Ticket #1040 CRM ticket creation related to undelivery of order ...

phani.kumar — Wed, 11 Apr 2012 16:08:43 +0530

phani.kumar – 7 file(s) modified
Ticket #1040 CRM ticket creation related to undelivery of order
reviewer: Rajveer

~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
~ /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 4947 – Changed the configurations for prod3 machine to connect to db3 ...

rajveer — Wed, 11 Apr 2012 15:30:10 +0530

rajveer – 1 file(s) modified
Changed the configurations for prod3 machine to connect to db3 database.

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

Rev 4946 – changed target attribute in quick links from _blank to _self

varun.gupta — Wed, 11 Apr 2012 13:14:20 +0530

varun.gupta – 1 file(s) modified
changed target attribute in quick links from _blank to _self

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

Rev 4945 – Removed six links from Quick Links section in footer

varun.gupta — Wed, 11 Apr 2012 13:12:24 +0530

varun.gupta – 1 file(s) modified
Removed six links from Quick Links section in footer

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

Rev 4944 – For crm service, support should connect to crm machine.

rajveer — Wed, 11 Apr 2012 11:35:37 +0530

rajveer – 1 file(s) modified
For crm service, support should connect to crm machine.

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

Rev 4943 – panscript changes to include aggregate table ETLs

anupam.singh — Wed, 11 Apr 2012 10:52:04 +0530

anupam.singh – 1 file(s) modified
panscript changes to include aggregate table ETLs

~ /trunk/pentaho/scripts/panScript.sh

Rev 4942 – ETL scripts for aggregate tables for productactivity

anupam.singh — Wed, 11 Apr 2012 10:45:16 +0530

anupam.singh – 3 file(s) modified
ETL scripts for aggregate tables for productactivity

+ /trunk/pentaho/data-integration/transformations/dateItemAggregate.ktr
+ /trunk/pentaho/data-integration/transformations/dateOnlyAggregate.ktr
+ /trunk/pentaho/data-integration/transformations/lostItemAggregate.ktr

Rev 4941 – Ticket #1089 - Coupon rule, to give discount to specific ...

varun.gupta — Tue, 10 Apr 2012 17:17:15 +0530

varun.gupta – 2 file(s) modified
Ticket #1089 - Coupon rule, to give discount to specific user, is now templatized.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_discount_to_specific_users.py

Rev 4940 – Page to display quick links added

varun.gupta — Tue, 10 Apr 2012 16:41:22 +0530

varun.gupta – 4 file(s) modified
Page to display quick links added

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/QuicklinksController.java
~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css
+ /trunk/Website/src/main/webapp/WEB-INF/content/quicklinks-index.vm

Rev 4939 – Helper Client will now connect to production Helper Service

varun.gupta — Tue, 10 Apr 2012 13:53:41 +0530

varun.gupta – 1 file(s) modified
Helper Client will now connect to production Helper Service

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

Rev 4938 – Added condition of warehouse for hotspot.

rajveer — Tue, 10 Apr 2012 13:16:20 +0530

rajveer – 1 file(s) modified
Added condition of warehouse for hotspot.

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

Rev 4937 – Adding three new points to Refund Policy

varun.gupta — Mon, 09 Apr 2012 17:18:07 +0530

varun.gupta – 1 file(s) modified
Adding three new points to Refund Policy

~ /trunk/Website/src/main/webapp/WEB-INF/content/terms-conditions.vm

Rev 4936 – if start date is null return filter to true.

amit.gupta — Mon, 09 Apr 2012 16:52:42 +0530

amit.gupta – 1 file(s) modified
if start date is null return filter to true.

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

Rev 4935 – Ticket Id : #1094 Reviewed By : Varun Gupta

amar.kumar — Mon, 09 Apr 2012 15:08:13 +0530

amar.kumar – 1 file(s) modified
Ticket Id : #1094
Reviewed By : Varun Gupta

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/productSearch.jsp

Rev 4934 – Added changes for Loading items with least delivery date on ...

amit.gupta — Mon, 09 Apr 2012 15:02:59 +0530

amit.gupta – 15 file(s) modified
Added changes for Loading items with least delivery date on top...

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.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/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 4933 – Added Default option Getting Colors

amit.gupta — Mon, 09 Apr 2012 14:58:52 +0530

amit.gupta – 1 file(s) modified
Added Default option Getting Colors

~ /trunk/ContentStore/src/velocity/ProductDetail.vm

Rev 4932 – Ticket Id : #1094 Reviewed By : Varun Gupta

amar.kumar — Mon, 09 Apr 2012 14:51:49 +0530

amar.kumar – 1 file(s) modified
Ticket Id : #1094
Reviewed By : Varun Gupta

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/productSearch.jsp

Rev 4931 – Ticket #1086 - added for showing count of selected ...

varun.gupta — Mon, 09 Apr 2012 14:31:22 +0530

varun.gupta – 1 file(s) modified
Ticket #1086 - added <span> for showing count of selected items in Compare List widget

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

Rev 4930 – Added color info in OOS mails.

rajveer — Mon, 09 Apr 2012 14:31:05 +0530

rajveer – 1 file(s) modified
Added color info in OOS mails.

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