SmartDukaan – /

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

Rev 3388 – Added dependency for org.json

varun.gupta — Wed, 21 Sep 2011 11:49:44 +0530

varun.gupta – 1 file(s) modified
Added dependency for org.json

~ /trunk/Support/pom.xml

Rev 3387 – Updated Coupon Rule module's doc strings to include Coupon description.

varun.gupta — Wed, 21 Sep 2011 11:48:00 +0530

varun.gupta – 6 file(s) modified
Updated Coupon Rule module's doc strings to include Coupon description.

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_10perc_off_on_Spice_models.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_400_off_on_GalaxyPro.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_nokias_promotion.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_single_coupon_different_discounts_for_different_models.py

Rev 3386 – Added method implementations in UserContextService and Promotion Service to gather ...

varun.gupta — Wed, 21 Sep 2011 11:46:12 +0530

varun.gupta – 5 file(s) modified
Added method implementations in UserContextService and Promotion Service to gather coupon statistics.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py

Rev 3385 – Added methods in UserContextService and Promotion Service to gather coupon ...

varun.gupta — Wed, 21 Sep 2011 11:41:51 +0530

varun.gupta – 9 file(s) modified
Added methods in UserContextService and Promotion Service to gather coupon statistics.

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Coupon.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 3384 – Restricted the discount for one item per line

varun.gupta — Tue, 20 Sep 2011 21:22:37 +0530

varun.gupta – 1 file(s) modified
Restricted the discount for one item per line

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

Rev 3383 – New methods for managing purchase orders

chandranshu — Tue, 20 Sep 2011 19:21:46 +0530

chandranshu – 9 file(s) modified
New methods for managing purchase orders

~ /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/PyProj/src/shop2020/warehouse/main/handler/WarehouseHandler.py
+ /trunk/PyProj/src/shop2020/warehouse/main/model/ItemNumberMapping.py
~ /trunk/PyProj/src/shop2020/warehouse/main/model/Scan.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Scan.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift

Rev 3382 – Add first source time also in sales cube.

vikas — Tue, 20 Sep 2011 18:26:55 +0530

vikas – 1 file(s) modified
Add first source time also in sales cube.

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

Rev 3381 – Added support to scan in items against a Purchase Order

chandranshu — Tue, 20 Sep 2011 14:51:58 +0530

chandranshu – 9 file(s) modified
Added support to scan in items against a Purchase Order

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseOrderController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/WarehouseController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-create.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-new.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-order-index.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-order-show.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-show.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/warehouse-index.vm

Rev 3380 – Update test database to get rid of string column to ...

vikas — Tue, 20 Sep 2011 13:18:22 +0530

vikas – 1 file(s) modified
Update test database to get rid of string column to store the event type.

~ /trunk/Website/src/test/resources/db/user.sql

Rev 3379 – Get rid of string column to store the event type.

vikas — Tue, 20 Sep 2011 13:17:09 +0530

vikas – 1 file(s) modified
Get rid of string column to store the event type.

~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 3378 – Get rid of string column to store the event type.

vikas — Tue, 20 Sep 2011 13:13:41 +0530

vikas – 13 file(s) modified
Get rid of string column to store the event type.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/TrackLog.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/TrackLogType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
x /trunk/Website/src/main/java/in/shop2020/serving/controllers/TrackingController.java

Rev 3377 – Updated thrift stuff generation scripts to include GenericService in classpath.

rajveer — Tue, 20 Sep 2011 13:13:31 +0530

rajveer – 2 file(s) modified
Updated thrift stuff generation scripts to include GenericService in classpath.

~ /trunk/ThriftGen/thriftsrc/thrift-gen-java.sh
~ /trunk/ThriftGen/thriftsrc/thrift-gen-py.sh

Rev 3376 – Implemented new method isAlive()

rajveer — Tue, 20 Sep 2011 13:11:13 +0530

rajveer – 43 file(s) modified
Implemented new method isAlive()

~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /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/test/CatalogTest.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/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.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/generic
+ /trunk/PyProj/src/shop2020/thriftpy/generic/constants.py
+ /trunk/PyProj/src/shop2020/thriftpy/generic/GenericService-remote
+ /trunk/PyProj/src/shop2020/thriftpy/generic/GenericService.py
+ /trunk/PyProj/src/shop2020/thriftpy/generic/ttypes.py
+ /trunk/PyProj/src/shop2020/thriftpy/generic/__init__.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.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/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/model/v1/user/PromotionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.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/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py

Rev 3375 – Implemented unimplemented isAlive method.

rajveer — Tue, 20 Sep 2011 13:07:46 +0530

rajveer – 2 file(s) modified
Implemented unimplemented isAlive method.

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java

Rev 3374 – Added GenericService and isAlive call in this service. Extended other ...

rajveer — Tue, 20 Sep 2011 13:06:51 +0530

rajveer – 21 file(s) modified
Added GenericService and isAlive call in this service. Extended other services from this service.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/generic
+ /trunk/ThriftConfig/src/main/java/in/shop2020/generic/GenericService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
+ /trunk/ThriftGen/thriftsrc/GenericService
+ /trunk/ThriftGen/thriftsrc/GenericService/GenericService.thrift
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift

Rev 3373 – Trac#488 Creating thrift clients before every invocation BugFix - Updating ...

mandeep.dhir — Tue, 20 Sep 2011 11:08:26 +0530

mandeep.dhir – 2 file(s) modified
Trac#488 Creating thrift clients before every invocation
BugFix - Updating the lastReceivedTimestamp only when an email is successfully processed

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

Rev 3372 – Added three more handsets

varun.gupta — Mon, 19 Sep 2011 20:02:45 +0530

varun.gupta – 1 file(s) modified
Added three more handsets

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

Rev 3371 – Product access detail report.

vikas — Mon, 19 Sep 2011 19:05:19 +0530

vikas – 1 file(s) modified
Product access detail report.

+ /trunk/GoogleAppDatalog/src/main/webapp/jsp/product-access.jsp

Rev 3370 – fix a typo.

vikas — Mon, 19 Sep 2011 19:04:30 +0530

vikas – 2 file(s) modified
fix a typo.

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/session-activity.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/user-activity.jsp

Rev 3369 – Trac#488 Ignoring mails from mailor-daemon

mandeep.dhir — Mon, 19 Sep 2011 18:30:30 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Ignoring mails from mailor-daemon

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

Rev 3368 – Trac#488 Mime emails support date and not time precisions as ...

mandeep.dhir — Mon, 19 Sep 2011 18:21:14 +0530

mandeep.dhir – 2 file(s) modified
Trac#488 Mime emails support date and not time precisions as IMAP search commands do not accept them.

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

Rev 3367 – Updated solr script to start solr with jmx.

rajveer — Mon, 19 Sep 2011 18:18:03 +0530

rajveer – 1 file(s) modified
Updated solr script to start solr with jmx.

~ /trunk/runutils/start-solr-service.sh

Rev 3366 – Added support to refund COD orders till the time they ...

chandranshu — Mon, 19 Sep 2011 17:28:43 +0530

chandranshu – 2 file(s) modified
Added support to refund COD orders till the time they are shipped

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 3365 – Added a test for getting all items

chandranshu — Mon, 19 Sep 2011 17:28:12 +0530

chandranshu – 1 file(s) modified
Added a test for getting all items

~ /trunk/PyProj/src/shop2020/model/v1/catalog/test/CatalogTest.py

Rev 3364 – Added inventory stock report to the reports dashboard

chandranshu — Mon, 19 Sep 2011 16:41:35 +0530

chandranshu – 4 file(s) modified
Added inventory stock report to the reports dashboard

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
+ /trunk/Support/src/main/java/in/shop2020/support/utils/FileUtils.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/stock-reports-index.vm

Rev 3363 – Added expected delay and preferred warehouse to the new item ...

chandranshu — Mon, 19 Sep 2011 13:56:59 +0530

chandranshu – 1 file(s) modified
Added expected delay and preferred warehouse to the new item created for item update

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

Rev 3362 – Updated the check which ensures that the updates are sent ...

chandranshu — Mon, 19 Sep 2011 13:43:18 +0530

chandranshu – 1 file(s) modified
Updated the check which ensures that the updates are sent to server only if something has changed

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

Rev 3361 – Corrected the type of preferred warehouse from long to string

chandranshu — Mon, 19 Sep 2011 13:15:41 +0530

chandranshu – 4 file(s) modified
Corrected the type of preferred warehouse from long to string

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /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 3360 – Show the Myresearch widget as closed if there is no ...

rajveer — Mon, 19 Sep 2011 13:12:31 +0530

rajveer – 1 file(s) modified
Show the Myresearch widget as closed if there is no item in myresearch.

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

Rev 3359 – Adding support for Chaitnaya to adjust the delivery estimate and ...

chandranshu — Mon, 19 Sep 2011 12:47:30 +0530

chandranshu – 10 file(s) modified
Adding support for Chaitnaya to adjust the delivery estimate and set the preferred warehouse

~ /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/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.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 3358 – Added support to delete a special page. Also fixed small ...

rajveer — Mon, 19 Sep 2011 12:31:24 +0530

rajveer – 3 file(s) modified
Added support to delete a special page. Also fixed small ui issue.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SpecialPageController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-edit.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-index.vm

Rev 3357 – Increase cache element limits.

vikas — Mon, 19 Sep 2011 12:28:53 +0530

vikas – 1 file(s) modified
Increase cache element limits.

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

Rev 3356 – Added support to delete a special page from bdb

rajveer — Mon, 19 Sep 2011 12:27:44 +0530

rajveer – 2 file(s) modified
Added support to delete a special page from bdb

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java
~ /trunk/ContentStore/src/main/java/in/shop2020/storage/bdb/StorageManager.java

Rev 3355 – Added support to manipulate the estimate of an item's delivery

chandranshu — Mon, 19 Sep 2011 12:06:34 +0530

chandranshu – 11 file(s) modified
Added support to manipulate the estimate of an item's delivery

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.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/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 3354 – Started logging all messages instead of just the push-to-prod ones ...

chandranshu — Mon, 19 Sep 2011 11:39:17 +0530

chandranshu – 2 file(s) modified
Started logging all messages instead of just the push-to-prod ones and started rolling the log files daily

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/resources/log4j.properties

Rev 3353 – Added delay in delivery notice

chandranshu — Mon, 19 Sep 2011 11:36:32 +0530

chandranshu – 1 file(s) modified
Added delay in delivery notice

~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 3352 – Trac#488 Adding support for assembly plugin

mandeep.dhir — Mon, 19 Sep 2011 11:15:29 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Adding support for assembly plugin

~ /trunk/Crm/pom.xml

Rev 3351 – M-5445, M-5570, M-6200 removed from effect of this coupon

varun.gupta — Sat, 17 Sep 2011 07:27:25 +0530

varun.gupta – 1 file(s) modified
M-5445, M-5570, M-6200 removed from effect of this coupon

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