SmartDukaan – /

Rev 5810 – Instead of other terms used throughout the UI we will ...

anupam.singh — Thu, 16 Aug 2012 18:44:52 +0530

anupam.singh – 6 file(s) modified
Instead of other terms used throughout the UI we will now be using the following two terms "Pickup In Store" and "Pay in store".

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/images/mob_icon.png
~ /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/proceed-to-pay-index.vm

Rev 5809 – Add abhishek in customer mails for Pickup In Store.

rajveer — Thu, 16 Aug 2012 18:28:53 +0530

rajveer – 1 file(s) modified
Add abhishek in customer mails for Pickup In Store.

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

Rev 5808 – Changed method to get attributes.

rajveer — Thu, 16 Aug 2012 16:42:52 +0530

rajveer – 1 file(s) modified
Changed method to get attributes.

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

Rev 5807 – Enqueue delivery success mail once order has been delivered.

rajveer — Thu, 16 Aug 2012 16:28:35 +0530

rajveer – 1 file(s) modified
Enqueue delivery success mail once order has been delivered.

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

Rev 5806 – Push collections to hotspot once order has been deliverd.

rajveer — Thu, 16 Aug 2012 14:59:18 +0530

rajveer – 1 file(s) modified
Push collections to hotspot once order has been deliverd.

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

Rev 5805 – Changes in contentmodel for cameras suggested by vrinda

amit.gupta — Thu, 16 Aug 2012 14:48:23 +0530

amit.gupta – 4 file(s) modified
Changes in contentmodel for cameras suggested by vrinda

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

Rev 5804 – Added new icon for pickup in store.

rajveer — Thu, 16 Aug 2012 14:14:08 +0530

rajveer – 2 file(s) modified
Added new icon for pickup in store.

~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css

Rev 5803 – The message on empty address list was "Enter and address ...

anupam.singh — Thu, 16 Aug 2012 13:56:20 +0530

anupam.singh – 1 file(s) modified
The message on empty address list was "Enter and address where items would be delivered" irrespective of the tab selected. Fixed this.

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

Rev 5802 – Added email when order is received at store.

rajveer — Thu, 16 Aug 2012 12:54:16 +0530

rajveer – 1 file(s) modified
Added email when order is received at store.

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

Rev 5801 – Checking back the changes which were reverted by Rajveer because ...

amar.kumar — Thu, 16 Aug 2012 11:44:55 +0530

amar.kumar – 1 file(s) modified
Checking back the changes which were reverted by Rajveer because of me reverting their changes
Changes were related to logistics tracking through Alert service

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

Rev 5800 – Changes in contentmodel for cameras suggested by vrinda

amit.gupta — Thu, 16 Aug 2012 10:31:18 +0530

amit.gupta – 4 file(s) modified
Changes in contentmodel for cameras suggested by vrinda

~ /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 5799 – Trac#1550 Added pickupType dimension in salesCube

anupam.singh — Wed, 15 Aug 2012 23:38:05 +0530

anupam.singh – 1 file(s) modified
Trac#1550

Added pickupType dimension in salesCube

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 5798 – Updating ETR script to include pickupStoreId while loading sales cube.

anupam.singh — Wed, 15 Aug 2012 23:34:06 +0530

anupam.singh – 1 file(s) modified
Updating ETR script to include pickupStoreId while loading sales cube.

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

Rev 5797 –

anupam.singh — Wed, 15 Aug 2012 10:57:57 +0530

anupam.singh – 1 file(s) modified

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

Rev 5796 – Changing text to "Select a pickup point" from "Select a ...

anupam.singh — Wed, 15 Aug 2012 10:15:50 +0530

anupam.singh – 1 file(s) modified
Changing text to "Select a pickup point" from "Select a pickup point nearest to you". The longer string was causing misalignment on shipping page when "Pick from store" tab was selected on mozilla firefox.

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

Rev 5795 – Correcting title to "Buy online and pick in store"

anupam.singh — Wed, 15 Aug 2012 09:42:14 +0530

anupam.singh – 1 file(s) modified
Correcting title to "Buy online and pick in store"

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

Rev 5794 – Reducing the padding of "Deliver to my address" tab on ...

anupam.singh — Wed, 15 Aug 2012 09:33:58 +0530

anupam.singh – 1 file(s) modified
Reducing the padding of "Deliver to my address" tab on shipping page to 19px from 25px. It was causing issues on chrome on windows.

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

Rev 5793 – Making changes which had been reverted by Amar.

rajveer — Wed, 15 Aug 2012 07:18:44 +0530

rajveer – 1 file(s) modified
Making changes which had been reverted by Amar.

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

Rev 5792 – Cosmetic changes in T&C page for in store pickup as ...

anupam.singh — Wed, 15 Aug 2012 03:32:01 +0530

anupam.singh – 1 file(s) modified
Cosmetic changes in T&C page for in store pickup as suggested by Abhishek

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

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