SmartDukaan – /

Rev 5405 – added more mobile processor families.

amit.gupta — Tue, 12 Jun 2012 14:27:24 +0530

amit.gupta – 1 file(s) modified
added more mobile processor families.

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

Rev 5404 – #1327, #1339 Added synonyms for product index and compatible index ...

amit.gupta — Tue, 12 Jun 2012 14:12:28 +0530

amit.gupta – 3 file(s) modified
#1327, #1339
Added synonyms for product index and compatible index accessories page.

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

Rev 5403 – #1397 Added new datatype definitions for mobile hardware processor family.

amit.gupta — Tue, 12 Jun 2012 12:39:59 +0530

amit.gupta – 1 file(s) modified
#1397
Added new datatype definitions for mobile hardware processor family.

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

Rev 5402 – Billed Orders can be marked as delivered if they are ...

rajveer — Tue, 12 Jun 2012 12:06:46 +0530

rajveer – 1 file(s) modified
Billed Orders can be marked as delivered if they are self pickup.

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

Rev 5401 – Added functionality to export data as spreadsheet

varun.gupta — Tue, 12 Jun 2012 09:56:29 +0530

varun.gupta – 9 file(s) modified
Added functionality to export data as spreadsheet

~ /trunk/PriceComparisonFramework/src/DataStore/FeedbackManager.py
~ /trunk/PriceComparisonFramework/src/DataStore/WatchListManager.py
~ /trunk/PriceComparisonFramework/src/Scrapers/HS18Scraper.py
~ /trunk/PriceComparisonFramework/src/Scrapers/SnapdealScraper.py
+ /trunk/PriceComparisonFramework/src/Scrapers/SoupSelect.py
~ /trunk/PriceComparisonFramework/src/Utils.py
~ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/PriceChart.html
~ /trunk/PriceComparisonFramework/src/WebUI/PriceComparisonServer.py
~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.js

Rev 5400 – PLB - Not skipping accessories now.

mandeep.dhir — Mon, 11 Jun 2012 18:22:28 +0530

mandeep.dhir – 1 file(s) modified
PLB - Not skipping accessories now.

~ /ClientAgent/src/main/java/in/shop2020/agent/utils/Agent.java

Rev 5399 – PLB - Not skipping accessories now.

mandeep.dhir — Mon, 11 Jun 2012 18:22:11 +0530

mandeep.dhir – 1 file(s) modified
PLB - Not skipping accessories now.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java

Rev 5398 – New Hardware interface SSD added for laptops.

amit.gupta — Mon, 11 Jun 2012 14:41:01 +0530

amit.gupta – 1 file(s) modified
New Hardware interface SSD added for laptops.

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

Rev 5397 – Removed setId from ReusableMetaModelComoponent.

amit.gupta — Mon, 11 Jun 2012 13:49:43 +0530

amit.gupta – 2 file(s) modified
Removed setId from ReusableMetaModelComoponent.

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ReusableMetaModelComponent.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java

Rev 5396 – Migrating content of headset to new contentmodel headset/headphones

amit.gupta — Mon, 11 Jun 2012 12:56:58 +0530

amit.gupta – 5 file(s) modified
Migrating content of headset to new contentmodel headset/headphones

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ReusableMetaModelComponent.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/categoryslidesequence.xml
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 5395 – Trac#1344 Bugfix for po creation date, Updating PLB update logic

mandeep.dhir — Mon, 11 Jun 2012 09:45:09 +0530

mandeep.dhir – 2 file(s) modified
Trac#1344 Bugfix for po creation date, Updating PLB update logic

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 5394 – upgraded usage limit to 300 uses

varun.gupta — Sun, 10 Jun 2012 12:07:15 +0530

varun.gupta – 1 file(s) modified
upgraded usage limit to 300 uses

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

Rev 5393 – Trac#1307 Using new logic for warehouse assignment. Not using preferred/default ...

mandeep.dhir — Sat, 09 Jun 2012 11:20:52 +0530

mandeep.dhir – 3 file(s) modified
Trac#1307 Using new logic for warehouse assignment. Not using preferred/default shippinglocation

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

Rev 5392 – Pointing to loader scripts to hadb2

anupam.singh — Fri, 08 Jun 2012 18:12:24 +0530

anupam.singh – 1 file(s) modified
Pointing to loader scripts to hadb2

~ /trunk/pentaho/data-integration/transformations/itemLoader.ktr

Rev 5391 – Changed number display format from ##,### to ###,###

anupam.singh — Fri, 08 Jun 2012 17:35:27 +0530

anupam.singh – 1 file(s) modified
Changed number display format from ##,### to ###,###

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 5390 – More handsets added and Discounts updated under SAnniversary

varun.gupta — Fri, 08 Jun 2012 17:33:07 +0530

varun.gupta – 1 file(s) modified
More handsets added and Discounts updated under SAnniversary

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

Rev 5389 – vendor reconciliation float changed decimal(11, 3)

phani.kumar — Fri, 08 Jun 2012 17:23:18 +0530

phani.kumar – 1 file(s) modified
vendor reconciliation float changed decimal(11, 3)

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

Rev 5388 – vendorId copied into new order for reships

phani.kumar — Fri, 08 Jun 2012 16:19:24 +0530

phani.kumar – 1 file(s) modified
vendorId copied into new order for reships

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

Rev 5387 – Added support to handle self pickup. Also provided support to ...

rajveer — Fri, 08 Jun 2012 15:35:05 +0530

rajveer – 17 file(s) modified
Added support to handle self pickup. Also provided support to display quantity in OM dashboard.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.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/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

Rev 5386 – vendor reconciliation

phani.kumar — Fri, 08 Jun 2012 14:51:53 +0530

phani.kumar – 11 file(s) modified
vendor reconciliation

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ProcessReturnOrderHandler.java
~ /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/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/webapp/js/vendor-reconciliation.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5385 – Ticket #1256

phani.kumar — Fri, 08 Jun 2012 14:41:01 +0530

phani.kumar – 6 file(s) modified
Ticket #1256

~ /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 5384 – Ticket #1256

phani.kumar — Fri, 08 Jun 2012 14:35:06 +0530

phani.kumar – 9 file(s) modified
Ticket #1256

~ /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/server/MasterSheetGenerator.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

Rev 5383 – added content model for Hardware slide in mobile categories

amit.gupta — Thu, 07 Jun 2012 17:53:24 +0530

amit.gupta – 5 file(s) modified
added content model for Hardware slide in mobile categories

~ /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 5382 – Added paymentGatewayId as parameter to method when getting payment settlement

varun.gupta — Thu, 07 Jun 2012 17:28:50 +0530

varun.gupta – 7 file(s) modified
Added paymentGatewayId as parameter to method when getting payment settlement

~ /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/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5381 – If no inventory found for item, return None.

rajveer — Thu, 07 Jun 2012 16:50:22 +0530

rajveer – 1 file(s) modified
If no inventory found for item, return None.

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

Rev 5380 – Removed encoding at Controller, This is taken care by the ...

amit.gupta — Thu, 07 Jun 2012 16:42:15 +0530

amit.gupta – 1 file(s) modified
Removed encoding at Controller, This is taken care by the container

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/MediaController.java

Rev 5379 – minor changes in content model for new headset category.

amit.gupta — Thu, 07 Jun 2012 11:31:48 +0530

amit.gupta – 3 file(s) modified
minor changes in content model for new headset category.

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

Rev 5378 – Made Invoice number mandatory Trac#1360

mandeep.dhir — Thu, 07 Jun 2012 10:49:09 +0530

mandeep.dhir – 1 file(s) modified
Made Invoice number mandatory Trac#1360

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

Rev 5377 – Added search URL template for Snapdeal

varun.gupta — Wed, 06 Jun 2012 20:07:18 +0530

varun.gupta – 2 file(s) modified
Added search URL template for Snapdeal

~ /trunk/PriceComparisonFramework/src/Utils.py
~ /trunk/PriceComparisonFramework/src/WebUI/PriceComparisonServer.py

Rev 5376 – Added delhivery in the cod reconciliation report.

rajveer — Wed, 06 Jun 2012 18:55:06 +0530

rajveer – 1 file(s) modified
Added delhivery in the cod reconciliation report.

~ /trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm

Rev 5375 – Added delhivery in the cod reconciliation report.

rajveer — Wed, 06 Jun 2012 18:47:51 +0530

rajveer – 1 file(s) modified
Added delhivery in the cod reconciliation report.

~ /trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm

Rev 5374 – Added slidesequence to the entities.

amit.gupta — Wed, 06 Jun 2012 16:20:43 +0530

amit.gupta – 1 file(s) modified
Added slidesequence to the entities.

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

Rev 5373 – Corrected variable name.

rajveer — Wed, 06 Jun 2012 16:17:59 +0530

rajveer – 1 file(s) modified
Corrected variable name.

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

Rev 5372 – Trac#1344 Added report screens for Purchases report

mandeep.dhir — Wed, 06 Jun 2012 15:25:12 +0530

mandeep.dhir – 26 file(s) modified
Trac#1344 Added report screens for Purchases report

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/AccountingReportsController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SaleReportController.java (copied from /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SalesReportController.java@5368)
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SaleReturnReportController.java (copied from /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SalesReturnReportController.java@5368)
x /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SalesReportController.java
x /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SalesReturnReportController.java
~ /trunk/InventoryManager/src/main/resources/shiro.ini
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/accounting-reports-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-report-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sale-report-index.vm (copied from /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sales-report-index.vm@5368)
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sale-return-report-index.vm (copied from /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sales-return-report-index.vm@5368)
x /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sales-report-index.vm
x /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sales-return-report-index.vm
~ /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/warehouse/DetailedPurchaseScan.java
~ /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 5371 – New Content model for headset and Migrate content of headset ...

amit.gupta — Wed, 06 Jun 2012 13:40:39 +0530

amit.gupta – 1 file(s) modified
New Content model for headset and Migrate content of headset to headsetNew.
Reviewed by Rajveer

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

Rev 5370 – New Content model for headset and Migrate content of headset ...

amit.gupta — Wed, 06 Jun 2012 13:29:50 +0530

amit.gupta – 6 file(s) modified
New Content model for headset and Migrate content of headset to headsetNew.
Reviewed by Rajveer

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /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
~ /trunk/ContentStore/src/xml/model/units.xml

Rev 5369 – Trac#1065 Bug-fix - scanning serialized items efficiently

mandeep.dhir — Tue, 05 Jun 2012 23:01:12 +0530

mandeep.dhir – 2 file(s) modified
Trac#1065 Bug-fix - scanning serialized items efficiently

~ /trunk/InventoryManager/src/main/webapp/js/purchase.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm

Rev 5368 – Trac#1344 Added report screens for Sales and sales register

mandeep.dhir — Tue, 05 Jun 2012 18:41:57 +0530

mandeep.dhir – 11 file(s) modified
Trac#1344 Added report screens for Sales and sales register

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/AccountingReportsController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BaseController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SalesReportController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SalesReturnReportController.java
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/accounting-reports-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-report-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-return-report-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sales-report-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sales-return-report-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5367 – Boost the title for tablets and laptops also.

rajveer — Tue, 05 Jun 2012 18:15:24 +0530

rajveer – 1 file(s) modified
Boost the title for tablets and laptops also.

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

Rev 5366 – RTO orders jacket number must be validated against existing in ...

rajveer — Tue, 05 Jun 2012 17:12:39 +0530

rajveer – 1 file(s) modified
RTO orders jacket number must be validated against existing in database.

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