SmartDukaan – /

Rev 6788 – Make action fields as disabled in case of readonly user.

rajveer — Tue, 05 Feb 2013 16:55:10 +0530

rajveer – 12 file(s) modified
Make action fields as disabled in case of readonly user.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/AuthenticateDialog.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogDashboard.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemActions.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/LoginService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/LoginServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/LoginServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 6787 – Removed code of matching of color temporarily.

rajveer — Tue, 05 Feb 2013 13:41:11 +0530

rajveer – 1 file(s) modified
Removed code of matching of color temporarily.

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

Rev 6786 – Changes to add Scan Records in case of OurExternal Billing ...

amar.kumar — Mon, 04 Feb 2013 17:20:51 +0530

amar.kumar – 1 file(s) modified
Changes to add Scan Records in case of OurExternal Billing while
1) cancelling order after billing
2) validating return products as usable or unusable

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

Rev 6785 – Adding subtraction factor for diff warehouses while uploading inventory ...

amar.kumar — Mon, 04 Feb 2013 16:49:14 +0530

amar.kumar – 1 file(s) modified
Adding subtraction factor for diff warehouses while uploading inventory

Hotspot/HS Ingram/G 5
21st Century/G 5
Sangee Comunications Pvt Ltd/G 4
into/G 4
Ag telecom Pvt Ltd 2

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/EffectiveAvailabilityComputer.java

Rev 6784 – Set imei number in case of serialized orders.

rajveer — Mon, 04 Feb 2013 16:15:07 +0530

rajveer – 1 file(s) modified
Set imei number in case of serialized orders.

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

Rev 6783 – Change to stop Inventory Upload for Hotspot.

amar.kumar — Mon, 04 Feb 2013 15:58:47 +0530

amar.kumar – 1 file(s) modified
Change to stop Inventory Upload for Hotspot.

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-inventory-index.vm

Rev 6782 – Auto accept orders from 9I5 instead of 901.

rajveer — Mon, 04 Feb 2013 14:36:27 +0530

rajveer – 1 file(s) modified
Auto accept orders from 9I5 instead of 901.

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

Rev 6781 – Added new kalkaji warehose in the courier detail report.

rajveer — Mon, 04 Feb 2013 14:29:16 +0530

rajveer – 1 file(s) modified
Added new kalkaji warehose in the courier detail report.

~ /trunk/PyProj/src/shop2020/logistics/service/script/LogisticsReportSender.py

Rev 6780 – Change to check for availability while getting warehouses with min ...

amar.kumar — Fri, 01 Feb 2013 12:17:17 +0530

amar.kumar – 1 file(s) modified
Change to check for availability while getting warehouses with min transfer delay

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

Rev 6779 – Changed logic of breakeven calculation.

rajveer — Thu, 31 Jan 2013 18:42:43 +0530

rajveer – 1 file(s) modified
Changed logic of breakeven calculation.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java

Rev 6778 – Changed logic of warehouse assignment based on nlc instead of ...

rajveer — Thu, 31 Jan 2013 18:33:23 +0530

rajveer – 1 file(s) modified
Changed logic of warehouse assignment based on nlc instead of tp.

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

Rev 6777 – Added BestDeals Detail Text and Best Deals Details Link fields ...

vikram.raghav — Thu, 31 Jan 2013 16:54:25 +0530

vikram.raghav – 13 file(s) modified
Added BestDeals Detail Text and Best Deals Details Link fields to Catalogdashboard.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.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/java/in/shop2020/catalog/util/ReportGenerator.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml
~ /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/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 6776 – Removed My Notes feature from content.

rajveer — Thu, 31 Jan 2013 14:50:57 +0530

rajveer – 1 file(s) modified
Removed My Notes feature from content.

~ /trunk/ContentStore/src/velocity/SlideGuide.vm

Rev 6775 – Remove mynotes controller from the website. Also remove mynotes from ...

rajveer — Thu, 31 Jan 2013 14:47:06 +0530

rajveer – 9 file(s) modified
Remove mynotes controller from the website. Also remove mynotes from content.

~ /trunk/Website/build.xml
~ /trunk/Website/pom.xml
x /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyNotesController.java
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/webapp/css/product.css
~ /trunk/Website/src/main/webapp/js/entity.js
x /trunk/Website/src/main/webapp/js/my-notes.js
x /trunk/Website/src/main/webapp/WEB-INF/content/my-notes-json.vm
x /trunk/Website/src/main/webapp/WEB-INF/content/my-notes-show.vm

Rev 6774 – added blackberry 10 os

amit.gupta — Thu, 31 Jan 2013 14:46:10 +0530

amit.gupta – 2 file(s) modified
added blackberry 10 os

~ /trunk/ContentStore/src/jython/comparisonrules/software_math.py
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 6773 – updated links

kshitij.sood — Thu, 31 Jan 2013 14:28:16 +0530

kshitij.sood – 1 file(s) modified
updated links

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

Rev 6772 – Updated emi widget.

kshitij.sood — Wed, 30 Jan 2013 20:18:44 +0530

kshitij.sood – 1 file(s) modified
Updated emi widget.

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

Rev 6771 – Reverted changes.

kshitij.sood — Wed, 30 Jan 2013 18:57:53 +0530

kshitij.sood – 1 file(s) modified
Reverted changes.

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

Rev 6770 – Citi bank emi option is live.

amit.gupta — Wed, 30 Jan 2013 18:03:49 +0530

amit.gupta – 1 file(s) modified
Citi bank emi option is live.

~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 6769 – Send the invoice number to backend if required.

rajveer — Wed, 30 Jan 2013 17:36:40 +0530

rajveer – 5 file(s) modified
Send the invoice number to backend if required.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.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/JacketInfoBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddJacketNumberRequest.java

Rev 6768 – Change in the arguments of method call for OursExternalBilling

amar.kumar — Wed, 30 Jan 2013 16:49:42 +0530

amar.kumar – 1 file(s) modified
Change in the arguments of method call for OursExternalBilling

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

Rev 6767 – Ours external billing type to be passed to server side.

rajveer — Wed, 30 Jan 2013 16:31:30 +0530

rajveer – 1 file(s) modified
Ours external billing type to be passed to server side.

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

Rev 6766 – Reverting changes for Warehouse Service

amar.kumar — Wed, 30 Jan 2013 16:12:55 +0530

amar.kumar – 2 file(s) modified
Reverting changes for Warehouse Service

~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py

Rev 6765 – Reverting changes for Warehouse Service

amar.kumar — Wed, 30 Jan 2013 16:10:55 +0530

amar.kumar – 7 file(s) modified
Reverting changes for Warehouse Service

~ /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 6764 – Remove extra spaces from serialnumber and itemnumber.

rajveer — Wed, 30 Jan 2013 15:40:45 +0530

rajveer – 1 file(s) modified
Remove extra spaces from serialnumber and itemnumber.

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

Rev 6763 – Changes for Ours_External Billing

amar.kumar — Wed, 30 Jan 2013 15:27:21 +0530

amar.kumar – 1 file(s) modified
Changes for Ours_External Billing

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

Rev 6762 – Changes for OUR External Billing

amar.kumar — Wed, 30 Jan 2013 15:14:18 +0530

amar.kumar – 17 file(s) modified
Changes for OUR External Billing

~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/PurchaseOrder.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /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/purchase/PurchaseService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryMovement.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /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 6761 – Created special pages for accessories.

kshitij.sood — Wed, 30 Jan 2013 14:16:40 +0530

kshitij.sood – 1 file(s) modified
Created special pages for accessories.

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

Rev 6760 – Added tp when new vendor pricing is added to an ...

amit.gupta — Wed, 30 Jan 2013 11:12:32 +0530

amit.gupta – 1 file(s) modified
Added tp when new vendor pricing is added to an item.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java

Rev 6759 – Changes to add NLC field

amar.kumar — Tue, 29 Jan 2013 19:54:23 +0530

amar.kumar – 6 file(s) modified
Changes to add NLC field

Rev 6758 – Changed error message

anupam.singh — Tue, 29 Jan 2013 17:32:05 +0530

anupam.singh – 1 file(s) modified
Changed error message

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py

Rev 6757 – Updated case temporarily.

rajveer — Tue, 29 Jan 2013 17:04:21 +0530

rajveer – 1 file(s) modified
Updated case temporarily.

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

Rev 6756 – Auto generated for NLC.

amar.kumar — Tue, 29 Jan 2013 16:36:46 +0530

amar.kumar – 2 file(s) modified
Auto generated for NLC.

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py

Rev 6755 – Auto generated for NLC.

amar.kumar — Tue, 29 Jan 2013 16:36:16 +0530

amar.kumar – 1 file(s) modified
Auto generated for NLC.

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py

Rev 6754 – while validating coupon we had not taken care of string ...

anupam.singh — Tue, 29 Jan 2013 16:34:04 +0530

anupam.singh – 1 file(s) modified
while validating coupon we had not taken care of string "login".

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

Rev 6753 – Corrected comment.

rajveer — Tue, 29 Jan 2013 15:41:13 +0530

rajveer – 1 file(s) modified
Corrected comment.

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

Rev 6752 – Checking in generated code for nlc field in VendorItemPricing

amar.kumar — Tue, 29 Jan 2013 15:08:23 +0530

amar.kumar – 1 file(s) modified
Checking in generated code for nlc field in VendorItemPricing

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VendorItemPricing.java

Rev 6751 – Changes for billing of OURS EXTERNAL and changes for nlc ...

amar.kumar — Tue, 29 Jan 2013 14:58:50 +0530

amar.kumar – 6 file(s) modified
Changes for billing of OURS EXTERNAL and changes for nlc in InventoryService

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.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

Rev 6750 – Changed the invoice printing format in case of ours external ...

rajveer — Tue, 29 Jan 2013 14:39:46 +0530

rajveer – 1 file(s) modified
Changed the invoice printing format in case of ours external billing.

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

Rev 6749 – Repositioned tiles (cart widget)

kshitij.sood — Tue, 29 Jan 2013 14:13:33 +0530

kshitij.sood – 1 file(s) modified
Repositioned tiles (cart widget)

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