SmartDukaan – /

Rev 5703 – Changed RTO instruction as per instruction.

rajveer — Tue, 31 Jul 2012 14:44:02 +0530

rajveer – 1 file(s) modified
Changed RTO instruction as per instruction.

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

Rev 5702 – Updating last timestamp on staging as well

mandeep.dhir — Mon, 30 Jul 2012 17:26:52 +0530

mandeep.dhir – 1 file(s) modified
Updating last timestamp on staging as well

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

Rev 5701 – Will trim the labels automatically.

amit.gupta — Mon, 30 Jul 2012 17:02:27 +0530

amit.gupta – 1 file(s) modified
Will trim the labels automatically.

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

Rev 5700 – facebook will now be opened in new page.

amit.gupta — Mon, 30 Jul 2012 17:00:30 +0530

amit.gupta – 1 file(s) modified
facebook will now be opened in new page.

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

Rev 5699 – Changes as suggested by abhishek to be released on tuesday.

amit.gupta — Mon, 30 Jul 2012 14:48:17 +0530

amit.gupta – 2 file(s) modified
Changes as suggested by abhishek to be released on tuesday.

~ /trunk/Website/src/main/webapp/WEB-INF/content/thankyou.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/win-galaxy-s3-contest.vm

Rev 5698 – Updating last timestamp on staging as well

mandeep.dhir — Mon, 30 Jul 2012 12:06:38 +0530

mandeep.dhir – 1 file(s) modified
Updating last timestamp on staging as well

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java

Rev 5697 – Refer to correct variable.

rajveer — Mon, 30 Jul 2012 11:13:32 +0530

rajveer – 1 file(s) modified
Refer to correct variable.

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

Rev 5696 – Changes as suggested by abhishek

amit.gupta — Sun, 29 Jul 2012 14:35:00 +0530

amit.gupta – 1 file(s) modified
Changes as suggested by abhishek

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

Rev 5695 – Changes as suggested by abhishek

amit.gupta — Sun, 29 Jul 2012 14:29:20 +0530

amit.gupta – 1 file(s) modified
Changes as suggested by abhishek

+ /trunk/Website/src/main/webapp/WEB-INF/content/thankyou.vm

Rev 5694 – Added changes as suggested by abhishek.

amit.gupta — Sun, 29 Jul 2012 14:24:06 +0530

amit.gupta – 1 file(s) modified
Added changes as suggested by abhishek.

~ /trunk/Website/src/main/webapp/WEB-INF/content/win-galaxy-s3-contest.vm

Rev 5693 – More UI modifications in store dashboard UI.

rajveer — Fri, 27 Jul 2012 17:31:25 +0530

rajveer – 2 file(s) modified
More UI modifications in store dashboard UI.

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

Rev 5692 – Updated logic for assignment of courier to delhivery and bluedart. ...

rajveer — Fri, 27 Jul 2012 16:49:33 +0530

rajveer – 2 file(s) modified
Updated logic for assignment of courier to delhivery and bluedart. Also removed logic of warehouse location.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py

Rev 5691 – changed title for this page.

amit.gupta — Fri, 27 Jul 2012 16:27:39 +0530

amit.gupta – 1 file(s) modified
changed title for this page.

~ /trunk/Website/src/main/webapp/WEB-INF/content/win-galaxy-s3-contest.vm

Rev 5690 – Some amendments to make client connections happy

mandeep.dhir — Fri, 27 Jul 2012 13:27:43 +0530

mandeep.dhir – 1 file(s) modified
Some amendments to make client connections happy

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

Rev 5689 – Added new static file for samsung galaxy s3 contests

amit.gupta — Fri, 27 Jul 2012 12:49:42 +0530

amit.gupta – 1 file(s) modified
Added new static file for samsung galaxy s3 contests

+ /trunk/Website/src/main/webapp/WEB-INF/content/win-galaxy-s3-contest.vm

Rev 5688 –

amit.gupta — Fri, 27 Jul 2012 10:34:52 +0530

amit.gupta – 1 file(s) modified

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

Rev 5687 – This file can be used to upload events from data.log ...

amar.kumar — Thu, 26 Jul 2012 18:16:34 +0530

amar.kumar – 1 file(s) modified
This file can be used to upload events from data.log which were not stored in GAE because of QuotaDenial or any other issue

+ /trunk/Common/src/main/java/in/shop2020/utils/GAEFailedEventUploader.java

Rev 5686 – Added config for hotspot same as shop2020 gateways

mandeep.dhir — Thu, 26 Jul 2012 17:54:55 +0530

mandeep.dhir – 1 file(s) modified
Added config for hotspot same as shop2020 gateways

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

Rev 5685 – Added config for hotspot same as shop2020 gateways

mandeep.dhir — Thu, 26 Jul 2012 17:37:39 +0530

mandeep.dhir – 1 file(s) modified
Added config for hotspot same as shop2020 gateways

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

Rev 5684 – Trac#903 Auto shifting warehouse of orders with scan Ins of ...

mandeep.dhir — Thu, 26 Jul 2012 17:03:53 +0530

mandeep.dhir – 5 file(s) modified
Trac#903 Auto shifting warehouse of orders with scan Ins of items

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 5683 – Changing show Test gateway to true

amar.kumar — Thu, 26 Jul 2012 16:15:03 +0530

amar.kumar – 1 file(s) modified
Changing show Test gateway to true

~ /trunk/Website/src/main/filters/hotspot/filters.properties

Rev 5682 – Changed offer end date from 26th July to 15th August.

rajveer — Thu, 26 Jul 2012 15:21:28 +0530

rajveer – 1 file(s) modified
Changed offer end date from 26th July to 15th August.

~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm

Rev 5681 – Added Mac OS for all Macbooks.

amit.gupta — Thu, 26 Jul 2012 14:27:23 +0530

amit.gupta – 1 file(s) modified
Added Mac OS for all Macbooks.

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

Rev 5680 – Removing extra date field from log statements

amar.kumar — Thu, 26 Jul 2012 13:09:01 +0530

amar.kumar – 2 file(s) modified
Removing extra date field from log statements

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

Rev 5679 – Adding EntityIdentifier in log statements

amar.kumar — Thu, 26 Jul 2012 12:37:29 +0530

amar.kumar – 2 file(s) modified
Adding EntityIdentifier in log statements

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

Rev 5678 – Pickup store dashboard for user.

rajveer — Thu, 26 Jul 2012 11:26:59 +0530

rajveer – 5 file(s) modified
Pickup store dashboard for user.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
~ /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/WEB-INF/content/pickup-store-index.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-show.vm

Rev 5677 – Job to send mail to courier partners to inform ...

rajveer — Thu, 26 Jul 2012 11:24:17 +0530

rajveer – 1 file(s) modified
Job to send mail to courier partners to inform them about return pickups from the store.

+ /trunk/PyProj/src/shop2020/model/v1/order/script/PickupStoreReturns.py

Rev 5676 – Added two new methods corresponding to pickup from store.

rajveer — Thu, 26 Jul 2012 11:20:44 +0530

rajveer – 6 file(s) modified
Added two new methods corresponding to pickup from store.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5675 – Changes for storing active/passive alerts in different log files

amar.kumar — Wed, 25 Jul 2012 22:44:50 +0530

amar.kumar – 1 file(s) modified
Changes for storing active/passive alerts in different log files

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

Rev 5674 – Adding changes for --writing data to different log files ...

amar.kumar — Wed, 25 Jul 2012 18:11:38 +0530

amar.kumar – 5 file(s) modified
Adding changes for
--writing data to different log files for Active and Passive Alerts
--Alerting on threshold reached
--Start monitoring entity even if entity is in middle of life cycle

~ /trunk/AlertService/src/main/java/in/shop2020/alert/handler/EntityHandler.java
~ /trunk/AlertService/src/main/java/in/shop2020/alert/persistence/EntityMapper.java
~ /trunk/AlertService/src/main/java/in/shop2020/alert/util/AlertTask.java
~ /trunk/AlertService/src/main/resources/in/shop2020/alert/persistence/EntityMapper.xml
~ /trunk/AlertService/src/main/resources/log4j.properties

Rev 5673 – Updated contact info on the contact up page.

rajveer — Wed, 25 Jul 2012 16:37:04 +0530

rajveer – 3 file(s) modified
Updated contact info on the contact up page.

~ /trunk/Website/src/main/resources/templates/Hotspot-address.vm
~ /trunk/Website/src/main/resources/templates/Saholic-address.vm
~ /trunk/Website/src/main/resources/templates/Shop2020-address.vm

Rev 5672 – #1487 Skip warranty child slide for screen guards.

amit.gupta — Wed, 25 Jul 2012 16:13:43 +0530

amit.gupta – 1 file(s) modified
#1487
Skip warranty child slide for screen guards.

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

Rev 5671 – #1487 Skip warranty child slide for screen guards.

amit.gupta — Wed, 25 Jul 2012 16:09:34 +0530

amit.gupta – 2 file(s) modified
#1487
Skip warranty child slide for screen guards.

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

Rev 5670 – Adding proper recipients

anupam.singh — Wed, 25 Jul 2012 03:14:14 +0530

anupam.singh – 2 file(s) modified
Adding proper recipients

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

Rev 5669 – Logical changes for content generation for solr files.

amit.gupta — Wed, 25 Jul 2012 00:46:51 +0530

amit.gupta – 1 file(s) modified
Logical changes for content generation for solr files.

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

Rev 5668 – corrected shop2020 url.

amit.gupta — Tue, 24 Jul 2012 23:15:02 +0530

amit.gupta – 1 file(s) modified
corrected shop2020 url.

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

Rev 5667 – Adding ga-invoker.js to filtering

amar.kumar — Tue, 24 Jul 2012 19:01:51 +0530

amar.kumar – 1 file(s) modified
Adding ga-invoker.js to filtering

~ /trunk/Website/pom.xml

Rev 5666 – Made following updates Add a column for Value also ...

anupam.singh — Tue, 24 Jul 2012 17:08:14 +0530

anupam.singh – 2 file(s) modified
Made following updates

Add a column for Value also to the right of quantity
Add a Grand Total row at the top.
Remove sub-category.
And Sort by first Category and then Brand.

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

Rev 5665 – Unindexing "itemId", "itemIds", "shortdate" as they are never used in ...

amar.kumar — Tue, 24 Jul 2012 16:05:51 +0530

amar.kumar – 1 file(s) modified
Unindexing "itemId", "itemIds", "shortdate" as they are never used in queries

~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/AddDataLogServlet.java

Rev 5664 – Made folders for html entities configurable on domain basis. It ...

amit.gupta — Tue, 24 Jul 2012 12:34:07 +0530

amit.gupta – 3 file(s) modified
Made folders for html entities configurable on domain basis. It is now used from shop2020.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg