SmartDukaan – /

Rev 3428 – Changes related to upgrade of thrift version from 0.2 to ...

rajveer — Mon, 26 Sep 2011 19:18:55 +0530

rajveer – 5 file(s) modified
Changes related to upgrade of thrift version from 0.2 to 0.7.

~ /trunk/CRMService/pom.xml
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/CRMServer.java
~ /trunk/PaymentService/pom.xml
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/PaymentServer.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 3427 – Added the courier reconciliation report

chandranshu — Mon, 26 Sep 2011 18:19:36 +0530

chandranshu – 9 file(s) modified
Added the courier reconciliation report

~ /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/CourierReconciliationController.java
+ /trunk/Support/src/main/java/in/shop2020/support/services/CourierReconciliationGenerator.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/courier-reconciliation-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 3426 – Removed unused classes from auto generated thrift stuff.

rajveer — Mon, 26 Sep 2011 17:48:54 +0530

rajveer – 12 file(s) modified
Removed unused classes from auto generated thrift stuff.

x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryUpdate.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/RatingsWidget.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/RatingType.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserTrackerException.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/payments/ApplicationRegistry.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Param.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentRequest.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/payments/RequestStatus.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/utils/EstimationService.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/utils/ItemLogistics.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/StockLedger.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseDashboardUser.java

Rev 3425 – Code to authenticate with Gmail sever is a separate method ...

varun.gupta — Mon, 26 Sep 2011 17:14:03 +0530

varun.gupta – 1 file(s) modified
Code to authenticate with Gmail sever is a separate method now. On every disconnection detection, reconnection and authentication will be attempted.

~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py

Rev 3424 – Corrected the parameter type of the scanOut method

chandranshu — Mon, 26 Sep 2011 16:18:50 +0530

chandranshu – 6 file(s) modified
Corrected the parameter type of the scanOut method

~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/PyProj/src/shop2020/warehouse/main/handler/WarehouseHandler.py
+ /trunk/PyProj/src/shop2020/warehouse/test/WarehouseHandlerTest.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift

Rev 3423 – Started showing error messages on the UI for processing purchases

chandranshu — Mon, 26 Sep 2011 16:17:42 +0530

chandranshu – 3 file(s) modified
Started showing error messages on the UI for processing purchases

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-new.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-show.vm

Rev 3422 – Trac#485 Adding feature to enable search for tickets for unregistered ...

mandeep.dhir — Mon, 26 Sep 2011 14:36:26 +0530

mandeep.dhir – 8 file(s) modified
Trac#485 Adding feature to enable search for tickets for unregistered users

~ /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/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /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/tickets-index.vm

Rev 3421 – Added the capability to send error messages back to the ...

chandranshu — Mon, 26 Sep 2011 11:18:03 +0530

chandranshu – 1 file(s) modified
Added the capability to send error messages back to the server

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

Rev 3420 – Added support to record error messages

chandranshu — Mon, 26 Sep 2011 11:12:38 +0530

chandranshu – 1 file(s) modified
Added support to record error messages

~ /trunk/Support/src/main/java/in/shop2020/support/models/InventoryUpdate.java

Rev 3419 – Deleted unused configuration files.

rajveer — Fri, 23 Sep 2011 18:08:12 +0530

rajveer – 4 file(s) modified
Deleted unused configuration files.

x /trunk/Common/src/main/resources/shop2020.cfg
x /trunk/Common/src/main/resources/shop2020_production.cfg
x /trunk/Common/src/main/resources/shop2020_staging.cfg
x /trunk/Common/src/test/resources/shop2020.cfg

Rev 3418 – Missed staring promotion service. Fixing.

vikas — Fri, 23 Sep 2011 16:18:27 +0530

vikas – 1 file(s) modified
Missed staring promotion service. Fixing.

~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 3417 – Restricted max uses of the coupon by a user to ...

varun.gupta — Fri, 23 Sep 2011 16:15:19 +0530

varun.gupta – 1 file(s) modified
Restricted max uses of the coupon by a user to 5.

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

Rev 3416 – Allowed COD orders to be refunded till billing

chandranshu — Fri, 23 Sep 2011 14:56:12 +0530

chandranshu – 1 file(s) modified
Allowed COD orders to be refunded till billing

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/RejectOrderHandler.java

Rev 3415 – Corrected the status check condition

chandranshu — Fri, 23 Sep 2011 14:52:29 +0530

chandranshu – 1 file(s) modified
Corrected the status check condition

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

Rev 3414 – Added some log messages

chandranshu — Fri, 23 Sep 2011 13:55:00 +0530

chandranshu – 1 file(s) modified
Added some log messages

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

Rev 3413 – Create a return order when a billed COD order is ...

chandranshu — Fri, 23 Sep 2011 13:40:06 +0530

chandranshu – 1 file(s) modified
Create a return order when a billed COD order is cancelled

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

Rev 3412 – Started running warehouse and transaction service on the support machine

chandranshu — Fri, 23 Sep 2011 13:35:39 +0530

chandranshu – 1 file(s) modified
Started running warehouse and transaction service on the support machine

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

Rev 3411 – Trac#488 Adding a few CSS properties

mandeep.dhir — Fri, 23 Sep 2011 12:27:09 +0530

mandeep.dhir – 3 file(s) modified
Trac#488 Adding a few CSS properties

~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm

Rev 3410 – Trac#488 Displaying ticket description in detailed activity view

mandeep.dhir — Fri, 23 Sep 2011 12:02:45 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Displaying ticket description in detailed activity view

~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-info-index.vm

Rev 3409 – Trac#488 Adding css styles to make activity content more readable

mandeep.dhir — Fri, 23 Sep 2011 11:40:47 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Adding css styles to make activity content more readable

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

Rev 3408 – Trac#488 Handling cases when we receive mails with incorrect ticket ...

mandeep.dhir — Fri, 23 Sep 2011 11:26:38 +0530

mandeep.dhir – 2 file(s) modified
Trac#488 Handling cases when we receive mails with incorrect ticket Ids

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
~ /trunk/Crm/src/main/java/in/shop2020/util/EmailReader.java

Rev 3407 – Updated the test cases

rajveer — Fri, 23 Sep 2011 11:22:47 +0530

rajveer – 1 file(s) modified
Updated the test cases

~ /trunk/Website/src/test/samples/product/test34.javascript

Rev 3406 – Added most compared phones widget

rajveer — Fri, 23 Sep 2011 11:12:18 +0530

rajveer – 2 file(s) modified
Added most compared phones widget

~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 3405 – Trac#488 Made Tickets and activities non-user specific

mandeep.dhir — Fri, 23 Sep 2011 11:08:39 +0530

mandeep.dhir – 29 file(s) modified
Trac#488 Made Tickets and activities non-user specific

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
+ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityInfoController.java (copied from /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityInfoController.java@3390)
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
x /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityController.java
x /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityInfoController.java
x /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
~ /trunk/Crm/src/main/resources/shiro.ini
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-info-index.vm (copied from /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-info-index.vm@3397)
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm (copied from /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm@3397)
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-editNew.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-index.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-info-index.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-editNew.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-index.vm
~ /trunk/CRMService/pom.xml
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/ActivityHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3404 – Added synonyms for model name and model number.

rajveer — Thu, 22 Sep 2011 19:25:30 +0530

rajveer – 2 file(s) modified
Added synonyms for model name and model number.

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

Rev 3403 – Changes to test databases to create not store create table ...

vikas — Thu, 22 Sep 2011 18:54:39 +0530

vikas – 7 file(s) modified
Changes to test databases to create not store create table queries. Tables to be created by service itself.

~ /trunk/Website/src/test/resources/db/catalog.sql
~ /trunk/Website/src/test/resources/db/helper.sql
~ /trunk/Website/src/test/resources/db/logistics.sql
~ /trunk/Website/src/test/resources/db/transaction.sql
~ /trunk/Website/src/test/resources/db/user.sql
~ /trunk/Website/src/test/resources/scripts/create_dump.sh
~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 3402 – Added isAlive check in warehouse service.

rajveer — Thu, 22 Sep 2011 17:54:08 +0530

rajveer – 1 file(s) modified
Added isAlive check in warehouse service.

~ /trunk/PyProj/src/shop2020/warehouse/main/handler/WarehouseHandler.py

Rev 3401 – Corrected the message: 'selected' changed to 'selective'

varun.gupta — Thu, 22 Sep 2011 16:54:51 +0530

varun.gupta – 5 file(s) modified
Corrected the message: 'selected' changed to 'selective'

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_10perc_off_on_Spice_models.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_BB_campaign.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_DesiDime_campaign.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_HDFC_campaign.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_nokias_promotion.py

Rev 3400 – Moved SMTP server instantiation and authentication out of loop. These ...

varun.gupta — Thu, 22 Sep 2011 16:37:14 +0530

varun.gupta – 1 file(s) modified
Moved SMTP server instantiation and authentication out of loop. These will happen only once at the time of script start.

~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py

Rev 3399 – Trac#488 Adding python client for CRMService

mandeep.dhir — Thu, 22 Sep 2011 16:36:41 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Adding python client for CRMService

+ /trunk/PyProj/src/shop2020/clients/CRMClient.py

Rev 3398 – Trac#488 Marking mails from Users as unread

mandeep.dhir — Thu, 22 Sep 2011 10:22:17 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Marking mails from Users as unread

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java

Rev 3397 – Trac#488 Adding advanced search box

mandeep.dhir — Thu, 22 Sep 2011 10:19:20 +0530

mandeep.dhir – 11 file(s) modified
Trac#488 Adding advanced search box

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.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/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm

Rev 3396 – Updated the service availability script.

rajveer — Wed, 21 Sep 2011 19:37:25 +0530

rajveer – 1 file(s) modified
Updated the service availability script.

~ /trunk/PyProj/src/shop2020/scripts/ServiceAvailabilityTest.py

Rev 3395 – #Added script which will check service availability through nagios.

rajveer — Wed, 21 Sep 2011 19:16:54 +0530

rajveer – 3 file(s) modified
#Added script which will check service availability through nagios.

+ /trunk/PyProj/src/shop2020/scripts
+ /trunk/PyProj/src/shop2020/scripts/ServiceAvailabilityTest.py
+ /trunk/PyProj/src/shop2020/scripts/__init__.py

Rev 3394 – In a order creation event add items only in its ...

vikas — Wed, 21 Sep 2011 18:47:03 +0530

vikas – 1 file(s) modified
In a order creation event add items only in its line instead of all items from transaction.

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

Rev 3393 – Add level order hour to sales schema.

vikas — Wed, 21 Sep 2011 14:24:12 +0530

vikas – 1 file(s) modified
Add level order hour to sales schema.

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 3392 – Increase element count for category and product snippets cache.

vikas — Wed, 21 Sep 2011 13:35:30 +0530

vikas – 1 file(s) modified
Increase element count for category and product snippets cache.

~ /trunk/Website/src/main/resources/ehcache.xml

Rev 3391 – Update test database and samples.

vikas — Wed, 21 Sep 2011 13:26:11 +0530

vikas – 3 file(s) modified
Update test database and samples.

~ /trunk/Website/src/test/resources/db/catalog.sql
~ /trunk/Website/src/test/samples/home/test18.javascript
~ /trunk/Website/src/test/samples/product/test20.javascript

Rev 3390 – Trac#488 - Added few more fields customer name etc. ...

mandeep.dhir — Wed, 21 Sep 2011 12:30:20 +0530

mandeep.dhir – 41 file(s) modified
Trac#488
- Added few more fields customer name etc. to activity and tickets
- Made thrift model objects enriched with creator and assignee objects
- Added search filter to query tickets, activities, agents from CRM with single method

~ /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /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/LoginController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.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/activity-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-editNew.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Ticket.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/ActivityHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/AgentHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/TicketHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/ActivityMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/AgentMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/TicketMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/AgentMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
~ /trunk/CRMService/src/main/resources/mybatis-config.xml
~ /trunk/CRMService/src/test/java/in/shop2020/crm/handler/ActivityHandlerTest.java
~ /trunk/CRMService/src/test/java/in/shop2020/crm/handler/TicketHandlerTest.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/SearchFilter.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3389 – Dashboard to monitor coupon statistics.

varun.gupta — Wed, 21 Sep 2011 11:52:22 +0530

varun.gupta – 2 file(s) modified
Dashboard to monitor coupon statistics.

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/PromotionsController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/promotions-index.vm