SmartDukaan – /

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

Rev 5717 – Store collection report for hotspot finance department.

rajveer — Fri, 03 Aug 2012 12:24:01 +0530

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

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/StoreCollectionController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/store-collection-index.vm

Rev 5716 – InStore Pickup UI

anupam.singh — Fri, 03 Aug 2012 11:52:31 +0530

anupam.singh – 11 file(s) modified
InStore Pickup UI

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /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/cart-details.js
~ /trunk/Website/src/main/webapp/js/shippingAddress.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 5715 – New SNCA format

mandeep.dhir — Fri, 03 Aug 2012 09:36:34 +0530

mandeep.dhir – 1 file(s) modified
New SNCA format

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

Rev 5714 – Lot of improvements in the store dashboard.

rajveer — Thu, 02 Aug 2012 16:32:40 +0530

rajveer – 6 file(s) modified
Lot of improvements in the store dashboard.

~ /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/js/jquery.colorbox-min.js
~ /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 5713 – Added method for getting collection and changing awbs for return ...

rajveer — Thu, 02 Aug 2012 16:32:05 +0530

rajveer – 6 file(s) modified
Added method for getting collection and changing awbs for return orders.

~ /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 5712 – Bug fix. Added another separate method to update vendor string ...

mandeep.dhir — Thu, 02 Aug 2012 13:49:36 +0530

mandeep.dhir – 7 file(s) modified
Bug fix. Added another separate method to update vendor string of a warehouse

~ /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/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 5711 – Trac#1486 Reviewer: Anupam Ageing report for Mahipalpur

mandeep.dhir — Wed, 01 Aug 2012 16:39:12 +0530

mandeep.dhir – 14 file(s) modified
Trac#1486 Reviewer: Anupam
Ageing report for Mahipalpur

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryAgeController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SaleReportController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryAge.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
~ /trunk/WarehouseService/src/main/resources/mybatis-config.xml

Rev 5710 – Adding key expression to sales cube for productName heirarchy

anupam.singh — Wed, 01 Aug 2012 15:00:24 +0530

anupam.singh – 1 file(s) modified
Adding key expression to sales cube for productName heirarchy

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 5709 – Including newsletter in the productactivity cube

anupam.singh — Wed, 01 Aug 2012 14:58:03 +0530

anupam.singh – 1 file(s) modified
Including newsletter in the productactivity cube

~ /trunk/pentaho/schema/ProductActivitySchema.xml

Rev 5708 – Script to generate repeat sale report.

anupam.singh — Wed, 01 Aug 2012 14:56:36 +0530

anupam.singh – 1 file(s) modified
Script to generate repeat sale report.

+ /trunk/pentaho/scripts/repeatSaleReporter.py

Rev 5707 – Removed M-5665 and QT-64 from the list of applicable Spicedeck ...

rajveer — Wed, 01 Aug 2012 12:42:13 +0530

rajveer – 1 file(s) modified
Removed M-5665 and QT-64 from the list of applicable Spicedeck recharge vouchers.

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

Rev 5706 – #1496 - Single click action for "Push Price to Production" ...

amit.gupta — Wed, 01 Aug 2012 11:48:10 +0530

amit.gupta – 1 file(s) modified
#1496 - Single click action for "Push Price to Production"
reviewed by : mandeep.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java

Rev 5705 – If it has after-sales slide then generate content.

amit.gupta — Tue, 31 Jul 2012 15:44:54 +0530

amit.gupta – 1 file(s) modified
If it has after-sales slide then generate content.

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

Rev 5704 – Removed Varun from mailing list.

rajveer — Tue, 31 Jul 2012 15:07:44 +0530

rajveer – 1 file(s) modified
Removed Varun from mailing list.

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