SmartDukaan – /

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

Rev 6819 – handling for all items

amit.gupta — Thu, 14 Feb 2013 15:39:27 +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 6818 – handling for all items

amit.gupta — Thu, 14 Feb 2013 15:35:48 +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 6817 – changed round off to ceil.

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

amit.gupta – 1 file(s) modified
changed round off to ceil.

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

Rev 6816 – Removed some fields from innoviti pay-show view.

rajveer — Thu, 14 Feb 2013 14:55:02 +0530

rajveer – 1 file(s) modified
Removed some fields from innoviti pay-show view.

~ /trunk/Website/src/main/webapp/WEB-INF/content/innoviti-pay-show.vm

Rev 6815 – changed round off to ceil.

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

amit.gupta – 1 file(s) modified
changed round off to ceil.

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

Rev 6814 – handling for all items

amit.gupta — Thu, 14 Feb 2013 14:28:44 +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 6813 – Changes to add 1) Min Stock Level 2) ...

amar.kumar — Wed, 13 Feb 2013 17:39:43 +0530

amar.kumar – 7 file(s) modified
Changes to add
1) Min Stock Level
2) Min Num of Days of Stock
in 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/dashboard/shared/ItemStockPurchaseParams.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

Rev 6812 – Changing Chandan's emailId

amar.kumar — Wed, 13 Feb 2013 15:52:58 +0530

amar.kumar – 1 file(s) modified
Changing Chandan's emailId

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

Rev 6811 – Changed a comment

anupam.singh — Wed, 13 Feb 2013 14:35:08 +0530

anupam.singh – 1 file(s) modified
Changed a comment

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java

Rev 6810 – Corrected parameter.

rajveer — Tue, 12 Feb 2013 17:48:31 +0530

rajveer – 1 file(s) modified
Corrected parameter.

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

Rev 6809 – Added data-cards.

amit.gupta — Tue, 12 Feb 2013 17:40:00 +0530

amit.gupta – 5 file(s) modified
Added data-cards.

~ /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

Rev 6808 – Removed intercepter reference for innoviti.

rajveer — Tue, 12 Feb 2013 17:38:41 +0530

rajveer – 1 file(s) modified
Removed intercepter reference for innoviti.

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

Rev 6807 – Added production parameters for innoviti.

rajveer — Mon, 11 Feb 2013 19:11:13 +0530

rajveer – 1 file(s) modified
Added production parameters for innoviti.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 6806 – Made two extra parameters configurable for innoviti.

rajveer — Mon, 11 Feb 2013 19:10:12 +0530

rajveer – 2 file(s) modified
Made two extra parameters configurable for innoviti.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InnovitiPayController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/innoviti-pay-show.vm

Rev 6805 – Added insurer to catalog service

anupam.singh — Mon, 11 Feb 2013 17:37:04 +0530

anupam.singh – 13 file(s) modified
Added insurer to catalog service

~ /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/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/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Insurer.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInsurerMapping.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/PremiumType.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 6804 – Setting default subtraction quantity as 5 in itemQuantity

amar.kumar — Mon, 11 Feb 2013 14:49:59 +0530

amar.kumar – 1 file(s) modified
Setting default subtraction quantity as 5 in itemQuantity

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

Rev 6803 – New Image for Pickup in store widget.

kshitij.sood — Mon, 11 Feb 2013 11:42:52 +0530

kshitij.sood – 1 file(s) modified
New Image for Pickup in store widget.

~ /trunk/Website/src/main/webapp/images/Pick-Up-Store.jpg

Rev 6802 – Made changes of recharge offer as discussed by Abhishek.

amit.gupta — Fri, 08 Feb 2013 13:06:01 +0530

amit.gupta – 1 file(s) modified
Made changes of recharge offer as discussed by Abhishek.

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

Rev 6801 – only validate if there is some text in the DTH ...

amit.gupta — Fri, 08 Feb 2013 00:03:41 +0530

amit.gupta – 1 file(s) modified
only validate if there is some text in the DTH Amount field.

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

Rev 6800 – DishTv now has minimum recharge denomination of rs. 250

anupam.singh — Thu, 07 Feb 2013 19:15:23 +0530

anupam.singh – 1 file(s) modified
DishTv now has minimum recharge denomination of rs. 250

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

Rev 6799 – Added validation for Dish TV.

amit.gupta — Thu, 07 Feb 2013 18:26:03 +0530

amit.gupta – 2 file(s) modified
Added validation for Dish TV.

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

Rev 6798 – Minimum recharge for dishTv is now 250

anupam.singh — Thu, 07 Feb 2013 17:30:51 +0530

anupam.singh – 1 file(s) modified
Minimum recharge for dishTv is now 250

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

Rev 6797 –

amar.kumar — Thu, 07 Feb 2013 17:10:27 +0530

amar.kumar – 1 file(s) modified

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

Rev 6796 – Added javascript codes inside the condition.

rajveer — Thu, 07 Feb 2013 16:34:42 +0530

rajveer – 1 file(s) modified
Added javascript codes inside the condition.

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

Rev 6795 – Link to "More" position changed for best deal detail text

vikram.raghav — Thu, 07 Feb 2013 14:35:31 +0530

vikram.raghav – 1 file(s) modified
Link to "More" position changed for best deal detail text

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

Rev 6794 – Changed warehouse name.

rajveer — Thu, 07 Feb 2013 10:38:16 +0530

rajveer – 1 file(s) modified
Changed warehouse name.

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

Rev 6793 – Added new warehouses in the report.

rajveer — Thu, 07 Feb 2013 10:32:01 +0530

rajveer – 1 file(s) modified
Added new warehouses in the report.

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