SmartDukaan – /

Rev 5925 – minor changes related to content model for dslr.

amit.gupta — Tue, 04 Sep 2012 11:26:29 +0530

amit.gupta – 3 file(s) modified
minor changes related to content model for dslr.

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

Rev 5924 – Changed the username of sendgrid.

rajveer — Mon, 03 Sep 2012 19:25:44 +0530

rajveer – 1 file(s) modified
Changed the username of sendgrid.

~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py

Rev 5923 – minor changes related to content model for dslr.

amit.gupta — Mon, 03 Sep 2012 18:51:47 +0530

amit.gupta – 1 file(s) modified
minor changes related to content model for dslr.

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

Rev 5922 – minor changes related to content model for dslr.

amit.gupta — Mon, 03 Sep 2012 14:45:26 +0530

amit.gupta – 1 file(s) modified
minor changes related to content model for dslr.

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

Rev 5921 – minor changes related to content model for dslr.

amit.gupta — Mon, 03 Sep 2012 14:40:50 +0530

amit.gupta – 3 file(s) modified
minor changes related to content model for dslr.

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

Rev 5920 – Added a message on shipping page informing the user that ...

anupam.singh — Mon, 03 Sep 2012 12:49:59 +0530

anupam.singh – 4 file(s) modified
Added a message on shipping page informing the user that In-store pickup is available only in Delhi/NCR. This message is visible only when "pickup in store" tab is selected.

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/css/shipping.css
~ /trunk/Website/src/main/webapp/js/shippingAddress.js

Rev 5919 – Creating activities while extending expiry date

anupam.singh — Fri, 31 Aug 2012 19:03:40 +0530

anupam.singh – 1 file(s) modified
Creating activities while extending expiry date

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

Rev 5918 – Extend button should not be visible in closed tickets.

anupam.singh — Fri, 31 Aug 2012 16:07:35 +0530

anupam.singh – 1 file(s) modified
Extend button should not be visible in closed tickets.

~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm

Rev 5917 – On expiry-extension ticket Id was not being set. Fixed.

anupam.singh — Fri, 31 Aug 2012 15:22:19 +0530

anupam.singh – 4 file(s) modified
On expiry-extension ticket Id was not being set. Fixed.

~ /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

Rev 5916 – Making changes to monitor tickets through Alert Service only if ...

amar.kumar — Fri, 31 Aug 2012 11:42:30 +0530

amar.kumar – 1 file(s) modified
Making changes to monitor tickets through Alert Service only if category is one of the following
1) cod verification
2) undelivered
3) store pickup

And we will end monitoring only if one of the following activities occur on the ticket
1) send email to customer
2) escalate
3) called customer

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 5915 – Corrected some of html tags.

rajveer — Thu, 30 Aug 2012 19:14:33 +0530

rajveer – 2 file(s) modified
Corrected some of html tags.

~ /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 5914 – Fixed minor bug related to the Auto update of Title ...

amit.gupta — Thu, 30 Aug 2012 17:16:17 +0530

amit.gupta – 1 file(s) modified
Fixed minor bug related to the Auto update of Title and metadescription

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 5913 – Changes in DSLR model suggested by Vrinda.

amit.gupta — Thu, 30 Aug 2012 17:08:07 +0530

amit.gupta – 4 file(s) modified
Changes in DSLR model suggested by Vrinda.

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

Rev 5912 – Used wrong css earlier for displaying in-store pickup orders when ...

anupam.singh — Thu, 30 Aug 2012 14:52:35 +0530

anupam.singh – 1 file(s) modified
Used wrong css earlier for displaying in-store pickup orders when doing COD verification. Fixing it.

~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm

Rev 5911 – Changed location of file which keeps the last orderId seen ...

anupam.singh — Thu, 30 Aug 2012 12:02:06 +0530

anupam.singh – 1 file(s) modified
Changed location of file which keeps the last orderId seen till date to /root/lastMaxOrderId from /tmp/lastMaxOrderId

~ /trunk/PyProj/src/shop2020/utils/orderTablePoller.py

Rev 5910 – Adding config parameters for Alert Service connection from Crm machines

amar.kumar — Wed, 29 Aug 2012 19:18:47 +0530

amar.kumar – 1 file(s) modified
Adding config parameters for Alert Service connection from Crm machines

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

Rev 5909 – Changes for new page in Crm for showing ticket category ...

amar.kumar — Wed, 29 Aug 2012 17:44:02 +0530

amar.kumar – 13 file(s) modified
Changes for new page in Crm for showing ticket category with open ticket count
Reviewed by : Anupam Singh

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /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/agent-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-open.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/TicketHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/TicketMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 5908 – Changing logic in invoice to decide which order should have ...

anupam.singh — Wed, 29 Aug 2012 13:03:31 +0530

anupam.singh – 1 file(s) modified
Changing logic in invoice to decide which order should have pay-mode as "In-Store"

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

Rev 5907 – Changed name.

rajveer — Wed, 29 Aug 2012 13:00:24 +0530

rajveer – 1 file(s) modified
Changed name.

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

Rev 5906 – Corrected bug for entity controller.

rajveer — Wed, 29 Aug 2012 12:13:57 +0530

rajveer – 1 file(s) modified
Corrected bug for entity controller.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 5905 – Added two dimensions Days to Second Order and averageValue.

anupam.singh — Tue, 28 Aug 2012 18:45:07 +0530

anupam.singh – 2 file(s) modified
Added two dimensions Days to Second Order and averageValue.

~ /trunk/pentaho/data-integration/transformations/repeatLoader.ktr
~ /trunk/pentaho/schema/RepeatSalesSchema.xml

Rev 5904 – Removing data of deprecated test framework using jmeter

rajveer — Tue, 28 Aug 2012 15:20:55 +0530

rajveer – 9 file(s) modified
Removing data of deprecated test framework using jmeter

x /trunk/Website/src/test/samples/accessories-category-page
x /trunk/Website/src/test/samples/cart
x /trunk/Website/src/test/samples/categorypage
x /trunk/Website/src/test/samples/forgotpass
x /trunk/Website/src/test/samples/home
x /trunk/Website/src/test/samples/myaccount
x /trunk/Website/src/test/samples/product
x /trunk/Website/src/test/samples/register
x /trunk/Website/src/test/samples/searching

Rev 5903 – Removing data of deprecated test framework using jmeter

rajveer — Tue, 28 Aug 2012 15:19:08 +0530

rajveer – 59 file(s) modified
Removing data of deprecated test framework using jmeter

x /trunk/Website/src/test/resources/solr/1000165_irdata_solr.xml
x /trunk/Website/src/test/resources/solr/1000355_irdata_solr.xml
x /trunk/Website/src/test/resources/solr/1000465_irdata_solr.xml
x /trunk/Website/src/test/resources/solr/1000535_irdata_solr.xml
x /trunk/Website/src/test/resources/solr/1000544_irdata_solr.xml
x /trunk/Website/src/test/resources/solr/1000546_irdata_solr.xml
x /trunk/Website/src/test/resources/solr/1000554_irdata_solr.xml
x /trunk/Website/src/test/resources/solr/1000557_irdata_solr.xml
x /trunk/Website/src/test/resources/solr/1001191_irdata_solr.xml
x /trunk/Website/src/test/resources/solr/1001192_irdata_solr.xml
x /trunk/Website/src/test/resources/solr/1001218_irdata_solr.xml
x /trunk/Website/src/test/resources/solr/1001220_irdata_solr.xml
x /trunk/Website/src/test/resources/solr/1001227_irdata_solr.xml
x /trunk/Website/src/test/resources/static/media/static/1000165
x /trunk/Website/src/test/resources/static/media/static/1000224
x /trunk/Website/src/test/resources/static/media/static/1000355
x /trunk/Website/src/test/resources/static/media/static/1000465
x /trunk/Website/src/test/resources/static/media/static/1000535
x /trunk/Website/src/test/resources/static/media/static/1000544
x /trunk/Website/src/test/resources/static/media/static/1000546
x /trunk/Website/src/test/resources/static/media/static/1000554
x /trunk/Website/src/test/resources/static/media/static/1000557
x /trunk/Website/src/test/resources/static/media/static/1000563
x /trunk/Website/src/test/resources/static/media/static/1000582
x /trunk/Website/src/test/resources/static/media/static/1000583
x /trunk/Website/src/test/resources/static/media/static/1000662
x /trunk/Website/src/test/resources/static/media/static/1000712
x /trunk/Website/src/test/resources/static/media/static/1000716
x /trunk/Website/src/test/resources/static/media/static/1001191
x /trunk/Website/src/test/resources/static/media/static/1001192
x /trunk/Website/src/test/resources/static/media/static/1001201
x /trunk/Website/src/test/resources/static/media/static/1001208
x /trunk/Website/src/test/resources/static/media/static/1001209
x /trunk/Website/src/test/resources/static/media/static/1001218
x /trunk/Website/src/test/resources/static/media/static/1001220
x /trunk/Website/src/test/resources/static/media/static/1001227
x /trunk/Website/src/test/resources/static/media/website/1000165
x /trunk/Website/src/test/resources/static/media/website/1000224
x /trunk/Website/src/test/resources/static/media/website/1000355
x /trunk/Website/src/test/resources/static/media/website/1000465
x /trunk/Website/src/test/resources/static/media/website/1000535
x /trunk/Website/src/test/resources/static/media/website/1000544
x /trunk/Website/src/test/resources/static/media/website/1000546
x /trunk/Website/src/test/resources/static/media/website/1000554
x /trunk/Website/src/test/resources/static/media/website/1000557
x /trunk/Website/src/test/resources/static/media/website/1000563
x /trunk/Website/src/test/resources/static/media/website/1000582
x /trunk/Website/src/test/resources/static/media/website/1000583
x /trunk/Website/src/test/resources/static/media/website/1000662
x /trunk/Website/src/test/resources/static/media/website/1000712
x /trunk/Website/src/test/resources/static/media/website/1000716
x /trunk/Website/src/test/resources/static/media/website/1001191
x /trunk/Website/src/test/resources/static/media/website/1001192
x /trunk/Website/src/test/resources/static/media/website/1001201
x /trunk/Website/src/test/resources/static/media/website/1001208
x /trunk/Website/src/test/resources/static/media/website/1001209
x /trunk/Website/src/test/resources/static/media/website/1001218
x /trunk/Website/src/test/resources/static/media/website/1001220
x /trunk/Website/src/test/resources/static/media/website/1001227

Rev 5902 – Added event tracking for in-store pickup and region selection change ...

amit.gupta — Tue, 28 Aug 2012 14:39:35 +0530

amit.gupta – 1 file(s) modified
Added event tracking for in-store pickup and region selection change for in-store pickup.

~ /trunk/Website/src/main/webapp/js/shippingAddress.js

Rev 5901 – Checking in the other file as well.

amit.gupta — Tue, 28 Aug 2012 11:39:37 +0530

amit.gupta – 1 file(s) modified
Checking in the other file as well.

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

Rev 5900 – buffers are flushed via streams to maintain low vm footprint ...

amit.gupta — Tue, 28 Aug 2012 07:27:40 +0530

amit.gupta – 1 file(s) modified
buffers are flushed via streams to maintain low vm footprint to avoid outofmemory errors in case of full run.

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

Rev 5899 – Changing username for prod DB

anupam.singh — Mon, 27 Aug 2012 19:56:55 +0530

anupam.singh – 1 file(s) modified
Changing username for prod DB

~ /trunk/pentaho/data-integration/transformations/repeatLoader.ktr

Rev 5898 – Changing password for prod connection

anupam.singh — Mon, 27 Aug 2012 19:52:38 +0530

anupam.singh – 1 file(s) modified
Changing password for prod connection

~ /trunk/pentaho/data-integration/transformations/repeatLoader.ktr

Rev 5897 – Using hadb2 instead of hadb

anupam.singh — Mon, 27 Aug 2012 19:44:09 +0530

anupam.singh – 1 file(s) modified
Using hadb2 instead of hadb

~ /trunk/pentaho/data-integration/transformations/repeatLoader.ktr

Rev 5896 – ETL and Cube schema for repeat sale analysis cube.

anupam.singh — Mon, 27 Aug 2012 19:39:25 +0530

anupam.singh – 3 file(s) modified
ETL and Cube schema for repeat sale analysis cube.

+ /trunk/pentaho/data-integration/transformations/repeatLoader.ktr
+ /trunk/pentaho/schema/RepeatSalesSchema.xml
~ /trunk/pentaho/schema/SalesSchema.xml

Rev 5895 – Enable camera tab when camera category is open.

rajveer — Mon, 27 Aug 2012 15:12:03 +0530

rajveer – 1 file(s) modified
Enable camera tab when camera category is open.

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

Rev 5894 – Added Rajneesh in BCC and Khushal in CC for pickup ...

rajveer — Mon, 27 Aug 2012 11:36:47 +0530

rajveer – 1 file(s) modified
Added Rajneesh in BCC and Khushal in CC for pickup mails.

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

Rev 5893 – Added support to send mail to cc and bcc.

rajveer — Mon, 27 Aug 2012 11:30:33 +0530

rajveer – 1 file(s) modified
Added support to send mail to cc and bcc.

~ /trunk/PyProj/src/shop2020/utils/EmailAttachmentSender.py

Rev 5892 – Added Rajneesh and Khushal in the mailing list.

rajveer — Sat, 25 Aug 2012 18:28:23 +0530

rajveer – 1 file(s) modified
Added Rajneesh and Khushal in the mailing list.

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

Rev 5891 – Added sony in the brand

amit.gupta — Fri, 24 Aug 2012 17:44:13 +0530

amit.gupta – 1 file(s) modified
Added sony in the brand

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

Rev 5890 – Showing store shipping address on user-order-info page Showing in-store orders ...

anupam.singh — Fri, 24 Aug 2012 17:29:17 +0530

anupam.singh – 3 file(s) modified
Showing store shipping address on user-order-info page
Showing in-store orders in red
Running logistics service on crm and crm_backup

~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 5889 – Content related changes to incorportate very lengthy bullets for cameras.

amit.gupta — Fri, 24 Aug 2012 15:55:12 +0530

amit.gupta – 7 file(s) modified
Content related changes to incorportate very lengthy bullets for cameras.

~ /trunk/ContentStore/src/velocity/ComparisonSnippet.vm
~ /trunk/ContentStore/src/velocity/SlideGuide.vm
~ /trunk/Website/src/main/webapp/css/comparision.css
~ /trunk/Website/src/main/webapp/css/product.css
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm

Rev 5888 – Removed use of crypto-js.

anupam.singh — Fri, 24 Aug 2012 14:43:11 +0530

anupam.singh – 1 file(s) modified
Removed use of crypto-js.

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

Rev 5887 – Adding extra argument - pickup type for logisticsinfo()

mandeep.dhir — Fri, 24 Aug 2012 14:13:08 +0530

mandeep.dhir – 1 file(s) modified
Adding extra argument - pickup type for logisticsinfo()

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

Rev 5886 – Removing extra argument

mandeep.dhir — Fri, 24 Aug 2012 14:11:18 +0530

mandeep.dhir – 1 file(s) modified
Removing extra argument

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