SmartDukaan – /

Rev 4172 – Ticket# 733 --- Added column of dealText in lineitem and ...

rajveer — Fri, 02 Dec 2011 15:32:25 +0530

rajveer – 10 file(s) modified
Ticket# 733 --- Added column of dealText in lineitem and dashboard.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.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/model/v1/order/impl/Convertors.py
~ /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/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4171 – Removed border-top of slide guide

varun.gupta — Fri, 02 Dec 2011 13:46:07 +0530

varun.gupta – 1 file(s) modified
Removed border-top of slide guide

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

Rev 4170 – Fixed the logic to count reopen tickest.

vikas — Fri, 02 Dec 2011 11:14:46 +0530

vikas – 1 file(s) modified
Fixed the logic to count reopen tickest.

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

Rev 4169 – Give bottom margin if we get the image, otherwise not.

rajveer — Thu, 01 Dec 2011 18:50:34 +0530

rajveer – 1 file(s) modified
Give bottom margin if we get the image, otherwise not.

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

Rev 4168 – Removed Chandranshu from mailing list.

rajveer — Thu, 01 Dec 2011 18:27:38 +0530

rajveer – 1 file(s) modified
Removed Chandranshu from mailing list.

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

Rev 4167 – Deleted rules for discontinued coupons

varun.gupta — Thu, 01 Dec 2011 17:12:34 +0530

varun.gupta – 6 file(s) modified
Deleted rules for discontinued coupons

x /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_10perc_off_on_Spice_models.py
x /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_400_off_on_GalaxyPro.py
x /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_Android_BDay.py
x /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_DesiDime_campaign.py
x /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_nokias_promotion.py
x /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_single_coupon_different_discounts_for_different_models.py

Rev 4166 – Fix a bug in actual_estimate_diff dimension.

vikas — Thu, 01 Dec 2011 16:22:20 +0530

vikas – 1 file(s) modified
Fix a bug in actual_estimate_diff dimension.

~ /trunk/pentaho/schema/FulfilmentReport.xml

Rev 4165 – Deleting rule for SPICE500

varun.gupta — Thu, 01 Dec 2011 13:34:45 +0530

varun.gupta – 1 file(s) modified
Deleting rule for SPICE500

x /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_500_off_on_MI310.py

Rev 4164 – Trac#669 Removing console log message

mandeep.dhir — Thu, 01 Dec 2011 13:24:34 +0530

mandeep.dhir – 1 file(s) modified
Trac#669 Removing console log message

~ /trunk/Crm/src/main/webapp/js/events.js

Rev 4163 – Trac#669 Not allowing mails with empty body to be sent.

mandeep.dhir — Thu, 01 Dec 2011 13:21:41 +0530

mandeep.dhir – 1 file(s) modified
Trac#669 Not allowing mails with empty body to be sent.

~ /trunk/Crm/src/main/webapp/js/events.js

Rev 4162 – Corrected the style of image/video label container.

rajveer — Thu, 01 Dec 2011 11:44:53 +0530

rajveer – 1 file(s) modified
Corrected the style of image/video label container.

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

Rev 4161 – Changed this script to enable copying of wars on CRM ...

anupam.singh — Wed, 30 Nov 2011 18:42:53 +0530

anupam.singh – 1 file(s) modified
Changed this script to enable copying of wars on CRM and CRM_Backup machines.
Reviewer : Rajveer
Trac : #695

~ /trunk/runutils/copy-wars-to-production.sh

Rev 4160 – Trac#669 Creating activity with type received_email_from_customer for cases

mandeep.dhir — Wed, 30 Nov 2011 18:07:37 +0530

mandeep.dhir – 1 file(s) modified
Trac#669 Creating activity with type received_email_from_customer for cases

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

Rev 4159 – Changed sleep time from 5 seconds to 15 seconds

rajveer — Wed, 30 Nov 2011 15:26:41 +0530

rajveer – 2 file(s) modified
Changed sleep time from 5 seconds to 15 seconds

~ /trunk/runutils/update-content-and-catalog.sh
~ /trunk/runutils/update-content.sh

Rev 4158 – Added one more email address to send PO.

rajveer — Wed, 30 Nov 2011 14:07:41 +0530

rajveer – 1 file(s) modified
Added one more email address to send PO.

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

Rev 4157 – Added three new columns to InventoryStockReport

rajveer — Wed, 30 Nov 2011 12:38:08 +0530

rajveer – 1 file(s) modified
Added three new columns to InventoryStockReport

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

Rev 4156 – Nokia and Tablet promotions

varun.gupta — Wed, 30 Nov 2011 12:11:02 +0530

varun.gupta – 5 file(s) modified
Nokia and Tablet promotions

~ /trunk/Social/src/main/java/in/shop2020/social/controllers/CommunityPromotionController.java
+ /trunk/Social/src/main/webapp/images/banner-nokia.jpg
+ /trunk/Social/src/main/webapp/images/banner-tablets.jpg
~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-success.vm
+ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-tab.vm

Rev 4155 – Item list and prices updated for renewed tablet campaign

varun.gupta — Wed, 30 Nov 2011 09:56:39 +0530

varun.gupta – 1 file(s) modified
Item list and prices updated for renewed tablet campaign

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

Rev 4154 – Removed the ID "checkout" from main action button

varun.gupta — Tue, 29 Nov 2011 19:20:07 +0530

varun.gupta – 1 file(s) modified
Removed the ID "checkout" from main action button

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

Rev 4153 – Added zones on Nokia and Tablets page.

rajveer — Tue, 29 Nov 2011 17:21:30 +0530

rajveer – 2 file(s) modified
Added zones on Nokia and Tablets page.

~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm

Rev 4152 – Automated the html generation for Community Promotion

varun.gupta — Mon, 28 Nov 2011 18:59:23 +0530

varun.gupta – 2 file(s) modified
Automated the html generation for Community Promotion

~ /trunk/Social/src/main/java/in/shop2020/social/controllers/CommunityPromotionController.java
~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-success.vm

Rev 4151 – Updated style of showcase pages.

rajveer — Mon, 28 Nov 2011 16:56:49 +0530

rajveer – 1 file(s) modified
Updated style of showcase pages.

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

Rev 4150 – Fixed the bug.

rajveer — Mon, 28 Nov 2011 16:36:30 +0530

rajveer – 1 file(s) modified
Fixed the bug.

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

Rev 4149 – Trac#704 Renaming Display & Graphics to Display n Graphics

mandeep.dhir — Mon, 28 Nov 2011 16:02:41 +0530

mandeep.dhir – 2 file(s) modified
Trac#704 Renaming Display & Graphics to Display n Graphics

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

Rev 4148 – Adding the address validation at myaccount page.

rajveer — Mon, 28 Nov 2011 15:23:58 +0530

rajveer – 1 file(s) modified
Adding the address validation at myaccount page.

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

Rev 4147 – Best Offer icon on category pages also

rajveer — Mon, 28 Nov 2011 14:18:38 +0530

rajveer – 2 file(s) modified
Best Offer icon on category pages also

~ /trunk/ContentStore/src/velocity/CategorySnippet.vm
~ /trunk/Website/src/main/webapp/css/style.css

Rev 4146 – Trac#686 Displaying color only when it is available

mandeep.dhir — Mon, 28 Nov 2011 13:29:11 +0530

mandeep.dhir – 3 file(s) modified
Trac#686 Displaying color only when it is available

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

Rev 4145 – Trac#686 Fixing the payment details shown in order info page

mandeep.dhir — Mon, 28 Nov 2011 13:17:29 +0530

mandeep.dhir – 1 file(s) modified
Trac#686 Fixing the payment details shown in order info page

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

Rev 4144 – Trac#686 Changing the format of dates

mandeep.dhir — Mon, 28 Nov 2011 12:38:14 +0530

mandeep.dhir – 1 file(s) modified
Trac#686 Changing the format of dates

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

Rev 4143 – Auto-suggest for Laptop Comparison

varun.gupta — Mon, 28 Nov 2011 11:58:30 +0530

varun.gupta – 3 file(s) modified
Auto-suggest for Laptop Comparison

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 4142 – Trac#686 UI Enhancements in Crm - Revamped Order info ...

mandeep.dhir — Mon, 28 Nov 2011 11:46:29 +0530

mandeep.dhir – 24 file(s) modified
Trac#686 UI Enhancements in Crm
- Revamped Order info page
- Cleaned up code to access the model objects directly in vm files
- Added advanced search options for ticket category and activity type
- Removed code related to UserCommunications
- Improved CartPageController and vm files
- Changed ticket edit page to reflect first orders and then tickets

~ /trunk/Common/src/main/java/in/shop2020/utils/ModelUtils.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/UserCartController.java
x /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCommunicationInfoController.java
x /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCommunicationsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.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/activity-index.vm
~ /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/user-cart-index.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-communication-info-index.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-communications-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml

Rev 4141 – Added support to download payment reconciliation report for a given ...

chandranshu — Fri, 25 Nov 2011 17:45:31 +0530

chandranshu – 12 file(s) modified
Added support to download payment reconciliation report for a given period

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/handler/PaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/persistence/PaymentMapper.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PaymentService/src/main/resources/in/shop2020/payment/persistence/PaymentMapper.xml
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/payment-reconciliation-authfail.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/payment-reconciliation-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 4140 – corrected the facet IDs

varun.gupta — Fri, 25 Nov 2011 15:49:36 +0530

varun.gupta – 1 file(s) modified
corrected the facet IDs

~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 4139 – Trac#611 Added a sheet for return orders to Hotspot Reconciliation ...

chandranshu — Fri, 25 Nov 2011 15:42:18 +0530

chandranshu – 1 file(s) modified
Trac#611 Added a sheet for return orders to Hotspot Reconciliation Report

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

Rev 4138 – Align center if there is no offer.

rajveer — Fri, 25 Nov 2011 15:22:58 +0530

rajveer – 1 file(s) modified
Align center if there is no offer.

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

Rev 4137 – Adding filters for Laptops

varun.gupta — Fri, 25 Nov 2011 15:09:20 +0530

varun.gupta – 3 file(s) modified
Adding filters for Laptops

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 4136 – Improved error messages and styling.

rajveer — Fri, 25 Nov 2011 15:01:32 +0530

rajveer – 6 file(s) modified
Improved error messages and styling.

~ /trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/css/common.css
~ /trunk/Website/src/main/webapp/css/myaccount.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm

Rev 4135 – Added facets for laptops

varun.gupta — Fri, 25 Nov 2011 14:59:01 +0530

varun.gupta – 11 file(s) modified
Added facets for laptops

+ /trunk/ContentStore/src/jython/irdatarules/laptops
+ /trunk/ContentStore/src/jython/irdatarules/laptops/display.py
+ /trunk/ContentStore/src/jython/irdatarules/laptops/os.py
+ /trunk/ContentStore/src/jython/irdatarules/laptops/ram.py
+ /trunk/ContentStore/src/jython/irdatarules/laptops/storage.py
+ /trunk/ContentStore/src/jython/irdatarules/laptops/weight.py
+ /trunk/ContentStore/src/jython/irmetadatarules/laptops
+ /trunk/ContentStore/src/jython/irmetadatarules/laptops/common.py
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/irdatarules.xml
~ /trunk/ContentStore/src/xml/model/irmetadatarules.xml

Rev 4134 – Updated prices for BB devices

varun.gupta — Fri, 25 Nov 2011 11:40:20 +0530

varun.gupta – 1 file(s) modified
Updated prices for BB devices

~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-bb-promo.vm

Rev 4133 – Added support for pagination to OM Dashboard's order lists

chandranshu — Thu, 24 Nov 2011 21:15:53 +0530

chandranshu – 22 file(s) modified
Added support for pagination to OM Dashboard's order lists

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/AdminPresenter.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/AdminPresenterImpl.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadAllOrdersListEvent.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadAllOrdersListEventHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadOrderListEvent.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenter.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AllOrderListHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AllOrderListRequest.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AllOrderListResponse.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderRequest.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderResponse.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/data/Constants.java
~ /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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift