SmartDukaan – /

Rev 6882 – Check for negative quantity in PurchaseOrder

amar.kumar — Tue, 26 Feb 2013 14:57:01 +0530

amar.kumar – 2 file(s) modified
Check for negative quantity in PurchaseOrder

~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py

Rev 6881 – Updated sort order availabality + popularity

amit.gupta — Tue, 26 Feb 2013 14:10:13 +0530

amit.gupta – 3 file(s) modified
Updated sort order availabality + popularity

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/webapp/js/common.js

Rev 6880 – Changes for 1) Inventory Movement Report 2) Rearranging of ...

amar.kumar — Tue, 26 Feb 2013 12:32:46 +0530

amar.kumar – 18 file(s) modified
Changes for
1) Inventory Movement Report
2) Rearranging of fields in PO creation dashboard

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/MovementReportController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/movement-report-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.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 6879 – Adding log statements

kshitij.sood — Mon, 25 Feb 2013 19:35:24 +0530

kshitij.sood – 1 file(s) modified
Adding log statements

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

Rev 6878 – Updated menu of mobile phones.

rajveer — Mon, 25 Feb 2013 17:57:04 +0530

rajveer – 1 file(s) modified
Updated menu of mobile phones.

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

Rev 6877 – added ready on removed created on.

amit.gupta — Mon, 25 Feb 2013 14:42:07 +0530

amit.gupta – 3 file(s) modified
added ready on removed created on.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/webapp/js/entity-index.js
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm

Rev 6876 – Removed ashutosh added kushal

amit.gupta — Mon, 25 Feb 2013 14:17:59 +0530

amit.gupta – 1 file(s) modified
Removed ashutosh
added kushal

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

Rev 6875 – Added validation and custom image names.

kshitij.sood — Mon, 25 Feb 2013 13:49:19 +0530

kshitij.sood – 3 file(s) modified
Added validation and custom image names.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-edit.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-editNew.vm

Rev 6874 – Corrected xolo menu.

rajveer — Sat, 23 Feb 2013 00:04:21 +0530

rajveer – 1 file(s) modified
Corrected xolo menu.

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

Rev 6873 – Added popularity

amit.gupta — Fri, 22 Feb 2013 18:55:34 +0530

amit.gupta – 1 file(s) modified
Added popularity

~ /trunk/ContentStore/src/xml/model/categoryfacetdefinitions.xml

Rev 6872 – Move orders based on inventory.

rajveer — Fri, 22 Feb 2013 17:08:48 +0530

rajveer – 1 file(s) modified
Move orders based on inventory.

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

Rev 6871 – Added popularity

amit.gupta — Fri, 22 Feb 2013 17:05:39 +0530

amit.gupta – 5 file(s) modified
Added popularity

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java

Rev 6870 – Shift orders if and only if billing warehouse is set.

rajveer — Fri, 22 Feb 2013 17:03:10 +0530

rajveer – 1 file(s) modified
Shift orders if and only if billing warehouse is set.

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

Rev 6869 – Sony added.

rajveer — Fri, 22 Feb 2013 15:11:43 +0530

rajveer – 1 file(s) modified
Sony added.

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

Rev 6868 – Added xolo and Huawai links in menu.

rajveer — Fri, 22 Feb 2013 14:57:03 +0530

rajveer – 1 file(s) modified
Added xolo and Huawai links in menu.

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

Rev 6867 – changes by vrinda make Capacity - Expansion capacity Dimensions - ...

amit.gupta — Fri, 22 Feb 2013 14:27:13 +0530

amit.gupta – 2 file(s) modified
changes by vrinda
make Capacity - Expansion capacity
Dimensions - Decimals should be accepted

~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 6866 – implemented Multi-select search.

amit.gupta — Fri, 22 Feb 2013 11:28:46 +0530

amit.gupta – 11 file(s) modified
implemented Multi-select search.

~ /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
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/style.css
~ /trunk/Website/src/main/webapp/js/common.js
~ /trunk/Website/src/main/webapp/js/productCategory.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm

Rev 6865 – Removing check for duplicate Serial Number if billing is of ...

amar.kumar — Thu, 21 Feb 2013 16:50:07 +0530

amar.kumar – 1 file(s) modified
Removing check for duplicate Serial Number if billing is of OURS_EXTERNAL type and
Setting purchaseReturnType as VIRTUAL in case of OURS_EXT sale return

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 6864 – Move all orders to correct warehouse in morning.

rajveer — Thu, 21 Feb 2013 16:33:44 +0530

rajveer – 1 file(s) modified
Move all orders to correct warehouse in morning.

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

Rev 6863 – Changing Widths for input boxes in PO creation page

amar.kumar — Thu, 21 Feb 2013 15:33:13 +0530

amar.kumar – 1 file(s) modified
Changing Widths for input boxes in PO creation page

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm

Rev 6862 – Setting fixed width (100px) of Transfer price column for PO-lineitem

amar.kumar — Thu, 21 Feb 2013 15:22:46 +0530

amar.kumar – 1 file(s) modified
Setting fixed width (100px) of Transfer price column for PO-lineitem

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm

Rev 6861 – Change to avoid negative quantity for PurchaseOrder

amar.kumar — Thu, 21 Feb 2013 14:57:46 +0530

amar.kumar – 1 file(s) modified
Change to avoid negative quantity for PurchaseOrder

~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py

Rev 6860 – Change to avoid negative quantity for PurchaseOrder

amar.kumar — Thu, 21 Feb 2013 14:47:21 +0530

amar.kumar – 1 file(s) modified
Change to avoid negative quantity for PurchaseOrder

~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py

Rev 6859 – Added apple lighting connector.

amit.gupta — Thu, 21 Feb 2013 13:51:17 +0530

amit.gupta – 1 file(s) modified
Added apple lighting connector.

~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 6858 – Avoiding updation of inventory in case of OURS_EXTERNAL Billing and ...

amar.kumar — Thu, 21 Feb 2013 12:37:59 +0530

amar.kumar – 1 file(s) modified
Avoiding updation of inventory in case of OURS_EXTERNAL Billing and ensuring it happens in case of OURS Billing

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 6857 – Additional Changes for PO creation process

amar.kumar — Thu, 21 Feb 2013 11:37:55 +0530

amar.kumar – 12 file(s) modified
Additional Changes for PO creation process

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/PurchaseOrder.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 6856 – Reverted home controller and index.vm

kshitij.sood — Tue, 19 Feb 2013 18:34:12 +0530

kshitij.sood – 2 file(s) modified
Reverted home controller and index.vm

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm

Rev 6855 – Adding rajneesh in mail for Manual Upload of Inventory containing ...

amar.kumar — Tue, 19 Feb 2013 17:58:09 +0530

amar.kumar – 1 file(s) modified
Adding rajneesh in mail for Manual Upload of Inventory containing the details of the stock uploaded and unmapped keys

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

Rev 6854 – Sending mail for Manual Upload of Inventory containing the details ...

amar.kumar — Tue, 19 Feb 2013 17:06:17 +0530

amar.kumar – 1 file(s) modified
Sending mail for Manual Upload of Inventory containing the details of the stock uploaded and unmapped keys

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

Rev 6853 – Updated remoteFilePath.

kshitij.sood — Tue, 19 Feb 2013 16:30:31 +0530

kshitij.sood – 1 file(s) modified
Updated remoteFilePath.

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

Rev 6852 – Created softlink for banners.

kshitij.sood — Tue, 19 Feb 2013 16:14:20 +0530

kshitij.sood – 1 file(s) modified
Created softlink for banners.

~ /trunk/runutils/deploy-everything.sh

Rev 6851 – Avoiding updation of inventory in case billing type EXTERNAL

amar.kumar — Tue, 19 Feb 2013 14:59:48 +0530

amar.kumar – 1 file(s) modified
Avoiding updation of inventory in case billing type EXTERNAL

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 6850 – Thrift changes for Sliding Banner and its user interface implementation.

kshitij.sood — Tue, 19 Feb 2013 13:53:23 +0530

kshitij.sood – 4 file(s) modified
Thrift changes for Sliding Banner and its user interface implementation.

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

Rev 6849 – Thrift changes for Sliding Banner and its user interface implementation.

kshitij.sood — Tue, 19 Feb 2013 13:02:04 +0530

kshitij.sood – 6 file(s) modified
Thrift changes for Sliding Banner and its user interface implementation.

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Banner.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BannerMap.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java

Rev 6848 – Sliding Banner and its user interface implementation.

kshitij.sood — Tue, 19 Feb 2013 12:59:14 +0530

kshitij.sood – 27 file(s) modified
Sliding Banner and its user interface implementation.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /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/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/ScpService.java
~ /trunk/Website/src/main/webapp/css/common.css
+ /trunk/Website/src/main/webapp/css/imgareaselect-default.css
+ /trunk/Website/src/main/webapp/css/jquery.slidy.css
+ /trunk/Website/src/main/webapp/images/add.png
+ /trunk/Website/src/main/webapp/images/background.gif
+ /trunk/Website/src/main/webapp/images/greendot.gif
+ /trunk/Website/src/main/webapp/images/reddot.gif
+ /trunk/Website/src/main/webapp/images/red_dot.gif
+ /trunk/Website/src/main/webapp/js/jquery.imgareaselect.pack.js
+ /trunk/Website/src/main/webapp/js/jquery.js
+ /trunk/Website/src/main/webapp/js/jquery.slidy.js
+ /trunk/Website/src/main/webapp/js/jquery.slidy.min.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-edit.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-editNew.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-index.vm

Rev 6847 –

amit.gupta — Mon, 18 Feb 2013 23:44:46 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ThriftGen

Rev 6846 –

amit.gupta — Mon, 18 Feb 2013 23:44:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj

Rev 6845 – Tagged Pages are now Solr searchable.

amit.gupta — Mon, 18 Feb 2013 23:40:56 +0530

amit.gupta – 4 file(s) modified
Tagged Pages are now Solr searchable.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py

Rev 6844 –

amar.kumar — Mon, 18 Feb 2013 19:29:38 +0530

amar.kumar – 1 file(s) modified

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/OosStatusMarker.java

Rev 6843 – Printing OOSStatus Evaluation Time

amar.kumar — Mon, 18 Feb 2013 19:19:44 +0530

amar.kumar – 1 file(s) modified
Printing OOSStatus Evaluation Time

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/OosStatusMarker.java