SmartDukaan – /

Rev 3207 – Trac#488 Ordering tickets by Date Opened

mandeep.dhir — Tue, 06 Sep 2011 11:02:07 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Ordering tickets by Date Opened

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

Rev 3206 – Trac#488 Added support to mail a customer from CRM as ...

mandeep.dhir — Tue, 06 Sep 2011 10:53:03 +0530

mandeep.dhir – 38 file(s) modified
Trac#488 Added support to mail a customer from CRM as part of an activity done on a ticket

~ /trunk/Crm/pom.xml
+ /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java (copied from /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMRealm.java@3177)
x /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMRealm.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
+ /trunk/Crm/src/main/java/in/shop2020/util
+ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/resources/shiro.ini
+ /trunk/Crm/src/main/webapp/css/colorbox.css
~ /trunk/Crm/src/main/webapp/css/common.css
+ /trunk/Crm/src/main/webapp/css/images
+ /trunk/Crm/src/main/webapp/css/images/border.png
+ /trunk/Crm/src/main/webapp/css/images/controls.png
+ /trunk/Crm/src/main/webapp/css/images/loading.gif
+ /trunk/Crm/src/main/webapp/css/images/loading_background.png
~ /trunk/Crm/src/main/webapp/images/ajax-loader.gif
~ /trunk/Crm/src/main/webapp/js/common.js
+ /trunk/Crm/src/main/webapp/js/dataTables.fnDisplayRow.js
~ /trunk/Crm/src/main/webapp/js/events.js
+ /trunk/Crm/src/main/webapp/js/jquery.colorbox-min.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-tickets-edit.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.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/log4j.properties
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /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/utils/HelperService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 3205 – Removed unnecessary query about alerts

chandranshu — Mon, 05 Sep 2011 18:57:59 +0530

chandranshu – 1 file(s) modified
Removed unnecessary query about alerts

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

Rev 3204 – Updated both failover parameters for services.

rajveer — Mon, 05 Sep 2011 18:32:23 +0530

rajveer – 1 file(s) modified
Updated both failover parameters for services.

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

Rev 3203 – Fix the bug. we should set cookie if it was ...

vikas — Mon, 05 Sep 2011 17:53:32 +0530

vikas – 1 file(s) modified
Fix the bug. we should set cookie if it was null.

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

Rev 3202 – Added failover configuration for Prod1 and Prod2 servers.

rajveer — Mon, 05 Sep 2011 17:36:00 +0530

rajveer – 1 file(s) modified
Added failover configuration for Prod1 and Prod2 servers.

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

Rev 3201 – Corrected small bug.

rajveer — Mon, 05 Sep 2011 17:26:22 +0530

rajveer – 1 file(s) modified
Corrected small bug.

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

Rev 3200 – Corrected import statements

rajveer — Mon, 05 Sep 2011 17:21:04 +0530

rajveer – 2 file(s) modified
Corrected import statements

~ /trunk/PyProj/src/shop2020/config/script/ConfigPropertiesReloader.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/ProductNotifier.py

Rev 3199 – Check for NPE.

vikas — Mon, 05 Sep 2011 17:16:28 +0530

vikas – 1 file(s) modified
Check for NPE.

~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java

Rev 3198 – Add table userwidgetitem in test database.

vikas — Mon, 05 Sep 2011 16:48:30 +0530

vikas – 1 file(s) modified
Add table userwidgetitem in test database.

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

Rev 3197 – Fix a typp.

vikas — Mon, 05 Sep 2011 16:27:50 +0530

vikas – 1 file(s) modified
Fix a typp.

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/search-events.jsp

Rev 3196 – Started showing cancelled orders in the dashboard

chandranshu — Mon, 05 Sep 2011 15:57:26 +0530

chandranshu – 1 file(s) modified
Started showing cancelled orders in the dashboard

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

Rev 3195 – Minor correction

chandranshu — Mon, 05 Sep 2011 15:53:01 +0530

chandranshu – 1 file(s) modified
Minor correction

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

Rev 3194 – Added reloading script to reload config server parameters from shop2020.cfg ...

rajveer — Mon, 05 Sep 2011 15:50:51 +0530

rajveer – 3 file(s) modified
Added reloading script to reload config server parameters from shop2020.cfg file.

+ /trunk/PyProj/src/shop2020/config/script
+ /trunk/PyProj/src/shop2020/config/script/ConfigPropertiesReloader.py
+ /trunk/PyProj/src/shop2020/config/script/__init__.py

Rev 3193 – Add shortdate to events.

vikas — Mon, 05 Sep 2011 15:50:20 +0530

vikas – 4 file(s) modified
Add shortdate to events.

~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/AddDataLogServlet.java
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/search-events.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/session-activity.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/user-activity.jsp

Rev 3192 – Removed the caching till further action.

rajveer — Mon, 05 Sep 2011 15:39:39 +0530

rajveer – 1 file(s) modified
Removed the caching till further action.

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

Rev 3191 – COD orders will now be cancelled instead of refunded

chandranshu — Mon, 05 Sep 2011 15:28:50 +0530

chandranshu – 1 file(s) modified
COD orders will now be cancelled instead of refunded

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

Rev 3190 – Added a different description for some order statuses

chandranshu — Mon, 05 Sep 2011 15:24:28 +0530

chandranshu – 1 file(s) modified
Added a different description for some order statuses

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java

Rev 3189 – Payment service will run on one server while others will ...

rajveer — Mon, 05 Sep 2011 15:18:34 +0530

rajveer – 1 file(s) modified
Payment service will run on one server while others will have multiple instances.

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

Rev 3188 – Updated configuration file for database hostname.

rajveer — Mon, 05 Sep 2011 15:14:46 +0530

rajveer – 1 file(s) modified
Updated configuration file for database hostname.

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

Rev 3187 – Made database hostname configurable.

rajveer — Mon, 05 Sep 2011 15:10:15 +0530

rajveer – 23 file(s) modified
Made database hostname configurable.

~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServer.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/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/logistics/service/LogisticsServer.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/CatalogServer.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/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/TransactionServer.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.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/model/v1/user/PromotionServer.py
~ /trunk/PyProj/src/shop2020/model/v1/user/UserContextServer.py
~ /trunk/PyProj/src/shop2020/warehouse/main/handler/WarehouseHandler.py
~ /trunk/PyProj/src/shop2020/warehouse/main/WarehouseServer.py

Rev 3186 – Added support for cancelling a COD order

chandranshu — Mon, 05 Sep 2011 14:33:37 +0530

chandranshu – 3 file(s) modified
Added support for cancelling a COD order

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

Rev 3185 – Save session id in cookie as now mutilple tomcats are ...

vikas — Mon, 05 Sep 2011 14:25:17 +0530

vikas – 18 file(s) modified
Save session id in cookie as now mutilple tomcats are running. This generates diff session id for each req.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AddressController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LogoutController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayErrorController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java

Rev 3184 – Trim the source to 500 chars.

vikas — Mon, 05 Sep 2011 14:22:24 +0530

vikas – 1 file(s) modified
Trim the source to 500 chars.

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/NewSession.java

Rev 3183 – Updated client to give exception when we dont have correct ...

rajveer — Mon, 05 Sep 2011 14:14:35 +0530

rajveer – 2 file(s) modified
Updated client to give exception when we dont have correct port in config server

~ /trunk/Common/src/main/java/in/shop2020/thrift/clients/GenericClient.java
~ /trunk/PyProj/src/shop2020/clients/GenericClient.py

Rev 3182 – Added logos for banks, cash cards and Visa electron debit ...

chandranshu — Mon, 05 Sep 2011 14:06:55 +0530

chandranshu – 6 file(s) modified
Added logos for banks, cash cards and Visa electron debit cards. Also corrected the labels for GA.

~ /trunk/Website/src/main/webapp/css/proceed-to-pay.css
+ /trunk/Website/src/main/webapp/images/banks-sprite.gif
+ /trunk/Website/src/main/webapp/images/cash-cards.gif
+ /trunk/Website/src/main/webapp/images/cc-logos-1.gif
~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 3181 – Corrected options parsing.

rajveer — Mon, 05 Sep 2011 13:13:06 +0530

rajveer – 1 file(s) modified
Corrected options parsing.

~ /trunk/PyProj/src/shop2020/config/ConfigServer.py

Rev 3180 – Corrected the coupon rule to take all items in the ...

chandranshu — Mon, 05 Sep 2011 12:48:31 +0530

chandranshu – 1 file(s) modified
Corrected the coupon rule to take all items in the cart into account

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

Rev 3179 – Updated test config server starting script

rajveer — Mon, 05 Sep 2011 12:24:20 +0530

rajveer – 2 file(s) modified
Updated test config server starting script

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 3178 – Price of Desire S modified

varun.gupta — Mon, 05 Sep 2011 12:05:38 +0530

varun.gupta – 1 file(s) modified
Price of Desire S modified

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

Rev 3177 – Prices for selected HTC models updated

varun.gupta — Mon, 05 Sep 2011 05:31:18 +0530

varun.gupta – 1 file(s) modified
Prices for selected HTC models updated

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

Rev 3176 – Sprited the images in the payment modes widget

chandranshu — Fri, 02 Sep 2011 17:37:23 +0530

chandranshu – 6 file(s) modified
Sprited the images in the payment modes widget

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/paymentmodes.vm
+ /trunk/Website/src/main/webapp/css/payment-modes.css
+ /trunk/Website/src/main/webapp/images/cod-netbank.gif
+ /trunk/Website/src/main/webapp/images/payment-modes-sprite.gif

Rev 3175 – Resized the images correctly

chandranshu — Fri, 02 Sep 2011 15:06:21 +0530

chandranshu – 2 file(s) modified
Resized the images correctly

~ /trunk/Website/src/main/webapp/images/cod.jpg
~ /trunk/Website/src/main/webapp/images/netbanking.gif

Rev 3174 – Added COD to the payment modes widget. resized all the ...

chandranshu — Fri, 02 Sep 2011 15:04:48 +0530

chandranshu – 8 file(s) modified
Added COD to the payment modes widget. resized all the images

~ /trunk/Website/src/main/resources/templates/paymentmodes.vm
+ /trunk/Website/src/main/webapp/images/cod.jpg
~ /trunk/Website/src/main/webapp/images/maestro.png
~ /trunk/Website/src/main/webapp/images/mastercard.png
~ /trunk/Website/src/main/webapp/images/mastercard_securecode.gif
~ /trunk/Website/src/main/webapp/images/visa-electron.png
~ /trunk/Website/src/main/webapp/images/visa-verified.jpg
~ /trunk/Website/src/main/webapp/images/visa.png

Rev 3173 – Changed parameter names from min-price to minPrice

rajveer — Fri, 02 Sep 2011 14:56:51 +0530

rajveer – 5 file(s) modified
Changed parameter names from min-price to minPrice

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BrandController.java
~ /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/controllers/SpecialPageController.java
~ /trunk/Website/src/main/webapp/js/priceSlider.js

Rev 3172 – Limit the source string to 500 chars as restricted by ...

vikas — Fri, 02 Sep 2011 13:58:35 +0530

vikas – 1 file(s) modified
Limit the source string to 500 chars as restricted by GAE.

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/NewSession.java

Rev 3171 – Invalid coupon code exception message corrected.

rajveer — Fri, 02 Sep 2011 13:52:15 +0530

rajveer – 1 file(s) modified
Invalid coupon code exception message corrected.

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

Rev 3170 – Added more machine configurations in config file.

rajveer — Fri, 02 Sep 2011 13:40:07 +0530

rajveer – 1 file(s) modified
Added more machine configurations in config file.

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

Rev 3169 – Get the sublist from the latest arrivals before reading the ...

chandranshu — Fri, 02 Sep 2011 12:44:35 +0530

chandranshu – 1 file(s) modified
Get the sublist from the latest arrivals before reading the snippets

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

Rev 3168 – Trac#488 Updating the thrift file for optional fields Made relevant ...

mandeep.dhir — Fri, 02 Sep 2011 12:37:48 +0530

mandeep.dhir – 13 file(s) modified
Trac#488 Updating the thrift file for optional fields
Made relevant changes to velocity templates to use isset* methods from thrift model objects

~ /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-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/test/java/in/shop2020/crm/handler/ActivityHandlerTest.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Agent.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift