SmartDukaan – /

Rev 4413 – Added default warehouse and is warehouse preference sticky field Reviewer ...

anupam.singh — Wed, 01 Feb 2012 13:10:29 +0530

anupam.singh – 5 file(s) modified
Added default warehouse and is warehouse preference sticky field
Reviewer : Rajveer

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 4412 – Return the alert in sorted order of timestamp.

rajveer — Wed, 01 Feb 2012 12:59:10 +0530

rajveer – 1 file(s) modified
Return the alert in sorted order of timestamp.

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

Rev 4411 – Added support to generate courior details report when user clicks ...

rajveer — Wed, 01 Feb 2012 12:53:17 +0530

rajveer – 4 file(s) modified
Added support to generate courior details report when user clicks second button.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ProviderDetails.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsReportMerger.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java

Rev 4410 – Introduced new status Manifested. Also added new method MarkOrdersAsShippedFromWarehouse. Now ...

rajveer — Wed, 01 Feb 2012 12:51:42 +0530

rajveer – 11 file(s) modified
Introduced new status Manifested. Also added new method MarkOrdersAsShippedFromWarehouse. Now old method will mark orders as manifested while new method will mark them as shipped from warehouse. Moved logistics reports generation code in second step.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /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/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4409 – Corrected blackberry string in comparsion to figure out the opsys

amit.gupta — Wed, 01 Feb 2012 10:17:12 +0530

amit.gupta – 1 file(s) modified
Corrected blackberry string in comparsion to figure out the opsys

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

Rev 4408 – Removed Hardcoding for vendors in raise-po dashboard

anupam.singh — Tue, 31 Jan 2012 18:59:50 +0530

anupam.singh – 2 file(s) modified
Removed Hardcoding for vendors in raise-po dashboard

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RaisePOController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/raisePO-index.vm

Rev 4407 – Updated the high range of slider from 30000 to 50000.

rajveer — Tue, 31 Jan 2012 17:58:04 +0530

rajveer – 1 file(s) modified
Updated the high range of slider from 30000 to 50000.

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

Rev 4406 – Added defaultWarehouse, isWarehousePreferenceSticky fields and changed logic for assigning warehouse ...

anupam.singh — Tue, 31 Jan 2012 17:19:37 +0530

anupam.singh – 8 file(s) modified
Added defaultWarehouse, isWarehousePreferenceSticky fields and changed logic for assigning warehouse id during order creation.

Reviewer : Rajveer

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/test/CatalogTest.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 4405 – One time Rs.200 off for michaelananth.ravichandran@tcs.com

varun.gupta — Tue, 31 Jan 2012 16:00:19 +0530

varun.gupta – 1 file(s) modified
One time Rs.200 off for michaelananth.ravichandran@tcs.com

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

Rev 4404 – Added side banner on all product pages.

rajveer — Tue, 31 Jan 2012 12:22:50 +0530

rajveer – 2 file(s) modified
Added side banner on all product pages.

~ /trunk/Website/src/main/webapp/css/widgets.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 4403 – Automated data generation for catalog items for purpose of the ...

amit.gupta — Tue, 31 Jan 2012 12:17:58 +0530

amit.gupta – 2 file(s) modified
Automated data generation for catalog items for purpose of the Amazon Seller Central.

+ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonFeatures.java
+ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java

Rev 4402 – Changed date display format and removed return order detail event.

rajveer — Tue, 31 Jan 2012 12:15:54 +0530

rajveer – 1 file(s) modified
Changed date display format and removed return order detail event.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/AlertList.java

Rev 4401 – Reverted the code to send to EBS for amount less ...

rajveer — Tue, 31 Jan 2012 11:37:20 +0530

rajveer – 1 file(s) modified
Reverted the code to send to EBS for amount less than 100.

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

Rev 4400 – Raise the alert once inventory is received for an item ...

rajveer — Tue, 31 Jan 2012 11:32:36 +0530

rajveer – 1 file(s) modified
Raise the alert once inventory is received for an item which has pending orders.

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

Rev 4399 – Added support to display alerts in the item list. Once ...

rajveer — Tue, 31 Jan 2012 00:44:50 +0530

rajveer – 11 file(s) modified
Added support to display alerts in the item list. Once user clicks on Alerts link, list of all alerts will be displayed.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/AdminPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadAlertsEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/AlertList.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/AlertList.ui.xml
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenter.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxWidget.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AlertsHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Alert.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AlertsResponse.java

Rev 4398 – Changed name of Alert to OrderAlert to accommodate generic Alerts.

rajveer — Mon, 30 Jan 2012 15:51:03 +0530

rajveer – 4 file(s) modified
Changed name of Alert to OrderAlert to accommodate generic Alerts.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Alert.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderAlert.java (copied from /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Alert.java@4386)

Rev 4397 – Adding infrastructure to display alerts in dashboard.

rajveer — Mon, 30 Jan 2012 15:12:15 +0530

rajveer – 12 file(s) modified
Adding infrastructure to display alerts in dashboard.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/AdminPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadAlertsEvent.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenter.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxWidget.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/TopPanel.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/TopPanel.ui.xml
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AlertsHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AlertsRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AlertsResponse.java

Rev 4396 – Orders less than 100 amount should go to EBS.

rajveer — Mon, 30 Jan 2012 13:28:41 +0530

rajveer – 1 file(s) modified
Orders less than 100 amount should go to EBS.

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

Rev 4395 – Block COD for less than 100 rupees.

rajveer — Mon, 30 Jan 2012 12:49:39 +0530

rajveer – 1 file(s) modified
Block COD for less than 100 rupees.

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

Rev 4394 – Adding infrastructure for alerts.

rajveer — Mon, 30 Jan 2012 12:24:06 +0530

rajveer – 7 file(s) modified
Adding infrastructure for alerts.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.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/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py

Rev 4393 – Adding infrastructure for alerts.

rajveer — Mon, 30 Jan 2012 12:23:10 +0530

rajveer – 4 file(s) modified
Adding infrastructure for alerts.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Alert.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AlertType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4392 – Do not allow COD for items below price 100 rupees.

rajveer — Mon, 30 Jan 2012 12:13:11 +0530

rajveer – 2 file(s) modified
Do not allow COD for items below price 100 rupees.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/resources/in/shop2020/serving/controllers/ProceedToPayController.properties

Rev 4391 – Removed getAwbForNumber method Reviewer : Rajveer

anupam.singh — Mon, 30 Jan 2012 12:00:13 +0530

anupam.singh – 9 file(s) modified
Removed getAwbForNumber method
Reviewer : Rajveer

Rev 4390 – Was sending parameters two times both with url and as ...

rajveer — Fri, 27 Jan 2012 19:41:36 +0530

rajveer – 1 file(s) modified
Was sending parameters two times both with url and as parameters. That was resulting in concatenation of both parameter sets. Removed from one place.

~ /trunk/Support/src/main/webapp/js/courier-details.js

Rev 4389 – Removing the command that was restarting apache2

mandeep.dhir — Fri, 27 Jan 2012 16:34:38 +0530

mandeep.dhir – 1 file(s) modified
Removing the command that was restarting apache2

~ /trunk/runutils/deploy-everything.sh

Rev 4388 – Removing instance variables from the UserInterceptor. This will prevent hashmap ...

rajveer — Fri, 27 Jan 2012 15:17:39 +0530

rajveer – 1 file(s) modified
Removing instance variables from the UserInterceptor. This will prevent hashmap to going into infinite loop. Because Interceptors has only one instance for all threads while actions (controllers in our case) have instance per thread.

~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java

Rev 4387 – Adding SH911 image promo in the widget bar for Lumia ...

rajveer — Fri, 27 Jan 2012 12:42:31 +0530

rajveer – 2 file(s) modified
Adding SH911 image promo in the widget bar for Lumia 710

+ /trunk/Website/src/main/webapp/images/SH911-widgetbar.jpg
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 4386 – On courier-details dashboard gave functionality to get details given an ...

anupam.singh — Fri, 27 Jan 2012 03:00:14 +0530

anupam.singh – 20 file(s) modified
On courier-details dashboard gave functionality to get details given an AWB number.

~ /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/LogisticsServiceHandler.py
~ /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/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
+ /trunk/Support/src/main/java/in/shop2020/support/models/AwbDetails.java
+ /trunk/Support/src/main/webapp/js/courier-details.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/courier-details-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/courier-details-info.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Awb.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4385 – keep backup of only two days.

rajveer — Thu, 26 Jan 2012 16:00:29 +0530

rajveer – 1 file(s) modified
keep backup of only two days.

~ /trunk/runutils/backup-CMS.sh

Rev 4384 – Added logs to XML generation code

varun.gupta — Wed, 25 Jan 2012 16:41:33 +0530

varun.gupta – 1 file(s) modified
Added logs to XML generation code

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

Rev 4383 – Allowed Laptops in product XML feed.

varun.gupta — Wed, 25 Jan 2012 16:24:25 +0530

varun.gupta – 1 file(s) modified
Allowed Laptops in product XML feed.

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

Rev 4382 – Included Laptop in product XML feed.

varun.gupta — Wed, 25 Jan 2012 16:04:03 +0530

varun.gupta – 1 file(s) modified
Included Laptop in product XML feed.

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

Rev 4381 – Batch no should be created for INVENTORY_LOW orders as well

mandeep.dhir — Wed, 25 Jan 2012 15:07:27 +0530

mandeep.dhir – 1 file(s) modified
Batch no should be created for INVENTORY_LOW orders as well

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

Rev 4380 – POs should be created for Low inventory items as well

mandeep.dhir — Wed, 25 Jan 2012 15:05:00 +0530

mandeep.dhir – 1 file(s) modified
POs should be created for Low inventory items as well

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

Rev 4379 – Reverting the removal of Lumnia 710 from SH911

varun.gupta — Wed, 25 Jan 2012 12:54:55 +0530

varun.gupta – 1 file(s) modified
Reverting the removal of Lumnia 710 from SH911

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_HDFC_campaign.py

Rev 4378 – Validating communication type

mandeep.dhir — Wed, 25 Jan 2012 12:07:53 +0530

mandeep.dhir – 1 file(s) modified
Validating communication type

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

Rev 4377 – Validating communication type

mandeep.dhir — Wed, 25 Jan 2012 12:04:02 +0530

mandeep.dhir – 1 file(s) modified
Validating communication type

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

Rev 4376 – Removed dependency on OrderStatus.

rajveer — Wed, 25 Jan 2012 11:22:06 +0530

rajveer – 1 file(s) modified
Removed dependency on OrderStatus.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/InventoryStockReportGenerator.py

Rev 4375 – Removed VendorId field from warehouse class in Catalog Service ...

anupam.singh — Tue, 24 Jan 2012 17:00:55 +0530

anupam.singh – 4 file(s) modified
Removed VendorId field from warehouse class in Catalog Service

Reviewer : Rajveer

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 4374 – Added abhishek in the mailing list once an item goes ...

rajveer — Tue, 24 Jan 2012 16:08:58 +0530

rajveer – 1 file(s) modified
Added abhishek in the mailing list once an item goes out of stock.

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