SmartDukaan – /

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

Rev 6842 – Tagged Pages are now Solr searchable.

amit.gupta — Mon, 18 Feb 2013 18:48:41 +0530

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

+ /trunk/ContentStore/src/jython/irdatarules/emptyvalue.py
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewIR.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/irdatarules.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java

Rev 6841 – Avoiding updation of inventory in case billing id OURS_EXTERNAL

amar.kumar — Mon, 18 Feb 2013 18:37:23 +0530

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

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

Rev 6840 – Added class selector.

kshitij.sood — Mon, 18 Feb 2013 17:11:26 +0530

kshitij.sood – 1 file(s) modified
Added class selector.

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

Rev 6839 – Correcting column order for PO-lineitem in PO creation dashboard

amar.kumar — Mon, 18 Feb 2013 16:42:37 +0530

amar.kumar – 1 file(s) modified
Correcting column order for PO-lineitem in PO creation dashboard

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

Rev 6838 – CatalogDashboard changes for Insurance

vikram.raghav — Mon, 18 Feb 2013 14:41:32 +0530

vikram.raghav – 15 file(s) modified
CatalogDashboard changes for Insurance

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
~ /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/dashboard/shared/Utils.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/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.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 6837 – Adding unit price conversion(earlier removed by mistake)

amar.kumar — Mon, 18 Feb 2013 11:48:28 +0530

amar.kumar – 1 file(s) modified
Adding unit price conversion(earlier removed by mistake)

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

Rev 6836 – Fixing logic of suggestedQty to treat it as sum of ...

amar.kumar — Sun, 17 Feb 2013 23:38:52 +0530

amar.kumar – 1 file(s) modified
Fixing logic of suggestedQty to treat it as sum of additionalQty and reqQty

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

Rev 6835 –

amar.kumar — Sun, 17 Feb 2013 23:30:52 +0530

amar.kumar – 1 file(s) modified

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

Rev 6834 –

amar.kumar — Sun, 17 Feb 2013 23:27:18 +0530

amar.kumar – 1 file(s) modified

~ /trunk/InventoryManager/src/main/webapp/css/common.css

Rev 6833 – Closing sessions after method calls

amar.kumar — Sun, 17 Feb 2013 23:20:30 +0530

amar.kumar – 1 file(s) modified
Closing sessions after method calls

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

Rev 6832 – Pending changes to change PO creation process

amar.kumar — Sun, 17 Feb 2013 23:01:01 +0530

amar.kumar – 8 file(s) modified
Pending changes to change PO creation process

~ /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/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 6831 – Adding AdditionalQty field

amar.kumar — Sun, 17 Feb 2013 22:35:04 +0530

amar.kumar – 1 file(s) modified
Adding AdditionalQty field

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

Rev 6830 – Setting MinStockLevel and NumOfDaysOfStock as 0 for newly added item ...

amar.kumar — Sun, 17 Feb 2013 21:46:48 +0530

amar.kumar – 1 file(s) modified
Setting MinStockLevel and NumOfDaysOfStock as 0 for newly added item if no value is entered

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

Rev 6829 – Added class selector.

kshitij.sood — Sat, 16 Feb 2013 13:54:10 +0530

kshitij.sood – 1 file(s) modified
Added class selector.

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

Rev 6828 – More link in header.vm

kshitij.sood — Fri, 15 Feb 2013 18:52:44 +0530

kshitij.sood – 1 file(s) modified
More link in header.vm

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

Rev 6827 – Removing extra "> characters in table header for newly added ...

amar.kumar — Fri, 15 Feb 2013 15:03:21 +0530

amar.kumar – 1 file(s) modified
Removing extra "> characters in table header for newly added Parameters in PurchaseOrder

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

Rev 6826 – Now coming soon can go live next day or immediately(when ...

amit.gupta — Fri, 15 Feb 2013 11:14:36 +0530

amit.gupta – 2 file(s) modified
Now coming soon can go live next day or immediately(when pushed to production.)
ACTIVE items can be PAUSED or vice versa on the fly via catalog dashboard.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 6825 – do not update inventory if billing warhouse is ours external

amit.gupta — Thu, 14 Feb 2013 16:54:56 +0530

amit.gupta – 1 file(s) modified
do not update inventory if billing warhouse is ours external

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

Rev 6824 – Changing call to constructor to accomodate ItemStockPurchaseParams

amar.kumar — Thu, 14 Feb 2013 16:40:06 +0530

amar.kumar – 1 file(s) modified
Changing call to constructor to accomodate ItemStockPurchaseParams

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportGenerator.java

Rev 6823 – Changes to include all third party good warehouses where avaliability ...

amar.kumar — Thu, 14 Feb 2013 16:00:20 +0530

amar.kumar – 1 file(s) modified
Changes to include all third party good warehouses where avaliability is not monitored

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

Rev 6822 – handling for all items

amit.gupta — Thu, 14 Feb 2013 15:57:37 +0530

amit.gupta – 1 file(s) modified
handling for all items

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

Rev 6821 – Changes in logic for PO creation to include 1) MinStockLevel ...

amar.kumar — Thu, 14 Feb 2013 15:56:46 +0530

amar.kumar – 40 file(s) modified
Changes in logic for PO creation to include
1) MinStockLevel
2) Min number of days stock required

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /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/inventory/impl/InventoryServiceHandler.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/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.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/purchase/main/model/PurchaseReturn.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemStockPurchaseParams.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/itemStockPurchaseParams.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/OOSStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/POType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturn.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturnType.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/OosStatusMarker.java

Rev 6820 – handling for all items

amit.gupta — Thu, 14 Feb 2013 15:52:12 +0530

amit.gupta – 1 file(s) modified
handling for all items

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