SmartDukaan – /

Rev 4043 – Fixed the bugs of comparison for laptops.

rajveer — Mon, 14 Nov 2011 16:22:18 +0530

rajveer – 3 file(s) modified
Fixed the bugs of comparison for laptops.

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/networking.py
~ /trunk/ContentStore/src/jython/comparisonrules/laptops/power.py
~ /trunk/ContentStore/src/jython/comparisonrules/laptops/storage.py

Rev 4042 – Storage capacity data type changed from int to float

varun.gupta — Mon, 14 Nov 2011 15:55:28 +0530

varun.gupta – 1 file(s) modified
Storage capacity data type changed from int to float

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/storage.py

Rev 4041 – Reverted the code.

rajveer — Mon, 14 Nov 2011 15:30:54 +0530

rajveer – 1 file(s) modified
Reverted the code.

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/storage.py

Rev 4040 – Updated rule to handle large integers.

rajveer — Mon, 14 Nov 2011 15:28:04 +0530

rajveer – 1 file(s) modified
Updated rule to handle large integers.

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/storage.py

Rev 4039 – Price comparison engine update

varun.gupta — Mon, 14 Nov 2011 12:20:35 +0530

varun.gupta – 14 file(s) modified
Price comparison engine update

~ /trunk/PriceComparisonFramework/src/Clients/GAEServletClient.py
+ /trunk/PriceComparisonFramework/src/conf.cfg
+ /trunk/PriceComparisonFramework/src/ProcessManager.py
~ /trunk/PriceComparisonFramework/src/PyLucene/IndexBuilder.py
~ /trunk/PriceComparisonFramework/src/PyLucene/IndexManager.py
~ /trunk/PriceComparisonFramework/src/PyLucene/Retriever.py
~ /trunk/PriceComparisonFramework/src/ScraperAgent.py
~ /trunk/PriceComparisonFramework/src/ScraperLoader.py
+ /trunk/PriceComparisonFramework/src/Scrapers/BaseScraper.py
/trunk/PriceComparisonFramework/src/Scrapers/FlipcartScraper.py
+ /trunk/PriceComparisonFramework/src/Scrapers/HS18Scraper.py
~ /trunk/PriceComparisonFramework/src/Scrapers/InfibeamScraper.py
~ /trunk/PriceComparisonFramework/src/Scrapers/LetsBuyScraper.py
~ /trunk/PriceComparisonFramework/src/Utils.py

Rev 4038 – Price Comparison servlet to store price data and scraper jobs

varun.gupta — Mon, 14 Nov 2011 12:15:28 +0530

varun.gupta – 1 file(s) modified
Price Comparison servlet to store price data and scraper jobs

+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/PriceComparisonServlet.java

Rev 4037 – Updated weights.

rajveer — Mon, 14 Nov 2011 11:46:08 +0530

rajveer – 1 file(s) modified
Updated weights.

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/networking.py

Rev 4036 – Scoring rules and code changes for comparison rules.

varun.gupta — Sun, 13 Nov 2011 21:15:13 +0530

varun.gupta – 17 file(s) modified
Scoring rules and code changes for comparison rules.

+ /trunk/ContentStore/src/jython/comparisonrules/laptops
+ /trunk/ContentStore/src/jython/comparisonrules/laptops/displayngraphics.py
+ /trunk/ContentStore/src/jython/comparisonrules/laptops/interfaces.py
+ /trunk/ContentStore/src/jython/comparisonrules/laptops/looknfeel.py
+ /trunk/ContentStore/src/jython/comparisonrules/laptops/memory.py
+ /trunk/ContentStore/src/jython/comparisonrules/laptops/networking.py
+ /trunk/ContentStore/src/jython/comparisonrules/laptops/operatingsystem.py
+ /trunk/ContentStore/src/jython/comparisonrules/laptops/power.py
+ /trunk/ContentStore/src/jython/comparisonrules/laptops/processor.py
+ /trunk/ContentStore/src/jython/comparisonrules/laptops/storage.py
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewCMP.java
~ /trunk/ContentStore/src/velocity/SlideGuide.vm
~ /trunk/ContentStore/src/xml/model/comparisonbuckets.xml
~ /trunk/ContentStore/src/xml/model/comparisondefinitions.xml
~ /trunk/ContentStore/src/xml/model/comparisonrules.xml

Rev 4035 – Trac#647 Setting assignee appropriately

mandeep.dhir — Fri, 11 Nov 2011 23:20:19 +0530

mandeep.dhir – 1 file(s) modified
Trac#647 Setting assignee appropriately

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java

Rev 4034 – Enhancing the escalation matrix. Displaying delay reason and expected shipping ...

mandeep.dhir — Fri, 11 Nov 2011 22:37:26 +0530

mandeep.dhir – 4 file(s) modified
Enhancing the escalation matrix. Displaying delay reason and expected shipping time.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm

Rev 4033 – fix the type of the price range level.

vikas — Fri, 11 Nov 2011 19:35:36 +0530

vikas – 1 file(s) modified
fix the type of the price range level.

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 4032 – Updated the status description of the orders being moved back ...

chandranshu — Fri, 11 Nov 2011 19:23:02 +0530

chandranshu – 1 file(s) modified
Updated the status description of the orders being moved back to the pending queue

~ /trunk/PyProj/src/shop2020/model/v1/order/script/MoveOrdersToPendingQueue.py

Rev 4031 – Set the appropriate system path

chandranshu — Fri, 11 Nov 2011 17:57:10 +0530

chandranshu – 1 file(s) modified
Set the appropriate system path

~ /trunk/PyProj/src/shop2020/model/v1/order/script/CreateRTGSBulkOrders.py

Rev 4030 – Add measures for average time taken to close a ticket, ...

vikas — Fri, 11 Nov 2011 15:06:56 +0530

vikas – 2 file(s) modified
Add measures for average time taken to close a ticket, how many times tickets are reopened

~ /trunk/pentaho/data-integration/transformations/crmLoader.ktr
~ /trunk/pentaho/schema/CRMResponseReport.xml

Rev 4029 – Add another hierarchy for product with two levels(brand and model_number ...

vikas — Fri, 11 Nov 2011 15:05:13 +0530

vikas – 1 file(s) modified
Add another hierarchy for product with two levels(brand and model_number with color). Change transfer price measure to be product of quantity and transfer price.

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 4028 – Use class B machine for backend. Do not pre-populate sessionIds ...

vikas — Fri, 11 Nov 2011 15:02:32 +0530

vikas – 2 file(s) modified
Use class B machine for backend. Do not pre-populate sessionIds as it is not necesary.

~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/DailyProductWithSourceAggregatorServlet.java
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/backends.xml

Rev 4027 – Enhancing the escalation matrix

mandeep.dhir — Fri, 11 Nov 2011 14:12:19 +0530

mandeep.dhir – 3 file(s) modified
Enhancing the escalation matrix

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm

Rev 4026 – Updated Css to display best deals text on product page.

rajveer — Fri, 11 Nov 2011 14:01:22 +0530

rajveer – 1 file(s) modified
Updated Css to display best deals text on product page.

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

Rev 4025 – Adding best deal offer in product page.

rajveer — Fri, 11 Nov 2011 14:00:20 +0530

rajveer – 2 file(s) modified
Adding best deal offer in product page.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/velocity/ProductDetail.vm

Rev 4024 – Added support for new columns required in the inventory stock ...

chandranshu — Fri, 11 Nov 2011 13:47:24 +0530

chandranshu – 11 file(s) modified
Added support for new columns required in the inventory stock reports

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
+ /trunk/PyProj/src/shop2020/model/v1/catalog/script/InventoryStockReportGenerator.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/test/CatalogTest.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/runutils/inventory-status-report.sh
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/AvailableAndReservedStock.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 4023 – Documented some non-obvioud behaviour

chandranshu — Fri, 11 Nov 2011 13:46:19 +0530

chandranshu – 1 file(s) modified
Documented some non-obvioud behaviour

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/ItemLoader.py

Rev 4022 – Adding an extra client creation statement

mandeep.dhir — Fri, 11 Nov 2011 12:33:58 +0530

mandeep.dhir – 1 file(s) modified
Adding an extra client creation statement

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

Rev 4021 – Adding an extra client creation statement

mandeep.dhir — Fri, 11 Nov 2011 12:29:32 +0530

mandeep.dhir – 1 file(s) modified
Adding an extra client creation statement

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

Rev 4020 – Trac#647 Built Escalation matrix and also allowing agents to voluntarily ...

mandeep.dhir — Fri, 11 Nov 2011 11:40:16 +0530

mandeep.dhir – 8 file(s) modified
Trac#647 Built Escalation matrix and also allowing agents to voluntarily assign themselves to unassigned tickets

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/ActivityType.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 4019 – Replaced numeral literals with constants

chandranshu — Wed, 09 Nov 2011 19:11:26 +0530

chandranshu – 1 file(s) modified
Replaced numeral literals with constants

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

Rev 4018 – Normalized the shipping time to be 12pm or 3pm on ...

chandranshu — Wed, 09 Nov 2011 19:02:28 +0530

chandranshu – 7 file(s) modified
Normalized the shipping time to be 12pm or 3pm on the expected day. Added a method to get a list of risky orders

~ /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/order/test/TestGetValidOrdersCount.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4017 – Increased page width from 960px to 980px

rajveer — Wed, 09 Nov 2011 17:42:49 +0530

rajveer – 9 file(s) modified
Increased page width from 960px to 980px

~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/css/common.css
~ /trunk/Website/src/main/webapp/css/entity.css
~ /trunk/Website/src/main/webapp/css/header-footer.css
~ /trunk/Website/src/main/webapp/css/home.css
~ /trunk/Website/src/main/webapp/css/myaccount.css
~ /trunk/Website/src/main/webapp/css/product.css
~ /trunk/Website/src/main/webapp/css/style.css
~ /trunk/Website/src/main/webapp/css/widgets.css

Rev 4016 – Added support to process orders lying in a different database

chandranshu — Wed, 09 Nov 2011 16:47:27 +0530

chandranshu – 5 file(s) modified
Added support to process orders lying in a different database

~ /trunk/PyProj/src/shop2020/model/v1/order/script/EditOrderDetails.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ExpectedAndActualDeliveryReport.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/MarkOrdersAsFailed.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/MoveOrdersToPendingQueue.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py

Rev 4015 – Trac#595 removing unnecessary autoincrement column

mandeep.dhir — Wed, 09 Nov 2011 16:44:01 +0530

mandeep.dhir – 1 file(s) modified
Trac#595 removing unnecessary autoincrement column

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

Rev 4014 – Added support to load data into a DB server running ...

chandranshu — Wed, 09 Nov 2011 16:09:52 +0530

chandranshu – 4 file(s) modified
Added support to load data into a DB server running on a different host

~ /trunk/PyProj/src/shop2020/logistics/service/script/DestinationProviderAllocationLoader.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/HolidaysLoader.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/ServiceDetailsLoader.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/WarehouseAllocationLoader.py

Rev 4013 – Added support to add AWB numbers to a DB server ...

chandranshu — Wed, 09 Nov 2011 16:03:57 +0530

chandranshu – 1 file(s) modified
Added support to add AWB numbers to a DB server running on a different host

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

Rev 4012 – Fixed messaging.

rajveer — Wed, 09 Nov 2011 15:40:33 +0530

rajveer – 1 file(s) modified
Fixed messaging.

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

Rev 4011 – Reduced non-assignment range from 2 hours to 45 minutes.

rajveer — Wed, 09 Nov 2011 15:32:47 +0530

rajveer – 1 file(s) modified
Reduced non-assignment range from 2 hours to 45 minutes.

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

Rev 4010 – Corrected the miscalculation in the expected delivery time

chandranshu — Wed, 09 Nov 2011 15:28:02 +0530

chandranshu – 1 file(s) modified
Corrected the miscalculation in the expected delivery time

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py

Rev 4009 – Added support to set the expected shipping time of an ...

chandranshu — Wed, 09 Nov 2011 15:05:33 +0530

chandranshu – 5 file(s) modified
Added support to set the expected shipping time of an order

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsInfo.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 4008 – Trac#595 Robust handling of Failed payments, COD transactions and delayed ...

mandeep.dhir — Wed, 09 Nov 2011 14:08:53 +0530

mandeep.dhir – 38 file(s) modified
Trac#595 Robust handling of Failed payments, COD transactions and delayed orders by CRM. TransacitonService and PaymentService now persist relevant transactions, payments to their own database. Then CRM polls these new tables and processes them (creation of tickets essentially)

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTransactionProcessorTask.java
x /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTxnProcessor.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/util/DelayedOrderProcessorTask.java
x /trunk/CRMService/src/main/java/in/shop2020/crm/util/FailedPaymentsProcessor.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/util/PaymentProcessorTask.java
+ /trunk/PaymentService/src/main/java/in/shop2020/payment/handler/PaymentRequiringExtraProcessingHandler.java
+ /trunk/PaymentService/src/main/java/in/shop2020/payment/persistence/PaymentRequiringExtraProcessingMapper.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
+ /trunk/PaymentService/src/main/resources/in/shop2020/payment/persistence/PaymentRequiringExtraProcessingMapper.xml
~ /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/crm/CRMService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ExtraTransactionProcessingType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/ExtraPaymentProcessingType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 4007 – Added scripts for inventory stock reports

chandranshu — Wed, 09 Nov 2011 09:10:59 +0530

chandranshu – 2 file(s) modified
Added scripts for inventory stock reports

+ /trunk/PyProj/src/shop2020/utils/CsvToXlsConvertor.py
+ /trunk/runutils/inventory-status-report.sh

Rev 4006 – All videos should also be displayed on the Introduction slide.

rajveer — Tue, 08 Nov 2011 19:26:21 +0530

rajveer – 1 file(s) modified
All videos should also be displayed on the Introduction slide.

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

Rev 4005 – Deleting unused velocity files.

rajveer — Tue, 08 Nov 2011 18:15:33 +0530

rajveer – 1 file(s) modified
Deleting unused velocity files.

x /trunk/ContentStore/src/main/java/in/shop2020/ui/velocity

Rev 4004 – Added support to highlight delayed orders in the OM dashboard

chandranshu — Tue, 08 Nov 2011 15:26:51 +0530

chandranshu – 11 file(s) modified
Added support to highlight delayed orders in the 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/client/inbox/OrderList.ui.xml
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Alert.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift